Commit Graph

23432 Commits

Author SHA1 Message Date
Christian Flothmann aa4dd4fcf0 fix high deps tests 2016-03-29 22:47:33 +02:00
Fabien Potencier 8110612a46 minor #18348 [Process] remove dead code (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] remove dead code

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

Commits
-------

d5e8f6f [Process] remove dead code
2016-03-29 22:11:02 +02:00
Nicolas Grekas d5e8f6f20a [Process] remove dead code 2016-03-29 16:17:20 +02:00
Christian Flothmann eca25ba3ea minor #18325 [Form] cs fixes in date types (HeahDude)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] cs fixes in date types

| Q             | A
| ------------- | ---
| Branch?       | 2.3+
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| License       | MIT
| Doc PR        | ~

Commits
-------

bc21828 [Form] cs fixes in date types
2016-03-29 15:20:02 +02:00
Christian Flothmann b054aebf37 minor #18340 [WebProfilerBundle] Add missing use statement. (camporter)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Add missing use statement.

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

The RouterController creates a Request in getTraces, but does not have a `use` statement, which causes an exception when trying to view profile routing in >2.7.

Commits
-------

0d31c3e [WebProfilerBundle] Add missing use statement.
2016-03-29 09:06:00 +02:00
Cameron Porter 0d31c3e9cb [WebProfilerBundle] Add missing use statement.
Request is needed in RouterController::getTraces to be able to create a request.
2016-03-28 23:46:00 -05:00
Tobias Schultze 666dc41d0e bug #18312 [ClassLoader] Fix storing not-found classes in APC cache (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Fix storing not-found classes in APC cache

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

Commits
-------

106ed06 [ClassLoader] Fix storing not-found classes in APC cache
2016-03-28 21:27:59 +02:00
Nicolas Grekas 106ed0660c [ClassLoader] Fix storing not-found classes in APC cache 2016-03-28 10:34:42 +02:00
Fabien Potencier bcd981aadd Merge branch '2.3' into 2.7
* 2.3:
  [phpunit] disable prophecy
2016-03-28 09:32:00 +02:00
Jules Pietri bc21828838 [Form] cs fixes in date types 2016-03-27 14:59:14 +02:00
Fabien Potencier 3c1738a46b bug #18298 [Validator] do not treat payload as callback (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] do not treat payload as callback

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

see http://stackoverflow.com/a/36140305/2289865

Commits
-------

2066fc0 [Validator] do not treat payload as callback
2016-03-27 12:30:46 +02:00
Fabien Potencier bbf00d22dc minor #18304 [phpunit] disable prophecy (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[phpunit] disable prophecy

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

Both Prophecy and Symfony require some phpdocumentor dependencies, but incompatible versions.
Since we don't use Prophecy, let's disable it.
phpunit-mock-objects is forced to v3.1.1 until we fix our test suite (see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299).

Commits
-------

ae9bae7 [phpunit] disable prophecy
2016-03-27 12:05:51 +02:00
Fabien Potencier 831de7a015 bumped Symfony version to 2.7.12 2016-03-27 11:07:32 +02:00
Jules Pietri 562f5e4394 [Form] remove useless code in ChoiceType
`ChoiceListFactoryInterface` expected `$group_by` to be a callable or
null not an array.
The factory defaults `group_by` to
`ChoiceListInterface::getStructuredValues`.
2016-03-26 02:35:52 +01:00
Fabien Potencier 66c99826ce Merge pull request #18315 from fabpot/release-2.7.11
released v2.7.11
2016-03-25 19:14:23 +01:00
Fabien Potencier 4cd33fb4be updated VERSION for 2.7.11 2016-03-25 19:14:10 +01:00
Fabien Potencier dc729f3112 updated CHANGELOG for 2.7.11 2016-03-25 19:13:57 +01:00
Fabien Potencier 932211d071 Merge branch '2.3' into 2.7
* 2.3:
  [Request] Fix support of custom mime types with parameters
2016-03-25 18:55:03 +01:00
Fabien Potencier db869e2841 minor #18307 [2.7] fix mocks (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] fix mocks

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

