Commit Graph

18590 Commits

Author SHA1 Message Date
Fabien Potencier
e3ca5165c6 Merge branch '2.3' into 2.5
* 2.3:
  [2.3] fix failing test
  fixed typo
  Escape annotations in comments, refs #13089.
  [2.3] missing cleanup for legacy test
  add missing param names to @param annotation
  Improve the composer root version setting on Travis
2015-01-05 21:58:03 +01:00
Fabien Potencier
1201853b55 minor #13272 [2.3] fix failing test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] fix failing test

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

Fix failing tests on 2.3 with components=high

Commits
-------

064799a [2.3] fix failing test
2015-01-05 21:55:16 +01:00
Nicolas Grekas
064799a146 [2.3] fix failing test 2015-01-05 20:37:56 +01:00
Fabien Potencier
e11f8b4934 minor #12970 [FrameworkBundle] use Table instead of the deprecated TableHelper (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] use Table instead of the deprecated TableHelper

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

Commits
-------

c5ad74d use Table instead of the deprecated TableHelper
2015-01-05 19:46:33 +01:00
Fabien Potencier
987717e40b minor #13268 [Form] fix Context\ExecutionContextInterface mock (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Form] fix Context\ExecutionContextInterface mock

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

Proper mock creation should fix tests on 2.6 once merged.

Commits
-------

d79aa70 [Form] fix Context\ExecutionContextInterface mock
2015-01-05 18:57:23 +01:00
Nicolas Grekas
d79aa70edd [Form] fix Context\ExecutionContextInterface mock 2015-01-05 18:29:33 +01:00
Fabien Potencier
b6dadf4e18 minor #13242 CS: add missing param names to @param annotation (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: add missing param names to @param annotation

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

