Commit Graph

19564 Commits

Author SHA1 Message Date
Fabien Potencier
3b0db95cc8 Merge branch '2.5' into 2.6
* 2.5:
  [Form] fix Context\ExecutionContextInterface mock
  [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 18:57:42 +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
57fddbf9b7 [2.6] fix deprecation silencing... 2015-01-05 18:41:06 +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
12d8261d21 Merge branch '2.5' into 2.6
* 2.5:
  [2.5] cleanup deprecated uses
2015-01-05 15:28:40 +01:00
Fabien Potencier
9d4bab0cd2 minor #13254 [2.6] cleanup deprecated uses (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] cleanup deprecated uses

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

I wish again we could find a way to make deprecation authors do this job.
This is especially visible here: trying to use the new factory declaration enlightens holes in the implementation.

Commits
-------

2856cae [2.6] cleanup deprecated uses
2015-01-05 15:28:02 +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
Peter Thompson
3760e67cb2 [Yaml] Improve YAML boolean escaping
- Moves dumping single-quoting logic into Yaml\Escaper
- Ensures that PHP values which would be interpreted as booleans in
  older versions of the YAML spec are escaped with single quotes when
  dumped by the Dumper.
2015-01-05 12:50:08 +01:00
Nicolas Grekas
2856caed2f [2.6] cleanup deprecated uses 2015-01-05 09:56:52 +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
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
Christian Flothmann
1c4a75a00a add back model_timezone and view_timezone options 2015-01-04 13:18:24 +01:00
WouterJ
57b08e4393 Made CLI help consistent 2015-01-04 11:02:10 +01:00
WouterJ
a450d66bab Made help information consistent 2015-01-04 10:52:37 +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
Stefano Sala
23c0ddca39 [Toolbar] Handle info position via javascript
Place info div to not float out of the window
2015-01-03 15:13:38 -05:00
Stefano Sala
7a8582e1f6 [Toolbar] Display all icons, even on two lines for small screens 2015-01-03 15:13:37 -05: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
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
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
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