Commit Graph

17251 Commits

Author SHA1 Message Date
Fabien Potencier 8185106a8d Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 13:46:35 +02:00
Fabien Potencier bf72e871f6 bumped Symfony version to 2.3.18 2014-07-08 13:19:32 +02:00
Fabien Potencier c02f56f794 updated VERSION for 2.3.17 2014-07-07 14:59:36 +02:00
Fabien Potencier c09ff16cbc update CONTRIBUTORS for 2.3.17 2014-07-07 14:58:57 +02:00
Fabien Potencier d393ddd11a updated CHANGELOG for 2.3.17 2014-07-07 14:57:59 +02:00
Fabien Potencier f98a281006 minor #11329 add XSD to PHPUnit configuration (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

add XSD to PHPUnit configuration

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

The syntax check functionality has been removed in PHPUnit 3.6 already. But there's no Composer constraint for PHPUnit, so you can never know which version will actually be used to run tests. Let me know what you think.

Commits
-------

84b5581 added XSD to PHPUnit configuration
2014-07-07 11:57:22 +02:00
Christian Raue 84b5581521 added XSD to PHPUnit configuration 2014-07-07 11:57:21 +02:00
Romain Neutron 9b7bd8eba6 minor #11336 [Process] add missing docblock for ProcessBuilder::addEnvironmentVariables() (xabbuh)
This PR was merged into the 2.4 branch.

Discussion
----------

[Process] add missing docblock for ProcessBuilder::addEnvironmentVariables()

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

Commits
-------

9e1d11d add missing docblock for ProcessBuilder::addEnvironmentVariables()
ce29e0a bug #11283 [SecurityBundle] Remove Expression Language services when the component is unavailable (thewilkybarkid)
557a82a Remove Expression Language services when the component is unavailable
5b2e34f Merge branch '2.3' into 2.4
85af997 bug #11259 [Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage (ccorliss)
de2bef5 Fixed failed config schema loads due to libxml_disable_entity_loader usage.
8a68e6c bug #11234 [ClassLoader] fixed PHP warning on PHP 5.3 (fabpot)
3b9902a enabled PHP 5.6 for tests
cd7fe02 bug #11179 [Process] Fix ExecutableFinder with open basedir (cs278)
b8f8c0e [Process] Fix ExecutableFinder with open basedir
fa2d337 bug #11242 [CssSelector] Refactored the CssSelector to remove the circular object graph (stof)
994f81f Refactored the CssSelector to remove the circular object graph
1045adf bug #11219 [DomCrawler] properly handle buttons with single and double quotes insid... (xabbuh)
84be8de minor #11230 Fix mocks to support >=5.5.14 and >=5.4.30 (jpauli)
1c5c694 Fix mocks to support >=5.5.14 and >=5.4.30
7b2e3d9 [ClassLoader] fixed PHP warning on PHP 5.3
7b0ed91 minor #11225 [Validator] added Lithuanian translation for empty file (Tadcka)
a954083 [Validator] added Lithuanian translation for empty file
803b06b bug #11220 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process (xabbuh)
05c51f5 minor #11203 Added missing dutch translations (WouterJ)
bd9283e Added missing dutch translations
5bb2345 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process
cbbdbe4 [DomCrawler] properly handle buttons with single and double quotes inside the name attribute
f6eb9b6 minor #11201 [Validator] Added missing pt and pt_BR translations (dcsg)
71a2b59 Added missing pt and pt_BR translations
0067952 minor #11195 [Validator] Add missing ru translations (megazoll)
71eb8a8 [Validator] Add missing ru translations
f45f2df minor #11191 [Tests] fix tests due to recent changes in PHP's behavior (xabbuh)
bc8042d don't disable constructor calls to mockups of classes that extend internal PHP classes
f4a3c7a special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer
f2bdc22 fixed previous merge
b387477 Merge branch '2.3' into 2.4
eeeae94 minor #11187 [Tests] don't disable constructor calls to mockups of classes that extend intern... (xabbuh)
ff00dcc bug #11186 Added missing `break` statement (apfelbox)
5af2802 Added missing `break` statement
2c726b8 don't disable constructor calls to mockups of classes that extend internal PHP classes
96bc061 minor #11182 Small comment update according to PSR-2 (apfelbox)
31b1dff Small comment update according to PSR-2
7d4f4f2 bug #11169 [Console] Fixed notice in DialogHelper (florianv)
ff6c65e [Console] Fixed notice in DialogHelper
fbf92e5 bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
bd11e92 minor #11136 [Filesystem] Fix test suite on OSX (romainneutron)
2a0e8e3 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
e26f08e [Filesystem] Fix test suite on OSX
185aafa minor #11077 [TwigBundle] [Tests] Add framework-bundle (clemens-tolboom)
a12471d Add framework-bundle
2014-07-07 08:55:09 +02:00
Fabien Potencier 7d88e37cbe minor #11321 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest (penyaskito)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Ensure the storage exists before purging it in ProfilerTest

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

