Commit Graph

9822 Commits

Author SHA1 Message Date
Rafał Muszyński
3176f8bb98 [Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator 2014-07-17 12:20:11 +02:00
Fabien Potencier
a9af6be54e Merge branch '2.4' into 2.5
* 2.4:
  [Process] Adjust PR #11264, make it Windows compatible and fix CS
  [Process] Fix unit tests on Windows platform
  bumped Symfony version to 2.4.9
  bumped Symfony version to 2.3.19
  updated VERSION for 2.4.8
  updated CHANGELOG for 2.4.8
  updated VERSION for 2.3.18
  update CONTRIBUTORS for 2.3.18
  updated CHANGELOG for 2.3.18
  [Process] Use correct test for empty string in UnixPipes

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-16 15:13:02 +02:00
Fabien Potencier
2797df89b8 Merge branch '2.3' into 2.4
* 2.3:
  [Process] Adjust PR #11264, make it Windows compatible and fix CS
  [Process] Fix unit tests on Windows platform
  bumped Symfony version to 2.3.19
  updated VERSION for 2.3.18
  update CONTRIBUTORS for 2.3.18
  updated CHANGELOG for 2.3.18
  [Process] Use correct test for empty string in UnixPipes

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2014-07-16 15:12:41 +02:00
Fabien Potencier
91e32f810b bug #11381 [2.3] [Process] Use correct test for empty string in UnixPipes (whs, romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Process] Use correct test for empty string in UnixPipes

| 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

This PR supersedes #11264 : 2.3 compatibility + Windows compatibility + CS fix

Commits
-------

cec0a45 [Process] Adjust PR #11264, make it Windows compatible and fix CS
9e1ea4a [Process] Use correct test for empty string in UnixPipes
2014-07-16 15:02:06 +02:00
Romain Neutron
cec0a45ff5 [Process] Adjust PR #11264, make it Windows compatible and fix CS 2014-07-16 14:40:06 +02:00
Romain Neutron
d4189350c0 [Process] Fix unit tests on Windows platform 2014-07-16 11:55:07 +02:00
Romain Neutron
ff0bb01a91 [Process] Reduce I/O load on Windows platform 2014-07-16 11:39:41 +02:00
Fabien Potencier
28defa8741 bumped Symfony version to 2.5.3 2014-07-15 22:52:32 +02:00
Fabien Potencier
98142a0a35 bumped Symfony version to 2.4.9 2014-07-15 22:38:14 +02:00
Fabien Potencier
ace5a29867 bumped Symfony version to 2.3.19 2014-07-15 21:58:41 +02:00
Fabien Potencier
e66ee96757 updated VERSION for 2.5.2 2014-07-15 17:39:46 +02:00
Fabien Potencier
3da923989c updated VERSION for 2.4.8 2014-07-15 16:52:02 +02:00
Sebastian Blum
705d67b563 [2.5][Form] solved dependency to ValidatorInterface, fix #11036 2014-07-15 16:46:59 +02:00
Fabien Potencier
ff4997fb39 Merge branch '2.4' into 2.5
* 2.4:
  fixed typo
2014-07-15 16:22:44 +02:00
Fabien Potencier
84334058b8 fixed typo 2014-07-15 16:22:28 +02:00
Fabien Potencier
75e07e6bde updated VERSION for 2.3.18 2014-07-15 16:20:44 +02:00
Fabien Potencier
cd8927017f Merge branch '2.4' into 2.5
* 2.4:
  Remove Spaceless Blocks From Twig Templates
  Validate locales sets intos translator
  Fix UserPassword validator translation
  Remove Spaceless Blocks from Twig Form Templates
  fixed typo
  [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
  added regression test
  fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
  [HttpFoundation] Fix wrong assertion in Response test
  [Upgrade] Fixed markdown syntax
  [2.3][Form] Cleanup & fix phpdocs
  Added verbosity methods

Conflicts:
	src/Symfony/Component/Form/FormError.php
2014-07-15 16:15:12 +02:00
Christopher Davis
793a083fd7 Remove Spaceless Blocks From Twig Templates 2014-07-15 16:12:54 +02:00
Fabien Potencier
56b0139b0d Merge branch '2.3' into 2.4
* 2.3:
  Validate locales sets intos translator
  Fix UserPassword validator translation
  Remove Spaceless Blocks from Twig Form Templates
  fixed typo
  [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
  added regression test
  fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
  [HttpFoundation] Fix wrong assertion in Response test
  [Upgrade] Fixed markdown syntax
  [2.3][Form] Cleanup & fix phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
2014-07-15 16:07:10 +02:00
Jérémy Derussé
06a80fbdbe Validate locales sets intos translator 2014-07-15 15:44:49 +02:00
Fabien Potencier
06fc97ead8 feature #11367 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671) (Andrew Moore)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix to prevent magic bytes injection in JSONP responses... (CVE-2014-4671)

| 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
| CVE Ticket   | [CVE-2014-4671](http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-4671)
| See Also | [Rosetta Flash](http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/)

\* Unless you are parsing the response string manually, which you really shouldn't do anyway

**THIS IS A SECURITY FIX AND SHOULD BE MERGED SHORTLY**

This fix prevents attacks vectors where third-party browser plugins depends on ASCII magic bytes in order to execute a plugin. This is currently exploited with Flash using a carefully crafted JSONP response, allowing the execution of random SWF data from a domain with a vulnerable JSONP endpoint.

This security issue is mitigated by adding an empty comment right before the callback parameter. This does not affect the execution of the JSONP callback.

Commits
-------

6af3d05 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
2014-07-15 15:35:51 +02:00
Christophe Coevoet
7e1b4f6e2d bug #11284 [Console] Remove estimated field from debug_nomax (bburnichon)
This PR was squashed before being merged into the 2.5 branch (closes #11284).

Discussion
----------

[Console] Remove estimated field from debug_nomax

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

Commits
-------

2ac1bb4 [Console] Remove estimated field from debug_nomax
2014-07-15 13:45:19 +02:00
Benoît Burnichon
2ac1bb45bc [Console] Remove estimated field from debug_nomax 2014-07-15 13:44:57 +02:00
Fabien Potencier
3c54659baf minor #11387 [2.3] [Validator] Fix UserPassword validator translation (redstar504)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Validator] Fix UserPassword validator translation

| Q             | A
| ------------- | ---
| Fixed tickets | None
| License       | MIT

Fixes the UserPassword translation message only for 2.3 as discussed in symfony/symfony#11383.

Commits
-------

73d50ed Fix UserPassword validator translation
2014-07-15 10:15:42 +02:00
redstar504
73d50edc17 Fix UserPassword validator translation 2014-07-13 22:59:18 -07:00
Manatsawin Hanmongkolchai
9e1ea4aa4b [Process] Use correct test for empty string in UnixPipes 2014-07-12 16:25:05 +02:00
Tobias Schultze
bde043d035 [Validator] remove wrong deprecation message 2014-07-11 15:26:12 +02:00
Fabien Potencier
ea45769aab fixed typo 2014-07-11 11:32:34 +02:00
Andrew Moore
6af3d05b85 [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671) 2014-07-10 09:27:11 -04:00
Christophe Coevoet
ca69dbba43 minor #11362 [2.3][HttpFoundation] Fix wrong assertion in Response test (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][HttpFoundation] Fix wrong assertion in Response test

| Q             | A
| ------------- | ---
| Bug fix?      | kinda
| New feature?  | no
| BC breaks?    | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

3d63f80 [HttpFoundation] Fix wrong assertion in Response test
2014-07-10 11:13:00 +02:00
Luis Cordova
9aa88e4494 added regression test 2014-07-10 10:55:37 +02:00
Joseph Bielawski
3d63f801ff [HttpFoundation] Fix wrong assertion in Response test 2014-07-10 09:54:15 +02:00
Christophe Coevoet
d976118844 minor #11274 Added verbosity methods to NullOutput (WouterJ)
This PR was merged into the 2.4 branch.

Discussion
----------

Added verbosity methods to NullOutput

These 4 methods were not added to the OutputInterface because of BC, but they should still be implemented in all classes which implement that interface. Otherwise we have to do nasty tricks...

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

Commits
-------

0459249 Added verbosity methods
2014-07-09 14:44:38 +02:00
Joseph Bielawski
a67bc7612e [2.3][Form] Cleanup & fix phpdocs 2014-07-09 12:39:32 +02:00
Fabien Potencier
17009c148b Merge branch '2.4' into 2.5
* 2.4:
  added missing test
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  bumped Symfony version to 2.4.8
  removed defaults from PHPUnit configuration

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-09 11:05:48 +02:00
Fabien Potencier
1edd1c7147 added missing test 2014-07-09 11:05:16 +02:00
Fabien Potencier
dd5a14b831 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  [HttpFoundation] Remove content-related headers if content is empty
  removed defaults from PHPUnit configuration
2014-07-09 11:04:55 +02:00
Fabien Potencier
5955f8edfe fixed CS 2014-07-09 11:04:31 +02:00
Simon Schick
9dbe89dba6 [HttpFoundation] Remove content-related headers if content is empty 2014-07-09 11:03:31 +02:00
Fabien Potencier
cc84d95787 minor #11344 remove defaults from PHPUnit configuration (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

remove defaults from PHPUnit configuration

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

Follow-up to #11329.

Commits
-------

afc4930 removed defaults from PHPUnit configuration
2014-07-08 21:12:37 +02:00
Fabien Potencier
50a210b1da bumped Symfony version to 2.5.2 2014-07-08 20:56:57 +02:00
Fabien Potencier
1fb3ccb3be bumped Symfony version to 2.4.8 2014-07-08 16:47:36 +02:00
Fabien Potencier
e3d2844abc updated VERSION for 2.5.1 2014-07-08 16:42:08 +02:00
Fabien Potencier
47c686db88 Merge branch '2.4' into 2.5
* 2.4:
  updated VERSION for 2.4.7
  updated CHANGELOG for 2.4.7
  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
  add missing docblock for ProcessBuilder::addEnvironmentVariables()
  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
  Remove Expression Language services when the component is unavailable
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 14:21:33 +02:00
Fabien Potencier
e72f9ebfdf updated VERSION for 2.4.7 2014-07-08 13:54:27 +02:00
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
Romain Neutron
ebf967de8f [Form] Check if IntlDateFormatter constructor returned a valid object before using it 2014-07-07 23:17:57 +02:00
Fabien Potencier
c02f56f794 updated VERSION for 2.3.17 2014-07-07 14:59:36 +02:00
Christian Raue
afc4930900 removed defaults from PHPUnit configuration 2014-07-07 12:13:42 +02:00
Christian Raue
84b5581521 added XSD to PHPUnit configuration 2014-07-07 11:57:21 +02:00
Christian Flothmann
3466601a5e fix the return types 2014-07-06 17:10:45 +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
Dmitriy Simushev
816a4a9ff1 [Translation] Added unescaping of ids in PoFileLoader 2014-07-04 08:08:13 +02:00
Michele Orselli
b74afe0700 updated italian translation for validation messages 2014-07-04 08:05:32 +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
Andrej Hudec
585a045279 Added SK translations 2014-07-02 15:21:28 +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
Wouter J
0459249a6c Added verbosity methods 2014-07-02 14:27:38 +02:00
Fabien Potencier
a22858ba57 Merge branch '2.4' into 2.5
* 2.4:
  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
  [Validator] added Lithuanian translation for empty file
  Added missing dutch translations
  [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
  Added missing pt and pt_BR translations
2014-07-01 08:40:40 +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
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
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
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
Tadcka
a9540835bb [Validator] added Lithuanian translation for empty file 2014-06-26 09:09:23 +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
Daniel Gomes
71a2b59572 Added missing pt and pt_BR translations 2014-06-24 18:10:01 +02:00
Fabien Potencier
44501976ae Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Add missing ru translations
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer

Conflicts:
	src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
	src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
	src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
	src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
	src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
2014-06-23 09:34:27 +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
Christian Flothmann
bc8042dc34 don't disable constructor calls to mockups of classes that extend internal PHP classes 2014-06-21 00:02:36 +02:00
Fabien Potencier
76d3c9e185 Merge branch '2.4' into 2.5
* 2.4:
  fixed previous merge
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Console] Fixed notice in DialogHelper
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  Add framework-bundle

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2014-06-20 19:38:20 +02:00
Fabien Potencier
f2bdc22b0d fixed previous merge 2014-06-20 19:37:57 +02:00
Fabien Potencier
b387477d51 Merge branch '2.3' into 2.4
* 2.3:
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Console] Fixed notice in DialogHelper
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2014-06-20 19:36:47 +02:00
Fabien Potencier
eeeae94196 minor #11187 [Tests] don't disable constructor calls to mockups of classes that extend intern... (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Tests] don't disable constructor calls to mockups of classes that extend intern...

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

Fixes the tests for the 2.3 branch as reported by @stof in #11176.

Commits
-------

2c726b8 don't disable constructor calls to mockups of classes that extend internal PHP classes
2014-06-20 19:32:59 +02:00
Jannik Zschiesche
5af2802661 Added missing break statement
Added missing `break` statement in `AbstractFindAdapter` - a fall through doesn't seem to be intended here.
2014-06-20 18:06:33 +02:00
Christian Flothmann
2c726b8988 don't disable constructor calls to mockups of classes that extend internal PHP classes 2014-06-20 17:17:50 +02:00
Jannik Zschiesche
31b1dff875 Small comment update according to PSR-2
See [PSR-2](http://www.php-fig.org/psr/psr-2/) paragraph 5.2

> There MUST be a comment such as `// no break` when fall-through is intentional in a non-empty case body.

Related to #11181
2014-06-20 16:22:59 +02:00
Fabien Potencier
a50aca04e4 bug #11168 [YAML] fix merge node (<<) (Tobion)
This PR was merged into the 2.5 branch.

Discussion
----------

[YAML] fix merge node (<<)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes but according to spec
| Deprecations? | no
| Tests pass?   | yes
| Needs merge to | 2.5
| Fixed tickets | #11142 and #11154
| License       | MIT
| Doc PR        | —

First commit small refactoring.
Second fixes #11154 (causing a BC break for a less common feature)
Third fixes #11142

Commits
-------

dee1562 [Yaml] fix overwriting of keys after merged map
8c621ab [Yaml] fix priority of sequence merges according to spec
02614e0 [Yaml] refactoring of merges for performance
2014-06-20 09:17:53 +02:00
Fabien Potencier
cd0309f847 minor #11162 [Console] remove weird use statement (cordoval)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] remove weird use statement

|Q            |A     |
|---          |---   |
|Bug Fix?     |yes   |
|New Feature? |no    |
|BC Breaks?   |no    |
|Deprecations?|no    |
|Tests Pass?  |yes     |
|Fixed Tickets| |
|License      |MIT   |
|Doc PR       |      |

Commits
-------

c117e8e [Console] remove weird use statement
2014-06-19 18:27:19 +02:00
Tobias Schultze
dee15623ae [Yaml] fix overwriting of keys after merged map
fixes symfony/symfony#11142
2014-06-19 16:02:29 +02:00
Tobias Schultze
8c621ab4b5 [Yaml] fix priority of sequence merges according to spec
fixes symfony/symfony#11154
2014-06-19 16:01:11 +02:00
florianv
9fe4b88aaa [Console] Fixed notice in QuestionHelper 2014-06-19 01:05:50 +02:00
florianv
ff6c65ecf7 [Console] Fixed notice in DialogHelper 2014-06-19 01:02:32 +02:00
Tobias Schultze
02614e064f [Yaml] refactoring of merges for performance 2014-06-18 19:56:19 +02:00
Luis Cordova
c117e8eaa8 [Console] remove weird use statement 2014-06-18 07:37:22 -05:00
Fabien Potencier
fbf92e58cb bug #11144 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6 (kicken)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6

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

Commits
-------

2a0e8e3 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
2014-06-18 07:53:47 +02:00
Fabien Potencier
bd11e9216e minor #11136 [Filesystem] Fix test suite on OSX (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Filesystem] Fix test suite on OSX

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

Reviewing PR's, I realized the filesystem test suite fails on my setup (OSX, PHP 5.5.13 with posix ext). `posix_getgrgid` returns false, so some tests are failing.
This solves this issue.

Be aware that the patched method has been moved in FilesystemTestCase in recent branches

Commits
-------

e26f08e [Filesystem] Fix test suite on OSX
2014-06-17 21:57:48 +02:00
Keith Maika
2a0e8e39b8 [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
Fixed issue with Request::getPort method returning an incorrect value when the HTTP_HOST header is a IPv6 address.
2014-06-17 10:14:17 -04:00
Romain Neutron
e26f08e9b5 [Filesystem] Fix test suite on OSX 2014-06-17 03:04:39 +02:00
Fabien Potencier
349549cd17 Merge branch '2.4' into 2.5
* 2.4:
  PHP Fatal error when getContainer method of ContainerAwareCommand has be...
  [HttpFoundation] Fixed isSecure() check to be compliant with the docs
  Update MimeTypeExtensionGuesser.php
  fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
  Fixed the Travis build on PHP 5.3.3
2014-06-16 11:30:12 +02:00
Fabien Potencier
75179c78a0 Merge branch '2.3' into 2.4
* 2.3:
  PHP Fatal error when getContainer method of ContainerAwareCommand has be...
  [HttpFoundation] Fixed isSecure() check to be compliant with the docs
  Update MimeTypeExtensionGuesser.php
  fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
  Fixed the Travis build on PHP 5.3.3
2014-06-16 11:30:02 +02:00
Jannik Zschiesche
7bc37bd899 [HttpFoundation] Fixed isSecure() check to be compliant with the docs 2014-06-16 09:30:49 +02:00
kevinklika
c986b912a9 Update MimeTypeExtensionGuesser.php
Add ```'text/rtf' => 'rtf'``` type, as it is a valid type specification for rtf documents.
2014-06-16 08:02:36 +02:00
Seb Koelen
9247ef5e27 fix test src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php 2014-06-15 10:49:34 +02:00
Romain Neutron
b35250fd3b [Process] Do not redirect output to file handles when output is disabled 2014-06-14 14:57:30 +02:00
Jakub Zalas
aa6b08df97 [Validator] Fix array notation in the PropertyPath::append() 2014-06-13 15:18:45 +02:00
Fabien Potencier
057c2745ef bug #11113 [HttpKernel] Fix event dispatcher dependency (hacfi)
This PR was merged into the 2.5 branch.

Discussion
----------

[HttpKernel] Fix event dispatcher dependency

Update composer.json to account for #9792.

[Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass](https://github.com/symfony/symfony/blob/2.5/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php#L14) extends `Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass` which exists only in 2.5

Commits
-------

3d2dd81 [HttpKernel] Fix event dispatcher dependency
2014-06-12 22:10:11 +02:00
Tristan Maindron
859f34e1c4 Fixed undefined ImageValidator:: property when uploading an image during functional tests 2014-06-12 22:09:04 +02:00
hacfi
3d2dd81855 [HttpKernel] Fix event dispatcher dependency
Update composer.json to account for #9792
2014-06-12 19:00:29 +02:00
Fabien Potencier
e74d37b864 Merge branch '2.4' into 2.5
* 2.4:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Process] Minor README update
  [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
  Fixed a html error "Element ul is not closed" in logger.html.twig
  [HttpFoundation] Officialize the 308 redirect RFC
  Officialize the 308 redirect RFC
  issue #10808 crawler test
  Empty select with attribute name="foo[]" bug fix
  Fixed contextually wrong translation
2014-06-12 12:01:04 +02:00
Fabien Potencier
ec1065ac97 Merge branch '2.3' into 2.4
* 2.3:
  Minor doc fix.
  Simplified the way to update PHPUnit to the latest version
  [Process] Minor README update
  [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
  Fixed a html error "Element ul is not closed" in logger.html.twig
  [HttpFoundation] Officialize the 308 redirect RFC
  issue #10808 crawler test
  Empty select with attribute name="foo[]" bug fix
  Fixed contextually wrong translation
2014-06-12 12:00:57 +02:00
Hans N. Hjort
bf21d1a0f1 Minor doc fix. 2014-06-12 11:58:07 +02:00
Fabien Potencier
cf28fd40b5 bug #11092 [HttpFoundation] Fix basic authentication in url with PHP-FPM (Kdecherf)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix basic authentication in url with PHP-FPM

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

`getUser()` and `getPassword()` from `Request` are broken when using PHP-FPM because of the lack of `$_SERVER['PHP_AUTH_USER']` and `$_SERVER['PHP_AUTH_PW']`. This PR fixes the issue.

However, now an empty password will return an empty string (which is the expected behavior of `ServerBag`) instead of `NULL`. The test is updated accordingly, but should we consider this as a breakage?

This issue was spotted by using basic auth via the Illuminate component of Laravel and is present from v2.1.0 to master.

Commits
-------

7a75adf [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
2014-06-12 10:56:53 +02:00
Nicolas Grekas
cb8aff323e [Debug] work-around https://bugs.php.net/61272 2014-06-11 20:54:02 +02:00
Nicolas Grekas
ecefccd8ba [Debug] simplify code path to remove potential blank pages 2014-06-11 12:05:25 +02:00
Romain Neutron
c7d6bbbacc [Process] Minor README update 2014-06-11 09:56:44 +02:00
Kevin Decherf
7a75adf6f1 [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
Request#getUser() and Request#getPassword() introduced in
aecfd0a891 do not handle the lack of
PHP_AUTH_USER and PHP_AUTH_PW in $this->server when using PHP-FPM. Use
$this->headers instead.
Furthermore, the test of empty password now expects an empty string
instead of NULL according to a450d002f2.
2014-06-10 23:31:45 +02:00
Fabien Potencier
3e62ad8e53 [HttpFoundation] Officialize the 308 redirect RFC 2014-06-07 17:46:10 +02:00
Jordi Boggiano
9834670d18 Officialize the 308 redirect RFC 2014-06-07 17:45:34 +02:00
Michal Dabrowski
876d6caacb issue #10808 crawler test 2014-06-06 07:27:49 +02:00
Darius
15f081d80a Empty select with attribute name="foo[]" bug fix
If you have a select with attribute name="foo[]", and you submit your form, http_build_query returns empty string as a result. In this case you get a form extra field validation error, because your field "foo" converts to
'' => bool(false)
2014-06-06 07:26:43 +02:00
Alaattin Kahramanlar
96518b4a0b Fixed contextually wrong translation 2014-06-06 06:58:08 +02:00
Fabien Potencier
c558887cdf Merge branch '2.4' into 2.5
* 2.4:
  [Bridge][Twig] Replace deprecated features
  [HttpFoundation] fix switch statement
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  Remove undefined variable $e
  bumped Symfony version to 2.4.7
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.4.6
  updated CHANGELOG for 2.4.6
  updated VERSION for 2.3.16
  update CONTRIBUTORS for 2.3.16
  updated CHANGELOG for 2.3.16
  [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-06 05:57:03 +02:00
Fabien Potencier
b85c68d38a Merge branch '2.3' into 2.4
* 2.3:
  [Bridge][Twig] Replace deprecated features
  [HttpFoundation] fix switch statement
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  Remove undefined variable $e
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.3.16
  update CONTRIBUTORS for 2.3.16
  updated CHANGELOG for 2.3.16
  [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-06 05:56:41 +02:00
Tobias Schultze
da24bc9d13 [HttpFoundation] fix switch statement 2014-06-05 14:50:34 +02:00
Fabien Potencier
fe01d10735 bug #11009 [HttpFoundation] smaller fixes for PdoSessionHandler (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] smaller fixes for PdoSessionHandler

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

For both the PdoSessionHandler and DbalSessionHandler
- https://github.com/symfony/symfony/pull/10652#issuecomment-42370425: Transactional DELETE + INSERT does not work as expected
- https://github.com/symfony/symfony/pull/10652#issuecomment-44359784: sqlsrv 2005 does not support the MERGE SQL, and if used it requires an HOLDLOCK
- missing time update for sqlsrv and oracle

Commits
-------

a0e1d4d [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
00d707f [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle
2014-06-04 19:27:41 +02:00
fieg
466a3d70b7 [serializer] fixed whitespace issue when decoding xml 2014-06-04 12:17:52 +02:00
Tobias Schultze
a0e1d4d5d7 [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler 2014-06-04 11:55:45 +02:00
Fabien Potencier
ceb4e0e369 fixed previous merge 2014-06-03 22:40:26 +02:00
Tony Cosentino
58b0aefa16 Added phpdoc for Cache-Control directives methods 2014-06-03 22:39:50 +02:00
Fabien Potencier
f2721ddace bug #11042 [Debug] fix debug handlers config (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix debug handlers config

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

Commits
-------

e1ba70e [Debug] fix debug handlers config
2014-06-03 22:37:38 +02:00
Denis Zunke
724bb50942 [Console] OutputFormatter Unset Bold has wrong id 2014-06-03 22:33:46 +02:00
Nicolas Grekas
e1ba70ecb9 [Debug] fix debug handlers config 2014-06-03 17:24:49 +02:00
Fabien Potencier
315c3e50d8 bug #11033 [Debug] fix wrong case mismatch exception (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] fix wrong case mismatch exception

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

Commits
-------

8e9cc35 [Debug] fix wrong case mismatch exception
2014-06-03 17:09:24 +02:00
fieg
48d9f36ea0 [Serializer] fixed bc-break with cdata-section nodes 2014-06-03 14:01:38 +02:00
Volker
637c6e1c69 Remove undefined variable $e 2014-06-03 03:40:41 +02:00
Fabien Potencier
38bdcf141c minor #11026 [Validator] Fix a parameter name in a test (elnur)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fix a parameter name in a test

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

Commits
-------

069e925 Fix a parameter name in a test
2014-06-02 16:55:16 +02:00
Nicolas Grekas
8e9cc350c2 [Debug] fix wrong case mismatch exception 2014-06-02 09:03:03 +02:00
Fabien Potencier
9c60a8582e bumped Symfony version to 2.5.1 2014-06-01 17:15:34 +02:00
Fabien Potencier
1fc8a82f35 bumped Symfony version to 2.4.7 2014-06-01 17:15:23 +02:00
Fabien Potencier
1793292ae9 bumped Symfony version to 2.3.17 2014-06-01 17:15:00 +02:00
Elnur Abdurrakhimov
069e925ae8 Fix a parameter name in a test 2014-06-01 01:16:29 +04:00
Fabien Potencier
59365832a0 updated VERSION for 2.5.0 2014-05-31 20:45:50 +02:00
Fabien Potencier
ebf1be8a92 updated VERSION for 2.4.6 2014-05-31 20:42:13 +02:00
Fabien Potencier
069683a14e updated VERSION for 2.3.16 2014-05-31 04:04:21 +02:00
Fabien Potencier
af10b106b4 Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:56 +02:00
Fabien Potencier
f1970a76ae Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:48 +02:00
Jakub Zalas
9c2616e788 [Validator] Remove property and method targets from the optional and required constraints.
At the moment both constraints can only be defined on other annotations (specifically, the Collection annotation). Defining the required or optional annotation directly on a field or method throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist).
2014-05-29 08:58:28 +01:00
Fabien Potencier
082006278c bumped Symfony version to 2.5.0 2014-05-29 01:33:40 +02:00
Tobias Schultze
00d707f76c [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle 2014-05-28 13:50:14 +02:00
Fabien Potencier
515fbe9d95 updated VERSION for 2.5.0-RC1 2014-05-28 03:21:58 +02:00
Fabien Potencier
cff410507f bug #10983 [DomCrawler] Fixed charset detection in html5 meta charset tag (77web)
This PR was squashed before being merged into the 2.3 branch (closes #10983).

Discussion
----------

[DomCrawler] Fixed charset detection in html5 meta charset tag

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

It may be minor to folks with ascii-charactered language, but is critical for us Japanese.
Many Japanese websites with SJIS encoding have "Shift_JIS" as their encoding declaration.

Commits
-------

172e752 [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-27 00:15:18 +02:00
77web
172e75208a [DomCrawler] Fixed charset detection in html5 meta charset tag 2014-05-27 00:15:16 +02:00
Fabien Potencier
682f0a34fe Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-26 21:02:40 +02:00
Fabien Potencier
6cee250b55 Merge branch '2.4' into 2.5
* 2.4:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy
2014-05-26 18:43:24 +02:00
Fabien Potencier
53d5ecaa00 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-26 18:43:09 +02:00
Fabien Potencier
5d13be7c71 Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
This reverts commit 735e9a4768, reversing
changes made to 5c91dc1a3a.
2014-05-26 18:42:04 +02:00
Fabien Potencier
55888299be Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
This reverts commit 7dc8931969, reversing
changes made to 309046a207.
2014-05-26 18:42:01 +02:00
Fabien Potencier
d1f77c6d0d Revert "fixed CS"
This reverts commit 11816c5e51.
2014-05-26 18:41:58 +02:00
Fabien Potencier
af1c41c2fc Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
This reverts commit 9766c72324, reversing
changes made to 168174af08.
2014-05-26 18:41:54 +02:00
Fabien Potencier
8d29ca160d Revert "[HttpKernel] simplified some tests"
This reverts commit ccacd8d2af.
2014-05-26 18:41:51 +02:00
Fabien Potencier
ccacd8d2af [HttpKernel] simplified some tests 2014-05-26 18:12:56 +02:00
Arturs Vonda
31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier
487e6ed466 Merge branch '2.4' into 2.5
* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:38 +02:00
Fabien Potencier
4ba44a786c Merge branch '2.3' into 2.4
* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:05 +02:00
Fabien Potencier
0572674ac0 minor #10988 [Debug] preserve modified error level (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] preserve modified error level

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

Minor edge case, but still a bug fix.
Replaces https://github.com/symfony/symfony/pull/10978

Commits
-------

e40b717 [Debug] preserve modified error level
2014-05-25 16:44:21 +02:00
Nicolas Grekas
d06b206762 [Debug] throw even in stacking mode to preserve code paths 2014-05-25 12:15:31 +02:00
Nicolas Grekas
e40b717b17 [Debug] preserve modified error level 2014-05-25 11:36:54 +02:00
Christophe Coevoet
a9de61e86d [DomCrawler] Fixed a forgotten case of complex XPath queries 2014-05-24 19:16:55 +02:00
Fabien Potencier
e705499f34 bumped Symfony version to 2.4.6 2014-05-23 16:00:26 +02:00
Romain Neutron
9887b831d2 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput 2014-05-23 11:02:52 +02:00
Fabien Potencier
885b6d1744 updated VERSION for 2.4.5 2014-05-22 23:04:05 +02:00
Romain Neutron
3454d6084f [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation 2014-05-22 22:37:04 +02:00
Fabien Potencier
29341fab1b bumped Symfony version to 2.3.16 2014-05-22 22:22:30 +02:00
Fabien Potencier
424a567d2c updated VERSION for 2.3.15 2014-05-22 19:23:49 +02:00
Tobias Schultze
ad348a9b07 [HttpFoundation] implement session locking for PDO 2014-05-22 18:22:20 +02:00
Fabien Potencier
26bc81e5a0 Merge branch '2.4'
* 2.4:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14
2014-05-22 18:21:05 +02:00
Fabien Potencier
513483fb49 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-22 18:21:00 +02:00
Fabien Potencier
57a64a0fa6 Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-22 18:20:26 +02:00
Fabien Potencier
08bc4d9203 bumped Symfony version to 2.3.15 2014-05-22 18:18:05 +02:00
Fabien Potencier
a037f31de8 updated VERSION for 2.3.14 2014-05-22 16:27:03 +02:00
Fabien Potencier
c296c9ca19 Merge branch '2.4'
* 2.4:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
	src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
2014-05-22 15:47:45 +02:00
Fabien Potencier
6ceb6556fe Merge branch '2.3' into 2.4
* 2.3:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input
2014-05-22 15:46:01 +02:00
Fabien Potencier
059042ef92 feature #10932 [Process] Deprecate Process::setStdin in favor of Process::setInput (romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Process] Deprecate Process::setStdin in favor of Process::setInput

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

From the `Process` point of view, what we pass is an *input*, as well as we retrieve *output* and *error output*.
As we use `getOutput` and `getErrorOutput` we should use `setInput` and let the underlying `ProcessPipes` deal with the actual `STDIN`.

By the way, `ProcessBuilder` already has `setInput` method and no `setStdin` method

Commits
-------

53b9d73 [Process] Deprecate Process::setStdin in favor of Process::setInput
2014-05-22 15:44:17 +02:00
Romain Neutron
53b9d737f1 [Process] Deprecate Process::setStdin in favor of Process::setInput 2014-05-22 15:42:53 +02:00
prophet777
b965fa23a6 [WIP][Finder] Fix wrong implementation on sortable callback comparator 2014-05-22 15:42:36 +02:00
Fabien Potencier
c8476ee744 bug #10929 [2.3][Process] Add validation on Process input (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Add validation on Process input

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

This adds validation on Process input. For the moment, passing a stream would result in a PHP error.
I propose to deprecate values that are not strictly string in 2.6 (see upcoming PR)

Commits
-------

583092b [Process] Add validation on Process input
2014-05-22 15:40:43 +02:00
Fabien Potencier
3c9d8837cf minor #10951 Made use of "kB" vs. "KiB" consistent (Yannick, webmozart)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Made use of "kB" vs. "KiB" consistent

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

Continuation of #10661.

This PR makes the usage of "kB" and "KiB" consistent across the project. The notations equal the internationally recognized ones:

Short form | Long form | Value in Bytes
--- | --- | ---
B | bytes | 1
kB | kilobytes | 1000
KiB | kibibytes | 1024
MB | megabytes | 1000000
MiB | mebibytes | 1048576
GB | gigabytes | 1000000000
GiB | gibibytes | 1073741824

The reason for differentiating between the two is that several users got confused with the current mix (see #10648, #10917, #10661).

FileValidator, UploadedFile and the ProgressBar helper were changed accordingly.

Follow-up feature request: #10962

Commits
-------

e4c6da5 [Validator] Improved to-string conversion of the file size/size limit
bbe1045 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB")
2014-05-22 15:36:06 +02:00
Fabien Potencier
c505a639b2 minor #10956 [Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default

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

Commits
-------

a470ae2 [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
2014-05-22 15:29:31 +02:00
apodgorbunschih
7d0811cfba ommited space 2014-05-22 14:40:41 +02:00
Bernhard Schussek
e4c6da548b [Validator] Improved to-string conversion of the file size/size limit 2014-05-22 11:16:37 +02:00
Yannick
bbe1045989 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB") 2014-05-22 10:54:24 +02:00
Bernhard Schussek
a470ae2bb9 [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default 2014-05-22 10:35:37 +02:00
ilyes kooli
3d576eff19 Include file path in exception 2014-05-21 18:08:05 +02:00
Fabien Potencier
85e08278ca Merge branch '2.4'
* 2.4:
  Fixed the XPath filtering to have the same behavior than Symfony 2.4
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Added more tests for the XPath filtering
  [PropertyAccess] Fixed inverted logic
  [HttpKernel] fixed file uploads in functional tests when no file was selected
  [PropertyAccess] fixed CS
  Fixed test cases failing when the Intl extension is not installed
  Fixed the Travis build to avoid exiting too early
  [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations
  [PropertyAccess] Refactored PropertyAccessorCollectionTest
  [PropertyAccess] Refactored PropertyAccessorTest
2014-05-21 18:04:07 +02:00
Fabien Potencier
8954a1a88d bug #10946 [2.5][PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations (webmozart)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[2.5][PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations

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

Previously, when the following code was executed:

```php
$object = new ImplOfArrayAccess();

$propertyAccessor->setValue($object, '[index]', 'Value');
```

and that index did not exist, a fatal error would be generated because `array_keys()` was executed on `$object`. This error is fixed now.

Commits
-------

fef698e [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations
2014-05-21 17:54:53 +02:00
Fabien Potencier
54ab31a7fc Merge branch '2.3' into 2.4
* 2.3:
  Fixed the XPath filtering to have the same behavior than Symfony 2.4
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Added more tests for the XPath filtering
  [HttpKernel] fixed file uploads in functional tests when no file was selected
  Fixed test cases failing when the Intl extension is not installed
  Fixed the Travis build to avoid exiting too early

Conflicts:
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
2014-05-21 17:50:42 +02:00