Skip to content
Commits on Feb 4, 2016
  1. @nicolas-grekas

    Merge branch '3.0'

    nicolas-grekas committed
    * 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
Commits on Feb 3, 2016
  1. @xabbuh
Commits on Jan 25, 2016
  1. @Tobion
  2. @fabpot

    fixed bad merge

    fabpot committed
  3. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      fixed undefined variable
      Fixed the phpDoc of UserInterface
      fixed APCu dep version
      make apc class loader testable against apcu without apc bc layer
      Added support for the `0.0.0.0/0` trusted proxy
      fixed CS
      [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
      Limit the max height/width of icons in the profiler menu
      added missing constant
      Added 451 status code
      Remove unnecessary code
      Allow absolute URLs to be displayed in the debug toolbar
      [ClassLoader] Use symfony/polyfill-apcu
      update upgrade files with CSRF related option info
      [TranslationUpdateCommand] fixed undefined resultMessage var.
      [HttpKernel] Lookup the response even if the lock was released after 2 seconds
  4. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      fixed undefined variable
      Fixed the phpDoc of UserInterface
      fixed APCu dep version
      make apc class loader testable against apcu without apc bc layer
      Added support for the `0.0.0.0/0` trusted proxy
      [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
      added missing constant
      Added 451 status code
      Remove unnecessary code
      Allow absolute URLs to be displayed in the debug toolbar
      [ClassLoader] Use symfony/polyfill-apcu
      [HttpKernel] Lookup the response even if the lock was released after 2 seconds
  5. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      fixed undefined variable
      Fixed the phpDoc of UserInterface
      fixed APCu dep version
      Added support for the `0.0.0.0/0` trusted proxy
      [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument
      [HttpKernel] Lookup the response even if the lock was released after 2 seconds
  6. @fabpot

    fixed APCu dep version

    fabpot committed
  7. @Tobion
  8. @Tobion

    remove obsolete apcu polyfill

    Tobion committed
  9. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      [ClassLoader] Use symfony/polyfill-apcu
Commits on Jan 20, 2016
  1. @fabpot

    Merge branch '3.0'

    fabpot committed
    * 3.0: (36 commits)
      Fixed form types in profiler
      [Process] Use stream based storage to avoid memory issues
      Fix upgrade guides concerning erroneous removal of assets helper
      [Process] Remove a misleading comment
      Fix markdown typo
      ChooseBaseUrl should return an index
      [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced
      Improve the phpdoc of SplFileInfo methods
      [Process] Use stream based storage to avoid memory issues
      [FrameworkBundle] Don't log twice with the error handler
      synchronize 2.8 and 3.0 upgrade files
      Remove useless is_object condition
      [Process] Fix typo, no arguments needed anymore
      [Serializer] Introduce constants for context keys
      Fixed the documentation of VoterInterface::supportsAttribute
      Fixed Bootstrap form theme form "reset" buttons
      Fixed the form profiler when using long form types
      [PropertyInfo] PhpDocExtractor: Fix a notice when the property doesn't exist
      Remove useless duplicated tests
      [FrameworkBundle] Optimize framework extension tests
      ...
  2. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8: (48 commits)
      [Process] Use stream based storage to avoid memory issues
      Fix upgrade guides concerning erroneous removal of assets helper
      [Process] Remove a misleading comment
      Fix markdown typo
      ChooseBaseUrl should return an index
      [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced
      Improve the phpdoc of SplFileInfo methods
      [Process] Use stream based storage to avoid memory issues
      [FrameworkBundle] Don't log twice with the error handler
      synchronize 2.8 and 3.0 upgrade files
      Remove useless is_object condition
      [Process] Fix typo, no arguments needed anymore
      [Serializer] Introduce constants for context keys
      Fixed the documentation of VoterInterface::supportsAttribute
      Fixed Bootstrap form theme form "reset" buttons
      Fixed the form profiler when using long form types
      [PropertyInfo] PhpDocExtractor: Fix a notice when the property doesn't exist
      Remove useless duplicated tests
      [FrameworkBundle] Optimize framework extension tests
      synchronize 2.7 and 3.0 upgrade files
      ...
  3. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7: (28 commits)
      [Process] Use stream based storage to avoid memory issues
      Fix upgrade guides concerning erroneous removal of assets helper
      [Process] Remove a misleading comment
      Fix markdown typo
      ChooseBaseUrl should return an index
      [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced
      Improve the phpdoc of SplFileInfo methods
      [Process] Use stream based storage to avoid memory issues
      [FrameworkBundle] Don't log twice with the error handler
      Remove useless is_object condition
      [Process] Fix typo, no arguments needed anymore
      [Serializer] Introduce constants for context keys
      Fixed the documentation of VoterInterface::supportsAttribute
      Fixed Bootstrap form theme form "reset" buttons
      Remove useless duplicated tests
      [FrameworkBundle] Optimize framework extension tests
      synchronize 2.7 and 3.0 upgrade files
      fix merge 2.3 into 2.7 for SecureRandom dependency
      Use is_subclass_of instead of reflection
      Use is_subclass_of instead of Reflection when possible
      ...
Commits on Jan 18, 2016
  1. @gapple
Commits on Jan 16, 2016
  1. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      Fixed correct class name in thrown exception
      Add gc_mem_caches() call for PHP7 after itoken_get_all() as new memory manager will not release small buckets to OS automatically
      Removed a duplicated test in CardSchemeValidatorTest
      Fix perf and mem issue when using token_get_all
      [SecurityBundle] fix SecureRandom service constructor args
      Normalize params only when used.
Commits on Jan 15, 2016
  1. @fabpot

    bug #17377 Fix performance (PHP5) and memory (PHP7) issues when using…

    fabpot committed
    … token_get_all (nicolas-grekas, peteward)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Fix performance (PHP5) and memory (PHP7) issues when using token_get_all
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #16868
    | License       | MIT
    | Doc PR        | -
    
    Although it's not the case anymore on PHP 7, on PHP 5, `is_array` checks are much slower than `isset` checks.
    
    Also from @peteward in #17384:
    >  New PHP7 memory manager will not release small buckets to OS automatically in cases exposed by `token_get_all()`. This function call addition specifically for PHP7 will reclaim this memory to keep the footprint down of long processe
    
    > See above ticket and suggested actions by PHP internals team for long-running tasks (https://bugs.php.net/70098) - I think `cache:clear/warmup` on a heavy app justifies this.
    
    > We're running on cloud-based hosting platforms under memory limitations (Platform.sh). When memory is exceeded we're into swap and the cache clearing process goes from seconds to minutes for the initial deployment, which really slows our development workflow and also causes holding page delays.
    
    Commits
    -------
    
    e555aad Add gc_mem_caches() call for PHP7 after itoken_get_all() as new memory manager will not release small buckets to OS automatically
    d1f72d8 Fix perf and mem issue when using token_get_all
  2. @nicolas-grekas

    Merge branch '3.0'

    nicolas-grekas committed
    * 3.0:
      [ClassLoader] Use symfony/polyfill-apcu
      [HttpFoundation][Cookie] Cookie DateTimeInterface fix
      bumped Symfony version to 2.8.3
      updated VERSION for 2.8.2
      updated CHANGELOG for 2.8.2
      bumped Symfony version to 2.7.10
      updated VERSION for 2.7.9
      updated CHANGELOG for 2.7.9
      bumped Symfony version to 2.3.38
      updated VERSION for 2.3.37
      update CONTRIBUTORS for 2.3.37
      updated CHANGELOG for 2.3.37
      added missing requirement
      removed obsolete tests, fixed composer.json
      do not ship with a custom rng implementation
      [Console] HHVM read input stream bug
      Fix max width for multibyte keys in choice question
      [Console] Display console application name even when no version set
      Remove calls to non-existing method
      Remove empty statements.
  3. @nicolas-grekas

    Merge branch '2.8' into 3.0

    nicolas-grekas committed
    * 2.8:
      [ClassLoader] Use symfony/polyfill-apcu
      [HttpFoundation][Cookie] Cookie DateTimeInterface fix
      bumped Symfony version to 2.8.3
      updated VERSION for 2.8.2
      updated CHANGELOG for 2.8.2
      bumped Symfony version to 2.7.10
      updated VERSION for 2.7.9
      updated CHANGELOG for 2.7.9
      bumped Symfony version to 2.3.38
      updated VERSION for 2.3.37
      update CONTRIBUTORS for 2.3.37
      updated CHANGELOG for 2.3.37
      added missing requirement
      removed obsolete tests, fixed composer.json
      do not ship with a custom rng implementation
      [Console] HHVM read input stream bug
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.7.md
    	CHANGELOG-2.8.md
    	composer.json
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/HttpKernel/Kernel.php
  4. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas committed
    * 2.7:
      [ClassLoader] Use symfony/polyfill-apcu
      [HttpFoundation][Cookie] Cookie DateTimeInterface fix
      bumped Symfony version to 2.7.10
      updated VERSION for 2.7.9
      updated CHANGELOG for 2.7.9
      bumped Symfony version to 2.3.38
      updated VERSION for 2.3.37
      update CONTRIBUTORS for 2.3.37
      updated CHANGELOG for 2.3.37
    
    Conflicts:
    	composer.json
    	src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
    	src/Symfony/Component/HttpKernel/Kernel.php
  5. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas committed
    * 2.3:
      [ClassLoader] Use symfony/polyfill-apcu
      [HttpFoundation][Cookie] Cookie DateTimeInterface fix
      bumped Symfony version to 2.3.38
      updated VERSION for 2.3.37
      update CONTRIBUTORS for 2.3.37
      updated CHANGELOG for 2.3.37
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/HttpKernel/Kernel.php
  6. @peteward @nicolas-grekas

    Add gc_mem_caches() call for PHP7 after itoken_get_all() as new memor…

    peteward committed with nicolas-grekas
    …y manager will not release small buckets to OS automatically
Commits on Jan 14, 2016
  1. @nicolas-grekas
  2. @nicolas-grekas
Commits on Jan 3, 2016
  1. @fabpot

    Merge branch '3.0'

    fabpot committed
    * 3.0:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  2. @fabpot

    Merge branch '2.8' into 3.0

    fabpot committed
    * 2.8:
      updated copyright year
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  3. @fabpot

    Merge branch '2.7' into 2.8

    fabpot committed
    * 2.7:
      updated copyright year
      Update copyright year
      [2.3] Static Code Analysis for Components
  4. @fabpot

    Merge branch '2.3' into 2.7

    fabpot committed
    * 2.3:
      Update copyright year
      [2.3] Static Code Analysis for Components
Commits on Jan 2, 2016
  1. @dosten

    Update copyright year

    dosten committed
Commits on Dec 31, 2015
  1. @fabpot

    minor #17085 [2.3] Static Code Analysis for Components (kalessil)

    fabpot committed
    This PR was squashed before being merged into the 2.3 branch (closes #17085).
    
    Discussion
    ----------
    
    [2.3] Static Code Analysis for Components
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Static Code Analysis with Php Inspections (EA Extended):
        - remaining mkdir race conditions
        - continue miss-usage in switch
    
    Commits
    -------
    
    6d303c7 [2.3] Static Code Analysis for Components
  2. @kalessil @fabpot
Commits on Dec 28, 2015
  1. @nicolas-grekas

    Merge branch '3.0'

    nicolas-grekas committed
    * 3.0:
      [travis] timeout the sigchild tests at 60s
      CS: Single line comments should use double slashes (//) and not hash (#).
      Do not use HttpKernel Extension when not needed for 2.7
      bumped Symfony version to 3.0.2
      Do not use HttpKernel Extension when not needed
      updated VERSION for 3.0.1
      updated CHANGELOG for 3.0.1
      bumped Symfony version to 2.8.2
      updated VERSION for 2.8.1
      updated CHANGELOG for 2.8.1
      bumped Symfony version to 2.7.9
      updated VERSION for 2.7.8
      updated CHANGELOG for 2.7.8
      bumped Symfony version to 2.3.37
      updated VERSION for 2.3.36
      update CONTRIBUTORS for 2.3.36
      updated CHANGELOG for 2.3.36
      Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
      Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
      use nowdoc instead of heredoc
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
  2. @nicolas-grekas

    Merge branch '2.8' into 3.0

    nicolas-grekas committed
    * 2.8:
      [travis] timeout the sigchild tests at 60s
      CS: Single line comments should use double slashes (//) and not hash (#).
      Do not use HttpKernel Extension when not needed for 2.7
      Do not use HttpKernel Extension when not needed
      bumped Symfony version to 2.8.2
      updated VERSION for 2.8.1
      updated CHANGELOG for 2.8.1
      bumped Symfony version to 2.7.9
      updated VERSION for 2.7.8
      updated CHANGELOG for 2.7.8
      bumped Symfony version to 2.3.37
      updated VERSION for 2.3.36
      update CONTRIBUTORS for 2.3.36
      updated CHANGELOG for 2.3.36
      Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
      Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
      use nowdoc instead of heredoc
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.7.md
    	CHANGELOG-2.8.md
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
    	src/Symfony/Bundle/WebProfilerBundle/Command/ExportCommand.php
    	src/Symfony/Bundle/WebProfilerBundle/Command/ImportCommand.php
    	src/Symfony/Component/Console/Shell.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/HttpKernel/Kernel.php
  3. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas committed
    * 2.7:
      [travis] timeout the sigchild tests at 60s
      CS: Single line comments should use double slashes (//) and not hash (#).
      Do not use HttpKernel Extension when not needed for 2.7
      Do not use HttpKernel Extension when not needed
      bumped Symfony version to 2.7.9
      updated VERSION for 2.7.8
      updated CHANGELOG for 2.7.8
      bumped Symfony version to 2.3.37
      updated VERSION for 2.3.36
      update CONTRIBUTORS for 2.3.36
      updated CHANGELOG for 2.3.36
      Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
      Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
      use nowdoc instead of heredoc
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
  4. @nicolas-grekas

    Merge branch '2.3' into 2.7

    nicolas-grekas committed
    * 2.3:
      [travis] timeout the sigchild tests at 60s
      CS: Single line comments should use double slashes (//) and not hash (#).
      Do not use HttpKernel Extension when not needed
      bumped Symfony version to 2.3.37
      updated VERSION for 2.3.36
      update CONTRIBUTORS for 2.3.36
      updated CHANGELOG for 2.3.36
      use nowdoc instead of heredoc
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
Something went wrong with that request. Please try again.