* check for existance of `setMetadataFactory()` method (this is needed
  for tests run with deps=high as the method was removed in Symfony
  3.0)
* fix mock testing the `EngineInterface` as the `stream()` method cannot
  be mocked when it is does not exist in the mocked interface

Commits
-------

d9be1b4 fix mocks
2016-03-25 18:34:49 +01:00
Fabien Potencier 09cc0b20d5 bug #18255 [HttpFoundation] Fix support of custom mime types with parameters (Ener-Getick)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix support of custom mime types with parameters

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/FriendsOfSymfony/FOSRestBundle/issues/1399
| License       | MIT

When using mime types with parameters, ``getFormat`` won't return the expected format as illustrated:
```php
$request = new Request();
$request->setFormat('custom', 'app/foo;param=bar');

$request->getFormat('app/foo;param=bar');
// will return null as the parameters are removed
```

So my proposal is to search the format corresponding to a mime type with its raw value or with the its parameters removed.

Commits
-------

f7ad285 [Request] Fix support of custom mime types with parameters
2016-03-25 17:26:41 +01:00
Ener-Getick f7ad285746 [Request] Fix support of custom mime types with parameters 2016-03-25 17:13:36 +01:00
Christian Flothmann d9be1b4cc4 fix mocks
* check for existance of `setMetadataFactory()` method (this is needed
  for tests run with deps=high as the method was removed in Symfony
  3.0)
* fix mock testing the `EngineInterface` as the `stream()` method cannot
  be mocked when it is does not exist in the mocked interface
2016-03-25 16:52:47 +01:00
Nicolas Grekas c1ca48765e Merge branch '2.3' into 2.7
* 2.3:
  fix mocks

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
2016-03-25 16:39:22 +01:00
Nicolas Grekas ae9bae7e16 [phpunit] disable prophecy 2016-03-25 10:58:58 +01:00
Nicolas Grekas 37dd041cda minor #18306 [2.3] fix mocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] fix mocks

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

* fix a typo in a method name (`setResponse` instead of `seetResopnse`)
* fix mocking a method that is not part of the `DomainObjectInterface`

Commits
-------

c211523 fix mocks
2016-03-25 10:57:13 +01:00
Christian Flothmann c211523f6e fix mocks
* fix a typo in a method name (`setResponse` instead of `seetResopnse`)
* fix mocking a method that is not part of the `DomainObjectInterface`
2016-03-25 10:45:26 +01:00
Tobias Schultze 0cd725ea42 Merge branch '2.3' into 2.7 2016-03-25 02:39:14 +01:00
Christian Flothmann 2066fc03c7 [Validator] do not treat payload as callback 2016-03-24 16:03:49 +01:00
Tobias Schultze 058dee70c6 minor #18293 [FrameworkBundle 2.7+] Removed unused variables (iltar)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle 2.7+] Removed unused variables

| Q             | A
| ------------- | ---
| Branch?       | 2.7, can be merged upwards
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

I noticed some unused variables in the Framework Extension. I did a project inspection in phpstorm and I found nothing else. Hence I submit this PR to make it consistent again.

Commits
-------

9fea1ee Removed unused variables
2016-03-24 14:05:39 +01:00
Iltar van der Berg 9fea1ee4f4 Removed unused variables 2016-03-24 12:33:34 +01:00
Tobias Schultze 89f1c35e58 minor #18291 Fix copy-paste in PHPDoc comment text (guilliamxavier)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix copy-paste in PHPDoc comment text

| Q             | A
| ------------- | ---
| Branch?       | 2.3+ (actually all branches from 2.0)
| License       | MIT

In http://api.symfony.com/2.3/Symfony/Component/Form/DataTransformerInterface.html, compare the documentation (*emphasis* mine) respectively for `transform` and for `reverseTransform`:

> Usually this will be *NULL*, but […] other empty values are possible as well (such as *empty strings*).
> Usually this will be *an empty string*, but […] other empty values are possible as well (such as *empty strings*).

This PR corrects the repetition in the latter, giving symmetry:

