[DI] Allow imports in string format for YAML #22176
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
reviewed
Mar 27, 2017
| @@ -181,7 +181,9 @@ private function parseImports(array $content, $file) | |||
| $defaultDirectory = dirname($file); | |||
| foreach ($content['imports'] as $import) { | |||
| if (!is_array($import)) { | |||
| throw new InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file)); | |||
| $import = array('resource' => $import); | |||
There was a problem hiding this comment.
only strings should be allowed to be rewritten that way, not any non-array value
There was a problem hiding this comment.
Do we really care? Whatever the input is; it crashes like before.
imports:
- { resource: { breakit: config.yml } }Warning: strlen() expects parameter 1 to be string, array given
Which actually comes from FileLoader::glob(). AFAIK the api describes type mixed for resources. Hence i think we should just pass here... and fix the glob issue of course ^^
ro0NL
commented
Mar 27, 2017
| @@ -82,6 +82,10 @@ public function getLocator() | |||
| */ | |||
| public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null) | |||
| { | |||
| if (!is_string($resource)) { | |||
There was a problem hiding this comment.
Tiny change introduced after #21635
|
Tests added. Build failures unrelated. |
|
Rebased. Would love to see this in 3.4 👼 (same trend as we did with |
xabbuh
approved these changes
Jul 9, 2017
|
Thank you @ro0NL. |
fabpot
added a commit
that referenced
this pull request
Jul 11, 2017
This PR was merged into the 3.4 branch.
Discussion
----------
[DI] Allow imports in string format for YAML
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License | MIT
| Doc PR | symfony/symfony-docs#... <!--highly recommended for new features-->
I see no real reasons why this shouldnt be allowed..
Before
```yml
imports:
- { resource: config.yml }
```
After
```yml
imports:
- config.yml
```
Commits
-------
632e934 [DI] Allow imports in string format for YAML
This was referenced Oct 18, 2017
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I see no real reasons why this shouldnt be allowed..
Before
After