Permalink
Commits on Nov 3, 2016
  1. Merge branch '2.7' into 2.8

    * 2.7:
      CS fixes
      Remove trailing space
      CS: apply rules
      [Yaml] Clean some messages + add test case
      [Form] Fix UrlType transforms valid protocols
      [SecurityBundle] Changed encoder configuration example to bcrypt
    nicolas-grekas committed Nov 3, 2016
  2. CS: apply rules

    keradus committed with nicolas-grekas Oct 30, 2016
Commits on Sep 6, 2016
  1. Merge branch '3.1'

    * 3.1:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [Form] Fix transformer tests after the ICU update
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      bumped Symfony version to 3.1.5
      updated VERSION for 3.1.4
      updated CHANGELOG for 3.1.4
      bumped Symfony version to 2.8.11
      updated VERSION for 2.8.10
      updated CHANGELOG for 2.8.10
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
  2. Merge branch '2.8' into 3.1

    * 2.8:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [Form] Fix transformer tests after the ICU update
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      bumped Symfony version to 2.8.11
      updated VERSION for 2.8.10
      updated CHANGELOG for 2.8.10
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
  3. Merge branch '2.7' into 2.8

    * 2.7:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
Commits on Jun 29, 2016
  1. Merge branch '3.1'

    * 3.1:
      fixed CS
      fixed CS
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      [Security] Allow LDAP loadUser override
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  2. Merge branch '3.0' into 3.1

    * 3.0:
      fixed CS
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  3. Merge branch '2.8' into 3.0

    * 2.8:
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  4. fixed CS

    fabpot committed Jun 29, 2016
  5. Merge branch '2.7' into 2.8

    * 2.7:
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
Commits on Jun 28, 2016
Commits on Jun 6, 2016
  1. Merge branch '3.1'

    * 3.1:
      `@throws` annotations should go after `@return`
      Fix merge
      updated VERSION for 2.3.42
      update CONTRIBUTORS for 2.3.42
      updated CHANGELOG for 2.3.42
      Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
      Partial revert of previous PR
      [DependencyInjection] Skip deep reference check for 'service_container'
      Catch \Throwable
      [Serializer] Add missing @throws annotations
      Fix for #18843
      force enabling the external XML entity loaders
      Removed UTC specification with timestamp
    nicolas-grekas committed Jun 6, 2016
  2. Merge branch '3.0' into 3.1

    * 3.0:
      `@throws` annotations should go after `@return`
      Fix merge
      updated VERSION for 2.3.42
      update CONTRIBUTORS for 2.3.42
      updated CHANGELOG for 2.3.42
      Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
      Partial revert of previous PR
      [DependencyInjection] Skip deep reference check for 'service_container'
      Catch \Throwable
      [Serializer] Add missing @throws annotations
      Fix for #18843
      force enabling the external XML entity loaders
      Removed UTC specification with timestamp
    
    Conflicts:
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
    nicolas-grekas committed Jun 6, 2016
  3. Merge branch '2.8' into 3.0

    * 2.8:
      `@throws` annotations should go after `@return`
      Fix merge
      updated VERSION for 2.3.42
      update CONTRIBUTORS for 2.3.42
      updated CHANGELOG for 2.3.42
      Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
      Partial revert of previous PR
      [DependencyInjection] Skip deep reference check for 'service_container'
      Catch \Throwable
      [Serializer] Add missing @throws annotations
      Fix for #18843
      force enabling the external XML entity loaders
      Removed UTC specification with timestamp
    
    Conflicts:
    	CHANGELOG-2.3.md
    	src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
    	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
    	src/Symfony/Component/Config/Loader/FileLoader.php
    	src/Symfony/Component/DependencyInjection/Container.php
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/Finder/Expression/Expression.php
    	src/Symfony/Component/Finder/Finder.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
    	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
    nicolas-grekas committed Jun 6, 2016
  4. Merge branch '2.7' into 2.8

    * 2.7:
      `@throws` annotations should go after `@return`
      Fix merge
      updated VERSION for 2.3.42
      update CONTRIBUTORS for 2.3.42
      updated CHANGELOG for 2.3.42
      Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"
      Partial revert of previous PR
      [DependencyInjection] Skip deep reference check for 'service_container'
      Catch \Throwable
      [Serializer] Add missing @throws annotations
      Fix for #18843
      force enabling the external XML entity loaders
      Removed UTC specification with timestamp
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
    	src/Symfony/Component/Finder/Finder.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
    	src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
    	src/Symfony/Component/Security/Acl/Model/AclInterface.php
    	src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
    	src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
    	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
    nicolas-grekas committed Jun 6, 2016
