summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Adds deprecation notices for structures to be removed in 3.0.Hugo Hamon2015-01-053-0/+12
| | | | |
* | | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-01-052-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | * 2.6: [2.6] fix deprecation silencing... [Form] fix Context\ExecutionContextInterface mock [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
| * | | minor #13271 [2.6] fix deprecation silencing... (nicolas-grekas)Fabien Potencier2015-01-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.6 branch. Discussion ---------- [2.6] fix deprecation silencing... | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - My bad... Commits ------- 57fddbf [2.6] fix deprecation silencing...
| | * | | [2.6] fix deprecation silencing...Nicolas Grekas2015-01-051-1/+1
| | | | |
| * | | | Merge branch '2.5' into 2.6Fabien Potencier2015-01-051-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | * 2.5: [Form] fix Context\ExecutionContextInterface mock [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
| | * | [Form] fix Context\ExecutionContextInterface mockNicolas Grekas2015-01-051-1/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-053-10/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.6] cleanup deprecated uses [2.5] cleanup deprecated uses Conflicts: src/Symfony/Component/Form/composer.json src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
| * | | Merge branch '2.5' into 2.6Fabien Potencier2015-01-051-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * 2.5: [2.5] cleanup deprecated uses
| | * | [2.5] cleanup deprecated usesNicolas Grekas2015-01-051-1/+2
| | | |
| * | | [2.6] cleanup deprecated usesNicolas Grekas2015-01-052-9/+3
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-01-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: fixed typo Fixed minor typo - override [Filesystem] enforce umask while testing [TwigBridge] moved fixtures into their own directory Use $this->iniSet() in tests
| * | | fixed typoFabien Potencier2015-01-031-1/+1
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-01-035-8/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/ButtonBuilder.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
| * | | Merge branch '2.5' into 2.6Nicolas Grekas2015-01-035-8/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig src/Symfony/Component/HttpKernel/composer.json
| | * | Merge branch '2.3' into 2.5Nicolas Grekas2015-01-032-5/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] Remove useless tests skips [2.3] Cleanup deprecations Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/Debug/Tests/MockExceptionHandler.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Security/composer.json
| | | * minor #13206 [2.3] Cleanup deprecations (nicolas-grekas)Fabien Potencier2015-01-0337-323/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- [2.3] Cleanup deprecations | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | let's see | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- d649bef [2.3] Remove useless tests skips 1d68ad3 [2.3] Cleanup deprecations
| | | | * [2.3] Remove useless tests skipsNicolas Grekas2015-01-0336-322/+0
| | | | |
| | | | * [2.3] Cleanup deprecationsNicolas Grekas2015-01-031-1/+1
| | | | |
| | * | | Merge branch '2.3' into 2.5Fabien Potencier2015-01-031-2/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [ClassLoader] removes deprecated classes from documentation. [Yaml] Update README.md [Security] fixed wrong phpdoc
| | | * | minor #13211 [Security] fixed wrong phpdoc (fabpot)Fabien Potencier2015-01-031-2/+4
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- [Security] fixed wrong phpdoc | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12597 | License | MIT | Doc PR | n/a Commits ------- 064062d [Security] fixed wrong phpdoc
| | | | * | [Security] fixed wrong phpdocFabien Potencier2015-01-031-2/+4
| | | | |/
| | * | | adapted merge to 2.5Fabien Potencier2015-01-032-3/+2
| | | | |
| | * | | Merge branch '2.3' into 2.5Fabien Potencier2015-01-032-1/+23
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri Conflicts: src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
| | | * | adapted previous commit for 2.3Fabien Potencier2015-01-032-2/+2
| | | | |
| | | * | [Security] Don't send remember cookie for sub requestblanchonvincent2015-01-032-2/+24
| | | |/
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-036-6/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Updated copyright to 2015 Updated copyright to 2015 [VarDumper] increase debug.max_items to 2500 [Debug] Update exception messages. use value of DIRECTORY_SEPARATOR to detect Windows force ExpressionLanguage version >= 2.6 [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders. Clarify a comment. use PHP_WINDOWS_VERSION_BUILD to detect Windows Check if a field type_class is defined before using it. Currently if you want to use inline bootstrap form rendering, this is usually enough: Conflicts: src/Symfony/Component/Debug/composer.json
| * | | Merge branch '2.5' into 2.6Fabien Potencier2015-01-036-6/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Updated copyright to 2015 Clarify a comment. Conflicts: src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
| | * | Merge branch '2.3' into 2.5Fabien Potencier2015-01-032-2/+4
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Conflicts: src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php
| | | * Fixes various phpdoc and coding standards.Hugo Hamon2015-01-021-1/+3
| | | |
| | | * Updated copyright to 2015Saro0h2015-01-011-1/+1
| | | |
| | * | Updated copyright to 2015Saro0h2015-01-014-4/+4
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 2.6: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-301-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows Conflicts: src/Symfony/Component/Process/Process.php
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-301-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Form] Remove a redundant test. use value of DIRECTORY_SEPARATOR to detect Windows Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php src/Symfony/Component/Process/Process.php
| | | * minor #13147 [2.3] for consistency, use value of DIRECTORY_SEPARATOR to ↔Fabien Potencier2014-12-301-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detect Windows (xabbuh) This PR was merged into the 2.3 branch. Discussion ---------- [2.3] for consistency, use value of DIRECTORY_SEPARATOR to detect Windows | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This commit unifies the detection of Windows builds across the Symfony codebase. Commits ------- 20a427d use value of DIRECTORY_SEPARATOR to detect Windows
| | | | * use value of DIRECTORY_SEPARATOR to detect WindowsChristian Flothmann2014-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This commit unifies the detection of Windows builds across the Symfony codebase.
* | | | | [Debug] track and report deprecated classes and interfacesNicolas Grekas2014-12-302-2/+2
| | | | |
* | | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-308-7/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (21 commits) Updated generateSql tool Fix grammar Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger fix regression in form tests after pr #13027 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Make fabbot happy Clean up testing No global state for isolated tests and other fixes No global state for isolated tests and other fixes fix #10054 - form data collector with dynamic fields [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment [Debug] fix checkip6 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port Update the note about origins of the CssSelector component. Use the correct cssselect library name in docblocks. Fix wrong DateTransformer timezone param for non-UTC configuration. #12808 [Form] Add further timezone tests for date type ... Conflicts: src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/composer.json
| * | | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-309-9/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Updated generateSql tool Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger fix regression in form tests after pr #13027 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Make fabbot happy Clean up testing No global state for isolated tests and other fixes No global state for isolated tests and other fixes fix #10054 - form data collector with dynamic fields [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment [Debug] fix checkip6 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port Update the note about origins of the CssSelector component. Use the correct cssselect library name in docblocks. [DomCrawler] fixed bug #12143 Conflicts: src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
| | * | | Merge branch '2.3' into 2.5Fabien Potencier2014-12-308-9/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Updated generateSql tool Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger Make fabbot happy Clean up testing [DomCrawler] fixed bug #12143 Conflicts: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Serializer/Encoder/EncoderInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
| | | * | Updated generateSql toolJoshua Thijssen2014-12-301-2/+2
| | | | |
| | | * | Fix phpdoc and coding standardsChristophe Coevoet2014-12-297-7/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | This removes the unused use statements which were not catched by PHP-CS-Fixer because of string occurences. It also fixes some invalid phpdoc (scalar is not recognized as a valid type for instance).
| | * | No global state for isolated tests and other fixesFabien Potencier2014-12-291-0/+1
| | | |
| * | | Merge branch '2.5' into 2.6Nicolas Grekas2014-12-254-0/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 2.5: [2.5] silence deprecation notices in new components [TwigBundle] added missing absolute URL in Twig exceptions
| | * | [2.5] silence deprecation notices in new componentsNicolas Grekas2014-12-244-0/+16
| | | |
* | | | minor #13135 [2.7] Allow 3.0 requirements (nicolas-grekas)Fabien Potencier2014-12-305-22/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- [2.7] Allow 3.0 requirements | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | lets see | Fixed tickets | - | License | MIT | Doc PR | - 2.7 is going to provide almost the same interfaces as 3.0 but also a BC layer for previous releases. This means that 2.7 is going to be mostly compatible with 3.0. Lets continuously test this assumption and see when and were we break compat with 2.7 (and try to avoid it as much as possible to smoothen the transition to 3.0). Commits ------- b369bb6 [2.7] Allow 3.0 requirements
| * | | | [2.7] Allow 3.0 requirementsNicolas Grekas2014-12-275-22/+22
| | | | |
* | | | | Updated the SQL data generated from the generateSql toolJoshua Thijssen2014-12-296-42/+85
| | | | |
* | | | | Updated generateSql toolJoshua Thijssen2014-12-291-2/+2
|/ / / /
* | | | [Security/Http] fix mock logger in testNicolas Grekas2014-12-251-4/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-2256-150/+155
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-2256-150/+155
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolver.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Stopwatch/Stopwatch.php src/Symfony/Component/Translation/Loader/XliffFileLoader.php src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-2256-150/+155
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] CS And DocBlock Fixes [2.3] CS Fixes Conflicts: src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
| | | * [2.3] CS And DocBlock FixesGraham Campbell2014-12-2256-150/+155
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-211-0/+168
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 2.6: [Security] Fixed tests [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-211-0/+168
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 2.5: [Security] Fixed tests [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
| | * | [Security] Fixed testsSaro0h2014-12-211-0/+168
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-203-177/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (23 commits) [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate skip if param "translator.logging" doesn't exist. update required minimum TwigBridge version Very minor grammar fix in error message Added the function providers as container resources [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. [DebugBundle] enable the DumpDataCollectorPass [FrameworkBundle] Use debug namespace. [FrameworkBundle] update debug commands references skip compiler pass if interface doesn't exist Unify the way to provide expression functions for the DI container CS: There should be no empty lines following phpdocs fix link format handling with disabled templating [FrameworkBundle] fix cache:clear command ... Conflicts: src/Symfony/Bridge/Doctrine/phpunit.xml.dist src/Symfony/Bridge/Monolog/phpunit.xml.dist src/Symfony/Bridge/Propel1/phpunit.xml.dist src/Symfony/Bridge/ProxyManager/phpunit.xml.dist src/Symfony/Bridge/Twig/phpunit.xml.dist src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist src/Symfony/Bundle/TwigBundle/phpunit.xml.dist src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist src/Symfony/Component/BrowserKit/phpunit.xml.dist src/Symfony/Component/ClassLoader/phpunit.xml.dist src/Symfony/Component/Config/phpunit.xml.dist src/Symfony/Component/Console/phpunit.xml.dist src/Symfony/Component/CssSelector/phpunit.xml.dist src/Symfony/Component/Debug/phpunit.xml.dist src/Symfony/Component/DependencyInjection/phpunit.xml.dist src/Symfony/Component/DomCrawler/phpunit.xml.dist src/Symfony/Component/EventDispatcher/phpunit.xml.dist src/Symfony/Component/Filesystem/phpunit.xml.dist src/Symfony/Component/Finder/phpunit.xml.dist src/Symfony/Component/Form/phpunit.xml.dist src/Symfony/Component/HttpFoundation/phpunit.xml.dist src/Symfony/Component/HttpKernel/phpunit.xml.dist src/Symfony/Component/Intl/phpunit.xml.dist src/Symfony/Component/Locale/phpunit.xml.dist src/Symfony/Component/OptionsResolver/phpunit.xml.dist src/Symfony/Component/Process/phpunit.xml.dist src/Symfony/Component/PropertyAccess/phpunit.xml.dist src/Symfony/Component/Routing/phpunit.xml.dist src/Symfony/Component/Security/phpunit.xml.dist src/Symfony/Component/Serializer/phpunit.xml.dist src/Symfony/Component/Stopwatch/phpunit.xml.dist src/Symfony/Component/Templating/phpunit.xml.dist src/Symfony/Component/Translation/phpunit.xml.dist src/Symfony/Component/Validator/phpunit.xml.dist src/Symfony/Component/Yaml/phpunit.xml.dist
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-204-177/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-204-177/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed Conflicts: src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
| | | * bug #13048 [Security] Delete old session on auth strategy migrate (xelaris)Fabien Potencier2014-12-202-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- [Security] Delete old session on auth strategy migrate | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13026 | License | MIT | Doc PR | As identified by @austinh in #13026 there are two sessions after authentication, since the previous session is migrated to a new one by ``session_regenerate_id``. This PR ensures the old session is been deleted immediately on migration. I can't see any drawbacks, but if the change would break BC, another approach would be to add a new strategy like ``switch`` to enable instant deletion of the old session. Commits ------- 5dd11e6 [Security] Delete old session on auth strategy migrate
| | | | * [Security] Delete old session on auth strategy migrateAlexander Schwenn2014-12-202-2/+2
| | | | |
| | | * | [Tests] Silenced all deprecations in tests for 2.3sarah khalil2014-12-182-168/+4
| | | |/
* | | | [Security] Added the triggering of the security.interactive_login event ↔sarah khalil2014-12-163-6/+158
| | | | | | | | | | | | | | | | after set of token
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2014-12-163-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.6] Test lowest versions of dependencies Test lowest versions of dependencies Fix placeholder date format Test components using their lowest possible deps
| * | | [2.6] Test lowest versions of dependenciesNicolas Grekas2014-12-163-3/+3
| | | |
| * | | Merge remote-tracking branch 'symfony/2.5' into lowest-26Nicolas Grekas2014-12-162-3/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * symfony/2.5: Test lowest versions of dependencies Test components using their lowest possible deps Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json
| | * | Test lowest versions of dependenciesNicolas Grekas2014-12-162-2/+4
| | | |
| | * | Merge remote-tracking branch 'symfony/2.3' into lowest-25Nicolas Grekas2014-12-151-1/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * symfony/2.3: Test components using their lowest possible deps Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
| | | * Test components using their lowest possible depsNicolas Grekas2014-12-151-2/+3
| | | |
| | | * Fixed the AuthenticationProviderInterface alignmentGraham Campbell2014-12-091-8/+8
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2014-12-123-9/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (24 commits) [Form] fixed a maxlength overring on a guessing [Debug] Show only unique class candidates [SecurityBundle] Firewall providers building - code cleaning [Filesystem] symlink use RealPath instead LinkTarget [DependencyInjection] Remove duplicate declaration in PhpDumper terminals are not interactive on Travis Revert "[DependencyInjection] backport perf optim" [WebProfiler] Tweaked ajax requests toolbar css reset [WebProfilerBundle] replaced pattern to path attribute in routes definitions. fix phpdoc's alignment Fix missing addExpressionLanguageProvider (used by service container to add expression providers) Fixed the AuthenticationProviderInterface alignment Fixed the proxy-manager version constraint Fix missing space in label_attr fix DumpDataCollectorTest after CS changes avoid risky tests Fixed typo in SecurityContext PHPDoc [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim ...
| * | | Merge branch '2.5' into 2.6Nicolas Grekas2014-12-121-8/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [Form] fixed a maxlength overring on a guessing [Debug] Show only unique class candidates [SecurityBundle] Firewall providers building - code cleaning [Filesystem] symlink use RealPath instead LinkTarget [DependencyInjection] Remove duplicate declaration in PhpDumper terminals are not interactive on Travis Revert "[DependencyInjection] backport perf optim" [WebProfilerBundle] replaced pattern to path attribute in routes definitions. fix phpdoc's alignment Fixed the AuthenticationProviderInterface alignment Fixed the proxy-manager version constraint [FrameworkBundle][Template name] avoid error message for the shortcut notation. [DependencyInjection] perf optim: call dirname() at most 5x [DependencyInjection] backport perf optim Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher] [2.5] Remove possible call_user_func() [2.3] Remove possible call_user_func() Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
| | * | fix phpdoc's alignmentDariusz RumiƄski2014-12-091-8/+8
| | | |
| * | | bug #12935 [2.6] [Security] Fixed ExpressionVoter - ↔Fabien Potencier2014-12-121-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addExpressionLanguageProvider (Luca Genuzio) This PR was merged into the 2.6 branch. Discussion ---------- [2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | --- | Fixed tickets | --- | License | MIT | Doc PR | --- Fix missing addExpressionLanguageProvider in [ExpressionVoter](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php), used by [AddExpressionLanguageProvidersPass](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php) to add expression providers. Commits ------- 6c70bc5 Fix missing addExpressionLanguageProvider (used by service container to add expression providers)
| | * | | Fix missing addExpressionLanguageProvider (used by service container to add ↔Luca Genuzio2014-12-091-0/+6
| | | | | | | | | | | | | | | | | | | | expression providers)
| * | | | Fixed typo in SecurityContext PHPDocMatthias Althaus2014-12-081-1/+1
| | | | | | | | | | | | | | | Fixed typo in PHPDoc
* | | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-0819-36/+34
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (25 commits) Added information when an error occured during validation of an answer of a question Adding note about known BC issues Adding note about the PdoSessionHandler BC break [Console] fixes some typos and phpdoc. fix phpdoc's alignment [2.6] CS Fixes And Removed An Unused Import Minor phpcs fixes [ClassLoader] Fix undefined index in ClassCollectionLoader CS fixes Revert "minor #12821 Remove deprecated class (MasterB)" [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.6.2 updated VERSION for 2.6.1 updated CHANGELOG for 2.6.1 bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 ... Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| * | | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-081-7/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Added information when an error occured during validation of an answer of a question [Console] fixes some typos and phpdoc. fix phpdoc's alignment Minor phpcs fixes [ClassLoader] Fix undefined index in ClassCollectionLoader
| | * | | Merge branch '2.3' into 2.5Fabien Potencier2014-12-081-7/+7
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: fix phpdoc's alignment Minor phpcs fixes [ClassLoader] Fix undefined index in ClassCollectionLoader Conflicts: src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
| | | * | minor #12887 [2.3] CS Fixes: fix phpdoc's alignment (keradus)Fabien Potencier2014-12-071-7/+7
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- [2.3] CS Fixes: fix phpdoc's alignment | 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 Fix phpdoc's alignment Commits ------- f588610 fix phpdoc's alignment
| | | | * | fix phpdoc's alignmentDariusz RumiƄski2014-12-071-7/+7
| | | | | |
| | | * | | Minor phpcs fixesJeroen Thora2014-12-071-1/+1
| | | |/ /
| * | | | [2.6] CS Fixes And Removed An Unused ImportGraham Campbell2014-12-075-9/+10
| | | | |
| * | | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-0513-20/+17
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: CS fixes [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/HttpUtils.php src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
| | * | CS fixesGraham Campbell2014-12-046-12/+16
| | | |
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-048-9/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
| | | * CS fixesGraham Campbell2014-12-038-9/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-0242-160/+220
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes [Filesystem] fix lock file permissions Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Fixed a docblock bumped Symfony version to 2.6.1 updated VERSION for 2.6.0 updated CHANGELOG for 2.6.0 removed unneeded check Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| * | | Merge branch '2.5' into 2.6v2.6.1Fabien Potencier2014-12-0242-160/+220
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Yaml/Inline.php src/Symfony/Component/Yaml/Parser.php
| | * | Merge branch '2.3' into 2.5v2.5.8Fabien Potencier2014-12-0242-160/+220
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: composer.json src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Templating/TemplateReference.php src/Symfony/Component/Templating/TemplateReferenceInterface.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/MetadataFactoryInterface.php
| | | * PSR-2 fixesv2.3.23Graham Campbell2014-12-027-20/+20
| | | |
| | | * minor #12774 Docblock Fixes (GrahamCampbell)Fabien Potencier2014-11-3037-141/+201
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- Docblock Fixes | 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 ##### This pull request fixes the docblock alignment as requested in #12760. It was also necessary for me to ensure the `@return` annotations were correctly separated in order to accurately align the `@param` annotations. Commits ------- 443307e Docblock fixes
| | | | * Docblock fixesGraham Campbell2014-11-3037-141/+201
| | | | |
| | | * | Tweaked the password-compat version constraintGraham Campbell2014-11-301-1/+1
| | | |/
* | | | [PHPUnit] ignore E_USER_DEPRECATED noticesChristian Flothmann2014-11-294-0/+24
| | | | | | | | | | | | | | | | | | | | This updates the PHPUnit configuration files that have not been updated in #12705.
* | | | Adjust error_reporting to allow deprecation messages for 3.0David Fuhr2014-11-291-0/+6
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-11-283-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (36 commits) [Debug] fix error message on double exception [Validator] make DateTime objects represented as strings in the violation message. [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener Upgrade information for the Translation component regarding the new LoggingTranslator class. [WebProfilerBundle] Remove usage of app.request in search bar template Fix initialized() with aliased services fix data type in docblock Rename Symfony2 to Symfony bumped Symfony version to 2.6.0 updated VERSION for 2.6.0-BETA2 updated CHANGELOG for 2.6.0-BETA2 [Debug] fix ENT_SUBSTITUTE usage compare version using PHP_VERSION_ID backport #12489 remove an unneeded check Remove block submit_widget reformat code as suggested by @fabpot Fix typo Make `\Request::get` more performant. properly set request attributes in controller test ...
| * | | Merge branch '2.5' into 2.6v2.6.0Fabien Potencier2014-11-282-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [Debug] fix error message on double exception Fix initialized() with aliased services Rename Symfony2 to Symfony compare version using PHP_VERSION_ID backport #12489 remove an unneeded check
| | * | compare version using PHP_VERSION_IDChristian Flothmann2014-11-232-2/+2
| | | | | | | | | | | | | | | | This continues the work started in #12497 on the `2.3` branch.
generated by cgit v1.1 at 2025-05-28 19:53:21 +0000