Commit Graph

23096 Commits

Author SHA1 Message Date
Nicolas Grekas
8d49573fb6 [DI] Autowiring: w/a https://bugs.php.net/62715 2015-10-13 19:00:31 +02:00
Nicolas Grekas
8a76fd9dbc Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] fix ini matrix race conditions
  [Http*] Mock time() to fix transient tests
  [ci] Cache phpunit install
  [WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
	src/Symfony/Component/HttpFoundation/Response.php
2015-10-13 18:11:28 +02:00
Nicolas Grekas
7e848fba84 Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] fix ini matrix race conditions
  [Http*] Mock time() to fix transient tests
  [ci] Cache phpunit install
  [WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards

Conflicts:
	appveyor.yml
	src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
2015-10-13 18:05:47 +02:00
Nicolas Grekas
84f6b30147 minor #16225 [appveyor] fix ini matrix race conditions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] fix ini matrix race conditions

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

Commits
-------

8e59d4a [appveyor] fix ini matrix race conditions
2015-10-13 18:03:19 +02:00
Nicolas Grekas
5958eb463c minor #16227 [PhpUnit] exit gracefully to workaround segfaults at shutdown time (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnit] exit gracefully to workaround segfaults at shutdown time

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

Commits
-------

1a93494 [PhpUnit] exit gracefully to workaround segfaults at shutdown time
2015-10-13 18:01:15 +02:00
Hippolyte Alain
481fc12861 [HttpFoundation] Fix some typo in the Request doc 2015-10-13 17:57:12 +02:00
Nicolas Grekas
1a93494f7d [PhpUnit] exit gracefully to workaround segfaults at shutdown time 2015-10-13 17:54:10 +02:00
Nicolas Grekas
8e59d4ae17 [appveyor] fix ini matrix race conditions 2015-10-13 17:38:14 +02:00
Fabien Potencier
791b1247f9 fixed CS 2015-10-13 17:24:19 +02:00
Joshua Thijssen
7bb394e2c4 Added separated handling of root paths 2015-10-13 17:18:25 +02:00
Fabien Potencier
d949fcc8d6 minor #16221 [Http*] Mock time() to fix transient tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Http*] Mock time() to fix transient tests

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

Commits
-------

fa604d3 [Http*] Mock time() to fix transient tests
2015-10-13 16:31:59 +02:00
Nicolas Grekas
fa604d3c6f [Http*] Mock time() to fix transient tests 2015-10-13 16:19:21 +02:00
Nicolas Grekas
8ced3c63f3 minor #16222 [ci] Cache phpunit install (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Cache phpunit install

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

Commits
-------

e6d343a [ci] Cache phpunit install
2015-10-13 12:03:41 +02:00
Nicolas Grekas
e6d343a126 [ci] Cache phpunit install 2015-10-13 10:50:50 +02:00
Fabien Potencier
17499f550e minor #16218 [WebProfilerBundle] [toolbar] Changed profiler toolbar green color to comply with WCAG 2.0AA (spreston)
This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] [toolbar] Changed profiler toolbar green color to comply with WCAG 2.0AA

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
[WebProfilerBundle] Modified green icon colors for min contrast of 4.5
(resubmitting this on the 2.3 branch. Previous PR was #15827)

Commits
-------

58f5168 [WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards
2015-10-13 08:30:56 +02:00
Steve Preston
58f5168b4b [WebProfiler] [toolbar] Changed profiler toolbar color to comply with WCAG 2.0AA contrast standards 2015-10-12 16:28:48 -04:00
Fabien Potencier
e0e38ba8e3 minor #16211 [ExpressionLanguage] marked node classes as being internal (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[ExpressionLanguage] marked node classes as being internal

| 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

Adds `@internal` on some classes, would it make sense to also make them final?

Commits
-------

7d6bc48 [ExpressionLanguage] marked node classes as being internal
2015-10-12 16:08:01 +02:00
Fabien Potencier
117d65f1d8 minor #16210 [Yaml] marked some classes as being internal (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] marked some classes as being internal

| 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

Adds `@internal` on some YAML classes.

Commits
-------

29e7893 [Yaml] marked some classes as being internal
2015-10-12 16:07:28 +02:00
Nicolas Grekas
4c223c9d06 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Load memcache.so
  [2.3] Cherry-pick @group time-sensitive annotations
  [ci] load php_memcache.dll and apcu.so
  [ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures
2015-10-12 14:43:41 +02:00
Nicolas Grekas
c6da10674a Merge branch '2.3' into 2.7
* 2.3:
  [travis] Load memcache.so
  [2.3] Cherry-pick @group time-sensitive annotations
  [ci] load php_memcache.dll and apcu.so

Conflicts:
	.travis.yml
	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
2015-10-12 14:42:24 +02:00
Nicolas Grekas
ed40dc3300 [travis] Load memcache.so 2015-10-12 14:38:55 +02:00
Nicolas Grekas
bb07c761b8 minor #16213 [2.3] Cherry-pick @group time-sensitive annotations (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Cherry-pick @group time-sensitive annotations

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

From 34a08464ce

Commits
-------

c9f92ba [2.3] Cherry-pick @group time-sensitive annotations
2015-10-12 14:29:39 +02:00
Nicolas Grekas
e9993d39c8 minor #16208 [ci] load php_memcache.dll and apcu.so (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] load php_memcache.dll and apcu.so

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

Commits
-------

2704033 [ci] load php_memcache.dll and apcu.so
2015-10-12 14:28:17 +02:00
Nicolas Grekas
840e7a9003 minor #16212 [ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures

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

To be removed when merging in 3.0

Commits
-------

3c06c81 [ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures
2015-10-12 14:05:47 +02:00
Nicolas Grekas
c9f92baad7 [2.3] Cherry-pick @group time-sensitive annotations 2015-10-12 13:59:00 +02:00
Nicolas Grekas
27040333cf [ci] load php_memcache.dll and apcu.so 2015-10-12 13:42:34 +02:00
Nicolas Grekas
3c06c815a4 [ClassLoader] Split LegacyApcUniversalClassLoaderTest fixtures 2015-10-12 13:28:14 +02:00
Fabien Potencier
7d6bc483a6 [ExpressionLanguage] marked node classes as being internal 2015-10-12 13:23:20 +02:00
Fabien Potencier
29e789301a [Yaml] marked some classes as being internal 2015-10-12 13:16:35 +02:00
Fabien Potencier
24529f66c7 feature #16194 [PhpUnit] Mock clock on @group time-sensitive annotations (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnit] Mock clock on @group time-sensitive annotations

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

Instead of spreading the same clock mock code everywhere, let's create a test case that helps mocking the time related functions.

Commits
-------

34a0846 [PhpUnit] Mock clock on @group time-sensitive annotations
2015-10-12 12:31:17 +02:00
Fabien Potencier
77f51412e2 feature #16201 [Yaml] deprecated non-escaped \ in double-quoted strings when parsing (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] deprecated non-escaped \ in double-quoted strings when parsing

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

According to the YAML specs, backslashes must be escaped when used in a double-quoted string. So, `"Foo\Var"` is not valid, `"Foo\\Var"` is.

This PR deprecates the old ways so that we can throw an exception in 3.0 when parsing a non-compliant YAML string in 3.0.

ping @nicolas-grekas @tucksaun

Commits
-------

e599a72 [Yaml] deprecated non-escaped \ in double-quoted strings when parsing
2015-10-12 12:21:50 +02:00
Fabien Potencier
e599a72fc7 [Yaml] deprecated non-escaped \ in double-quoted strings when parsing 2015-10-12 12:20:37 +02:00
Fabien Potencier
a8b119d268 removed wrong dep 2015-10-12 12:18:26 +02:00
Fabien Potencier
b03ccb3a3d feature #16198 [EventDispatcher] added EventDispatcher::getListenerPriority() (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

[EventDispatcher] added EventDispatcher::getListenerPriority()

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

In #14563, we added a way to get the priorities of listeners, but as noted by @Tobion in #15825, the implementation is sub-optimal because of two main reasons: the change is not part of the interface but more importantly, the added boolean changes the return value of `getListeners()`.

This PR reverts most of #14563 to add a `getListenerPriority()` method. This method is quite slow, but as it should only be used for debugging purposes (on the CLI or the WDT), I think it's not really a problem.

In 3.0, this method should probably be added to `EventDispatcherInterface`.

ping @Tobion

Commits
-------

068e955 [EventDispatcher] added EventDispatcher::getListenerPriority()
2015-10-12 12:13:39 +02:00
Nicolas Grekas
d36e284192 Fix merge 2015-10-12 11:27:31 +02:00
Nicolas Grekas
38ee8b34c4 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Fix tests requirements
  [ci] SymfonyTestsListener is now auto-registered
  adds validation messages missing italian translations
  [Console] fixed progress bar format on edge cases
  fix bug with set max count, by start method in progress bar

Conflicts:
	src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
	src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderTest.php
	src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php
2015-10-12 11:25:14 +02:00
Nicolas Grekas
9d9c252c89 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Fix tests requirements

Conflicts:
	src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
2015-10-12 11:20:33 +02:00
Nicolas Grekas
f14aa486d9 minor #16207 [ci] Fix tests requirements (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Fix tests requirements

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

Commits
-------

3c0b441 [ci] Fix tests requirements
2015-10-12 11:18:33 +02:00
Nicolas Grekas
3c0b441371 [ci] Fix tests requirements 2015-10-12 11:06:32 +02:00
Nicolas Grekas
34a08464ce [PhpUnit] Mock clock on @group time-sensitive annotations 2015-10-12 10:02:31 +02:00
Fabien Potencier
068e9559d0 [EventDispatcher] added EventDispatcher::getListenerPriority() 2015-10-11 16:56:23 +02:00
Nicolas Grekas
f30ae9a9bb Merge branch '2.3' into 2.7
* 2.3:
  [ci] SymfonyTestsListener is now auto-registered
  adds validation messages missing italian translations
2015-10-11 11:39:48 +02:00
Nicolas Grekas
d1d0e041c2 [ci] SymfonyTestsListener is now auto-registered 2015-10-11 11:37:49 +02:00
Fabien Potencier
6907498c21 feature #15025 [2.8] [Form] Rename CollectionType options for entries (WouterJ)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [Form] Rename CollectionType options for entries

Description
---

Replaces #13820 for the 2.8 branch.

Original description:

 > `type` and `options` are extremely generic. Prefixing them with `entry_` makes it clear what they are configuring.

 > About the property deprecation it is the same story as https://github.com/symfony/symfony/pull/13717 and I don't know which direction you want me to go.

I've tried to apply the comments in the previous PR, but got a bit lost in the normalizers/default closure stuff. I hope I did everything correctly, but please review :)

PR Info Table
---

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

Commits
-------

942a237 Rename CollectionType options for entries
2015-10-11 11:32:20 +02:00
Fabien Potencier
cd97d41881 bug #16196 [Console] Fix progress bar formatting when max is set on start() and some other edge cases (vsychov, fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fix progress bar formatting when max is set on start() and some other edge cases

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

Besides what #16149 fixed, it also fixes the case where `setFormat()` is called before `start()`.

From #16149

When I set max count, by call "ProgressBar::start()", I got invalid progress bar format.

Example code:
```php
$bar = new ProgressBar($output, 100);
$bar->start();
$bar->advance(100);
$bar->finish();
```
Output:
 100/100 [============================] 100%

Example code:
```php
$bar = new ProgressBar($output);
$bar->start(100);
$bar->advance(100);
$bar->finish();
```
Output:
 100 [============================]

Commits
-------

e651da4 [Console] fixed progress bar format on edge cases
3cbfa63 fix bug with set max count, by start method in progress bar
2015-10-11 11:14:05 +02:00
Nicolas Grekas
2b60058d74 minor #16197 [PhpUnit] Auto-register SymfonyTestsListener (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnit] Auto-register SymfonyTestsListener

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

This allows removing the copy/pasted `<listeners>` tags in our phpunit.xml.dist files and opens for future enhancements (like #16194)

Commits
-------

9e2bb00 [PhpUnit] Auto-register SymfonyTestsListener
2015-10-11 11:12:21 +02:00
Nicolas Grekas
9e2bb0082f [PhpUnit] Auto-register SymfonyTestsListener 2015-10-11 10:29:26 +02:00
Fabien Potencier
45b2382f46 minor #15825 Fix potential access to undefined index (Seldaek)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix potential access to undefined index

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

Fixes @tobion's comment in https://github.com/symfony/symfony/pull/14563/files#r39705270

Commits
-------

de41002 Fix potential access to undefined index
2015-10-11 10:02:03 +02:00
Fabien Potencier
c5966ba6b9 minor #16099 [Validator] Adds some missing validation messages translations for IT (micheleorselli)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16099).

Discussion
----------

[Validator] Adds some missing validation messages translations for IT

Commits
-------

4ac8ff7 adds validation messages missing italian translations
2015-10-11 09:51:52 +02:00
Michele Orselli
4ac8ff7e26 adds validation messages missing italian translations 2015-10-11 09:51:52 +02:00