Commits
-------

eb63270 bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
2014-07-06 20:21:17 +02:00
Christian Flothmann 9e1d11dcce add missing docblock for ProcessBuilder::addEnvironmentVariables() 2014-07-06 17:05:33 +02:00
Christian Lopez Espinola eb63270bab bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest 2014-07-05 21:11:49 +02:00
Fabien Potencier ce29e0aa8c bug #11283 [SecurityBundle] Remove Expression Language services when the component is unavailable (thewilkybarkid)
This PR was merged into the 2.4 branch.

Discussion
----------

[SecurityBundle] Remove Expression Language services when the component is unavailable

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

The Expression Language isn't a dependency of the SecurityBundle, but ExpressionVoter is still added if it isn't installed, leading to a class not found fatal error. This removes the services (alternatively the services could be moved to a different file and added if it is installed).

Commits
-------

557a82a Remove Expression Language services when the component is unavailable
2014-07-04 08:17:48 +02:00
Fabien Potencier 37931f4f1b minor #11285 Simplified the Travis test command (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Simplified the Travis test command

There is no reason to turn a failure into a different failure. And this will avoid Travis to say that the "false" command failed.

Commits
-------

e8d01c9 Simplified the Travis test command
2014-07-04 08:15:30 +02:00
Fabien Potencier 8d1e8f9045 bug #11238 [Translation] Added unescaping of ids in PoFileLoader (JustBlackBird)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #11238).

Discussion
----------

[Translation] Added unescaping of ids in PoFileLoader

| 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

Although it is not directly described in gettext docs, _msgid_ should be unescaped too. The other reason to unescape _msgid_ is symmetry between ```PoFileLoader``` and ```PoFileDumper```. The dumper escapes both _msgid_ and _msgstr_ values, but the loader unescapes only _msgstr_.

Commits
-------

816a4a9 [Translation] Added unescaping of ids in PoFileLoader
2014-07-04 08:08:13 +02:00
Dmitriy Simushev 816a4a9ff1 [Translation] Added unescaping of ids in PoFileLoader 2014-07-04 08:08:13 +02:00
Fabien Potencier 3b2bff89a4 minor #11246 [Validator] updated italian translations (micheleorselli)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11246).

Discussion
----------

[Validator] updated italian translations

Commits
-------

b74afe0 updated italian translation for validation messages
2014-07-04 08:05:32 +02:00
Michele Orselli b74afe0700 updated italian translation for validation messages 2014-07-04 08:05:32 +02:00
Christophe Coevoet d6b10e897b minor #11288 [DomCrawler] Fix Link docblocks and formatting (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fix Link docblocks and formatting

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

re #11194

Commits
-------

