Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Config] fix filelocator with empty name #12206

Merged
merged 2 commits into from Oct 30, 2014
Merged

Conversation

Tobion
Copy link
Member

@Tobion Tobion commented Oct 10, 2014

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

fix filelocator with empty name + phpdoc in config component

@Tobion Tobion changed the title [Config] fix filelocator with empty name WIP [Config] fix filelocator with empty name Oct 10, 2014
@Tobion Tobion changed the title WIP [Config] fix filelocator with empty name [Config] fix filelocator with empty name Oct 10, 2014
@Tobion Tobion force-pushed the config-loader branch 2 times, most recently from dea509e to f1dba8a Compare October 10, 2014 21:11
* @param mixed $resource The resource
* @param string|null $type The resource type or null if unknown
*
* @throws FileLoaderLoadException If something went wrong
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is wrong. Other loaders than the FileLoader won't use the FileLoaderLoadException but any exception (the FileLoader is wrapping exceptions in a FileLoaderLoadException to add the info about which file is being loaded)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

@Tobion
Copy link
Member Author

Tobion commented Oct 30, 2014

@fabpot this mostly fixes phpdoc and should be easy to merge.

@fabpot
Copy link
Member

fabpot commented Oct 30, 2014

Thank you @Tobion.

@fabpot fabpot merged commit 63b8c07 into symfony:2.3 Oct 30, 2014
fabpot added a commit that referenced this pull request Oct 30, 2014
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] fix filelocator with empty name

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

fix filelocator with empty name + phpdoc in config component

Commits
-------

63b8c07 [DependencyInjection] use inheritdoc for loaders
ddd2fe2 [Config] fix filelocator with empty name
@Tobion Tobion deleted the config-loader branch October 30, 2014 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants