Commit Graph

23293 Commits

Author SHA1 Message Date
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 77fcaf4b9a minor #16209 [3.0][appveyor] load apcu and memcache (nicolas-grekas)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[3.0][appveyor] load apcu and memcache

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

Commits
-------

c401e2a [3.0][appveyor] load apcu and memcache
2015-10-12 14:23:47 +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 c401e2af48 [3.0][appveyor] load apcu and memcache 2015-10-12 13:42:52 +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 5dbf6bc9b5 [Yaml] removed parsing of non-escaped backslash in a double-quoted string 2015-10-12 13:09:16 +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 133bd0a274 Merge branch '2.8'
* 2.8:
  [Yaml] deprecated non-escaped \ in double-quoted strings when parsing
  removed wrong dep
  [EventDispatcher] added EventDispatcher::getListenerPriority()
2015-10-12 12:22:36 +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 5b678192af Merge branch '2.8'
* 2.8:
  Fix merge
  [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
  Rename CollectionType options for entries

Conflicts:
	appveyor.yml
	src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
	src/Symfony/Component/Console/Helper/ProgressBar.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
2015-10-12 11:38:36 +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
Nicolas Grekas 66a60f7d91 Merge branch '2.8'
* 2.8:
  [PhpUnit] Auto-register SymfonyTestsListener
  [phpunit] Upgrade when a change is detected and when install subcommand is used
  [Filesystem] Fix test on Windows
  Fix merge
  [HttpFoundation] Extend ClockMock to session storage tests
  [Process] Don't use @requires on abstract class
  [VarDumper] Fix wordwrap with Bootstrap
  Fix the BC layer for the key->secret renaming for remember_me
  Fix potential access to undefined index

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
	src/Symfony/Component/Locale/phpunit.xml.dist
2015-10-11 11:14:55 +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
Fabien Potencier e651da4e6a [Console] fixed progress bar format on edge cases 2015-10-11 09:41:52 +02:00
Nicolas Grekas cfbda28e21 Merge branch '2.7' into 2.8
* 2.7:
  [phpunit] Upgrade when a change is detected and when install subcommand is used
2015-10-11 09:37:21 +02:00
Nicolas Grekas e49fa27a14 Merge branch '2.3' into 2.7
* 2.3:
  [phpunit] Upgrade when a change is detected and when install subcommand is used
2015-10-11 09:37:07 +02:00
Nicolas Grekas 47f09d808a minor #16195 [phpunit] Upgrade when a change is detected and when install subcommand is used (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[phpunit] Upgrade when a change is detected and when install subcommand is used

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

When a change is merged in our local ./phpunit script, this will upgrade already installed ones.

Commits
-------

31fb362 [phpunit] Upgrade when a change is detected and when install subcommand is used
2015-10-11 09:36:48 +02:00
Viacheslav Sychov 3cbfa63d05 fix bug with set max count, by start method in progress bar 2015-10-11 09:16:20 +02:00
Nicolas Grekas 31fb362a08 [phpunit] Upgrade when a change is detected and when install subcommand is used 2015-10-11 09:13:05 +02:00
Fabien Potencier f5da7aa71e bug #16176 Fix the BC layer for the key->secret renaming for remember_me (stof)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix the BC layer for the key->secret renaming for remember_me

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

There was a mistake in https://github.com/symfony/symfony/pull/15141 removing the configuration entirely.

Commits
-------

f52b3a0 Fix the BC layer for the key->secret renaming for remember_me
2015-10-11 09:05:55 +02:00
Nicolas Grekas dac3c9e82d Merge branch '2.7' into 2.8
* 2.7:
  [Filesystem] Fix test on Windows
  Fix merge
  [HttpFoundation] Extend ClockMock to session storage tests
  [Process] Don't use @requires on abstract class
  [VarDumper] Fix wordwrap with Bootstrap
2015-10-10 20:55:46 +02:00
Nicolas Grekas c98ce2a6e3 bug #16183 [VarDumper] Fix wordwrap with Bootstrap (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix wordwrap with Bootstrap

| 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

Without this rule, there can be issues in the profiler bar and css from bootstrap (https://github.com/twbs/bootstrap/blob/v3.3.5/less/code.less#L47)

<img width="888" alt="screenshot 2015-10-09 a 18 09 28" src="https://cloud.githubusercontent.com/assets/2211145/10400156/645c77a6-6eb7-11e5-954b-f80c34b09f86.PNG">

Commits
-------

e448e1c [VarDumper] Fix wordwrap with Bootstrap
2015-10-10 19:33:17 +02:00
Nicolas Grekas 1903a6084c minor #16193 [Filesystem] Fix test on Windows (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Filesystem] Fix test on Windows

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

Commits
-------

57e253e [Filesystem] Fix test on Windows
2015-10-10 19:28:08 +02:00
Nicolas Grekas 57e253e92c [Filesystem] Fix test on Windows 2015-10-10 19:17:51 +02:00
Nicolas Grekas 0b59ba428d Fix merge 2015-10-10 18:58:46 +02:00