Commit Graph

18521 Commits

Author SHA1 Message Date
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
9e5066fbde minor #13117 [FrameworkBundle] fix browserkit requirement (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fix browserkit requirement

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

Commits
-------

abbd270 [FrameworkBundle] fix browserkit requirement
2014-12-26 00:19:57 +01:00
Nicolas Grekas
841f532fda minor #13118 [TwigBridge] fix form requirement (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge] fix form requirement

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

Commits
-------

d9053d9 [TwigBridge] fix form requirement
2014-12-26 00:18:04 +01:00
Nicolas Grekas
abbd2707ef [FrameworkBundle] fix browserkit requirement 2014-12-26 00:04:51 +01:00
Nicolas Grekas
d9053d9b55 [TwigBridge] fix form requirement 2014-12-25 23:41:41 +01:00
Fabien Potencier
37724f01a5 minor #13104 [CssSelector] added the license of the Python library we ported to PHP (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] added the license of the Python library we ported to PHP

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

Commits
-------

fa36b98 [CssSelector] added the license of the Python library we ported to PHP
2014-12-25 20:43:18 +01:00
Fabien Potencier
49dd88ff86 minor #13103 [SecurityBundle] avoid unneeded work (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] avoid unneeded work

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

Commits
-------

8135727 [SecurityBundle] avoid unneeded work
2014-12-25 20:42:32 +01:00
Fabien Potencier
73dddac4e0 [HttpFoundation] removed wrong HTTP header 2014-12-25 20:39:31 +01:00
Fabien Potencier
0e721881e1 minor #13112 [FrameworkBundle] fix http-foundation requirement (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] fix http-foundation requirement

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

Request::getDefaultLocale() has been introduced in 2.5.4

Commits
-------

965b4dd [FrameworkBundle] fix http-foundation requirement
2014-12-25 12:12:13 +01:00
Nicolas Grekas
965b4ddc42 [FrameworkBundle] fix http-foundation requirement 2014-12-25 12:07:27 +01:00
Fabien Potencier
771703d094 minor #13098 [2.5] silence deprecation notices in new components (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] 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
-------

6872e51 [2.5] silence deprecation notices in new components
2014-12-25 11:07:16 +01:00
Nicolas Grekas
6872e51289 [2.5] silence deprecation notices in new components 2014-12-24 22:27:15 +01:00
Fabien Potencier
fa36b98141 [CssSelector] added the license of the Python library we ported to PHP 2014-12-24 16:07:20 +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
Nicolas Grekas
3aa2fe017d Merge branch '2.3' into 2.5
* 2.3:
  [travis] remove sh wrapper
2014-12-24 11:55:06 +01:00
Nicolas Grekas
87e0e220f6 minor #13095 [travis] remove sh wrapper (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] remove sh wrapper

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

Not ready yet

Commits
-------

a848d69 [travis] remove sh wrapper
2014-12-24 11:54:22 +01:00
Nicolas Grekas
227712380f minor #13096 [Console] Move QuestionHelperTest to tty group (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] Move QuestionHelperTest to tty group

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

Commits
-------

e714f85 [Console] Move QuestionHelperTest to tty group
2014-12-24 11:48:35 +01:00
Nicolas Grekas
e714f8583e [Console] Move QuestionHelperTest to tty group 2014-12-24 10:25:10 +01:00
Nicolas Grekas
a848d69dbc [travis] remove sh wrapper 2014-12-24 10:20:55 +01:00
Fabien Potencier
0ec80c6d1f Merge branch '2.3' into 2.5
* 2.3:
  [Bridge] [Propel] minor improvements to the Propel bridge.

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/Fixtures/Column.php
2014-12-24 08:11:46 +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
9ea3f6ac2f minor #13063 [2.3] [Bridge] [Propel] minor improvements to the Propel bridge. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Bridge] [Propel] minor improvements to the Propel bridge.

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

Commits
-------

