Commit Graph

16325 Commits

Author SHA1 Message Date
Fabien Potencier
52f8dc7c1b Merge branch '2.3' into 2.4
* 2.3:
  changed some PHPUnit assertions to more specific ones
  fixed Kernel::stripComments() normalizing new-lines
  added a BC comment
  Update FileLoader to fix issue #10339
2014-03-01 18:35:04 +01:00
Fabien Potencier
0ccf5bcd7a minor #10358 PHPUnit more specific assertions (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

PHPUnit more specific assertions

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

Commits
-------

4927d0c changed some PHPUnit assertions to more specific ones
2014-03-01 18:34:45 +01:00
Fabien Potencier
4927d0c8a3 changed some PHPUnit assertions to more specific ones 2014-03-01 18:25:29 +01:00
Fabien Potencier
dde2365de8 bug #10284 [2.4][HttpKernel] Fix issue #10209 (stephpy)
This PR was merged into the 2.4 branch.

Discussion
----------

[2.4][HttpKernel] Fix issue #10209

When the profiler has `only_exception` option activated and a subrequest which
throw an exception, the parent profile cannot be found.

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

Fix issue #10209

Commits
-------

b949c49 [2.4][HttpKernel] Fix issue #10209 When the profiler has `only_exception` option activated and a subrequest throw an exception, the parent profile cannot be found.
2014-02-28 15:10:50 +01:00
Fabien Potencier
a4f0f0cc98 bug #10351 [HttpKernel] fix stripComments() normalizing new-lines (sstok)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] fix stripComments() normalizing new-lines

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

This makes normalizing new-lines less error-prone
when a string contains multiple new line-lines

Commits
-------

63032c7 fixed Kernel::stripComments() normalizing new-lines
2014-02-28 14:50:48 +01:00
Sebastiaan Stok
63032c7c89 fixed Kernel::stripComments() normalizing new-lines
This makes normalizing new-lines less error-prone
when a string contains multiple new line-lines
2014-02-28 13:42:15 +01:00
Fabien Potencier
e756686bb4 added a BC comment 2014-02-28 09:17:36 +01:00
Fabien Potencier
79999ffd5c bug #10348 Update FileLoader to fix issue #10339 (msumme)
This PR was merged into the 2.3 branch.

Discussion
----------

Update FileLoader to fix issue #10339

This fixes an issue in Symfony\Component\Config\Loader\FileLoader

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

Commits
-------

3988728 Update FileLoader to fix issue #10339
2014-02-28 09:16:24 +01:00
Max Summe
3988728169 Update FileLoader to fix issue #10339
FileLoader now uses resolved FileLoader's (the one that explicitly
supports that resource) FileLocatorInterface instance before falling
back to its own when trying to load resources in import() method.
2014-02-27 21:56:34 -06:00
Fabien Potencier
cb4a9cc2eb Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.12
  updated VERSION for 2.3.11
  update CONTRIBUTORS for 2.3.11
  updated CHANGELOG for 2.3.11
  Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-02-27 18:04:59 +01:00
