[Routing] Fix XmlFileLoader exception message #23222
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
|
Hello, Thanks for your contribution! Please fix your code using the fabbot fix: Then squash your commits so there is still only one commit. |
|
@Nek- your comment is correct ... but for Symfony repos we use a tool to merge PRs that squashes everything automatically. So there's no need to do that. Thanks! |
|
@Nek-, fabbot suggests to fix docblocks that I didn’t change: --- src/Symfony/Component/Routing/Loader/XmlFileLoader.php 2017-06-18 19:04:58.715402348 +0000
+++ src/Symfony/Component/Routing/Loader/XmlFileLoader.php 2017-06-18 19:05:00.419350700 +0000
@@ -36,8 +36,8 @@
*
* @return RouteCollection A RouteCollection instance
*
- * @throws \InvalidArgumentException When the file cannot be loaded or when the XML cannot be
- * parsed because it does not validate against the scheme.
+ * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
+ * parsed because it does not validate against the scheme
*/
public function load($file, $type = null)
{
@@ -219,7 +219,7 @@
* @param \DOMElement $node Element to parse that contains the configs
* @param string $path Full path of the XML file being processed
*
- * @return array An array with the defaults as first item, requirements as second and options as third.
+ * @return array an array with the defaults as first item, requirements as second and options as third
*
* @throws \InvalidArgumentException When the XML is invalid
*/ |
|
Thank you @voronkovich. |
fabpot
added a commit
that referenced
this pull request
Jun 19, 2017
This PR was merged into the 2.7 branch. Discussion ---------- [Routing] Fix XmlFileLoader exception message | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT When an `XmlFileLoader` encounters an unknown tag it throws an exception with message like `Unknown tag "foo" used in file "bar". Expected "default", "requirement" or "option".`. A proper message should be `Unknown tag "foo" used in file "bar". Expected "default", "requirement", "option" or "condition".` Commits ------- f6a94cb [Routing] Fix XmlFileLoader exception message
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.
When an
XmlFileLoaderencounters an unknown tag it throws an exception with message likeUnknown tag "foo" used in file "bar". Expected "default", "requirement" or "option".. A proper message should beUnknown tag "foo" used in file "bar". Expected "default", "requirement", "option" or "condition".