summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch '3.0'Fabien Potencier2016-02-231-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: (21 commits) fixed typo fixed typo Fixed a minor XML issue in a translation file Fix merge Fix merge Fix merge Fix merge Update twig.html.twig PhpUnitNoDedicateAssertFixer results disable the assets helper when assets are disabled Improve Norwegian translations [2.7] [FrameworkBundle] minor fix tests added by #17569 Fixed the antialiasing of the toolbar text Simplify markdown for PR template fixed CS fixed CS documented the $url parameter better [Form] add test for ArrayChoiceList handling null [Form] fix edge cases with choice placeholder register commands from kernel when accessing list ...
| * | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-02-231-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: fixed typo fixed typo Fixed a minor XML issue in a translation file Fix merge Fix merge Fix merge Fix merge Update twig.html.twig PhpUnitNoDedicateAssertFixer results Improve Norwegian translations [2.7] [FrameworkBundle] minor fix tests added by #17569 Fixed the antialiasing of the toolbar text Simplify markdown for PR template fixed CS fixed CS documented the $url parameter better [Form] add test for ArrayChoiceList handling null [Form] fix edge cases with choice placeholder register commands from kernel when accessing list Update FileSystem
| | * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2016-02-221-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * 2.7: Fix merge
| | | * | | | Fix mergeNicolas Grekas2016-02-221-2/+2
| | | | | | |
| | * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2016-02-221-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: PhpUnitNoDedicateAssertFixer results Improve Norwegian translations Simplify markdown for PR template
| | | * | | | Merge branch '2.3' into 2.7Nicolas Grekas2016-02-221-2/+2
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: PhpUnitNoDedicateAssertFixer results Improve Norwegian translations Simplify markdown for PR template Conflicts: src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
| | | | * | | PhpUnitNoDedicateAssertFixer resultsSpacePossum2016-02-211-1/+1
| | | | | | |
| | | | * | | Improve Norwegian translationsValentin Jonovs2016-02-201-2/+2
| | | | | | |
* | | | | | | Improved the Ldap ComponentCharles Sarrazin2016-02-116-55/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved connection logic to dedicated class * Added support for Ldap result entries iterator and renamed LdapClient to Ldap * Added support for multiple adapters * Attempt anonymous bind if the connection is not bound beforehand * Finalized API * Updated the Security component to use v3.1 of the Ldap component * Updated unit tests * Added support for functional tests * Updated README file
* | | | | | | Merge branch '3.0'Nicolas Grekas2016-02-046-5/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | Merge branch '2.8' into 3.0v3.0.2Nicolas Grekas2016-02-021-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [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 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 simplified a test fix container cache key generation [Form] fix option name in upgrade file [Form] fix option name in changelog [Translation] Add resources from fallback locale [DependencyInjection] enforce tags to have a name [YAML] Refine the return value of Yaml::parse() Conflicts: UPGRADE-2.8.md
| | * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2016-02-021-0/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Console] Add missing `@require` annotation in test Fix merge [appveyor] Fix failure reporting [#17634] move DebugBundle license file 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 simplified a test fix container cache key generation [Form] fix option name in changelog [Translation] Add resources from fallback locale [DependencyInjection] enforce tags to have a name [YAML] Refine the return value of Yaml::parse() Conflicts: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
| | | * | | | Merge branch '2.3' into 2.7Nicolas Grekas2016-02-011-0/+9
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * 2.3: [appveyor] Fix failure reporting
| | | | * | | [appveyor] Fix failure reportingNicolas Grekas2016-02-011-0/+9
| | | | | | |
| * | | | | | Limit Ldap component version for the 3.0 branchCharles Sarrazin2016-02-012-2/+2
| | | | | | |
| * | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-271-2/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-271-2/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-272-3/+2
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * | | minor #17480 Static code analysis (Koc)Fabien Potencier2016-01-273-4/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | | Static code analysisKonstantin.Myakshin2016-01-253-4/+3
| | | | | | | |
| * | | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-251-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-251-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-251-1/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * | | | Fixed the phpDoc of UserInterfaceJavier Eguiluz2016-01-251-1/+1
| | | | | | | |
| * | | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-251-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-251-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-251-0/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | | * | | | Fixer findings.Possum2016-01-221-0/+4
| | | | |/ / /
* | | | | | | [Security] add USERNAME_NONE_PROVIDED constantSofHad2016-01-253-2/+9
| | | | | | |
* | | | | | | Merge branch '3.0'Fabien Potencier2016-01-213-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: fixed CS fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension Remove unused imports [FrameworkBundle][Validator] Fix apc cache service deprecation
| * | | | | | fixed CSFabien Potencier2016-01-211-1/+0
| | | | | | |
| * | | | | | minor #17465 Remove unused imports (Koc)Fabien Potencier2016-01-211-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 3.0 branch. Discussion ---------- Remove unused imports | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | wait travis | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- b8028f6 Remove unused imports
| | * | | | | | Remove unused importsKonstantin.Myakshin2016-01-211-1/+0
| | | | | | | |
| * | | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-211-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension [FrameworkBundle][Validator] Fix apc cache service deprecation
| | * | | | | fixed CSFabien Potencier2016-01-211-1/+0
| | | | | | |
| | * | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-201-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | | * | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-201-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Process] Remove a misleading comment Improve the phpdoc of SplFileInfo methods [Process] Use stream based storage to avoid memory issues Fixed the documentation of VoterInterface::supportsAttribute Remove useless duplicated tests [FrameworkBundle] Optimize framework extension tests Use is_subclass_of instead of Reflection when possible
| | | | * | | Fixed the documentation of VoterInterface::supportsAttributeJavier Eguiluz2016-01-181-1/+1
| | | | | | |
| | * | | | | Merge branch '2.7' into 2.8v2.8.2Fabien Potencier2016-01-141-161/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: added missing requirement removed obsolete tests, fixed composer.json do not ship with a custom rng implementation
| | | * | | | added missing requirementv2.7.9Fabien Potencier2016-01-141-1/+2
| | | | | | |
| | | * | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-143-291/+3
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: removed obsolete tests, fixed composer.json do not ship with a custom rng implementation
| | | | * | | removed obsolete tests, fixed composer.jsonv2.3.37Fabien Potencier2016-01-142-205/+3
| | | | | | |
| | | | * | | do not ship with a custom rng implementationChristian Flothmann2016-01-142-91/+3
| | | | | | |
* | | | | | | minor #17166 Add placeholders into log messages (hason)Fabien Potencier2016-01-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 3.1-dev branch. Discussion ---------- Add placeholders into log messages | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15753 | License | MIT | Doc PR | Commits ------- c92fcdb Added placeholders to all log messages instead of hardcoded values
| * | | | | | | Added placeholders to all log messages instead of hardcoded valuesMartin Hasoň2015-12-291-1/+1
| | | | | | | |
* | | | | | | | Merge branch '3.0'Kévin Dunglas2016-01-131-4/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: (22 commits) [Yaml] Fix tests on PHP 7.0.2 [FrameworkBundle] Don't log twice with the error handler [2.7] Workaround https://bugs.php.net/63206 [2.3] Workaround https://bugs.php.net/63206 Add closing parenthesis [Serializer] Unset object_to_populate after using it Typo fix [WebProfiler] Fixed sf-minitoolbar height [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions [2.3] Static Code Analysis for Components [Serializer] Use $context['cache_key'] to enhance caching Removed non-existent directory from composer autoload Fixed erroneous deprecation notice for extended Interfaces [Routing] cs fix Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php [Serializer] Allow to use proxies in object_to_populate Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner ... Conflicts: src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
| * | | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-121-4/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Typo fix [WebProfiler] Fixed sf-minitoolbar height [2.3] Static Code Analysis for Components [Serializer] Use $context['cache_key'] to enhance caching Fixed erroneous deprecation notice for extended Interfaces [Routing] cs fix Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class [Serializer] ObjectNormalizer: context can contain not serializable data
| | * | | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-121-4/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Typo fix [2.3] Static Code Analysis for Components Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class
| | | * | | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-121-4/+2
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Typo fix [2.3] Static Code Analysis for Components Added support \IteratorAggregate for UniqueEntityValidator Fix #17306 Paths with % in it are note allowed (like urlencoded) Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class
| | | | * | | | [2.3] Static Code Analysis for ComponentsVladimir Reznichenko2016-01-121-4/+2
| | | | | | | |
* | | | | | | | Merge branch '3.0'Fabien Potencier2016-01-035-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: updated copyright year updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| * | | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-035-5/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: updated copyright year updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| | * | | | | updated copyright yearFabien Potencier2016-01-031-1/+1
| | | | | | |
| | * | | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-034-4/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| | | * | | | updated copyright yearFabien Potencier2016-01-034-4/+4
| | | | | | |
| | | * | | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-031-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Update copyright year [2.3] Static Code Analysis for Components
| | | | * | | Update copyright yearDiego Saint Esteben2016-01-011-1/+1
| | | | | | |
| | | * | | | Merge branch '2.3' into 2.7Nicolas Grekas2015-12-282-3/+3
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * | | minor #17086 CS: use nowdoc instead of heredoc (gharlan)Nicolas Grekas2015-12-282-3/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- CS: use nowdoc instead of heredoc | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | — | License | MIT | Doc PR | — if this is accepted, we could add the fixer to symfony level of php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1580 Commits ------- 3dca549 use nowdoc instead of heredoc
| | | | | * | | use nowdoc instead of heredocGregor Harlan2015-12-212-3/+3
| | | | | | | |
* | | | | | | | Merge branch '3.0'Fabien Potencier2015-12-261-9/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: fixed previous merge [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [DomCrawler] Revert previous restriction, allow selection of every DOMNode object [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| * | | | | | | Merge branch '2.8' into 3.0v3.0.1Fabien Potencier2015-12-261-9/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [DomCrawler] Revert previous restriction, allow selection of every DOMNode object [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| | * | | | | | Merge branch '2.7' into 2.8v2.8.1Fabien Potencier2015-12-261-9/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| | | * | | | | [Security] Run tests on all PHP versionsv2.7.8Jakub Zalas2015-12-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symfony 2.7 supports PHP >= 5.3.9
* | | | | | | | Merge branch '3.0'Nicolas Grekas2015-12-221-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| * | | | | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-221-0/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| | * | | | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-221-0/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| | | * | | | | Merge branch '2.3' into 2.7Nicolas Grekas2015-12-221-0/+9
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms Conflicts: .travis.yml
| | | | * | | | use requires annotationv2.3.36Christian Flothmann2015-12-221-13/+9
| | | | | | | |
| | | | * | | | skip bcrypt tests on incompatible platformsChristian Flothmann2015-12-191-0/+13
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all PHP versions before 5.3.7 have backported fixes that make it possible to use `password_hash()` function. Therefore, we have to skip tests on not supported platforms.
* | | | | | | Merge branch '3.0'Nicolas Grekas2015-12-223-3/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: Fix merge [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Validator] Add missing pt_BR translation Fix doctrine bridge tests on older PHP versions [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks
| * | | | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-223-3/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix merge [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Validator] Add missing pt_BR translation Fix doctrine bridge tests on older PHP versions [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks Conflicts: src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
| | * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-223-3/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php src/Symfony/Component/Yaml/Tests/ParserTest.php
| | | * | | | Merge branch '2.3' into 2.7Fabien Potencier2015-12-183-3/+7
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Yaml] do not remove "comments" in scalar blocks
| | | | * | | [Security] Enable bcrypt validation and result length tests on all PHP versionsJakub Zalas2015-12-171-6/+0
| | | | | | |
| | | | * | | [Security] Verify if a password encoded with bcrypt is no longer than 72 ↵Jakub Zalas2015-12-173-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | characters
* | | | | | | Merge branch '3.0'Nicolas Grekas2015-12-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line [FrameworkBundle] fixes outdated phpdoc on Controller::createForm() method. fix error level for deprecation Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto"
| * | | | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line fix error level for deprecation Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto" Conflicts: .travis.yml UPGRADE-2.8.md appveyor.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpFoundation/ParameterBag.php
| | * | | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-181-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: prefer phpunit 5.x on hhvm [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/composer.json
| | | * | | | Fix the logout path when not using the routerChristophe Coevoet2015-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.
* | | | | | | Merge branch '3.0'Tobias Schultze2015-12-152-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '2.8' into 3.0Tobias Schultze2015-12-152-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '2.7' into 2.8Tobias Schultze2015-12-151-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '2.3' into 2.7Tobias Schultze2015-12-151-1/+11
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | [Security] backported phpdoc from Guard component.Hugo Hamon2015-12-101-1/+11
| | | | | | |
| | * | | | | Added @return to checkCredentials()Alexander M. Turek2015-12-101-0/+2
| | | | | | |
| | * | | | | [Security] Fix a Polyfill import statement in StringUtilsBaptiste Lafontaine2015-12-081-1/+1
| | | | | | |
* | | | | | | Merge branch '3.0'Christophe Coevoet2015-12-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
| * | | | | | Merge branch '2.8' into 3.0Christophe Coevoet2015-12-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
| | * | | | | Merge branch '2.7' into 2.8Christophe Coevoet2015-12-051-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
| | | * | | | Merge branch '2.3' into 2.7Christophe Coevoet2015-12-052-4/+4
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
| | | | * | | CS: general fixesDariusz Ruminski2015-12-012-4/+4
| | | | | | |
| | | * | | | minor #16697 CS: remove impossible default argument value (keradus)Fabien Potencier2015-11-282-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- CS: remove impossible default argument value | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- acef3a3 CS: remove impossible default argument value
| | | | * | | | CS: remove impossible default argument valueDariusz Ruminski2015-11-262-2/+2
| | | | | | | |
* | | | | | | | updated version to 3.1Fabien Potencier2015-11-309-9/+9
|/ / / / / / /
* | | | | | | Merge branch '2.8'v3.0.0Fabien Potencier2015-11-301-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: add subject variable to expression context [Process] Fix signaling/stopping logic on Windows Forward compatibility with AbstractLayout* 2.8 tests [Yaml] minor CS cleaning [Console] do not encode backslashes in console default description
| * | | | | | add subject variable to expression contextv2.8.0Christian Flothmann2015-11-301-0/+1
| | | | | | |
* | | | | | | allow arbitrary types in VoterInterface::vote()Christian Flothmann2015-11-305-13/+13
| | | | | | |
* | | | | | | Merge branch '2.8'Nicolas Grekas2015-11-294-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Bridge/Doctrine+Ldap] Fix tests Marked the Ldap component as internal and removed Ldap constants polyfill Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
| * | | | | | [Bridge/Doctrine+Ldap] Fix testsNicolas Grekas2015-11-292-0/+6
| | | | | | |