Commit Graph

19583 Commits

Author SHA1 Message Date
Fabien Potencier a054bede9f minor #13244 [Debug] fix test (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] fix test

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

My bad, I missed this one.

Commits
-------

a2435a7 [Debug] fix test
2015-01-04 19:08:19 +01:00
Nicolas Grekas 7e929ab162 [2.3] missing cleanup for legacy test 2015-01-04 16:10:38 +01:00
Nicolas Grekas a2435a78e3 [Debug] fix test 2015-01-04 15:59:17 +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 de14c14daf minor #13199 [Debug] split tests for deprecated interfaces (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] split tests for deprecated interfaces

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

Splitting tests for deprecated interfaces in "Legacy" prefixed test classes/methods should be done for every component.
Let's start by this simple one. To anyone: help welcomed for the other components.

Commits
-------

3a18cc6 [Debug] split tests for deprecated interfaces
2015-01-04 13:31:37 +01:00
Fabien Potencier 60a97ec3c5 minor #13232 [TwigBundle] always load the exception listener if the templating.engines is not present (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] always load the exception listener if the templating.engines is not present

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

This PR removes (partially) the dependency of TwigBundle on FrameworkBundle. If FrameworkBundle is not registered, the Twig exception listener is always registered (this change was part of #13143 but as it is now totally independent, I've created a new PR).

Commits
-------

30ba9df [TwigBundle] always load the exception listener if the templating.engines is not present
2015-01-04 11:49:17 +01:00
Fabien Potencier 3dd48f2147 feature #13230 [TwigBundle] removed the Container dependency on ActionsExtension (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] removed the Container dependency on ActionsExtension

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

This PR removes the injection of the container into the actions extension, and decouple this extension from FrameworkBundle (it was part of #13143 but as it is now totally independent, I've created a new PR).

Commits
-------

76abf98 [TwigBundle] removed the Container dependency on ActionsExtension
2015-01-04 11:48:20 +01:00
Fabien Potencier 30ba9df07c [TwigBundle] always load the exception listener if the templating.engines is not present 2015-01-04 11:30:48 +01:00
Fabien Potencier 76abf98bff [TwigBundle] removed the Container dependency on ActionsExtension 2015-01-04 11:30:17 +01:00
Fabien Potencier 59f3751052 bug #13227 [Filesystem] keep perms when copying (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Filesystem] keep perms when copying

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

Replaces PR #13222

Commits
-------

085e813 [Filesystem] keep exec perms when copying
2015-01-04 11:29:28 +01:00
Nicolas Grekas 085e813936 [Filesystem] keep exec perms when copying 2015-01-04 10:06:13 +01:00
Nicolas Grekas 7e660fdead Merge branch '2.6' into 2.7
* 2.6:
  fixed typo
  Fixed minor typo - override
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory
  Use $this->iniSet() in tests
2015-01-03 23:52:01 +01:00
Fabien Potencier fb23abe18d Merge branch '2.5' into 2.6
* 2.5:
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory
  Use $this->iniSet() in tests
2015-01-03 22:13:09 +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
Fabien Potencier f14c7ca625 fixed typo 2015-01-03 21:59:06 +01:00
Fabien Potencier 54d39518db minor #13226 Fixed minor typo - override (mmoreram)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13226).

Discussion
----------

Fixed minor typo - override

Commits
-------

77c10e0 Fixed minor typo - override
2015-01-03 21:58:04 +01:00
mmoreram 77c10e0363 Fixed minor typo - override 2015-01-03 21:58:03 +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 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
Nicolas Grekas 3a18cc623a [Debug] split tests for deprecated interfaces 2015-01-03 17:05:44 +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 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
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