Commits on May 13, 2016
  1. updated version to 3.2

    fabpot committed May 13, 2016
Commits on Mar 4, 2016
  1. Merge branch '3.0'

    * 3.0:
      Updated all the README files
      [TwigBundle] Fix failing test on appveyor
      Improved the error message when using "@" in a decorated service
      Improve error reporting in router panel of web profiler
      [DoctrineBridge][Form] Fix performance regression in EntityType
      [FrameworkBundle] Fix a regression in handling absolute and namespaced template paths
      Allow to normalize \Traversable
      minor [Form] fix tests added by #16886
      Remove _path from query parameters when fragment is a subrequest and request attributes are already set Added tests for _path removal in FragmentListener
      Simplified everything
      Added a test
      Fixed the problem in an easier way
      Fixed a syntax issue
      Improved the error message when a template is not found
      [CodingStandards] Conformed to coding standards
      [TwigBundle] fixed Include file locations in "Template could not be found" exception
    fabpot committed Mar 4, 2016
  2. Merge branch '2.8' into 3.0

    * 2.8:
      Updated all the README files
      [TwigBundle] Fix failing test on appveyor
      Improved the error message when using "@" in a decorated service
      Improve error reporting in router panel of web profiler
      [DoctrineBridge][Form] Fix performance regression in EntityType
      [FrameworkBundle] Fix a regression in handling absolute and namespaced template paths
      Allow to normalize \Traversable
      minor [Form] fix tests added by #16886
      Remove _path from query parameters when fragment is a subrequest and request attributes are already set Added tests for _path removal in FragmentListener
      Simplified everything
      Added a test
      Fixed the problem in an easier way
      Fixed a syntax issue
      Improved the error message when a template is not found
      [CodingStandards] Conformed to coding standards
      [TwigBundle] fixed Include file locations in "Template could not be found" exception
    fabpot committed Mar 4, 2016
  3. Merge branch '2.7' into 2.8

    * 2.7:
      Updated all the README files
      [TwigBundle] Fix failing test on appveyor
      Improved the error message when using "@" in a decorated service
      Improve error reporting in router panel of web profiler
      [DoctrineBridge][Form] Fix performance regression in EntityType
      [FrameworkBundle] Fix a regression in handling absolute and namespaced template paths
      Allow to normalize \Traversable
      minor [Form] fix tests added by #16886
      Remove _path from query parameters when fragment is a subrequest and request attributes are already set Added tests for _path removal in FragmentListener
      Simplified everything
      Added a test
      Fixed the problem in an easier way
      Fixed a syntax issue
      Improved the error message when a template is not found
      [CodingStandards] Conformed to coding standards
      [TwigBundle] fixed Include file locations in "Template could not be found" exception
    fabpot committed Mar 4, 2016
  4. Merge branch '2.3' into 2.7

    * 2.3:
      Updated all the README files
      [TwigBundle] Fix failing test on appveyor
      [FrameworkBundle] Fix a regression in handling absolute and namespaced template paths
      Allow to normalize \Traversable
      Remove _path from query parameters when fragment is a subrequest and request attributes are already set Added tests for _path removal in FragmentListener
      Simplified everything
      Added a test
      Fixed the problem in an easier way
      Fixed a syntax issue
      Improved the error message when a template is not found
      [CodingStandards] Conformed to coding standards
      [TwigBundle] fixed Include file locations in "Template could not be found" exception
    fabpot committed Mar 4, 2016
