Commit Graph

19877 Commits

Author SHA1 Message Date
Nicolas Grekas
9f588e6a56 Merge branch '2.6' into 2.7
* 2.6:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2015-01-03 19:24:27 +01:00
Nicolas Grekas
45547519ae Merge branch '2.5' into 2.6
* 2.5:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags
2015-01-03 19:23:00 +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
Saro0h
1cdb655b11 [Form] Removed depracted events PRE_BIND, BIND and POST_BIND 2015-01-03 18:51:27 +01:00
Hugo Hamon
a333811d04 [Config] removed deprecated ReferenceDumper class. 2015-01-03 17:09:48 +01:00
Nicolas Grekas
3a18cc623a [Debug] split tests for deprecated interfaces 2015-01-03 17:05:44 +01:00
Nicolas Grekas
afcf52f485 Merge branch '2.7'
* 2.7:
  [Hackday] - add trigger error for deprecated clases.
  [2.3] Remove useless tests skips
  [ClassLoader] removes deprecated classes from documentation.
  Add type aliases for allowed types in OptionsResolver
  [ClassLoader] added missing deprecation notice.
  [HttpFoundation] Fix an issue caused by php's Bug #66606.
  [Yaml] Update README.md
  Don't add Accept-Range header on unsafe HTTP requests
  simplify hasScheme method
  adapted merge to 2.5
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [Security] fixed wrong phpdoc
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
  [2.3] Cleanup deprecations
  [Form] Add deprecation message for Form::bind() and Form::isBound()
  [Validator] add deprecation log (#12674)
  [Filesystem] Keep executable permission when a file is copied
  [HttpKernel] RouterListener uses "context" argument when logging route

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
	src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
	src/Symfony/Component/HttpKernel/CHANGELOG.md
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
2015-01-03 16:56:00 +01:00
Saro0h
ad2f906daf [Validator] Added a check DNS option on URL validator 2015-01-03 16:47:12 +01:00
Nicolas Grekas
ad84fb78e1 Merge branch '2.6' into 2.7
* 2.6:
  [2.3] Remove useless tests skips
  [ClassLoader] removes deprecated classes from documentation.
  [ClassLoader] added missing deprecation notice.
  [HttpFoundation] Fix an issue caused by php's Bug #66606.
  [Yaml] Update README.md
  Don't add Accept-Range header on unsafe HTTP requests
  simplify hasScheme method
  adapted merge to 2.5
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [Security] fixed wrong phpdoc
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
  [2.3] Cleanup deprecations

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/Form/ButtonBuilder.php
	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
2015-01-03 16:46:01 +01:00
Nicolas Grekas
363e5b41a5 Merge branch '2.5' into 2.6
* 2.5:
  [2.3] Remove useless tests skips
  [ClassLoader] removes deprecated classes from documentation.
  [ClassLoader] added missing deprecation notice.
  [HttpFoundation] Fix an issue caused by php's Bug #66606.
  [Yaml] Update README.md
  Don't add Accept-Range header on unsafe HTTP requests
  simplify hasScheme method
  adapted merge to 2.5
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [Security] fixed wrong phpdoc
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
  [2.3] Cleanup deprecations

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
	src/Symfony/Component/HttpKernel/composer.json
2015-01-03 16:33:07 +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
5099d43897 minor #13217 [3.0] [FrameworkBundle] Fixed tests (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [FrameworkBundle] 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 this error: https://travis-ci.org/symfony/symfony/jobs/45764447#L1719

Commits
-------

4391219 Fixed tests
2015-01-03 15:51:07 +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
ff25c81002 minor #12720 [Hackday] [Form] Deprecation messages for Form::bind() and Form::isBound() (stefanosala)
This PR was merged into the 2.7 branch.

Discussion
----------

[Hackday] [Form] Deprecation messages for Form::bind() and Form::isBound()

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

Commits
-------

eb9e4d3 [Form] Add deprecation message for Form::bind() and Form::isBound()
2015-01-03 15:46:49 +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
d58bdaeb51 minor #12750 [Hackday] - add trigger error for deprecated clases. (desarrolla2)
This PR was squashed before being merged into the 2.7 branch (closes #12750).

Discussion
----------

[Hackday] - add trigger error for deprecated clases.

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

Commits
-------

48dd497 [Hackday] - add trigger error for deprecated clases.
2015-01-03 15:12:57 +01:00
Daniel González Cerviño
48dd497514 [Hackday] - add trigger error for deprecated clases. 2015-01-03 15:12:54 +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
Fabien Potencier
c91d72a039 minor #12850 [Validator] add deprecation log (#12674) (phramz)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] add deprecation log (#12674)

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

... follows #12730

Commits
-------

0f7e303 [Validator] add deprecation log (#12674)
2015-01-03 14:26:32 +01:00
Saro0h
4391219d33 Fixed tests 2015-01-03 14:15:49 +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
Fabien Potencier
a0e3757bf0 feature #12602 Add type aliases for allowed types in OptionsResolver (henrikbjorn)
This PR was submitted for the 2.3 branch but it was merged into the 2.7 branch instead (closes #12602).

Discussion
----------

Add type aliases for allowed types in OptionsResolver

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | [#12586]
| License       | MIT

Improves DX by allowing type names that does not correspond 1 to 1
with php is_ functions.

integer => int
boolean => bool
double => float

(have one for 2.6 branch aswell, but cant never remember what branch i am supposed to base stuff off)

Commits
-------

ae544e5 Add type aliases for allowed types in OptionsResolver
2015-01-03 13:06:15 +01:00
Henrik Bjornskov
ae544e5d8f Add type aliases for allowed types in OptionsResolver 2015-01-03 13:06:09 +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
92a741603c feature #12457 [FrameworkBundle] REFS #11294 Controller class become abstract (mickaelandrieu)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] REFS #11294 Controller class become abstract

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

Commits
-------

0ab13b9 Publics methods are protected, class become abstract
2015-01-03 11:31:18 +01: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
Fabien Potencier
2ecf45c0f2 bug #12491 [Security] Don't send remember cookie for sub request (blanchonvincent)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12491).

Discussion
----------

[Security] Don't send remember cookie for sub request

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

Remember cookie shouldn't be sent for sub request

Commits
-------

ec38936 adapted previous commit for 2.3
119b091 [Security] Don't send remember cookie for sub request
2015-01-03 11:25:40 +01:00
Fabien Potencier
ec38936fbf adapted previous commit for 2.3 2015-01-03 11:25:34 +01:00
blanchonvincent
119b0917dc [Security] Don't send remember cookie for sub request 2015-01-03 11:24:57 +01:00
Fabien Potencier
064062dff3 [Security] fixed wrong phpdoc 2015-01-03 11:04:03 +01:00
Fabien Potencier
d2e951b74b bug #12574 [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri (nyroDev)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #12574).

Discussion
----------

[HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri

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

I have a weird server installation behind Varnish that rewrite the signed URL to add the _hash at the end of the url queries.
Exemple :
URL called: http://exemple.com/page?foo=bar&_hash=123
URL received by PHP: http://exemple.com/page?_hash=123&foo=bar

When the _hash is not at the end of the URL, the UriSigner fail to verify it even if the _hash is correct.

The fix rewrites the check function to use parse_url and parse_str to analyse the URI and check the signature.

Commits
-------

29b217c [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
2015-01-03 11:03:21 +01:00