Commit Graph

5531 Commits

Author SHA1 Message Date
Fabien Potencier
12d8261d21 Merge branch '2.5' into 2.6
* 2.5:
  [2.5] cleanup deprecated uses
2015-01-05 15:28:40 +01:00
Nicolas Grekas
2856caed2f [2.6] cleanup deprecated uses 2015-01-05 09:56:52 +01:00
Nicolas Grekas
237c315144 [2.5] cleanup deprecated uses 2015-01-05 09:51:41 +01:00
Fabien Potencier
eb5f3b4014 feature #12663 [FrameworkBundle] remove deprecated method 'createEsi' (FlorianLB)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] remove deprecated method 'createEsi'

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | --
| License       | MIT
| Doc PR        | --

Commits
-------

5e9aa16 [FrameworkBundle] remove deprecated method 'createEsi'
2015-01-04 17:49:12 +01:00
Nicolas Grekas
7e929ab162 [2.3] missing cleanup for legacy test 2015-01-04 16:10:38 +01:00
Fabien Potencier
5e017e504f Merge branch '2.7'
* 2.7:
  [TwigBundle] always load the exception listener if the templating.engines is not present
  [TwigBundle] removed the Container dependency on ActionsExtension
  [Filesystem] keep exec perms when copying
  fixed typo
  Fixed minor typo - override
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags
  Use $this->iniSet() in tests

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2015-01-04 11:51:22 +01:00
Fabien Potencier
60a97ec3c5 minor #13232 [TwigBundle] always load the exception listener if the templating.engines is not present (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] always load the exception listener if the templating.engines is not present

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | fixes #11876 partially
| License       | MIT
| Doc PR        | n/a