Commits on Feb 4, 2016
  1. Merge branch '3.0'

    * 3.0: (105 commits)
      [Console] remove readline support
      bumped Symfony version to 3.0.3
      updated VERSION for 3.0.2
      updated CHANGELOG for 3.0.2
      [Routing] added a suggestion to add the HttpFoundation component.
      [FrameworkBundle] fix assets and templating tests
      [ClassLoader] fix ApcClassLoader tests on HHVM
      [travis] Add some comments
      changed operator from and to &&
      [DependencyInjection] Remove unused parameter
      [Process] Fix transient tests for incremental outputs
      [Console] Add missing `@require` annotation in test
      Fix merge
      [appveyor] Fix failure reporting
      [#17634] move DebugBundle license file
      Limit Ldap component version for the 3.0 branch
      backport GlobTest from 2.7 branch
      Move licenses according to new best practices
      [FrameworkBundle] Remove unused code in test
      [2.3] Fixed an undefined variable in Glob::toRegex
      ...
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/assets.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/assets.yml
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
    	src/Symfony/Component/Console/CHANGELOG.md
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/PropertyInfo/Tests/PropertyInfoExtractorTest.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
    nicolas-grekas committed Feb 4, 2016
Commits on Jan 27, 2016
  1. Merge branch '2.8' into 3.0

    * 2.8:
      [WebProfilerBundle] Don't inherit CSS text-transform property for the toolbar.
      Remove duplicate cursor property
      Increase the inlining YAML level for config:debug
      [Serializer] Minor: fix CS and PHPDoc
      [Form] fix tests
      [Serializer] Ensure that groups are strings
      [Debug] Tell that the extension is for PHP 5 only
      Static code analysis
      Update AnnotationDirectoryLoader.php
      added a test
      Escape the delimiter in Glob::toRegex
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
    fabpot committed Jan 27, 2016
  2. Merge branch '2.7' into 2.8

    * 2.7:
      Increase the inlining YAML level for config:debug
      [Serializer] Minor: fix CS and PHPDoc
      [Form] fix tests
      [Serializer] Ensure that groups are strings
      [Debug] Tell that the extension is for PHP 5 only
      Static code analysis
      Update AnnotationDirectoryLoader.php
      added a test
      Escape the delimiter in Glob::toRegex
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
    fabpot committed Jan 27, 2016
  3. Merge branch '2.3' into 2.7

    * 2.3:
      Static code analysis
      Update AnnotationDirectoryLoader.php
      [FrameworkBundle] Fix template location for PHP templates
      [FrameworkBundle] Add path verification to the template parsing test cases
    fabpot committed Jan 27, 2016
  4. minor #17480 Static code analysis (Koc)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Static code analysis
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Things that done:
    * fix case in method calls
    * removed unused imports
    * use shorter concat where it possible
    * optimize some css
    * removed duplicated array keys
    * removed redurant return statements
    * removed one-time variables
    * do not pass arguments that not used in functions
    
    Commits
    -------
    
    8db691a Static code analysis
    fabpot committed Jan 27, 2016
Commits on Jan 25, 2016
  1. Static code analysis

    Koc committed Jan 25, 2016
  2. Merge branch '2.8' into 3.0

    * 2.8:
      fixed test
      [Request] Ignore invalid IP addresses sent by proxies
      [EventDispatcher] TraceableEventDispatcher resets listener priorities
      Throw for missing container extensions
      [TwigBridge] add missing unit tests (AppVariable)
      Able to load big xml files with DomCrawler
      fixed typo
      [Form] Fix constraints could be null if not set
      [Finder] Check PHP version before applying a workaround for a PHP bug
      fixed CS
      add defaultNull to version
      sort bundles in config:dump-reference command
      Fixer findings.
      Profiler CSS position conflicts with JS detection
      [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
      [FrameworkBundle] Compute the kernel root hash only one time
    fabpot committed Jan 25, 2016
  3. Merge branch '2.7' into 2.8

    * 2.7:
      fixed test
      [Request] Ignore invalid IP addresses sent by proxies
      Throw for missing container extensions
      [TwigBridge] add missing unit tests (AppVariable)
      Able to load big xml files with DomCrawler
      fixed typo
      [Form] Fix constraints could be null if not set
      [Finder] Check PHP version before applying a workaround for a PHP bug
      fixed CS
      add defaultNull to version
      sort bundles in config:dump-reference command
      Fixer findings.
      [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
      [FrameworkBundle] Compute the kernel root hash only one time
    fabpot committed Jan 25, 2016
  4. Merge branch '2.3' into 2.7

    * 2.3:
      [Request] Ignore invalid IP addresses sent by proxies
      Able to load big xml files with DomCrawler
      fixed typo
      [Form] Fix constraints could be null if not set
      [Finder] Check PHP version before applying a workaround for a PHP bug
      fixed CS
      sort bundles in config:dump-reference command
      Fixer findings.
    fabpot committed Jan 25, 2016
Commits on Jan 22, 2016
  1. Fixer findings.

    SpacePossum committed Jan 22, 2016
Commits on Jan 3, 2016
  1. Merge branch '3.0'

    * 3.0:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
    fabpot committed Jan 3, 2016
  2. Merge branch '2.8' into 3.0

    * 2.8:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
    fabpot committed Jan 3, 2016