> Usually this will be *NULL*, but […] other empty values are possible as well (such as *empty strings*).
> Usually this will be *an empty string*, but […] other empty values are possible as well (such as *NULL*).

_Note:_ For now I just changed `empty strings` to `NULL`, which is 9 characters shorter, should I also reformat the affected comment paragraph so that this line and the subsequent ones fill up to 80 columns (as was the case before the change, and is for `transform`)?

Commits
-------

3f6e37e Fix copy-paste in PHPDoc comment text
2016-03-24 12:17:56 +01:00
Tobias Schultze d31d92ef67 minor #18286 [2.7] fix mocking of some methods (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] fix mocking of some methods

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | items 6 and 8 of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299#issuecomment-200443756
| License       | MIT
| Doc PR        |

Commits
-------

a45b93d [2.7] fix mocking of some methods
2016-03-24 11:22:08 +01:00
Guilliam Xavier 3f6e37efe6 Fix copy-paste in PHPDoc comment text 2016-03-24 10:50:31 +01:00
Christian Flothmann a45b93d423 [2.7] fix mocking of some methods 2016-03-24 10:06:43 +01:00
Tobias Schultze e375161784 minor #18284 [2.3] fix mocking of some methods (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] fix mocking of some methods

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? |no
| Tests pass?   | yes
| Fixed tickets | items 3, 4, 5, and 7 of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299#issuecomment-200443756
| License       | MIT
| Doc PR        |

Commits
-------

542cf6b [2.3] fix mocking of some methods
2016-03-24 00:07:02 +01:00
Christian Flothmann 542cf6b046 [2.3] fix mocking of some methods 2016-03-23 22:36:43 +01:00
Nicolas Grekas bd6d9bb1c2 minor #18283 [FrameworkBundle] move test methods to test case class (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] move test methods to test case class

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

Commits
-------

8188653 move test methods to test case class
2016-03-23 20:29:17 +01:00
Christian Flothmann 81886530c7 move test methods to test case class 2016-03-23 19:17:25 +01:00
Tobias Schultze 1ef2edf4b4 [Routing] add query param if value is different from default 2016-03-23 18:41:29 +01:00
Nicolas Grekas 505bf4db5d Merge branch '2.3' into 2.7
* 2.3:
  [ci] Tweak scripts
2016-03-23 17:16:30 +01:00
Nicolas Grekas a5965fb23b minor #18276 [ci] Tweak scripts (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Tweak scripts

| Q             | A
| ------------- | ---
| Branch?       | 2.3
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299
| License       | MIT
| Doc PR        | -

Commits
-------

82c6bed [ci] Tweak scripts
2016-03-23 17:16:02 +01:00
Nicolas Grekas 82c6bed6b0 [ci] Tweak scripts 2016-03-23 17:07:44 +01:00
Nicolas Grekas 2b3f4261d6 Fix backport 2016-03-23 13:43:53 +01:00
Nicolas Grekas c5dbb1d9b6 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
2016-03-23 13:40:00 +01:00
Nicolas Grekas ec84aafa28 bug #18272 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests

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

Commits
-------

4ea9548 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
2016-03-23 13:39:43 +01:00
Nicolas Grekas 483da73079 minor #18270 [travis] Upgrade phpunit wrapper & hirak/prestissimo (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Upgrade phpunit wrapper & hirak/prestissimo

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

Must be merged after #18232

Commits
-------

bf465eb [travis] Upgrade phpunit wrapper & hirak/prestissimo
2016-03-23 13:37:48 +01:00
Nicolas Grekas bf465eb6db [travis] Upgrade phpunit wrapper & hirak/prestissimo 2016-03-23 13:34:50 +01:00
Nicolas Grekas 4ea9548e23 [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests 2016-03-23 13:16:35 +01:00
Arjen van der Meijden b3da6a11a7 [Routing] Don't needlessly execute strtr's as they are fairly expensive 2016-03-22 21:13:27 +01:00
Nicolas Grekas f4c18db19a Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Backport fixes from 2.7

Conflicts:
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-03-22 11:18:53 +01:00