Commit Graph

24553 Commits

Author SHA1 Message Date
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
a8843132b8 Merge branch '2.7' into 2.8 2016-03-25 02:40:30 +01:00
Tobias Schultze
0cd725ea42 Merge branch '2.3' into 2.7 2016-03-25 02:39:14 +01:00
Tobias Schultze
43df701103 minor #18303 [Form] Fix Forms docblock to use FQCN (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix `Forms` docblock to use FQCN

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

Commits
-------

df61aab [Form] Fix `Forms` docblock to use FQCN
2016-03-25 02:32:07 +01:00
Jules Pietri
df61aabaa7 [Form] Fix Forms docblock to use FQCN 2016-03-24 20:57:49 +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
Christian Flothmann
d2b0ebc941 Merge branch '2.7' into 2.8
* 2.7:
  move test methods to test case class
2016-03-23 20:59:19 +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
Nicolas Grekas
a18812563f Merge branch '2.7' into 2.8
* 2.7:
  [ci] Tweak scripts

Conflicts:
	appveyor.yml
2016-03-23 17:56:49 +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
1373a5b747 Fix backport 2016-03-23 14:45:24 +01:00
Nicolas Grekas
8fe02a8cbb minor #18274 [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt (nicolas-grekas)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #18274).

Discussion
----------

[Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt

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

Commits
-------

50e1445 [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt
2016-03-23 14:38:15 +01:00
Nicolas Grekas
50e1445c11 [Bridge\PhpUnit] Add Tests/DeprecationErrorHandler/regexp.phpt 2016-03-23 14:38:15 +01:00
Nicolas Grekas
42815018ed Merge branch '2.7' into 2.8
* 2.7:
  Fix backport
  [travis] Upgrade phpunit wrapper & hirak/prestissimo
  [Bridge\PhpUnit] Workaround old phpunit bug, no colors in weak mode, add tests
  [PropertyAccess] Fix isPropertyWritable not using the reflection cache
  [PropertyAccess] Backport fixes from 2.7
  [Validator] use correct term for a property in docblock (not "option")
  [Routing] small refactoring for scheme requirement
  [PropertyAccess] Remove most ref mismatches to improve perf
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  [Process] fix docblock syntax
  Use XML_ELEMENT_NODE in nodeType check
  [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
  [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
  [FrameworkBundle] Add tests for the Controller class
  [FrameworkBundle] Add tests for the Controller class
  [Process] getIncrementalOutput should work without calling getOutput

Conflicts:
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bridge/PhpUnit/TextUI/Command.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
2016-03-23 14:11:46 +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
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
Nicolas Grekas
e06574110a bug #18259 [PropertyAccess] Backport fixes from 2.7 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Backport fixes from 2.7

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

While merging 2.3 into 2.7, I noticed that many fixes were merged into 2.7 that should have been merged into 2.3. This PR backports them, with a few other fixes applied when merging 2.3 into 2.7.

Commits
-------

cb1c87a [PropertyAccess] Backport fixes from 2.7
2016-03-22 11:15:09 +01:00
Nicolas Grekas
241a72504b bug #18261 [PropertyAccess] Fix isPropertyWritable not using the reflection cache (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PropertyAccess] Fix isPropertyWritable not using the reflection cache

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

While merging 2.3 into 2.7, I noticed that isPropertyWritable did not make use of the reflection cache of getWriteAccessInfo. This PR fixes it.

Commits
-------

8a52fcd [PropertyAccess] Fix isPropertyWritable not using the reflection cache
2016-03-22 10:58:08 +01:00
Nicolas Grekas
8a52fcdbff [PropertyAccess] Fix isPropertyWritable not using the reflection cache 2016-03-22 10:40:06 +01:00
Nicolas Grekas
cb1c87ac5f [PropertyAccess] Backport fixes from 2.7 2016-03-22 10:19:04 +01:00
Nicolas Grekas
86c0a17721 Merge branch '2.3' into 2.7
* 2.3:
  [Validator] use correct term for a property in docblock (not "option")
  [PropertyAccess] Remove most ref mismatches to improve perf
  [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols
  [NumberFormatter] Fix invalid numeric literal on PHP 7
  Use XML_ELEMENT_NODE in nodeType check
  [PropertyAccess] Reduce overhead of UnexpectedTypeException tracking
  [PropertyAccess] Throw an UnexpectedTypeException when the type do not match
  [FrameworkBundle] Add tests for the Controller class

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/PropertyAccess/PropertyPath.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
2016-03-22 09:55:46 +01:00
Fabien Potencier
d01a10651b bug #18224 [PropertyAccess] Remove most ref mismatches to improve perf (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Remove most ref mismatches to improve perf

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

This PR is for PHP5 where ref mismatches is a perf pain: it removes all ref mismatches along the "getValue" path, and keeps only the required ones on the "setValue" path.

Commits
-------

72940d7 [PropertyAccess] Remove most ref mismatches to improve perf
2016-03-21 09:49:16 -07:00
Fabien Potencier
46e82299e2 minor #18227 [Routing] small refactoring for scheme requirement (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] small refactoring for scheme requirement

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

Commits
-------

85f5e01 [Routing] small refactoring for scheme requirement
2016-03-21 06:55:59 -07:00
Fabien Potencier
dd7e05dd14 minor #18206 [FrameworkBundle][2.8] Add tests for the Controller class (dunglas)
This PR was squashed before being merged into the 2.8 branch (closes #18206).

Discussion
----------

[FrameworkBundle][2.8] Add tests for the Controller class

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

Backport tests of #18193 to the `abstract` Controller.

Commits
-------

5ee9f93 [FrameworkBundle][2.8] Add tests for the Controller class
2016-03-21 06:51:25 -07:00