Commit Graph

13686 Commits

Author SHA1 Message Date
Fabien Potencier
77f37fb077 Merge branch '2.8' into 3.0
* 2.8:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:39:53 +01:00
Fabien Potencier
27129228eb Merge branch '2.7' into 2.8
* 2.7:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:56 +01:00
Fabien Potencier
97cf53f9bd Merge branch '2.3' into 2.7
* 2.3:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:43 +01:00
Fabien Potencier
7660fb8c89 bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fix indented line handling in folded blocks

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

Commits
-------

756834c [Yaml] fix indented line handling in folded blocks
2015-12-26 13:21:40 +01:00
Graham Campbell
2b0721d0e4 [2.7] Fixed flatten exception recursion with errors 2015-12-26 13:17:22 +01:00
WouterJ
61b863b7ba Also transform inline mappings to objects 2015-12-26 13:08:46 +01:00
Fabien Potencier
494b4a466d minor #17114 [Serializer] Make metadata interfaces internal (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Make metadata interfaces internal

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17113#discussion_r48291776
| License       | MIT
| Doc PR        | n/a

Introducing such interfaces was a (my) mistake. Serializer metadata are value objects. Nobody will (nor should) implement these interfaces. Composition is better for "extending" metadata.

They were not marked as `@api` and should now be marked as `@internal` (or even deprecated but it will cause some maintenance headaches).

Commits
-------

3f6cfcd [Serializer] Make metadata interfaces internal
2015-12-26 13:07:05 +01:00
Fabien Potencier
f24690e493 bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Fix array sort on normalization in edge case

| 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

Commits
-------

eca41a8 [Config] Fix array sort on normalization in edge case
2015-12-26 13:02:10 +01:00
Mathieu MARCHOIS
85c271b7a2 Change the ExtensionInterface load method definition to bo identical to the documentation. 2015-12-26 13:00:54 +01:00
Tigran Azatyan
54e6fb4911 add and correct armenian translations 2015-12-26 12:56:14 +01:00
Romain Neutron
eca41a8fbf [Config] Fix array sort on normalization in edge case 2015-12-24 14:08:45 +01:00
Tobias Schultze
45a006046d minor #17069 improve BrowserKit test coverage p1 (eventhorizonpl)
This PR was merged into the 2.3 branch.

Discussion
----------

improve BrowserKit test coverage p1

Hi,

This PR improves BrowserKit test coverage.

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

I rebased previous PR https://github.com/symfony/symfony/pull/16549 to 2.3

Commits
-------

0261b48 improve BrowserKit test coverage p1
2015-12-24 02:02:08 +01:00
Jakub Zalas
4bec98000f [Security] Run tests on all PHP versions
Symfony 2.7 supports PHP >= 5.3.9
2015-12-23 19:13:52 +01:00
Jakub Zalas
09efd0666b feature #17035 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object (EdgarPE)
This PR was squashed before being merged into the 2.8 branch (closes #17035).

Discussion
----------

[DomCrawler] Revert previous restriction, allow selection of every DOMNode object

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes, revert to previous behaviour
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16933
| License       | MIT
| Doc PR        |

This is a backport of PR https://github.com/symfony/symfony/pull/17021

Commits
-------

d2872a3 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
2015-12-23 18:17:26 +01:00
EdgarPE
d2872a3189 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object 2015-12-23 18:16:29 +01:00
Maxime Steinhausser
211d58956f [Console][2.7] Fix merge #17040 2015-12-23 12:17:38 +01:00
Nicolas Grekas
f72f2f01ea Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:04:02 +01:00
Nicolas Grekas
b7d18f9309 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:46 +01:00
Nicolas Grekas
cd94014b07 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:39 +01:00
Nicolas Grekas
088fcfe093 [Process] Fix the fix for --enable-sigchild php 2015-12-23 12:02:45 +01:00
Nicolas Grekas
6c5f7364d5 Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix transient test on Windows
  [Process] Make tests more deterministic
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  Improved the design of the web debug toolbar
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests
2015-12-23 09:00:11 +01:00
Nicolas Grekas
7fe0a3b922 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix transient test on Windows
  [Process] Make tests more deterministic
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests
2015-12-23 08:56:26 +01:00
Nicolas Grekas
3bb3f3bdb3 minor #17070 [Process] Make tests more deterministic (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Process] Make tests more deterministic

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

This makes running the Process tests faster and more deterministic.

Commits
-------

0dc9389 [Process] Make tests more deterministic
2015-12-23 08:54:37 +01:00
Nicolas Grekas
53b0d77419 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix transient test on Windows
2015-12-23 08:54:09 +01:00
Nicolas Grekas
5517368265 [Process] Fix transient test on Windows 2015-12-23 08:53:52 +01:00
Nicolas Grekas
0dc9389982 [Process] Make tests more deterministic 2015-12-23 08:33:19 +01:00
Nicolas Grekas
5dc2bb30ca Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/ProcessTest.php
2015-12-23 07:54:35 +01:00
Fabien Potencier
b598fcadbd bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] More robustness and deterministic tests

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