Fabien Potencier
1c0fcd0252 bumped Symfony version to 2.3.12 2014-02-27 17:33:40 +01:00
Fabien Potencier
aa5b228e87 updated VERSION for 2.3.11 2014-02-27 15:55:30 +01:00
Fabien Potencier
75b94ab601 update CONTRIBUTORS for 2.3.11 2014-02-27 15:55:21 +01:00
Fabien Potencier
812f870ce5 updated CHANGELOG for 2.3.11 2014-02-27 15:55:17 +01:00
Fabien Potencier
186f0855a8 bug #10306 [Serializer] Throw exception when unable to normalize embedded object (gquemener)
This PR was submitted for the 2.1 branch but it was merged into the 2.4 branch instead (closes #10306).

Discussion
----------

[Serializer] Throw exception when unable to normalize embedded object

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

This PR intends to prevent Fatal Error about calling undefined method `normalize()` on object `$serializer` in the `GetSetMethodNormalizer` when injected serializer does not implement the `NormalizerInterface`.

Commits
-------

8a54920 [Serializer] Throw exception when unable to normalize embedded object
2014-02-27 15:27:31 +01:00
Gildas Quéméner
a92aa5e849 Throw exception when unable to normalize embedded object
Added a check to ensure that injected serializer of the
GetSetMethodNormalizer is a normalizer before normalizing object value.
2014-02-27 15:27:25 +01:00
Fabien Potencier
4986f6db46 bug #10338 [ExpressionLanguage] Fixed evaluation of short circuit operators (florianv)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #10338).

Discussion
----------

[ExpressionLanguage] Fixed evaluation of short circuit operators

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

Commits
-------

fba0a40 [ExpressionLanguage] Fixed evaluation of short circuit operators
2014-02-27 14:31:10 +01:00
florianv
3a46a8e799 Fixed evaluation of short circuit operators 2014-02-27 14:31:09 +01:00
Fabien Potencier
ca60916331 minor #10323 [Yaml] Fixed minor performance related issues in Yaml\Inline. (sun)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10323).

Discussion
----------

[Yaml] Fixed minor performance related issues in Yaml\Inline.

Follow-up to #10312

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

Commits
-------

a36fef5 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.
2014-02-25 22:36:55 +01:00
sun
108e169353 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline. 2014-02-25 22:36:55 +01:00
Fabien Potencier
81e27d2a3e Merge branch '2.3' into 2.4
* 2.3:
  [Process] minor fixes
  Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
  Avoid unnecessary line indentation calculation.
  Optimise Inline::evaluateScalar() for parsing strings.
  fixed CS
  fixed parsing Mongo DSN and added Test for it
  () is also a valid delimiter
  Adding PHP 5.6 to travis-ci tests
  Update BCryptPasswordEncoder.php
  [Validator] Removed PHP <5.3.3 specific code which is not officially supported.
  Fixed wrong redirect url if path contains some query parameters
2014-02-24 17:20:54 +01:00
Fabien Potencier
30f35c08a1 minor #10305 [Process] minor fixes (aeryaguzov)
This PR was squashed before being merged into the 2.3 branch (closes #10305).

Discussion
----------

[Process] minor fixes

| Q             | A
| ------------- | ---
| Fixed tickets | [n/a]
| License       | MIT

The "same" PR as #10220, but on "2.3" branch

Commits
-------

f03e5dc [Process] minor fixes
2014-02-24 17:20:12 +01:00
Andrey Ryaguzov
f03e5dcd40 [Process] minor fixes 2014-02-24 17:20:12 +01:00
Fabien Potencier
eed7a864d8 minor #10317 [YAML] Improve performance of getNextEmbedBlock (alexpott)
This PR was merged into the 2.3 branch.

Discussion
----------

[YAML] Improve performance of getNextEmbedBlock

| 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

By removing unnecessary preg_match and function calls - isCurrentLineEmpty() contains a call to isCurrentLineBlank() - therefore this function is called twice every time this condition is hit. The preg_match appears to legacy handling of blank lines.

This improves the performance of the Drupal 8 installer.
![image](https://f.cloud.github.com/assets/769634/2241426/69effb0c-9cd1-11e3-9145-e4fabd2ec870.png)

Commits
-------

995a033 Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
2014-02-24 17:11:10 +01:00
Alex Pott
995a033243 Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls. 2014-02-23 23:16:29 +00:00
Fabien Potencier
6b0b504348 minor #10312 [Yaml] Optimise Inline::evaluateScalar() for parsing strings. (alexpott)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10312).

Discussion
----------

[Yaml] Optimise Inline::evaluateScalar() for parsing strings.

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

The Drupal 8 installer does a lot of YAML parsing. With the patch attached it is significantly quicker.
![image](https://f.cloud.github.com/assets/769634/2237906/630c3308-9bcf-11e3-8038-35cbbeedd7e6.png)

https://drupal.org/node/1851234

Commits
-------

10c898d Avoid unnecessary line indentation calculation.
c65a647 Optimise Inline::evaluateScalar() for parsing strings.
2014-02-23 19:17:23 +01:00
Alex Pott
5e9f41eef4 Avoid unnecessary line indentation calculation. 2014-02-23 19:17:23 +01:00
Alex Pott
d5aca818b2 Optimise Inline::evaluateScalar() for parsing strings. 2014-02-23 19:17:23 +01:00
Fabien Potencier
7ee758c5fb fixed CS 2014-02-21 07:38:26 +01:00
Fabien Potencier
a8955bf96c bug #10146 [WebProfilerBundle] fixed parsing Mongo DSN and added Test for it (malarzm)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10146).

Discussion
----------

[WebProfilerBundle] fixed parsing Mongo DSN and added Test for it

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

Commits
-------

5cd274b [WebProfilerBundle] fixed parsing Mongo DSN and added Test for it
2014-02-21 07:33:54 +01:00
Maciej Malarz
5f0557ef27 fixed parsing Mongo DSN and added Test for it
Applied Coding Standards patch

Applied Fabien's comments

[WebProfilerBundle] fixed parsing Mongo DSN and added Test for it

Removing whitespaces

Applied fabbot patch
2014-02-21 07:33:54 +01:00
Fabien Potencier
5e665b5c7a bug #10299 [Finder] () is also a valid delimiter (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] () is also a valid delimiter

The `Regex` class should also accept `()` as delimiters, as they are valid PREG delimiters: http://3v4l.org/D8v54

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

Commits
-------

b7519c7 () is also a valid delimiter
2014-02-20 20:43:52 +01:00
Wouter J
b7519c7727 () is also a valid delimiter 2014-02-20 16:15:12 +01:00
Fabien Potencier
7ac17be3ae minor #10248 Adding PHP 5.6 to travis-ci tests (pborreli)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10248).

Discussion
----------

Adding PHP 5.6 to travis-ci tests

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

PHP 5.6.0alpha1 is available on travis-ci
tests are green

Commits
-------

7083a30 Adding PHP 5.6 to travis-ci tests
2014-02-19 22:46:50 +01:00
Pascal Borreli
b9d13f2b65 Adding PHP 5.6 to travis-ci tests 2014-02-19 22:46:50 +01:00
Fabien Potencier
26732d7468 bug #10255 [FrameworkBundle] Fixed wrong redirect url if path contains some query parameters (pulzarraider)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fixed wrong redirect url if path contains some query parameters

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

Commits
-------

a25d1e1 Fixed wrong redirect url if path contains some query parameters
2014-02-19 22:33:06 +01:00
Fabien Potencier
bbe716cc35 minor #10281 Update BCryptPasswordEncoder.php (Szymciosek)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10281).

Discussion
----------

Update BCryptPasswordEncoder.php

Commits
-------

4c81fb3 Update BCryptPasswordEncoder.php
2014-02-19 22:27:56 +01:00
szymek
04a506ee7d Update BCryptPasswordEncoder.php 2014-02-19 22:27:55 +01:00
Fabien Potencier
0788896e32 minor #10289 [Validator] Removed PHP <5.3.3 specific code which is not officially supported (pylebecq)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Removed PHP <5.3.3 specific code which is not officially supported

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

There is some code in the validator component which handles a PHP bug for versions strictly inferiors to 5.3.3. Since these versions are not supported (the requirements say 5.3.3 minimum) I thought we could remove it.

Regards.

Commits
-------

f10c974 [Validator] Removed PHP <5.3.3 specific code which is not officially supported.
2014-02-18 17:39:47 +01:00
Pierre-Yves LEBECQ
f10c9748e3 [Validator] Removed PHP <5.3.3 specific code which is not officially supported. 2014-02-18 17:30:53 +01:00
Fabien Potencier
88118a2cf7 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10207 [DomCrawler] Fixed filterXPath() chaining (robbertkl)"
  Bypass sigchild detection if phpinfo is not available

Conflicts:
	src/Symfony/Component/DomCrawler/Crawler.php
2014-02-18 17:29:54 +01:00
Fabien Potencier
8f379217b8 Revert "bug #10207 [DomCrawler] Fixed filterXPath() chaining (robbertkl)"
This reverts commit c11c5888f3, reversing
changes made to e453c4589d.
2014-02-18 17:26:04 +01:00
Fabien Potencier
2637e5555c bug #10285 Bypass sigchild detection if phpinfo is not available (Seldaek)
This PR was merged into the 2.3 branch.

Discussion
----------

Bypass sigchild detection if phpinfo is not available

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

This fixes composer/composer#2711, i.e. anyone disabling phpinfo for security (by obscurity, but whatever) reasons can not use the Process class anymore.

Commits
-------

714aee9 Bypass sigchild detection if phpinfo is not available
2014-02-18 17:13:33 +01:00
Fabien Potencier
5ab9c3b3ca Merge branch '2.3' into 2.4
* 2.3:
  Revert "Fix "Array was modified outside object" in ResizeFormListener."
  Added failing test
  bumped Symfony version to 2.3.11
  updated VERSION for 2.3.10
  update CONTRIBUTORS for 2.3.10
  updated CHANGELOG for 2.3.10
  [Console] removed problematic regex
  [DomCrawler] Added support for <area> tags to be treated as links
  Fix "Array was modified outside object" in ResizeFormListener.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-02-18 16:41:06 +01:00
Jordi Boggiano
714aee9bc0 Bypass sigchild detection if phpinfo is not available 2014-02-18 14:12:33 +01:00
Stéphane PY
b949c49f26 [2.4][HttpKernel] Fix issue #10209
When the profiler has `only_exception` option activated and a subrequest
throw an exception, the parent profile cannot be found.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
2014-02-18 11:56:22 +01:00
Fabien Potencier
c4ffe02100 bug #10269 [Form] Revert "Fix "Array was modified outside object" in ResizeFormListener." (norzechowicz)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Revert "Fix "Array was modified outside object" in ResizeFormListener."

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

Unseting key on iterator is not an solution because in php "Array assignment always involves value copying. " So if \IteratorAggregate implementation create new iterator from array (just like [Doctrine ArrayCollection](https://github.com/doctrine/common/blob/2.3/lib/Doctrine/Common/Collections/ArrayCollection.php#L362) does)  such operation will not affect original data.

I'm just not sure if it's good to use Doctirn ArrayCollection in this test case or maybe its better to create own implementation of such Collection as a fixture.

Commits
-------

f62e30d Revert "Fix "Array was modified outside object" in ResizeFormListener."
462b7af Added failing test
2014-02-17 20:52:05 +01:00
Norbert Orzechowicz
f62e30db30 Revert "Fix "Array was modified outside object" in ResizeFormListener." 2014-02-15 12:03:01 +01:00
Norbert Orzechowicz
462b7af9b1 Added failing test 2014-02-15 12:00:54 +01:00
Andrej Hudec
a25d1e1c0f Fixed wrong redirect url if path contains some query parameters 2014-02-13 06:42:11 +01:00