6d9d460 [Bridge] [Propel] minor improvements to the Propel bridge.
2014-12-24 06:49:41 +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
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
5e0ae268c2 bug #13085 [FrameworkBundle] Fix dependency on ExtensionInterface over implementation (xphere)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] Fix dependency on ExtensionInterface over implementation

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no (but anyway, they didn't pass previously)
| Fixed tickets | #13084
| License       | MIT

When implementing `ExtensionInterface` through classes not inheriting the core `Extension`, the command `config:dump` throws.
This bug was introduced in 2.5 and could be fixed up to 2.7 with the same patch.

Commits
-------

5e1a5f7 fix dependency on ExtensionInterface over implementation
2014-12-23 18:18:54 +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
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
Fabien Potencier
cbbd0624fe minor #13066 [2.3] CS And DocBlock Fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #13066).

Discussion
----------

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

@fabpot The second commit of the two applies the docblock fixes you wanted, using https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/887. I made 3 or 4 minor manual changes because people had put bulleted lists in the "short description" which is not allowed, so we were ending up with colons followed by full stops. I've moved those lists to be part of a "long description".

// cc @keradus

Commits
-------

83c15db [2.3] CS And DocBlock Fixes
2014-12-22 16:58:14 +01:00
Graham Campbell
83c15db887 [2.3] CS And DocBlock Fixes 2014-12-22 16:58:09 +01:00
Nicolas Grekas
266afeb161 [Config] fix error handler restoration in test 2014-12-22 10:02:19 +01:00
Hugo Hamon
6d9d460ebb [Bridge] [Propel] minor improvements to the Propel bridge. 2014-12-21 17:25: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
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
Fabien Potencier
8dc747858f minor #13061 [Security] Fixed tests (saro0h)
This PR was merged into the 2.5 branch.

Discussion
----------

[Security] Fixed tests

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

Fixes the tests failing (https://travis-ci.org/symfony/symfony/jobs/44732074#L896)

This class have been removed in 2.3 (https://github.com/symfony/symfony/pull/13033) but is actually used since 2.4 (when the split of the Security component has been made).

Commits
-------

5aa3ef4 [Security] Fixed tests
2014-12-21 15:47:01 +01:00
Fabien Potencier
6031d7659d bug #13053 [FrameworkBundle] Fixed Translation loader and update translation command. (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fixed Translation loader and update translation command.

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

This patch verifies that the directory to load translations exists in ``FrameworkBundle/Translation/TranslationLoader.php`` and stop the command if there are no translation found.

**Before, when loading messages** :
![capture d ecran 2014-12-20 a 14 55 52](https://cloud.githubusercontent.com/assets/667519/5515053/09f4655c-8859-11e4-8231-fc6587ace5eb.png)

**After, when loading messages** :
![capture d ecran 2014-12-20 a 15 01 36](https://cloud.githubusercontent.com/assets/667519/5515056/216a9fbc-8859-11e4-87a2-9e452df708a5.png)

---------------------------

**Before, when writing messages** :
![capture d ecran 2014-12-20 a 14 57 50](https://cloud.githubusercontent.com/assets/667519/5515058/508c3184-8859-11e4-9456-f8e47190d3cd.png)

**After, when writing messages** :
![capture d ecran 2014-12-20 a 15 03 47](https://cloud.githubusercontent.com/assets/667519/5515062/711f61d2-8859-11e4-8d15-d27700ac0a0f.png)

---------------------------

**Before when loading message and there was no messages found**:
![capture d ecran 2014-12-20 a 15 05 36](https://cloud.githubusercontent.com/assets/667519/5515065/afe422a4-8859-11e4-9d2d-8f8399555462.png)

**After when loading message and there was no messages found**:
![capture d ecran 2014-12-20 a 15 06 48](https://cloud.githubusercontent.com/assets/667519/5515070/da0247dc-8859-11e4-8cd7-127435441ffd.png)

Commits
-------

2ca438d [FrameworkBundle] Fixed Translation loader and update translation command.
2014-12-21 15:32:01 +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
Fabien Potencier
1532b4e681 minor #13058 [2.3] [Console] remove « use » statement for PHP built-in exception classes. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Console] remove « use » statement for PHP built-in exception classes.

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

Commits
-------

cdc5c5b [Console] remove « use » statement for PHP built-in exception classes.
2014-12-21 11:54:23 +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
c9acca7381 minor #13049 [2.3] [SecurityBundle] adds unit tests suite for SecurityDataCollector class. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [SecurityBundle] adds 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
-------

85f72f4 [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
2014-12-21 09:19:38 +01:00
Hugo Hamon
85f72f4037 [SecurityBundle] adds unit tests suite for SecurityDataCollector class. 2014-12-20 22:33:13 +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