Commit Graph

16015 Commits

Author SHA1 Message Date
Mikael Pajunen
4e941e3d2d [Process] Fix input reset in WindowsPipes
Unsetting the input property causes an E_NOTICE error when the
property is checked on line 249 (and is likely unintentional anyway).
2015-01-07 00:47:52 +02:00
Fabien Potencier
eabc9b8901 Merge branch '2.5' into 2.6
* 2.5:
  [WIP] Made help information of commands more consistent
  Made help information consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
2015-01-06 18:50:02 +01:00
Fabien Potencier
a9fd4022e7 minor #13238 [2.6] Made help information of commands more consistent (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Made help information of commands more consistent

Just like https://github.com/symfony/symfony/pull/13231, but then for commands added in 2.6

Commits
-------

57b08e4 Made CLI help consistent
2015-01-06 18:42:55 +01:00
Fabien Potencier
111a88c042 minor #13239 [2.5] Made help information of commands more consistent (WouterJ)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Made help information of commands more consistent

Follow up of https://github.com/symfony/symfony/pull/13231 for commands added in 2.4 and 2.5

Commits
-------

a450d66 Made help information consistent
2015-01-06 18:42:03 +01:00
Fabien Potencier
cbcd0f42d7 Merge branch '2.3' into 2.5
* 2.3:
  [WIP] Made help information of commands more consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.json
	src/Symfony/Component/Console/Tests/Fixtures/application_2.json
2015-01-06 18:40:45 +01:00
Fabien Potencier
515a3ed07e minor #13231 [WIP] Made help information of commands more consistent (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #13231).

Discussion
----------

[WIP] Made help information of commands more consistent

| Q   | A
| --- | ---
| Test pass | Not yet
| License | MIT
| Fixed tickets | -

Commits
-------

602d687 [WIP] Made help information of commands more consistent
2015-01-06 18:30:00 +01:00
WouterJ
602d687a46 [WIP] Made help information of commands more consistent 2015-01-06 18:29:58 +01:00
Fabien Potencier
ed2e6b70d1 minor #13274 [2.6] Added internal annotation on Descriptor classes (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Added internal annotation on Descriptor classes

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

Commits
-------