5cbe13e [DomCrawler] Fix docblocks and formatting.
2014-07-04 01:03:26 +02:00
Jakub Zalas 5cbe13e371 [DomCrawler] Fix docblocks and formatting. 2014-07-03 23:56:58 +01:00
Christophe Coevoet 38be14dd14 bug #11194 [DomCrawler] Remove the query string and the anchor of the uri of a link (benja-M-1)
This PR was squashed before being merged into the 2.3 branch (closes #11194).

Discussion
----------

[DomCrawler] Remove the query string and the anchor of the uri of a link

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

Commits
-------

fe5d2d1 [DomCrawler] Remove the query string and the anchor of the uri of a link
2014-07-04 00:18:40 +02:00
Benjamin Grandfond fe5d2d1554 [DomCrawler] Remove the query string and the anchor of the uri of a link 2014-07-04 00:18:31 +02:00
Christophe Coevoet e8d01c9669 Simplified the Travis test command
There is no reason to turn a failure into a different failure. And this
will avoid Travis to say that the "false" command failed.
2014-07-03 14:53:01 +02:00
thewilkybarkid 557a82ac4d Remove Expression Language services when the component is unavailable 2014-07-03 13:17:18 +01:00
Fabien Potencier 5f8ee9d596 bug #11272 [Console] Make sure formatter is the same. (akimsko)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #11272).

Discussion
----------

[Console] Make sure formatter is the same.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |
The parent constructor will create a new formatter if the $formatter parameter is null.

This fix avoids that the formatter becomes 2 different instances in $this and $this->stderr, if null was passed to the constructor.

Commits
-------

64328d9 [Console] Make sure formatter is the same
2014-07-02 15:19:50 +02:00
akimsko 64328d967d [Console] Make sure formatter is the same
The parent constructor will create a new formatter if the $formatter parameter is null
This fix avoids that the formatter becomes 2 different instances in $this and $this->stderr
2014-07-02 15:19:50 +02:00
Fabien Potencier 5b2e34f765 Merge branch '2.3' into 2.4
* 2.3:
  Fixed failed config schema loads due to libxml_disable_entity_loader usage.
  enabled PHP 5.6 for tests
  [Process] Fix ExecutableFinder with open basedir
  Refactored the CssSelector to remove the circular object graph
  Fix mocks to support >=5.5.14 and >=5.4.30
  [ClassLoader] fixed PHP warning on PHP 5.3
  [Components][Serializer] optional constructor arguments can be omitted during the denormalization process
  [DomCrawler] properly handle buttons with single and double quotes inside the name attribute

Conflicts:
	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
2014-07-01 08:40:32 +02:00
Fabien Potencier 85af99787f bug #11259 [Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage (ccorliss)
This PR was submitted for the 2.4 branch but it was merged into the 2.3 branch instead (closes #11259).

Discussion
----------

[Config] Fixed failed config schema loads due to libxml_disable_entity_loader usage

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

PR #10493 helped this issue, but it can still affect users that:

1.  Have libxml_disable_entity_loader set to true by default.
2.  Experience libxml_disable_entity_loader php bug https://bugs.php.net/bug.php?id=64938

I used the same approach used in the DI xml validation.
https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php#L452

Commits
-------

de2bef5 Fixed failed config schema loads due to libxml_disable_entity_loader usage.
2014-07-01 08:37:02 +02:00
Curtis de2bef5886 Fixed failed config schema loads due to libxml_disable_entity_loader
usage.

Applied CS patch.
2014-07-01 08:37:02 +02:00
Fabien Potencier 8a68e6c77e bug #11234 [ClassLoader] fixed PHP warning on PHP 5.3 (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] fixed PHP warning on PHP 5.3

| 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

Commits
-------

7b2e3d9 [ClassLoader] fixed PHP warning on PHP 5.3
2014-06-29 11:45:08 +02:00
Fabien Potencier 3b9902ae77 enabled PHP 5.6 for tests 2014-06-28 15:47:37 +02:00
Romain Neutron cd7fe02e9b bug #11179 [Process] Fix ExecutableFinder with open basedir (cs278)
This PR was squashed before being merged into the 2.3 branch (closes #11179).

Discussion
----------

[Process] Fix ExecutableFinder with open basedir

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

This fixes the `ExecutableFinder` object to properly fetch the `open_basedir` setting, also added a bunch of tests for the `find()` method.

Commits
-------

b8f8c0e [Process] Fix ExecutableFinder with open basedir
2014-06-28 11:33:33 +02:00
Chris Smith b8f8c0ec4d [Process] Fix ExecutableFinder with open basedir 2014-06-28 11:33:24 +02:00
Fabien Potencier fa2d337b99 bug #11242 [CssSelector] Refactored the CssSelector to remove the circular object graph (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[CssSelector] Refactored the CssSelector to remove the circular object graph

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10879, replaces  #11221
| License       | MIT
| Doc PR        | n/a

This allows the translator and its extensions to be garbage collected based on the refcount rather than requiring the garbage collector run, making it much more likely to happen at the end of the ``CssSelector::toXPath`` call.

Node translators now receive the Translator as second argument, instead of requiring to inject it in the extension to keep a reference to it. This way, the Translator is referenced nowhere inside it, only by the caller, and so will be destructed at the end of the usage (and extensions will then be destructed after it when not used anymore).

Commits
-------

994f81f Refactored the CssSelector to remove the circular object graph
2014-06-27 13:00:13 +02:00
Christophe Coevoet 994f81fd86 Refactored the CssSelector to remove the circular object graph
This allows the translator and its extensions to be garbage collected
based on the refcount rather than requiring the garbage collector run,
making it much more likely to happen at the end of the
CssSelector::toXPath call.
2014-06-27 09:58:31 +02:00
Fabien Potencier 1045adfd56 bug #11219 [DomCrawler] properly handle buttons with single and double quotes insid... (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] properly handle buttons with single and double quotes insid...

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

Commits
-------

cbbdbe4 [DomCrawler] properly handle buttons with single and double quotes inside the name attribute
2014-06-27 08:55:46 +02:00
Fabien Potencier 84be8de5f9 minor #11230 Fix mocks to support >=5.5.14 and >=5.4.30 (jpauli)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11230).

Discussion
----------

Fix mocks to support >=5.5.14 and >=5.4.30

PHP 5.5.14 and PHP 5.4.30 disallow unseriliazing hand made strings for internal classes that forbids that (using zend_class_unserialize_deny)

There was a bug before, PHP did not filter those strings, which could lead to security problems.
Starting from 5.5.14 and 5.4.30 , PHP now reports an error when trying to unserialize such strings.
2c88ae5c4e
PHPUnit relies on this (wrong) behavior to create mock objects. This is a problem for SPlFileInfo.

This PR fixes that.

Commits
-------

1c5c694 Fix mocks to support >=5.5.14 and >=5.4.30
2014-06-27 08:53:23 +02:00
Julien Pauli 1c5c694196 Fix mocks to support >=5.5.14 and >=5.4.30 2014-06-27 08:53:23 +02:00
Fabien Potencier 7b2e3d91d8 [ClassLoader] fixed PHP warning on PHP 5.3 2014-06-26 10:33:01 +02:00
Fabien Potencier 7b0ed91eae minor #11225 [Validator] added Lithuanian translation for empty file (Tadcka)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11225).

Discussion
----------

[Validator] added Lithuanian translation for empty file

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

Commits
-------

a954083 [Validator] added Lithuanian translation for empty file
2014-06-26 09:09:23 +02:00
Tadcka a9540835bb [Validator] added Lithuanian translation for empty file 2014-06-26 09:09:23 +02:00
Fabien Potencier 803b06b2a4 bug #11220 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Components][Serializer] optional constructor arguments can be omitted during the denormalization process

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

Commits
-------

5bb2345 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process
2014-06-25 12:29:32 +02:00
Fabien Potencier 05c51f5441 minor #11203 Added missing dutch translations (WouterJ)
This PR was squashed before being merged into the 2.4 branch (closes #11203).

Discussion
----------

Added missing dutch translations

Commits
-------

bd9283e Added missing dutch translations
2014-06-25 12:28:44 +02:00
Wouter J bd9283e616 Added missing dutch translations 2014-06-25 12:28:43 +02:00
Christian Flothmann 5bb2345790 [Components][Serializer] optional constructor arguments can be omitted during the denormalization process 2014-06-24 23:45:04 +02:00
Christian Flothmann cbbdbe4c15 [DomCrawler] properly handle buttons with single and double quotes inside the name attribute 2014-06-24 23:09:12 +02:00
Fabien Potencier f6eb9b61c3 minor #11201 [Validator] Added missing pt and pt_BR translations (dcsg)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #11201).

Discussion
----------

[Validator] Added missing pt and pt_BR translations

| 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

Commits
-------

71a2b59 Added missing pt and pt_BR translations
2014-06-24 18:10:01 +02:00
Daniel Gomes 71a2b59572 Added missing pt and pt_BR translations 2014-06-24 18:10:01 +02:00
Fabien Potencier 00679520b2 minor #11195 [Validator] Add missing ru translations (megazoll)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Add missing ru translations

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

Commits
-------

71eb8a8 [Validator] Add missing ru translations
2014-06-23 09:29:44 +02:00
Vyacheslav Salakhutdinov 71eb8a8c0f [Validator] Add missing ru translations 2014-06-22 09:51:52 +00:00
Fabien Potencier f45f2dfd00 minor #11191 [Tests] fix tests due to recent changes in PHP's behavior (xabbuh)
This PR was merged into the 2.4 branch.

Discussion
----------

[Tests] fix tests due to recent changes in PHP's behavior

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

The drawback of this solution is that the pretty printed string produced by ``json_encode()`` isn't validated anymore. Instead, the tests only ensures that the represented object structure is as expected. I guess that's fair enough since the goal of the test is not to test PHP's pretty printing feature.

Commits
-------

bc8042d don't disable constructor calls to mockups of classes that extend internal PHP classes
f4a3c7a special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer
2014-06-21 19:50:06 +02:00