Commits
-------

d1a178a [Process] More robustness and deterministic tests
2015-12-23 07:40:46 +01:00
Kévin Dunglas
3f6cfcdf42 [Serializer] Make metadata interfaces internal 2015-12-22 21:37:45 +01:00
Alessandro Chitolina
d0c0294a7b [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17102
| License       | MIT
| Doc PR        |
2015-12-22 18:06:45 +01:00
Ener-Getick
9911524361 [Validator] fixed wrong php docs 2015-12-22 17:04:50 +01:00
Nicolas Grekas
cb23212bd6 [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM 2015-12-22 14:55:19 +01:00
Nicolas Grekas
eb51f79fe0 Merge branch '2.8' into 3.0
* 2.8:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms
2015-12-22 14:05:22 +01:00
Nicolas Grekas
352049c505 Merge branch '2.7' into 2.8
* 2.7:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms
2015-12-22 14:04:57 +01:00
Nicolas Grekas
68b3d2d6a8 Merge branch '2.3' into 2.7
* 2.3:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms

Conflicts:
	.travis.yml
2015-12-22 14:04:37 +01:00
Nicolas Grekas
d1a178a43c [Process] More robustness and deterministic tests 2015-12-22 13:58:57 +01:00
Nicolas Grekas
337957ad26 minor #17073 [Security] skip bcrypt tests on incompatible platforms (Christian Flothmann, xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] skip bcrypt tests on incompatible platforms

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

Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.

Commits
-------

2a6fa7b use requires annotation
65eb188 skip bcrypt tests on incompatible platforms
2015-12-22 12:51:12 +01:00
Nicolas Grekas
478a0312fd [Routing] Reduce memory usage of a high consuming test case 2015-12-22 12:36:46 +01:00
Nicolas Grekas
d1fa59d486 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [SecurityBundle] Removing test insulations for a huge perf win
  [Validator] Use the new interface in the README
  [Validator] Add missing pt_BR translation
  Fix doctrine bridge tests on older PHP versions
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
  [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition
  [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
  updated validators.bg.xlf
  [Security] Enable bcrypt validation and result length tests on all PHP versions
  [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
  [Console] Avoid extra blank lines when rendering exceptions
  [Console][Table] fixed render row with multiple cells.
  [Yaml] do not remove "comments" in scalar blocks

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
	src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
2015-12-22 11:39:06 +01:00
Nicolas Grekas
6755f87476 Fix merge 2015-12-22 11:27:42 +01:00
Nicolas Grekas
d70ff0abd4 Merge branch '2.7' into 2.8
* 2.7:
  [SecurityBundle] Removing test insulations for a huge perf win
  [Validator] Use the new interface in the README
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
  [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too
  updated validators.bg.xlf
  [Security] Enable bcrypt validation and result length tests on all PHP versions
  [Security] Verify if a password encoded with bcrypt is no longer than 72 characters
  [Console] Avoid extra blank lines when rendering exceptions
  [Console][Table] fixed render row with multiple cells.
  [Yaml] do not remove "comments" in scalar blocks

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
	src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
2015-12-22 11:25:57 +01:00
Nicolas Grekas
b7f998f744 Merge branch '2.3' into 2.7
* 2.3:
  [SecurityBundle] Removing test insulations for a huge perf win
  [Filesystem] fix tests on 2.3
  [Filesystem] Recursivly widen non-executable directories
2015-12-22 11:07:22 +01:00
Christian Flothmann
2a6fa7bbab use requires annotation 2015-12-22 09:19:23 +01:00
Ener-Getick
1fbbe84007 [Validator] Use the new interface in the README 2015-12-21 13:16:02 +01:00
Andreia Bohner
b59ea7da96 [Validator] Add missing pt_BR translation 2015-12-21 09:04:00 +01:00
Christian Flothmann
65eb18849a skip bcrypt tests on incompatible platforms
Not all PHP versions before 5.3.7 have backported fixes that make it
possible to use `password_hash()` function. Therefore, we have to skip
tests on not supported platforms.
2015-12-19 15:13:08 +01:00
Christian Flothmann
9050f676af [Filesystem] fix tests on 2.3
The test introduced in #16797 used the `assertFilePermissions()` method
to test for the expected result. This worked quite well for the PR as it
was submitted for the `master` branch. However, the tests now fail on
2.3 as the `FilesystemTestCase` class which contains this method was
introduced with Symfony 2.4.
2015-12-19 12:15:11 +01:00
Christian Flothmann
756834c8dd [Yaml] fix indented line handling in folded blocks 2015-12-19 10:10:51 +01:00
Michal Piotrowski
0261b48168 improve BrowserKit test coverage p1
improve BrowserKit test coverage p2

improve BrowserKit test coverage p3

improve BrowserKit test coverage p4

improve BrowserKit test coverage p5
2015-12-18 18:35:00 +01:00
Filippo Tessarotto
fb75651a81 [Filesystem] Recursivly widen non-executable directories 2015-12-18 18:05:29 +01:00