6776ab3 [2.6] Added internal annotation on Descriptor classes
2015-01-06 07:49:44 +01:00
Saro0h
6776ab36e3 [2.6] Added internal annotation on Descriptor classes 2015-01-05 22:39:05 +01:00
Fabien Potencier
a7fd55a7d3 Merge branch '2.5' into 2.6
* 2.5:
  [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
  use Table instead of the deprecated TableHelper

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
2015-01-05 21:59:13 +01:00
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
Christian Flothmann
0bcb59414e use Table instead of the deprecated TableHelper 2015-01-05 21:17:59 +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
966ac2d066 minor #13271 [2.6] fix deprecation silencing... (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] fix deprecation silencing...

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

My bad...

Commits
-------

57fddbf [2.6] fix deprecation silencing...
2015-01-05 18:58:26 +01:00
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
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
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
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
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
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
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
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
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
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
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
Joshua Thijssen
24a287f492 Don't add Accept-Range header on unsafe HTTP requests 2015-01-03 11:53:03 +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
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
nyro
29b217cf21 [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri 2015-01-03 11:03:21 +01:00
Nicolas Grekas
1d68ad3265 [2.3] Cleanup deprecations 2015-01-03 10:22:29 +01:00
Fabien Potencier
d79830fcfd Merge branch '2.5' into 2.6
* 2.5:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015
  Updated copyright to 2015
  Clarify a comment.

Conflicts:
	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
2015-01-03 09:01:59 +01:00
Fabien Potencier
6f34c47e27 Merge branch '2.3' into 2.5
* 2.3:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2015-01-03 09:01:13 +01:00
Mikael Pajunen
75d0d593e3 Use PHPUnit ini_set wrapper in tests
PHPUnit ini_set wrapper is now used in tests to automatically reset
ini settings after the test is run. This avoids possible side effects
and test skipping.

Native ini_set is still used in DefaultCsrfProviderTest, but its
tests are run in isolation.
2015-01-02 18:15:09 +02:00
Mikael Pajunen
99ff8a6de4 [Process] Added a test skip check for Windows
The test FindProcessInOpenBasedir fails similarly to
FindWithOpenBaseDir on Windows.
2015-01-02 18:15:08 +02:00
Mikael Pajunen
5a14941a6f [Process] Removed unused variable assignment 2015-01-02 17:27:11 +02:00
Christian Flothmann
c5ad74d4ba use Table instead of the deprecated TableHelper 2015-01-02 13:44:34 +01:00
Hugo Hamon
b83da8f742 Fixes various phpdoc and coding standards. 2015-01-02 09:58:20 +01:00
Bailey Parker
3c608ebc29 Fixes Issue #13184 - incremental output getters now return empty strings 2015-01-02 09:08:40 +01:00
Fabien Potencier
7eaecbb78c minor #13174 Clarify a comment (jakzal)
This PR was merged into the 2.5 branch.

Discussion
----------

Clarify a comment

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

The previous comment was lying since [`collectViewVariables()`](cffb64fd93/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php (L165)) doesn't really call the [`buildPreliminaryFormTree()`](cffb64fd93/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php (L186)) nor the [`buildFinalFormTree()`](cffb64fd93/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php (L196)).

Commits
-------

00b4297 Clarify a comment.
2015-01-02 08:54:59 +01:00
Fabien Potencier
ecbb003869 bug #13153 [TwigBridge] bootstrap_3_layout.html.twig inline form rendering button problem fix #13150 (edvinasme)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] bootstrap_3_layout.html.twig inline form rendering button problem fix #13150

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

Commits
-------

10df5d1 Currently if you want to use inline bootstrap form rendering, this is usually enough:
2015-01-02 08:53:54 +01:00
Saro0h
48174b195b Updated copyright to 2015 2015-01-01 14:28:01 +01:00
Saro0h
cfa3e71664 Updated copyright to 2015 2015-01-01 14:13:41 +01:00
Saro0h
5a121df42b Updated copyright to 2015 2015-01-01 13:56:52 +01:00
Nicolas Grekas
c40569ccf1 [VarDumper] increase debug.max_items to 2500 2014-12-31 14:56:49 +01:00
Nicolas Grekas
c637df134f minor #13186 [Debug] Update exception messages to fix the tests (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Update exception messages to fix the tests

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

Commits
-------

d5ccf01 [Debug] Update exception messages.
2014-12-31 12:28:49 +01:00
Nicolas Grekas
8565d492e0 bug #13183 [DependencyInjection] force ExpressionLanguage version >= 2.6 (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] force ExpressionLanguage version >= 2.6

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

The DependencyInjection component requires the ExpressionLanguage
component to be present in version 2.6 or higher to be able to use
expressions in service configurations since Symfony 2.6.

Commits
-------

625a02c force ExpressionLanguage version >= 2.6
2014-12-31 12:28:05 +01:00
Jakub Zalas
d5ccf018cf [Debug] Update exception messages. 2014-12-31 09:46:23 +00:00
Christian Flothmann
f38a72a2fb use value of DIRECTORY_SEPARATOR to detect Windows
This commit unifies the detection of Windows builds across the Symfony
codebase.
2014-12-31 10:20:32 +01:00
Fabien Potencier
563f9476df Merge branch '2.5' into 2.6
* 2.5:
  [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.
  use PHP_WINDOWS_VERSION_BUILD to detect Windows

Conflicts:
	src/Symfony/Component/Process/ProcessPipes.php
2014-12-31 10:14:35 +01:00
Fabien Potencier
3df409650c minor #13148 [2.5] for consistency, use DIRECTORY_SEPARATOR to detect Windows (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] for consistency, use DIRECTORY_SEPARATOR to detect Windows

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

This commit unifies the detection of Windows builds across the Symfony
codebase.

Specific changes for Symfony 2.5 not included in #13147.

Commits
-------

559273e use PHP_WINDOWS_VERSION_BUILD to detect Windows
2014-12-31 10:00:18 +01:00
Christian Flothmann
625a02c7b6 force ExpressionLanguage version >= 2.6
The DependencyInjection component requires the ExpressionLanguage
component to be present in version 2.6 or higher to be able to use
expressions in service configurations since Symfony 2.6.
2014-12-30 22:35:52 +01:00
Hugo Hamon
008f2ea00e [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders. 2014-12-30 16:55:41 +01:00
Jakub Zalas
00b429769b Clarify a comment.
The previous comment was lying since collectViewVariables() doesn't really call
the buildPreliminaryFormTree() nor the buildFinalFormTree().
2014-12-30 15:09:05 +00:00
Fabien Potencier
c33ce9c4c8 bug #13166 Fix a web profiler form issue with fields added to the form after the form was built (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix a web profiler form issue with fields added to the form after the form was built

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no, but not because of this PR
| Fixed tickets | #13155
| License       | MIT
| Doc PR        | -

This also make the check consistent with a similar check in this template made further down:
* check for `data.type_class`, instead of `data.type`
* check if `data.type_class` is defined rather than if it's empty

The problem doesn't exist in 2.5.

Commits
-------

1e794ca Check if a field type_class is defined before using it.
2014-12-30 15:20:32 +01:00
Christian Flothmann
559273ec1c use PHP_WINDOWS_VERSION_BUILD to detect Windows
This commit unifies the detection of Windows builds across the Symfony
codebase.
2014-12-30 14:45:54 +01:00
Fabien Potencier
67904e12dc Merge branch '2.5' into 2.6
* 2.5:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Component/Process/Process.php
2014-12-30 14:34:16 +01:00
Fabien Potencier
5b16d8eab5 Merge branch '2.3' into 2.5
* 2.3:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
	src/Symfony/Component/Process/Process.php
2014-12-30 14:32:44 +01:00
Fabien Potencier
f438eae402 minor #13147 [2.3] for consistency, use value of DIRECTORY_SEPARATOR to detect Windows (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] for consistency, use value of DIRECTORY_SEPARATOR to detect Windows

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

This commit unifies the detection of Windows builds across the Symfony
codebase.

Commits
-------

20a427d use value of DIRECTORY_SEPARATOR to detect Windows
2014-12-30 14:27:52 +01:00
Jakub Zalas
ae1061564e [Form] Remove a redundant test.
This is exactly the same as testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName().
2014-12-30 12:20:04 +00:00