Commit Graph

24514 Commits

Author SHA1 Message Date
Nicolas Grekas
03c42769a4 Merge branch '3.0'
* 3.0:
  [appveyor] Exit with failing status code
2015-12-23 16:36:00 +01:00
Nicolas Grekas
46c0a6afb4 Merge branch '2.8' into 3.0
* 2.8:
  [appveyor] Exit with failing status code
2015-12-23 16:35:39 +01:00
Nicolas Grekas
9d5bd2a3cd Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Exit with failing status code
2015-12-23 16:34:47 +01:00
Nicolas Grekas
90dd3fb6b9 Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Exit with failing status code
2015-12-23 16:34:07 +01:00
Nicolas Grekas
e625f1bb27 minor #17121 [Console][2.7] Fix merge #17040 (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console][2.7] Fix merge #17040

| Q             | A
| ------------- | ---
| Fixed tickets | 6a92f4e03f (commitcomment-15080872)
| License       | MIT

This change should not be merged in upper branches.

Commits
-------

211d589 [Console][2.7] Fix merge #17040
2015-12-23 16:33:43 +01:00
Nicolas Grekas
2f08b28a20 minor #17117 [appveyor] Exit with failing status code (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Exit with failing status code

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

[Sometimes](https://ci.appveyor.com/project/fabpot/symfony/build/1.0.4272#L1103), tests fail on appveyor and I'd like to see the exit code. This does it.

Commits
-------

a6cfff5 [appveyor] Exit with failing status code
2015-12-23 16:06:36 +01:00
Maxime Steinhausser
211d58956f [Console][2.7] Fix merge #17040 2015-12-23 12:17:38 +01:00
Nicolas Grekas
161f12ce02 Merge branch '3.0'
* 3.0:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:04:13 +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
774081cc60 minor #17118 [Process] Fix the fix for --enable-sigchild php (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix the fix for --enable-sigchild php

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

https://travis-ci.org/symfony/symfony/jobs/98471329#L2685
https://travis-ci.org/symfony/symfony/jobs/98470780#L2689

Commits
-------

088fcfe [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:18 +01:00
Nicolas Grekas
088fcfe093 [Process] Fix the fix for --enable-sigchild php 2015-12-23 12:02:45 +01:00
Nicolas Grekas
a6cfff5570 [appveyor] Exit with failing status code 2015-12-23 09:59:09 +01:00
Nicolas Grekas
676ddab73b Merge branch '3.0'
* 3.0:
  [Process] Fix transient test on Windows
  [Process] Make tests more deterministic
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  [Validator] fixed wrong php docs
  Improved the design of the web debug toolbar
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests
2015-12-23 09:01:03 +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
Tobias Schultze
7f5245c633 bug #17112 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace (alekitto)
This PR was merged into the 2.3 branch.

Discussion
----------

[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        |

Commits
-------

d0c0294 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
2015-12-22 19:03:17 +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
Tobias Schultze
a798d7dece minor #17092 [Validator] Fix wrong php docs (Ener-Getick)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #17092).

Discussion
----------

[Validator] Fix wrong php docs

| Q             | A
| ------------- | ---
| Fixed tickets | #17091
| License       | MIT

Commits
-------

9911524 [Validator] fixed wrong php docs
2015-12-22 17:04:51 +01:00
Ener-Getick
9911524361 [Validator] fixed wrong php docs 2015-12-22 17:04:50 +01:00
Fabien Potencier
05273449cb bug #17109 Improved the design of the web debug toolbar (javiereguiluz)
This PR was squashed before being merged into the 2.8 branch (closes #17109).

Discussion
----------

Improved the design of the web debug toolbar

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

This PR contains three little improvements:

## 1) Icon size

Somehow, the size of the icons wasn't limited properly. This makes them appear too big and unaligns text vertically:

### Before

![before_icon_size](https://cloud.githubusercontent.com/assets/73419/11956693/5dce6432-a8bc-11e5-9726-958bbf95e945.png)

### After

![after_icon_size](https://cloud.githubusercontent.com/assets/73419/11956696/5faba396-a8bc-11e5-8453-6d9601803335.png)

## 2) Status blocks

It's very common to have single-digit and double-digit status blocks in some panels. Now they show a different width:

![before_status_1](https://cloud.githubusercontent.com/assets/73419/11956743/affd180c-a8bc-11e5-8c53-044b60dad53e.png) ![before_status_2](https://cloud.githubusercontent.com/assets/73419/11956744/b0ed99c6-a8bc-11e5-83d6-7a926e780d14.png)

Now we set a minimum-width that looks good for single and double digit values:

![after_status_1](https://cloud.githubusercontent.com/assets/73419/11956766/dff29758-a8bc-11e5-9eea-f6204acb2794.png) ![after_status_2](https://cloud.githubusercontent.com/assets/73419/11956768/e1af5f68-a8bc-11e5-8d07-e6219a667529.png)

Although this solution doesn't solve the case when some block displays three digits, I think we can safely ignore that edge case.

## 3) Colors

The green/yellow/red colors of the toolbar were different from the green/yellow/red colors of the profiler. The reason is that we designed the toolbar first and separately from the profiler. The second (minor) issue is that green and yellow didn't have enough contrast (they didn't pass the WCAG accessibility check).

So I propose to slightly change the green and yellow colors and to use the same colors in the toolbar and the profiler.

### Toolbar Before

![before_colors](https://cloud.githubusercontent.com/assets/73419/11956842/83e1c618-a8bd-11e5-9ac0-b97de8e70ec3.png)

### Toolbar After

![after_colors](https://cloud.githubusercontent.com/assets/73419/11956844/86759af8-a8bd-11e5-83c5-7ce2f74d4b88.png)

### Profiler Before

![before_profiler_success](https://cloud.githubusercontent.com/assets/73419/11956864/c21889a8-a8bd-11e5-95ee-8d6103b6a26c.png)

![before_profiler_warning](https://cloud.githubusercontent.com/assets/73419/11956866/c3240e62-a8bd-11e5-8797-de3481dd40a0.png)

![before_profiler_error](https://cloud.githubusercontent.com/assets/73419/11956867/c4d7b25e-a8bd-11e5-9e7a-6519b34009de.png)

### Profiler After

![after_profiler_success](https://cloud.githubusercontent.com/assets/73419/11956887/ea5ceabc-a8bd-11e5-8373-492e838148ea.png)

![after_profiler_warning](https://cloud.githubusercontent.com/assets/73419/11956888/eb3bf284-a8bd-11e5-8be6-93a91ed2ae0e.png)

![after_profiler_error](https://cloud.githubusercontent.com/assets/73419/11956889/ed057b4e-a8bd-11e5-9533-a807d8547843.png)

The new colors pass the accessibility requirements:

![color_accessibility_success](https://cloud.githubusercontent.com/assets/73419/11956894/03ccbd60-a8be-11e5-96d2-727bb9b62dc7.png)

![color_accessibility_warning](https://cloud.githubusercontent.com/assets/73419/11956896/04d893f0-a8be-11e5-8c18-9515f624974a.png)

![color_accessibility_error](https://cloud.githubusercontent.com/assets/73419/11956899/06cbc524-a8be-11e5-8622-e2b60da1c8b2.png)

Commits
-------

9859125 Improved the design of the web debug toolbar
2015-12-22 16:06:00 +01:00
Javier Eguiluz
9859125130 Improved the design of the web debug toolbar 2015-12-22 16:05:58 +01:00
Nicolas Grekas
d481dda329 minor #17108 [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM

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

phpunit reports:
- before: `Memory: 430.91Mb`
- after: `Memory: 21.26Mb`

Commits
-------

cb23212 [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
2015-12-22 15:03:54 +01:00
Nicolas Grekas
cb23212bd6 [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM 2015-12-22 14:55:19 +01:00
Nicolas Grekas
e93ef5d2b8 Merge branch '3.0'
* 3.0:
  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:38 +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
ef53d6d755 Clean EOL whitespace 2015-12-22 14:02:38 +01:00
Nicolas Grekas
6a23de79b1 minor #17106 [travis] Fix (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Fix

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

Commits
-------

19a14c5 [travis] Fix
2015-12-22 14:01:03 +01:00
Nicolas Grekas
d1a178a43c [Process] More robustness and deterministic tests 2015-12-22 13:58:57 +01:00
Nicolas Grekas
19a14c5f4e [travis] Fix 2015-12-22 13:45:04 +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
ff56eb2350 minor #17104 [Routing] Reduce memory usage of a high consuming test case (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Reduce memory usage of a high consuming test case

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

Tests fail transiently on hhvm because of the high memory usage of this test case.
This patch cuts it by two.

See this blackfire comparison graph on the Memory dimension:
https://blackfire.io/profiles/compare/fd72ee66-e4d0-4ac2-92bf-16dd3849ef4c/graph?settings%5Bdimension%5D=pmu

Commits
-------

478a031 [Routing] Reduce memory usage of a high consuming test case
2015-12-22 12:50:18 +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
e48463bd06 Merge branch '3.0'
* 3.0:
  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
2015-12-22 11:39:31 +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
6fa4d5b8f1 Merge branch '2.7' into 2.8
* 2.7:
  Fix merge
2015-12-22 11:27:54 +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