Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Jan 09, 2013

  1. Fabien Potencier

    removed the .gitattributes files (closes #6605, reverts #5674)

    authored January 09, 2013

Jan 04, 2013

  1. Fabien Potencier

    Merge branch '2.0' into 2.1

    * 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
    authored January 04, 2013
  2. Fabien Potencier

    updated license year

    authored January 04, 2013

Dec 11, 2012

  1. Fabien Potencier

    fixed CS

    authored December 11, 2012

Dec 06, 2012

  1. Martin Hasoň

    Removed useless branch alias for dev-master in composer.json

    authored December 06, 2012

Dec 03, 2012

  1. Fabien Potencier

    Merge branch '2.0' into 2.1

    * 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
    authored December 03, 2012
  2. Tobias Schultze

    needs to use simpleContent in xsd to allow empty elements

    authored December 03, 2012

Dec 02, 2012

  1. Fabien Potencier

    merged branch Tobion/patch-2 (PR #6166)

    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.
    authored December 02, 2012

Dec 01, 2012

  1. Tobias Schultze

    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.
    authored December 01, 2012
  2. Tobias Schultze

    removed unused attribute from routing.xsd

    authored December 01, 2012

Nov 19, 2012

  1. Fabien Potencier

    merged branch Tobion/routing-centos (PR #6062)

    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.
    authored November 19, 2012
  2. Tobias Schultze

    [Routing] made it compatible with older PCRE version (pre 8)

    authored November 19, 2012

Nov 18, 2012

  1. Tobias Schultze

    tiny refactoring for consistency

    authored November 18, 2012

Nov 12, 2012

  1. Tobias Schultze

    [Routing] removed irrelevant string cast in Route

    Even if the passed key is an integer, casting to string won't make any difference in array keys (it remains an int key).
    authored November 12, 2012

Nov 08, 2012

  1. Włodzimierz Gajda

    Fix export-ignore on Windows

    authored November 08, 2012

Oct 26, 2012

  1. Tobias Schultze

    slight refactoring in UrlMatcher

    authored October 26, 2012

Oct 22, 2012

  1. Mario A. Alvarez Garcia

    Code cleanup

    authored October 22, 2012

Oct 20, 2012

  1. Drak

    Nsdocblocks

    authored October 19, 2012 fabpot committed October 20, 2012

Oct 14, 2012

  1. Christophe Coevoet

    Made the router lazy when setting the context

    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).
    authored October 14, 2012 fabpot committed October 14, 2012

Oct 08, 2012

  1. Tobias Schultze

    [Routing] fix handling of whitespace and synch between collection pre…

    …fix and route pattern
    authored October 06, 2012

Oct 05, 2012

  1. Tobias Schultze

    [Routing] fix handling of two starting slashes in the pattern

    It would be confused with a network path e.g. '//domain/path' when generating a path so should be prevented.
    authored October 06, 2012

Oct 04, 2012

  1. Igor Wiedler

    [2.1] Exclude tests from zips via gitattributes

    authored October 04, 2012

Sep 10, 2012

  1. Fabien Potencier

    replaced self.version by 2.1.* in composer.json files

    authored September 10, 2012

Sep 05, 2012

  1. Fabien Potencier

    Revert "merged branch Tobion/strictrequirements (PR #5181)"

    This reverts commit 2da2a44, reversing
    changes made to 5885547.
    authored September 05, 2012
  2. Fabien Potencier

    Revert "merged branch Tobion/requirementscheck (PR #5187)"

    This reverts commit 2cf50b7, reversing
    changes made to 569e29d.
    authored September 05, 2012
  3. Fabien Potencier

    Revert "merged branch Tobion/uselessparamdefaults (PR #5400)"

    This reverts commit 0f61b2e, reversing
    changes made to 5e7723f.
    authored September 05, 2012

Aug 31, 2012

  1. Tobias Schultze

    [Routing] added route compile check to identify a default value of a …

    …required variable that does not match the requirement
    authored August 31, 2012

Aug 30, 2012

  1. Tobias Schultze

    extended phpdoc of ConfigurableRequirementsInterface

    authored August 30, 2012
  2. Tobias Schultze

    [Routing] added test for disabled requirements check

    authored August 06, 2012
  3. Tobias Schultze

    [Routing] allow disabling the requirements check on URL generation

    authored August 06, 2012
  4. Fabien Potencier

    merged branch Tobion/strictrequirements (PR #5181)

    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.
    authored August 30, 2012

Aug 29, 2012

  1. Tobias Schultze

    [Routing] small refactoring in Router

    authored August 29, 2012

Aug 28, 2012

  1. Fabien Potencier

    [Routing] fixed a test

    authored August 28, 2012
  2. Fabien Potencier

    Merge branch '2.0'

    * 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
    authored August 28, 2012
  3. Fabien Potencier

    fixed XML decoding attack vector through external entities

    authored August 27, 2012
Something went wrong with that request. Please try again.