Commit Graph

20325 Commits

Author SHA1 Message Date
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
Fabien Potencier
a7d5624233 minor #13195 [Process] Fixes to executable finder tests (mpajunen)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fixes to executable finder tests

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

A couple of fixes for ExecutableFinder tests:
- Use PHPUnit ini_set wrapper to avoid side effects.
- Skip a test on Windows (similar to an earlier test that was already skipped).
- Removed an unused variable.

Commits
-------

75d0d59 Use PHPUnit ini_set wrapper in tests
99ff8a6 [Process] Added a test skip check for Windows
5a14941 [Process] Removed unused variable assignment
2015-01-03 08:54:46 +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
Fabien Potencier
a179b90fc9 feature #12460 [3.0] [FrameworkBundle] removed request service occurrences. (hhamon)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [FrameworkBundle] removed request service occurrences.

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

Commits
-------

2120554 Removed request service occurrences.
2015-01-02 15:03:12 +01:00
Hugo Hamon
2120554141 Removed request service occurrences. 2015-01-02 14:53:28 +01:00
Christian Flothmann
c5ad74d4ba use Table instead of the deprecated TableHelper 2015-01-02 13:44:34 +01:00
Fabien Potencier
e09b4f9a5a minor #13134 [2.3] Fixes various phpdoc and coding standards. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fixes various phpdoc and coding standards.

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

Commits
-------

b83da8f Fixes various phpdoc and coding standards.
2015-01-02 10:13:41 +01:00
Hugo Hamon
b83da8f742 Fixes various phpdoc and coding standards. 2015-01-02 09:58:20 +01:00
Fabien Potencier
14ca1c537d bug #13185 Fixes Issue #13184 - incremental output getters now return empty strings (Bailey Parker)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13185).

Discussion
----------

Fixes Issue #13184 - incremental output getters now return empty strings

fixed Issue #13184

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | Issue #13184
| License       | MIT
| Doc PR        | [`Symfony\Component\Process\Process::getIncrementalOutput()`](http://api.symfony.com/2.6/Symfony/Component/Process/Process.html#method_getIncrementalOutput), [`Symfony\Component\Process\Process::getIncrementalErrorOutput()`](http://api.symfony.com/2.6/Symfony/Component/Process/Process.html#method_getIncrementalErrorOutput)

Commits
-------

3c608eb Fixes Issue #13184 - incremental output getters now return empty strings
2015-01-02 09:09:58 +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
9ca3e8be5f minor #13088 Add deprecation warning to LegacyPdoSessionHandler (jeremylivingston)
This PR was merged into the 2.7 branch.

Discussion
----------

Add deprecation warning to LegacyPdoSessionHandler

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

LegacyPdoSessionHandler has been deprecated in favor of PdoSessionHandler. Trigger an E_USER_DEPRECATED error when the deprecated class is used.

Addresses @fabpot's comment on [#13068](https://github.com/symfony/symfony/pull/13068#issuecomment-67977358).

Commits
-------

3b9c073 Add deprecation warning to LegacyPdoSessionHandler
2015-01-02 08:57:18 +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
Fabien Potencier
1d63c78625 minor #13193 [2.6] * Happy New Year 2015 * (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] * Happy New Year 2015 *

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

Commits
-------

48174b1 Updated copyright to 2015
2015-01-02 08:43:41 +01:00
Fabien Potencier
2cd2cfb6ef minor #13192 [2.5] * Happy New Year 2015 * (saro0h)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] * Happy New Year 2015 *

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

Commits
-------

cfa3e71 Updated copyright to 2015
2015-01-02 08:42:57 +01:00
Fabien Potencier
a609ca0bd0 minor #13191 [2.3] * Happy New Year 2015 * (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] * Happy New Year 2015 *

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

Commits
-------

5a121df Updated copyright to 2015
2015-01-02 08:41:21 +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
afc6a338ba minor #13188 [VarDumper] increase debug.max_items to 2500 (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] increase debug.max_items to 2500

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

I see others (and me) hit the 250 limit too many times. The component is able to handle way more items.

Commits
-------

c40569c [VarDumper] increase debug.max_items to 2500
2014-12-31 15:43:22 +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
Nicolas Grekas
0cf7318c0a minor #13149 [2.6] for consistency, use DIRECTORY_SEPARATOR to detect Windows (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] 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.

Changes specific to Symfony 2.6 and not part of neither #13147 nor #13148.

Commits
-------

f38a72a use value of DIRECTORY_SEPARATOR to detect Windows
2014-12-31 12:27:18 +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
Fabien Potencier
71704212e4 minor #13175 [3.0] [Twig Bridge] Fixed Tests (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0] [Twig Bridge] Fixed Tests

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

Commits
-------

2221a15 [3.0] [Twig Bridge] Fixed Tests
2014-12-30 23:14:55 +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
Saro0h
2221a150fe [3.0] [Twig Bridge] Fixed Tests 2014-12-30 18:25:10 +01:00
Nicolas Grekas
c3ca7ac014 bug #13173 [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.

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

Commits
-------

008f2ea [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.
2014-12-30 17:44:17 +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
649061bd46 feature #13121 [Console] Removed DialogHelper, ProgressHelper and TableHelper (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Console] Removed DialogHelper, ProgressHelper and TableHelper

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

- [X]  Adapt output in fixtures according to the standard display with table.

Commits
-------

dfb9706 [Console] Removed DialogHelper, ProgressHelper and TableHelper
2014-12-30 15:33:30 +01:00
Fabien Potencier
a15df690be feature #13127 [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle] Removed the deprecated RouterApacheDumperCommand

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

Commits
-------

b552b1b [FrameworkBundle] Removed the deprecated RouterApacheDumperCommand
2014-12-30 15:29:46 +01:00
Fabien Potencier
b9f44253ec feature #13128 [Form] Removed deprecated form_enctype() (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Form] Removed deprecated form_enctype()

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

Commits
-------

c6b049f [Form] Removed deprecated form_enctype()
2014-12-30 15:26:34 +01:00
Fabien Potencier
e3872b9b60 feature #13130 [HttpKernel] Removed deprecated ErrorHandler and ExceptionHandler classes (saro0h)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[HttpKernel] Removed deprecated ErrorHandler and ExceptionHandler classes

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

Commits
-------

e93b571 [HttpKernel] Removed deprecated ErrorHandler and ExceptionHandler classes
2014-12-30 15:24:51 +01: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
303df69e34 Merge branch '2.7'
* 2.7:
  [Debug] track and report deprecated classes and interfaces
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
	src/Symfony/Component/Security/Core/Util/SecureRandom.php
2014-12-30 14:35:28 +01:00
Fabien Potencier
aedb247a30 Merge branch '2.6' into 2.7
* 2.6:
  [Form] Remove a redundant test.
  use value of DIRECTORY_SEPARATOR to detect Windows
2014-12-30 14:34:24 +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
Fabien Potencier
a86d4e3973 feature #13164 [Debug] track and report deprecated classes and interfaces (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] track and report deprecated classes and interfaces

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

Commits
-------

a541faf [Debug] track and report deprecated classes and interfaces
2014-12-30 14:26:16 +01:00
Fabien Potencier
b5e09ee817 minor #13172 [Form] Remove a redundant test (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Remove a redundant test

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

As a result of changing `bind()` to `submit()` in #13161, the `testValidateTokenOnBindIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName()` is exactly the same as `testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName()`. This makes the form tests to fail on 2.5 branch, as after a merge csrf provider is used instead of the token manager.

Commits
-------

ae10615 [Form] Remove a redundant test.
2014-12-30 14:23:26 +01:00