as stated by @stof [here](https://github.com/symfony/symfony/pull/12886#issuecomment-68626732)

Commits
-------

665825b add missing param names to @param annotation
2015-01-05 15:41:15 +01:00
Fabien Potencier
f7d489ef61 fixed typo 2015-01-05 15:38:29 +01:00
Fabien Potencier
190d00cb48 minor #13215 Improve the composer root version setting on Travis (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Improve the composer root version setting on Travis

The previous implementation was setting dev-master in all branches. This was working fine only because the dev-master branch alias was never updated in maintenance branches, and so dev-master was aliased as 2.3.x-dev in the 2.3 branch.

Commits
-------

01f7a3a Improve the composer root version setting on Travis
2015-01-05 15:37:49 +01:00
Fabien Potencier
1f13517347 minor #13237 [2.5] [Validator] marks TraversalStrategy::STOP_RECURSION constant internal (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] [Validator] marks TraversalStrategy::STOP_RECURSION constant internal

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

This constant has been introduced for the BC layer and will be removed in 3.0.

Commits
-------

583fee4 [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
2015-01-05 15:36:28 +01:00
Fabien Potencier
22885d82d7 minor #13243 [2.5] cleanup deprecated uses (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] cleanup deprecated uses

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

I wish deprecation authors could do this job.

Commits
-------

237c315 [2.5] cleanup deprecated uses
2015-01-05 15:26:33 +01:00
Nicolas Grekas
237c315144 [2.5] cleanup deprecated uses 2015-01-05 09:51:41 +01:00
Fabien Potencier
b4c1e898c0 minor #13245 [2.3] missing cleanup for legacy test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] missing cleanup for legacy test

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

Commits
-------

7e929ab [2.3] missing cleanup for legacy test
2015-01-04 19:21:09 +01:00
Fabien Potencier
bd8ff04506 minor #13240 Escape annotations in comments (cmfcmf)
This PR was merged into the 2.3 branch.

Discussion
----------

Escape annotations in comments

| Q             | A
| ------------- | ---
| Fixed tickets | ---
| Referenced tickets | #13089
| License       | MIT

Commits
-------

0cb17f3 Escape annotations in comments, refs #13089.
2015-01-04 19:18:18 +01:00
cmfcmf
0cb17f3dd2 Escape annotations in comments, refs #13089. 2015-01-04 19:14:50 +01:00
Nicolas Grekas
7e929ab162 [2.3] missing cleanup for legacy test 2015-01-04 16:10:38 +01:00
Christian Flothmann
665825b038 add missing param names to @param annotation 2015-01-04 15:17:53 +01:00
Hugo Hamon
583fee4d2d [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0. 2015-01-04 13:49:58 +01:00
Fabien Potencier
6537359c00 minor #13213 [2.5] Use $this->iniSet() in tests (mpajunen)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Use $this->iniSet() in tests

| 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

Conversion for 2.3 was done in #13195.

Only one test in 2.5 where replacing `ini_set()` with `$this->iniSet()` was needed. Other uses were class wide and in isolated tests.

Commits
-------

6309ffd Use $this->iniSet() in tests
2015-01-03 22:12:45 +01:00
Fabien Potencier
6b5cb6a3b8 Merge branch '2.3' into 2.5
* 2.3:
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory

Conflicts:
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
2015-01-03 22:04:44 +01:00
Fabien Potencier
7d15c1d9db minor #13225 [Filesystem] enforce umask while testing (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem] enforce umask while testing

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

Having a predictable umask (but not the usual one) should help (TDD for #13222).
When merging in 2.5, the patch should be moved to the new `FilesystemTestCase`

Commits
-------

1e547be [Filesystem] enforce umask while testing
2015-01-03 22:01:25 +01:00
Nicolas Grekas
1e547bebf4 [Filesystem] enforce umask while testing 2015-01-03 19:45:38 +01:00
Fabien Potencier
4d56fd077e minor #13223 [TwigBridge] moved fixtures into their own directory (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge] moved fixtures into their own directory

Commits
-------

0b775cd [TwigBridge] moved fixtures into their own directory
2015-01-03 19:33:06 +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
Fabien Potencier
0b775cd8ce [TwigBridge] moved fixtures into their own directory 2015-01-03 19:21:43 +01:00
Nicolas Grekas
ba51a0bf86 [2.3] Fix lowest deps 2015-01-03 19:20:28 +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
503d2de64a minor #13206 [2.3] Cleanup deprecations (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Cleanup deprecations

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

Commits
-------

d649bef [2.3] Remove useless tests skips
1d68ad3 [2.3] Cleanup deprecations
2015-01-03 15:49:25 +01:00
Fabien Potencier
dc21726e8d Merge branch '2.3' into 2.5
* 2.3:
  [ClassLoader] removes deprecated classes from documentation.
  [Yaml] Update README.md
  [Security] fixed wrong phpdoc
2015-01-03 15:48:25 +01:00
Fabien Potencier
efa1436ba3 minor #13204 [2.3] [ClassLoader] removes deprecated classes from documentation. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [ClassLoader] removes deprecated classes from documentation.

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

Commits
-------

57bd898 [ClassLoader] removes deprecated classes from documentation.
2015-01-03 15:17:52 +01:00
Fabien Potencier
82f8a795fe [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
Fabien Potencier
6de747e2ec minor #13211 [Security] fixed wrong phpdoc (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fixed wrong phpdoc

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

Commits
-------

064062d [Security] fixed wrong phpdoc
2015-01-03 14:33:53 +01:00
Fabien Potencier
8b84d8ec13 minor #13205 [2.5] [ClassLoader] added missing deprecation notice. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] [ClassLoader] added missing deprecation notice.

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

Commits
-------

00d3a5a [ClassLoader] added missing deprecation notice.
2015-01-03 14:29:20 +01:00
Nicolas Grekas
d649befa67 [2.3] Remove useless tests skips 2015-01-03 14:14:51 +01:00
Hugo Hamon
57bd898198 [ClassLoader] removes deprecated classes from documentation. 2015-01-03 14:04:11 +01:00
Fabien Potencier
36e05e9bf4 minor #13212 [Yaml] Update README.md (xelaris)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Update README.md

| Q             | A
| ------------- | ---
| Fixed tickets |
| License       | MIT

The ability to pass file names to Yaml::parse() was deprecated in 2.2 and will be removed in 3.0. So show an up-to-date example.

Commits
-------

bab98f0 [Yaml] Update README.md
2015-01-03 13:39:27 +01:00
Hugo Hamon
00d3a5a782 [ClassLoader] added missing deprecation notice. 2015-01-03 12:22:44 +01:00
Christophe Coevoet
01f7a3a9fc Improve the composer root version setting on Travis
The previous implementation was setting dev-master in all branches. This
was working fine only because the dev-master branch alias was never
updated in maintenance branches, and so dev-master was aliased as
2.3.x-dev in the 2.3 branch.
2015-01-03 12:15:23 +01:00
Fabien Potencier
169a420c9c Merge branch '2.3' into 2.5
* 2.3:
  [HttpFoundation] Fix an issue caused by php's Bug #66606.
  Don't add Accept-Range header on unsafe HTTP requests
  simplify hasScheme method

Conflicts:
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/Routing/Route.php
2015-01-03 12:12:44 +01:00
Fabien Potencier
1b1b8e074e bug #12417 [HttpFoundation] Fix an issue caused by php's Bug #66606. (wusuopu)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12417).

Discussion
----------

[HttpFoundation] Fix an issue caused by php's Bug #66606.

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

Commits
-------

75df4a6 [HttpFoundation] Fix an issue caused by php's Bug #66606.
2015-01-03 12:11:41 +01:00
wusuopu
75df4a6c50 [HttpFoundation] Fix an issue caused by php's Bug #66606. 2015-01-03 12:11:27 +01:00
Alexander Schwenn
bab98f00f9 [Yaml] Update README.md
The ability to pass file names to Yaml::parse() was deprecated in 2.2 and will be removed in 3.0. So show an up-to-date example.
2015-01-03 11:53:56 +01:00
Fabien Potencier
6116d335ae bug #13200 Don't add Accept-Range header on unsafe HTTP requests (jaytaph)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13200).

Discussion
----------

Don't add Accept-Range header on unsafe HTTP requests

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

Commits
-------

24a287f Don't add Accept-Range header on unsafe HTTP requests
2015-01-03 11:53:03 +01:00
Joshua Thijssen
24a287f492 Don't add Accept-Range header on unsafe HTTP requests 2015-01-03 11:53:03 +01:00
Fabien Potencier
cb79d91059 minor #13210 simplify hasScheme method (tjomamokrenko)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13210).

Discussion
----------

simplify hasScheme method

... and correct the mistake in docblock

Commits
-------

ad0d93b simplify hasScheme method
2015-01-03 11:51:47 +01:00
Artiom
ad0d93baf4 simplify hasScheme method
... and correct the mistake in docblock
2015-01-03 11:51:37 +01:00
Mikael Pajunen
6309ffd1b7 Use $this->iniSet() in tests 2015-01-03 12:33:34 +02:00
Fabien Potencier
27176d9b3d adapted merge to 2.5 2015-01-03 11:28:05 +01:00
Fabien Potencier
b1819d4498 Merge branch '2.3' into 2.5
* 2.3:
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri

Conflicts:
	src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
2015-01-03 11:26:24 +01:00