* 2.0: updated license year Update src/Symfony/Component/HttpFoundation/Response.php [Console] fixed unitialized properties (closes #5935) [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener. bumped Symfony version to 2.0.21-DEV updated VERSION for 2.0.21 updated CHANGELOG for 2.0.21 Conflicts: src/Symfony/Bundle/SwiftmailerBundle/LICENSE src/Symfony/Component/Filesystem/LICENSE src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Kernel.php
* 2.0: [TwigBundle] Moved the registration of the app global to the environment needs to use simpleContent in xsd to allow empty elements bumped Symfony version to 2.0.19-DEV removed wrong routing xsd statement `mixed="true"` removed unused attribute from routing.xsd updated VERSION for 2.0.19 update CONTRIBUTORS for 2.0.19 updated CHANGELOG for 2.0.19 Conflicts: CONTRIBUTORS.md src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml src/Symfony/Bundle/TwigBundle/TwigEngine.php src/Symfony/Component/HttpKernel/Kernel.php
This PR was merged into the 2.0 branch. Commits ------- 57edf56 removed wrong routing xsd statement `mixed="true"` Discussion ---------- removed wrong routing xsd statement `mixed="true"` mixed="true" means that the element could contain both text and other elements, e.g. `<requirement key="_locale">text <subelement /></requirement>` But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
mixed="true" means that the element could contain both text and other elements, e.g. `<requirement key="_locale">text <subelement /></requirement>` But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
This PR was merged into the 2.1 branch. Commits ------- 1daefa5 [Routing] made it compatible with older PCRE version (pre 8) Discussion ---------- [Routing] compatibility with older PCRE version (pre 8) fixes #4093 Ok I changed my mind about this issue. 1. I figured more people are affected than I thought and CentOS is stubborn. 2. Symfony still uses the old regex style `?P<param>` in several other components. So also doing so in the routing makes it more consistent. 3. Even if it's definitely not good to use an over 6 year old PCRE version with a recent PHP version, we can still try to provide the best experience. It doesn't mean we support outdated software stacks of custom PHP compilations as we won't and cannot specifically test against it. @fabpot: I will do a seperate PR on master when you merged this because the code changed alot in master so it cannot easily be merged I guess. I will also convert the symfony requirement for PCRE in the requirements check to a recommendation.
Initializing the matcher and the generator to set the context does not make sense as it is set anyway when building them. This avoids initializing them in the RouterListener if you never actually use them (for instance because you use the apache matcher).
…fix and route pattern
It would be confused with a network path e.g. '//domain/path' when generating a path so should be prevented.
This reverts commit 2da2a44382af2b9af85354ae5a381216534283d2, reversing changes made to 58855475c6c6879ee796d95cc522a74250ce5abb.
This reverts commit 2cf50b78017b805c75f8ba134925e3e71d2fea50, reversing changes made to 569e29d91fd35e91acc2dbcf490ad0f645eecd6d.
This reverts commit 0f61b2eb90f40e0665aed9ce82b94e6cfee7f07e, reversing changes made to 5e7723fcbb1232f6324312975f21a7d37243b785.
…required variable that does not match the requirement
Commits ------- 0706d18 [Routing] fixed 4 bugs in the UrlGenerator Discussion ---------- [Routing] UrlGenerator: fixed missing query param and some ignored requirements This was pretty hard to figure out. I could fix 4 bugs and refactor the code to safe 2 variables and several assignments. Sorry for doing this in one commit, but they were highly interdependent. See the added tests for what was fixed. The most obvious bug was that a query param was ignored if it had by accident the same name as a default param (but wasn't used in the path). In 3 cases it generated the wrong URL that wouldn't match this route. The generator wrongly ignored either the requirements or the passed parameter. I had to adjust one test that was asserting something wrong (see comments). --------------------------------------------------------------------------- by Tobion at 2012-08-13T14:22:35Z ping @fabpot --------------------------------------------------------------------------- by Tobion at 2012-08-29T17:53:07Z @fabpot I think it's important to merge this before 2.1 final.
* 2.0: updated VERSION for 2.0.17 updated CHANGELOG for 2.0.17 updated vendors for 2.0.17 fixed XML decoding attack vector through external entities prevents injection of malicious doc types disabled network access when loading XML documents refined previous commit prevents injection of malicious doc types standardized the way we handle XML errors Redirects are now absolute Conflicts: CHANGELOG-2.0.md src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/HttpKernel/Kernel.php tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php tests/Symfony/Tests/Component/Translation/Loader/XliffFileLoaderTest.php tests/Symfony/Tests/Component/Validator/Mapping/Loader/XmlFileLoaderTest.php vendors.php