This PR removes (partially) the dependency of TwigBundle on FrameworkBundle. If FrameworkBundle is not registered, the Twig exception listener is always registered (this change was part of #13143 but as it is now totally independent, I've created a new PR).

Commits
-------

30ba9df [TwigBundle] always load the exception listener if the templating.engines is not present
2015-01-04 11:49:17 +01:00
Fabien Potencier
30ba9df07c [TwigBundle] always load the exception listener if the templating.engines is not present 2015-01-04 11:30:48 +01:00
Fabien Potencier
76abf98bff [TwigBundle] removed the Container dependency on ActionsExtension 2015-01-04 11:30:17 +01:00
WouterJ
57b08e4393 Made CLI help consistent 2015-01-04 11:02:10 +01:00
WouterJ
a450d66bab Made help information consistent 2015-01-04 10:52:37 +01:00
Nicolas Grekas
9f588e6a56 Merge branch '2.6' into 2.7
* 2.6:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2015-01-03 19:24:27 +01:00
Nicolas Grekas
45547519ae Merge branch '2.5' into 2.6
* 2.5:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags
2015-01-03 19:23:00 +01:00
Nicolas Grekas
627ef4c2fd Merge branch '2.3' into 2.5
* 2.3:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/HttpKernel/composer.json
2015-01-03 19:22:52 +01:00
Nicolas Grekas
ba51a0bf86 [2.3] Fix lowest deps 2015-01-03 19:20:28 +01:00
Nicolas Grekas
afcf52f485 Merge branch '2.7'
* 2.7:
  [Hackday] - add trigger error for deprecated clases.
  [2.3] Remove useless tests skips
  [ClassLoader] removes deprecated classes from documentation.
  Add type aliases for allowed types in OptionsResolver
  [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
  [Form] Add deprecation message for Form::bind() and Form::isBound()
  [Validator] add deprecation log (#12674)
  [Filesystem] Keep executable permission when a file is copied
  [HttpKernel] RouterListener uses "context" argument when logging route

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
	src/Symfony/Component/HttpKernel/CHANGELOG.md
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
2015-01-03 16:56:00 +01:00
Nicolas Grekas
ad84fb78e1 Merge branch '2.6' into 2.7
* 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
2015-01-03 16:46:01 +01:00
Nicolas Grekas
363e5b41a5 Merge branch '2.5' into 2.6
* 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
2015-01-03 16:33:07 +01:00
Nicolas Grekas
85d0716cd5 Merge branch '2.3' into 2.5
* 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
2015-01-03 16:23:51 +01:00
Fabien Potencier
8b3b54d5a6 minor #13218 [TwigBundle] added missing @deprecated tags (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBundle] added missing @deprecated tags

The `Symfony\Bundle\TwigBundle\Extension\ActionsExtension` class has been deprecated in Symfony 2.2 but we forgot to deprecate the related classes.

Commits
-------

82f8a79 [TwigBundle] added missing @deprecated tags
2015-01-03 16:12:56 +01:00
Fabien Potencier
82f8a795fe [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
Saro0h
4391219d33 Fixed tests 2015-01-03 14:15:49 +01:00
Nicolas Grekas
d649befa67 [2.3] Remove useless tests skips 2015-01-03 14:14:51 +01:00
Fabien Potencier
92a741603c feature #12457 [FrameworkBundle] REFS #11294 Controller class become abstract (mickaelandrieu)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] REFS #11294 Controller class become abstract

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [yes]
| Deprecations? | [no]
| Tests pass?   | [no]
| Fixed tickets | [#11294]
| License       | MIT
| Doc PR        | []

Commits
-------

0ab13b9 Publics methods are protected, class become abstract
2015-01-03 11:31:18 +01:00
Nicolas Grekas
1d68ad3265 [2.3] Cleanup deprecations 2015-01-03 10:22:29 +01:00
Fabien Potencier
929f1d9213 Merge branch '2.7'
* 2.7:
  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:
  Add deprecation warning to LegacyPdoSessionHandler

Conflicts:
	src/Symfony/Bridge/Monolog/Logger.php
	src/Symfony/Bridge/Swiftmailer/LICENSE
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
2015-01-03 09:04:30 +01:00
Fabien Potencier
5f8d71be52 Merge branch '2.6' into 2.7
* 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
2015-01-03 09:02:46 +01:00
Fabien Potencier
d79830fcfd Merge branch '2.5' into 2.6
* 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
2015-01-03 09:01:59 +01:00
Fabien Potencier
6f34c47e27 Merge branch '2.3' into 2.5
* 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
2015-01-03 09:01:13 +01:00
Hugo Hamon
2120554141 Removed request service occurrences. 2015-01-02 14:53:28 +01:00
Christian Flothmann
c5ad74d4ba use Table instead of the deprecated TableHelper 2015-01-02 13:44:34 +01:00
Hugo Hamon
b83da8f742 Fixes various phpdoc and coding standards. 2015-01-02 09:58:20 +01:00
Saro0h
48174b195b Updated copyright to 2015 2015-01-01 14:28:01 +01:00
Saro0h
5a121df42b Updated copyright to 2015 2015-01-01 13:56:52 +01:00
Nicolas Grekas
c40569ccf1 [VarDumper] increase debug.max_items to 2500 2014-12-31 14:56:49 +01:00
Saro0h
2221a150fe [3.0] [Twig Bridge] Fixed Tests 2014-12-30 18:25:10 +01:00
Fabien Potencier
649061bd46 feature #13121 [Console] Removed DialogHelper, ProgressHelper and TableHelper (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Console] Removed DialogHelper, ProgressHelper and TableHelper

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR         | ~

- [X]  Adapt output in fixtures according to the standard display with table.

Commits
-------

dfb9706 [Console] Removed DialogHelper, ProgressHelper and TableHelper
2014-12-30 15:33:30 +01:00
Fabien Potencier
a15df690be feature #13127 [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] Removed the deprecated RouterApacheDumperCommand

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

b552b1b [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand
2014-12-30 15:29:46 +01:00
Fabien Potencier
c33ce9c4c8 bug #13166 Fix a web profiler form issue with fields added to the form after the form was built (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix a web profiler form issue with fields added to the form after the form was built

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no, but not because of this PR
| Fixed tickets | #13155
| License       | MIT
| Doc PR        | -

This also make the check consistent with a similar check in this template made further down:
* check for `data.type_class`, instead of `data.type`
* check if `data.type_class` is defined rather than if it's empty

The problem doesn't exist in 2.5.

Commits
-------

1e794ca Check if a field type_class is defined before using it.
2014-12-30 15:20:32 +01:00
Fabien Potencier
303df69e34 Merge branch '2.7'
* 2.7:
  [Debug] track and report deprecated classes and interfaces
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
	src/Symfony/Component/Security/Core/Util/SecureRandom.php
2014-12-30 14:35:28 +01:00
Fabien Potencier
aedb247a30 Merge branch '2.6' into 2.7
* 2.6:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows
2014-12-30 14:34:24 +01:00
Fabien Potencier
67904e12dc Merge branch '2.5' into 2.6
* 2.5:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Component/Process/Process.php
2014-12-30 14:34:16 +01:00
Fabien Potencier
5b16d8eab5 Merge branch '2.3' into 2.5
* 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
2014-12-30 14:32:44 +01:00
Fabien Potencier
f438eae402 minor #13147 [2.3] for consistency, use value of DIRECTORY_SEPARATOR to 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
2014-12-30 14:27:52 +01:00
Jakub Zalas
1e794ca298 Check if a field type_class is defined before using it.
This make the check consistent with a similar check in this template made further down, and fixes an issue with fields added to the form after the form was built.
2014-12-30 11:48:13 +00:00
Christian Flothmann
20a427de7c use value of DIRECTORY_SEPARATOR to detect Windows
This commit unifies the detection of Windows builds across the Symfony
codebase.
2014-12-30 12:17:23 +01:00
Graham Campbell
35e0845f23 [3.0] Removed some old hacks 2014-12-30 11:17:11 +01:00
Nicolas Grekas
fddcb86c31 [3.0] Update required PHP to 5.5.9 2014-12-30 11:17:11 +01:00
Fabien Potencier
86354c7352 Merge branch '2.7'
* 2.7: (26 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
  Updated the SQL data generated from the generateSql tool
  Updated generateSql tool
  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        | -
  [FrameworkBundle] added a test router for the buil-in web server
  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
  [2.7] Allow 3.0 requirements
  ...
2014-12-30 10:05:58 +01:00
Fabien Potencier
a1744234a2 Merge branch '2.6' into 2.7
* 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
2014-12-30 10:05:46 +01:00
Fabien Potencier
4cec9a9e86 Merge branch '2.5' into 2.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
2014-12-30 10:04:52 +01:00
Fabien Potencier
c4dc0034e7 Merge branch '2.3' into 2.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
2014-12-30 10:03:46 +01:00
Fabien Potencier
4c5730c23b minor #13135 [2.7] Allow 3.0 requirements (nicolas-grekas)
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
2014-12-30 09:56:10 +01:00
Fabien Potencier
be979330f8 minor #13162 Fix phpdoc and coding standards (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix phpdoc and coding standards

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

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).

This is complementary to https://github.com/symfony/symfony/pull/13134

Commits
-------

8cc3f6a Fix phpdoc and coding standards
2014-12-30 09:33:34 +01:00
Christophe Coevoet
8cc3f6aad4 Fix phpdoc and coding standards
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).
2014-12-29 23:41:34 +01:00
Christophe Coevoet
30cff2605e Update functional tests to use the PSR NullLogger
This avoids using the deprecated NullLogger in tests.
2014-12-29 21:47:13 +01:00
Fabien Potencier
77e27b7628 [FrameworkBundle] added a test router for the buil-in web server 2014-12-29 12:17:32 +01:00
Fabien Potencier
286b65d676 Merge branch '2.3' into 2.5
* 2.3:
  No global state for isolated tests and other fixes
  [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.
2014-12-29 11:02:13 +01:00
Fabien Potencier
4cc4e8a257 bug #13141 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #11773
| License       | MIT
| Doc PR        | n/a

The default escaping strategy was set on the Twig Engine and not the Twig Environment. That's a problem under some circumstances (like what #11773 describes), but it's also much better to set everything on the Twig  Environment directly.

Commits
-------

91b24e8 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
2014-12-29 09:40:20 +01:00
Fabien Potencier
91b24e8f92 [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment 2014-12-29 09:39:08 +01:00
Saro0h
b552b1b182 [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand 2014-12-28 18:19:42 +01:00
Nicolas Grekas
b369bb6eed [2.7] Allow 3.0 requirements 2014-12-27 12:44:51 +01:00
Saro0h
dfb97068ee [Console] Removed DialogHelper, ProgressHelper and TableHelper 2014-12-26 14:45:27 +01:00
Nicolas Grekas
d6af4d6efa Merge branch '2.7'
* 2.7:
  [travis] reorder matrix + prevent "Killed" jobs
  [FrameworkBundle] Optimize validator registration
  [FrameworkBundle] fix browserkit requirement
  [FrameworkBundle] fix expression-language requirement
  [TwigBridge] fix form requirement
  [HttpFoundation] removed wrong HTTP header
  [Filesystem] restore ability to create broken symlinks
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work
2014-12-26 11:31:50 +01:00
Fabien Potencier
2a85c7e19b minor #13111 [FrameworkBundle] Optimize validator registration (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Optimize validator registration

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Optimize validator registration (avoid an unneeded loop and access to the Reflection API).

Commits
-------

9c5b9e1 [FrameworkBundle] Optimize validator registration
2014-12-26 10:33:39 +01:00
Kévin Dunglas
9c5b9e1fed [FrameworkBundle] Optimize validator registration 2014-12-26 08:58:15 +01:00
Nicolas Grekas
df0f2b23d5 Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] fix browserkit requirement
  [FrameworkBundle] fix expression-language requirement
  [TwigBridge] fix form requirement
  [Filesystem] restore ability to create broken symlinks
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work
2014-12-26 00:30:25 +01:00
Nicolas Grekas
af0d5f9fe3 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fix browserkit requirement
  [TwigBridge] fix form requirement
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpKernel/composer.json
2014-12-26 00:28:31 +01:00
Nicolas Grekas
d7bd25978f Merge branch '2.3' into 2.5
* 2.3:
  [TwigBridge] fix form requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2014-12-26 00:24:15 +01:00
Nicolas Grekas
abbd2707ef [FrameworkBundle] fix browserkit requirement 2014-12-26 00:04:51 +01:00
Nicolas Grekas
23c603a7cc [FrameworkBundle] fix expression-language requirement 2014-12-25 23:57:44 +01:00
Fabien Potencier
0775080d33 bug #13109 [Filesystem] restore ability to create broken symlinks (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Filesystem] restore ability to create broken symlinks

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12793
| License       | MIT
| Doc PR        | -

Commits
-------

3101202 [Filesystem] restore ability to create broken symlinks
2014-12-25 19:54:01 +01:00
Nicolas Grekas
3101202333 [Filesystem] restore ability to create broken symlinks 2014-12-25 12:18:46 +01:00
Nicolas Grekas
965b4ddc42 [FrameworkBundle] fix http-foundation requirement 2014-12-25 12:07:27 +01:00
Nicolas Grekas
f333cb23de Merge branch '2.7'
* 2.7:
  [Security/Http] fix mock logger in test
  [Serializer] Fix XmlFileLoader test
  [2.6] silence deprecation notices in new components
  [2.5] silence deprecation notices in new components
  [VarDumper] Minor fix for the uniformity
  [TwigBundle] added missing absolute URL in Twig exceptions
2014-12-25 11:29:59 +01:00
Nicolas Grekas
c1c5cd58b7 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] silence deprecation notices in new components
  [2.5] silence deprecation notices in new components
  [VarDumper] Minor fix for the uniformity
  [TwigBundle] added missing absolute URL in Twig exceptions

Conflicts:
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
	src/Symfony/Component/Security/Acl/phpunit.xml.dist
	src/Symfony/Component/Security/Core/phpunit.xml.dist
	src/Symfony/Component/Security/Csrf/phpunit.xml.dist
	src/Symfony/Component/Security/Http/phpunit.xml.dist
	src/Symfony/Component/VarDumper/phpunit.xml.dist
2014-12-25 11:29:16 +01:00
Nicolas Grekas
667c8c7ddb Merge branch '2.5' into 2.6
* 2.5:
  [2.5] silence deprecation notices in new components
  [TwigBundle] added missing absolute URL in Twig exceptions
2014-12-25 11:26:10 +01:00
Fabien Potencier
0a2879e79b minor #13099 [2.6] silence deprecation notices in new components (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] silence deprecation notices in new components

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

b0a156f [2.6] silence deprecation notices in new components
2014-12-25 11:07:53 +01:00
Nicolas Grekas
b0a156fc11 [2.6] silence deprecation notices in new components 2014-12-24 22:28:06 +01:00
SofHad
7d02e4838b [VarDumper] Minor fix for the uniformity 2014-12-24 17:16:12 +01:00
Fabien Potencier
8135727102 [SecurityBundle] avoid unneeded work 2014-12-24 16:04:14 +01:00
Fabien Potencier
2707569865 bug #13093 [TwigBundle] added missing absolute URL in Twig exceptions (fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[TwigBundle] added missing absolute URL in Twig exceptions

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12471
| License       | MIT
| Doc PR        | n/a

Commits
-------

e4bb2c7 [TwigBundle] added missing absolute URL in Twig exceptions
2014-12-24 12:29:24 +01:00
Fabien Potencier
877390fad6 Merge branch '2.7'
* 2.7:
  [DependencyInjection] use/fix newest Definition::setFactory
  fixed unit tests
  [2.7] print deprecation summary at end of tests
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:12:09 +01:00
Fabien Potencier
94b293c5e3 Merge branch '2.6' into 2.7
* 2.6:
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:12:02 +01:00
Fabien Potencier
f31f5a96b0 Merge branch '2.5' into 2.6
* 2.5:
  [Bridge] [Propel] minor improvements to the Propel bridge.
  [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 08:11:54 +01:00
Fabien Potencier
87ac31a3e3 Merge branch '2.6' into 2.7
* 2.6:
  [DependencyInjection] use/fix newest Definition::setFactory
  fixed unit tests
2014-12-24 08:10:22 +01:00
Fabien Potencier
c90edd95a6 bug #13087 [DependencyInjection] use/fix newest Definition::setFactory (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] use/fix newest Definition::setFactory

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

f683a7a [DependencyInjection] use/fix newest Definition::setFactory
2014-12-24 08:03:13 +01:00
Nicolas Grekas
f683a7a72c [DependencyInjection] use/fix newest Definition::setFactory 2014-12-24 07:58:22 +01:00
Fabien Potencier
e4bb2c708d [TwigBundle] added missing absolute URL in Twig exceptions 2014-12-24 07:54:29 +01:00
Fabien Potencier
0566a50a33 bug #12975 [FrameworkBundle] Allow custom services for validator mapping cache. (jakzal)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] Allow custom services for validator mapping cache.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12803
| License       | MIT
| Doc PR        | -

#9892 introduced `DoctrineCache`, but it's not really used by the FrameworkBundle. This was overlooked, therefore I think it should go into 2.5.

This PR will let us to configure a service id, instead of a driver name. The only exception is apc, which is converted to `validator.mapping.cache.apc` to keep BC.

Examples:

```yaml
framework:
    validation:
        cache: apc # converted to validator.mapping.cache.apc
```

```yaml
framework:
    validation:
        cache: my_custom_cache_service
```

It would be nice to be able to provide a doctrine service id, instead of `CacheInterface` implementation. It could be automatically decorated with `DoctrineCache`:

```yaml
framework:
    validation:
        cache:
            doctrine: my_doctrine_cache_service # could be provided by DoctrineCacheBundle
```

I'll work on it next.

Commits
-------

4cdcf10 [FrameworkBundle] Allow custom services for validator mapping cache.
2014-12-24 07:41:03 +01:00
Fabien Potencier
1f98e60f5d fixed unit tests 2014-12-24 07:17:40 +01:00
Fabien Potencier
e09e027fc3 Merge branch '2.7'
* 2.7:
  Add LegacyPdoSessionHandler class
  fix dependency on ExtensionInterface over implementation
  [Console] Remove $this in closure
  [FrameworkBundle] forward error reporting level to insulated Client
  [VarDumper] fix and test PdoCaster
  [Config] fix error handler restoration in test
2014-12-23 18:36:41 +01:00
Fabien Potencier
9b501daf5a Merge branch '2.6' into 2.7
* 2.6:
  Add LegacyPdoSessionHandler class
  fix dependency on ExtensionInterface over implementation
  [FrameworkBundle] forward error reporting level to insulated Client
  [VarDumper] fix and test PdoCaster
  [Config] fix error handler restoration in test
2014-12-23 18:36:18 +01:00
Fabien Potencier
7ebb685805 Merge branch '2.5' into 2.6
* 2.5:
  fix dependency on ExtensionInterface over implementation
  [FrameworkBundle] forward error reporting level to insulated Client
  [Config] fix error handler restoration in test
2014-12-23 18:36:09 +01:00
Fabien Potencier
aaf4c84557 Merge branch '2.3' into 2.5
* 2.3:
  [FrameworkBundle] forward error reporting level to insulated Client
  [Config] fix error handler restoration in test
2014-12-23 18:36:02 +01:00
Berny Cantos
5e1a5f778d fix dependency on ExtensionInterface over implementation 2014-12-23 12:45:12 +01:00
Fabien Potencier
e2762f69c5 bug #13081 [FrameworkBundle] forward error reporting level to insulated Client (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] forward error reporting level to insulated Client

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Especially if deprecation notices are silenced on the main php instance, we should also silence them in the insulated Client

Commits
-------

d82e062 [FrameworkBundle] forward error reporting level to insulated Client
2014-12-23 09:09:12 +01:00
Nicolas Grekas
d82e062d17 [FrameworkBundle] forward error reporting level to insulated Client 2014-12-23 08:41:15 +01:00
Fabien Potencier
37909a407f Merge branch '2.7'
* 2.7:
  [2.3] CS And DocBlock Fixes
  [Serializer] Serialization groups support
  [2.3] CS Fixes
  Fixed the issue 11116
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
  [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
  [Serializer] Add xml_format_output context option. Close #12517.
  [WebProfilerBundle] Fixed IE8 support
2014-12-22 17:45:23 +01:00
Fabien Potencier
7c026bb33e Merge branch '2.6' into 2.7
* 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
2014-12-22 17:45:18 +01:00
Fabien Potencier
72c169e8a1 Merge branch '2.5' into 2.6
* 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
2014-12-22 17:44:09 +01:00
Fabien Potencier
f26c062c00 Merge branch '2.3' into 2.5
* 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
2014-12-22 17:29:52 +01:00
Fabien Potencier
442c633af4 Merge branch '2.3' into 2.5
* 2.3:
  [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/Component/Console/Helper/TableHelper.php
2014-12-22 17:16:14 +01:00
Graham Campbell
83c15db887 [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Fabien Potencier
ff1b6854bf minor #13044 [2.7] [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

337eb57 [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
2014-12-21 16:04:52 +01:00
Fabien Potencier
27ac290b2a Merge branch '2.6' into 2.7
* 2.6:
  [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
  [WebProfilerBundle] Fixed IE8 support

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
2014-12-21 16:02:02 +01:00
Fabien Potencier
ff52a9f928 minor #13054 [2.3] CS Fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #13054).

Discussion
----------

[2.3] CS 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 provides some cs fixes.

Commits
-------

b521c20 [2.3] CS Fixes
2014-12-21 15:56:19 +01:00
Graham Campbell
b521c200a8 [2.3] CS Fixes 2014-12-21 15:56:12 +01:00
Fabien Potencier
188963f526 minor #13045 [2.6] [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite. (hhamon)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

ea4cf33 [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
2014-12-21 15:49:48 +01:00
Saro0h
7b33d1a060 Removed all $that variables 2014-12-21 13:10:13 +01:00
Saro0h
2ca438deb6 [FrameworkBundle] Fixed Translation loader and update translation command. 2014-12-21 12:33:47 +01:00
Hugo Hamon
337eb57c48 [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class. 2014-12-20 22:39:05 +01:00
Hugo Hamon
ea4cf33e00 [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite. 2014-12-20 22:36:15 +01:00
Hugo Hamon
85f72f4037 [SecurityBundle] adds unit tests suite for SecurityDataCollector class. 2014-12-20 22:33:13 +01:00
Fabien Potencier
c9129dd70f bug #12900 [WebProfilerBundle] Fixed IE8 support (korotovsky)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fixed IE8 support

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

Commits
-------

a6dd6c9 [WebProfilerBundle] Fixed IE8 support
2014-12-20 17:16:09 +01:00
Fabien Potencier
fb34a6f938 Merge branch '2.7'
* 2.7: (32 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.
  [SecurityBundle] fixes SecurityDataCollector::getInheritedRoles() documentation.
  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
  [Security] Added the triggering of the security.interactive_login event after set of token
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-12-20 17:07:50 +01:00
Fabien Potencier
6451384426 Merge branch '2.6' into 2.7
* 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
2014-12-20 17:07:09 +01:00
Fabien Potencier
2c3572d450 Merge branch '2.5' into 2.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
2014-12-20 17:02:27 +01:00
Fabien Potencier
51aa13ad6d Merge branch '2.3' into 2.5
* 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
2014-12-20 17:01:23 +01:00
Fabien Potencier
13fae153b0 minor #12968 Deprecations (jzawadzki, dkvk, nicolas-grekas, picur, mrcmorales)
This PR was merged into the 2.7 branch.

Discussion
----------

Deprecations

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12625, #12605, #12628, #12622, #12642, #12609, #12651, #12604,  #12607, #12667, #12648
| License       | MIT
| Doc PR        | -

Cherry-picking some pending PRs to make them move forward

Commits
-------

badf8fc [Form] Log deprecation of constants, fixes #12607 #12667
1d58df4 Fix deprecation notice on VirtualFormAwareIterator
e2a19ee Add a deprecation note about VirtualFormAwareIterator
ab4d9b8 Add a deprecation note about CsrfProviderInterface
cb70632 [HttpKernel] fix deprecation notice for Kernel::init()
b5a315d [HttpKernel] Added deprecated error to init()
70012c1 [Hackday] [2.7] Add a deprecation note about TypeTestCase
2014-12-20 16:44:40 +01:00
Fabien Potencier
3bfa40513f minor #13033 [Tests] Silenced all deprecations in tests for 2.3 (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[Tests] Silenced all deprecations in tests for 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Also removed src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php as it was not running at all.

Commits
-------

ef4ae63 [Tests] Silenced all deprecations in tests for 2.3
2014-12-20 10:04:46 +01:00
Abdellatif AitBoudad
10089914c6 skip if param "translator.logging" doesn't exist. 2014-12-20 00:51:43 +00:00
Hugo Hamon
28492cfbe0 [SecurityBundle] fixes SecurityDataCollector::getInheritedRoles() documentation. 2014-12-20 00:03:39 +01:00
Christian Flothmann
cb351a6c1a update required minimum TwigBridge version
To be able to use `Twig_SimpleFunction` in `AssetsExtension`, Twig has
to be present in version 1.12 or higher. The TwigBridge only enforces
this Twig version as of version 2.3.10.
2014-12-19 16:27:51 +01:00
sarah khalil
ef4ae63e8a [Tests] Silenced all deprecations in tests for 2.3 2014-12-18 20:00:19 +01:00
Fabien Potencier
acb1b85b98 minor #13022 [DebugBundle] enable the DumpDataCollectorPass (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] enable the DumpDataCollectorPass

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

I forget to activate the `DumpDataCollectorPass` in #13009.

Commits
-------

cdb6c43 [DebugBundle] enable the DumpDataCollectorPass
2014-12-17 22:50:48 +01:00
Fabien Potencier
0a61aee21e bug #13021 [FrameworkBundle] skip compiler pass if interface doesn't exist (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] skip compiler pass if interface doesn't exist

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12813
| License       | MIT
| Doc PR        |

The FrameworkBundle doesn't depend on the `symfony/translation`
component and therefore does not enforce a high enough version of this
package. Thus, with `symfony/translation` versions before `2.6`, the
`translator` service does exist, but the `TranslatorBagInterface` is
not present.

Commits
-------

beff6fa skip compiler pass if interface doesn't exist
2014-12-17 22:49:13 +01:00
Fabien Potencier
aace2c6ee5 bug #12999 [FrameworkBundle] fix cache:clear command (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] fix cache:clear command

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12893
| License       | MIT
| Doc PR        | -

Reading comment on #12893 stating that using absolute paths works around the pb, I tried using realpath(),
and it works!
Pending work on #12955 can be done quietly now.

Commits
-------

a14153a [FrameworkBundle] fix cache:clear command
2014-12-17 22:38:55 +01:00
Christian Flothmann
cdb6c43565 [DebugBundle] enable the DumpDataCollectorPass 2014-12-17 21:23:23 +01:00
Abdellatif AitBoudad
c0925e4b39 [FrameworkBundle] Use debug namespace. 2014-12-17 21:16:04 +01:00
Christian Flothmann
584777102e [FrameworkBundle] update debug commands references
With #11627, both the `ContainerDebugCommand` name and the
`ConfigDebugCommand` name have been moved to the `debug` namespace.
Thus, references should be updated accordingly.
2014-12-17 21:15:32 +01:00
Christian Flothmann
beff6fa3e6 skip compiler pass if interface doesn't exist
The FrameworkBundle doesn't depend on the `symfony/translation`
component and therefore does not enforce a high enough version of this
package. Thus, with `symfony/translation` versions before `2.6`, the
`translator` service does exist, but the `TranslatorBagInterface` is
not present.
2014-12-17 21:06:22 +01:00
Fabien Potencier
c18cb4c7b2 bug #13009 [DebugBundle] fix link format handling with disabled templating (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] fix link format handling with disabled templating

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13007
| License       | MIT
| Doc PR        |

Commits
-------

91b4d1d fix link format handling with disabled templating
2014-12-17 07:20:33 +01:00
sarah khalil
2d17a0cac6 [Security] Added the triggering of the security.interactive_login event after set of token 2014-12-16 23:44:31 +01:00
Nicolas Grekas
cb9f8342c4 Merge branch '2.7'
* 2.7:
  [2.6] Test lowest versions of dependencies
  Test lowest versions of dependencies
  Fix placeholder date format
  Test components using their lowest possible deps
2014-12-16 21:28:59 +01:00
Nicolas Grekas
176b175043 Merge branch '2.6' into 2.7
* 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
2014-12-16 21:28:45 +01:00
Christian Flothmann
91b4d1d3af fix link format handling with disabled templating 2014-12-16 20:07:50 +01:00
Nicolas Grekas
a29ffa82d6 [2.6] Test lowest versions of dependencies 2014-12-16 19:41:39 +01:00
Nicolas Grekas
5e6959b39e Merge remote-tracking branch 'symfony/2.5' into lowest-26
* 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
2014-12-16 16:44:55 +01:00
Nicolas Grekas
b1b5cca41c Test lowest versions of dependencies 2014-12-16 16:17:56 +01:00
Nicolas Grekas
a14153a4fd [FrameworkBundle] fix cache:clear command 2014-12-16 12:29:05 +01:00
Fabien Potencier
5c54b69323 minor #12993 [2.3] Docblocks should not be followed by a blank line (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #12993).

Discussion
----------

[2.3] Docblocks should not be followed by a blank line

| 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

There should be no blank line(s) between phpdocs that document properties, interfaces, classes, functions, or traits. This pull request was a test run of a new php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/864.

Commits
-------

4e7ba1b [2.3] Docblocks should not be followed by a blank line
2014-12-16 05:02:47 +01:00
Graham Campbell
4e7ba1bd72 [2.3] Docblocks should not be followed by a blank line 2014-12-16 05:02:46 +01:00
Nicolas Grekas
88d524e541 Merge remote-tracking branch 'symfony/2.3' into lowest-25
* 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
2014-12-15 19:38:14 +01:00
Mantas Varatiejus
9a44aa85ac Fix placeholder date format 2014-12-15 20:18:43 +02:00
Nicolas Grekas
25fef27753 Test components using their lowest possible deps 2014-12-15 11:45:17 +01:00
Nicolas Grekas
cb70632077 [HttpKernel] fix deprecation notice for Kernel::init() 2014-12-15 10:58:24 +01:00
Jakub Zalas
4cdcf109d3 [FrameworkBundle] Allow custom services for validator mapping cache. 2014-12-13 20:05:40 +00:00
Fabien Potencier
dc7237f1d4 Merge branch '2.7'
* 2.7:
  remove short array syntax
  fix session restart on PHP 5.3
  Avoid missing method when using __invoke
  Show the inherited roles in the web profiler
2014-12-13 09:39:06 +01:00
Fabien Potencier
7ea7035e72 Merge branch '2.6' into 2.7
* 2.6:
  remove short array syntax
  fix session restart on PHP 5.3
  Avoid missing method when using __invoke
2014-12-13 09:38:56 +01:00