Commit Graph

10766 Commits

Author SHA1 Message Date
Kévin Dunglas
fbc933596b [Serializer] Add circular reference handling to the PropertyNormalizer 2015-01-04 21:41:58 +01:00
Fabien Potencier
9280c6272a minor #13108 [Serializer] Fix XmlFileLoader test (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix XmlFileLoader test

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

Fix a bug in `XmlFileLoaderTest` tests.

Commits
-------

efd39cf [Serializer] Fix XmlFileLoader test
2014-12-25 11:06:03 +01:00
Nicolas Grekas
4e544b9450 [Security/Http] fix mock logger in test 2014-12-25 10:39:34 +01:00
Kévin Dunglas
efd39cfa51 [Serializer] Fix XmlFileLoader test 2014-12-25 05:07:44 +01:00
Nicolas Grekas
1922f55259 Merge branch '2.6' into 2.7
* 2.6:
  [VarDumper] fix tests under 5.3
  [Console] Move QuestionHelperTest to tty group
  [travis] remove sh wrapper
2014-12-24 11:55:26 +01:00
Nicolas Grekas
b0d73f3765 Merge branch '2.5' into 2.6
* 2.5:
  [Console] Move QuestionHelperTest to tty group
  [travis] remove sh wrapper
2014-12-24 11:55:18 +01:00
Nicolas Grekas
333fb6f3df [VarDumper] fix tests under 5.3 2014-12-24 11:36:03 +01:00
Nicolas Grekas
e714f8583e [Console] Move QuestionHelperTest to tty group 2014-12-24 10:25:10 +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
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
Jeremy Livingston
3bd1616db9 Add LegacyPdoSessionHandler class
The changes made to the PdoSessionHandler in 2.6 introduced a
backwards-compatability break for users upgrading from 2.5. This update
introduces a LegacyPdoSessionHandler class that uses the old service's
functionality.

Users who cannot make schema updates or do not want to lose sessions can
use LegacyPdoSessionHandler until 3.0.
2014-12-23 18:34:42 +01:00
Fabien Potencier
cad7f0e99c bug #13075 [Config] fix error handler restoration in test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] fix error handler restoration in test

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

Commits
-------

266afeb [Config] fix error handler restoration in test
2014-12-23 18:31:59 +01:00
Fabien Potencier
3402fffb97 bug #13073 [VarDumper] fix and test PdoCaster (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] fix and test PdoCaster

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

Commits
-------

0b1be13 [VarDumper] fix and test PdoCaster
2014-12-23 18:30:47 +01:00
sarah khalil
de0fe5d175 [Console] Remove $this in closure 2014-12-23 12:23:33 +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
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
Nicolas Grekas
0b1be13309 [VarDumper] fix and test PdoCaster 2014-12-22 10:05:34 +01:00
Nicolas Grekas
266afeb161 [Config] fix error handler restoration in test 2014-12-22 10:02:19 +01:00
Kévin Dunglas
57a191b3a9 [Serializer] Serialization groups support 2014-12-21 23:11:52 +01:00
Fabien Potencier
affcafcc79 Merge branch '2.6' into 2.7
* 2.6:
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 17:36:23 +01:00
Fabien Potencier
1a473672af Merge branch '2.5' into 2.6
* 2.5:
  [Security] Fixed tests
  [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 17:36:15 +01:00
Fabien Potencier
397dfb2fa5 feature #13031 [Serializer] Add xml_format_output context option. Close #12517. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Add xml_format_output context option. Close #12517.

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

Allows to pretty print XML encoder output.

Commits
-------

37d3f84 [Serializer] Add xml_format_output context option. Close #12517.
2014-12-21 16:06:18 +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
3892389c6d minor #13059 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.

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

Commits
-------

e22c887 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 15:48:15 +01:00
Saro0h
fa03e523d7 Fixed the issue 11116 2014-12-21 14:13:21 +01:00
Saro0h
5aa3ef465e [Security] Fixed tests 2014-12-21 13:39:03 +01:00
Hugo Hamon
e22c887799 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. 2014-12-21 12:42:01 +01:00
Saro0h
2ca438deb6 [FrameworkBundle] Fixed Translation loader and update translation command. 2014-12-21 12:33:47 +01:00
Hugo Hamon
cdc5c5bb11 [Console] remove « use » statement for PHP built-in exception classes. 2014-12-21 11:19:40 +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
405b881d86 minor #12964 [PropertyAccess] Added test to verify #5775 is fixed (aboks)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Added test to verify #5775 is fixed

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

Added regression test to verify #5775 has been fixed some time ago, so that it can be closed.

Commits
-------

45651c6 [PropertyAccess] Added test to verify #5775 is fixed
2014-12-20 16:49:05 +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
1bb837e476 minor #13050 [Config] fixes broken unit test on ArrayNode class. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] fixes broken unit test on ArrayNode class.

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

Commits
-------

a7ee58a [Config] fixes broken unit test on ArrayNode class.
2014-12-20 13:59:28 +01:00
Fabien Potencier
6712a4ab30 minor #13051 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] adds missing « use » statement for InvalidTypeException type hint in documentation.

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

Commits
-------

e855424 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
2014-12-20 13:58:29 +01:00
Hugo Hamon
e855424768 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. 2014-12-20 13:26:26 +01:00
Hugo Hamon
a7ee58a95a [Config] fixes broken unit test on ArrayNode class. 2014-12-20 13:23:01 +01:00
Fabien Potencier
901d1de344 bug #13048 [Security] Delete old session on auth strategy migrate (xelaris)
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
2014-12-20 13:20:33 +01:00
Fabien Potencier
c5b906918d fixed CS 2014-12-20 12:33:01 +01:00