Commit Graph

22758 Commits

Author SHA1 Message Date
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 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
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
Nicolas Grekas f0b03bd391 Merge branch '2.3' into 2.7
* 2.3:
  [HttpFoundation] Extend ClockMock to session storage tests
  [Process] Don't use @requires on abstract class

Conflicts:
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
2015-10-10 18:53:09 +02:00
Nicolas Grekas 1ee8d2b821 minor #16191 [HttpFoundation] Extend ClockMock to session storage tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Extend ClockMock to session storage 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
-------

93a06df [HttpFoundation] Extend ClockMock to session storage tests
2015-10-10 18:37:41 +02:00
Nicolas Grekas 93a06dffa1 [HttpFoundation] Extend ClockMock to session storage tests 2015-10-10 18:18:50 +02:00
Nicolas Grekas 803ff9faf3 minor #16192 [Process] Don't use @requires on abstract class (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Don't use @requires on abstract class

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

Commits
-------

23fc32f [Process] Don't use @requires on abstract class
2015-10-10 18:09:26 +02:00
Nicolas Grekas 23fc32f78f [Process] Don't use @requires on abstract class 2015-10-10 18:01:13 +02:00
WouterJ 942a2370c6 Rename CollectionType options for entries 2015-10-10 12:12:18 +02:00
Nicolas Grekas c8475c938d minor #16187 [2.8][tests] Use @requires annotation when possible (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8][tests] Use @requires annotation when possible

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

Commits
-------

814d961 [tests] Use @requires annotation when possible
2015-10-10 11:38:45 +02:00
Nicolas Grekas 58475a1812 Merge branch '2.7' into 2.8
* 2.7:
  Fix merge
2015-10-10 11:37:53 +02:00
Nicolas Grekas 553ac3a0a3 Fix merge 2015-10-10 11:37:42 +02:00
Nicolas Grekas 3ecf2062b8 Merge branch '2.7' into 2.8
* 2.7:
  [tests] Use @requires annotation when possible
  [tests] Use @requires annotation when possible
  [ci] Enable collecting and replaying skipped tests
  [Process] Workaround buggy PHP warning
  [Console] Add additional ways to detect OS400 platform
  [Yaml] Allow tabs before comments at the end of a line
  Added more tests for PropertyAccess

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/DebugBundle/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/composer.json
	src/Symfony/Component/Asset/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/composer.json
	src/Symfony/Component/Config/composer.json
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/CssSelector/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/ExpressionLanguage/composer.json
	src/Symfony/Component/Filesystem/composer.json
	src/Symfony/Component/Finder/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Locale/composer.json
	src/Symfony/Component/OptionsResolver/composer.json
	src/Symfony/Component/Process/composer.json
	src/Symfony/Component/PropertyAccess/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/Acl/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Stopwatch/composer.json
	src/Symfony/Component/Templating/composer.json
	src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
	src/Symfony/Component/VarDumper/composer.json
	src/Symfony/Component/Yaml/composer.json
2015-10-10 11:36:22 +02:00
Nicolas Grekas 52dbc3b7cc minor #16186 [2.7][tests] Use @requires annotation when possible (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][tests] Use @requires annotation when possible

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

Commits
-------

b028aea [tests] Use @requires annotation when possible
2015-10-10 11:27:33 +02:00
Nicolas Grekas 309ad43b71 Merge branch '2.3' into 2.7
* 2.3:
  [tests] Use @requires annotation when possible
  [ci] Enable collecting and replaying skipped tests
  [Process] Workaround buggy PHP warning
  [Console] Add additional ways to detect OS400 platform
  [Yaml] Allow tabs before comments at the end of a line

Conflicts:
	composer.json
	src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Asset/composer.json
	src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Templating/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
2015-10-10 11:26:25 +02:00
ogizanagi e448e1c6b3 [VarDumper] Fix wordwrap with Bootstrap 2015-10-10 11:16:06 +02:00
Nicolas Grekas 4c431d6c67 minor #16190 [ci] Enable collecting and replaying skipped tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Enable collecting and replaying skipped tests

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

Commits
-------

4032c88 [ci] Enable collecting and replaying skipped tests
2015-10-10 11:14:14 +02:00
Fabien Potencier 10389e353e feature #16189 [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests

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

Commits
-------

dd640f5 [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests
2015-10-10 11:09:57 +02:00
Fabien Potencier f9940f3285 minor #16185 [2.3][tests] Use @requires annotation when possible (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][tests] Use @requires annotation when possible

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

Commits
-------

4061d37 [tests] Use @requires annotation when possible
2015-10-10 11:06:16 +02:00
Nicolas Grekas b028aeaa04 [tests] Use @requires annotation when possible 2015-10-10 11:00:45 +02:00
Nicolas Grekas 4061d37e87 [tests] Use @requires annotation when possible 2015-10-10 10:57:40 +02:00
Nicolas Grekas dd640f52f7 [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests 2015-10-10 10:49:24 +02:00
Nicolas Grekas 4032c88a21 [ci] Enable collecting and replaying skipped tests 2015-10-10 10:46:02 +02:00
Nicolas Grekas 814d96165d [tests] Use @requires annotation when possible 2015-10-10 10:11:41 +02:00
Tobias Schultze 5206086266 bug #16182 [Process] Workaround buggy PHP warning (cbj4074)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16182).

Discussion
----------

[Process] Workaround buggy PHP warning

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

This temporary workaround is intended to address an uncaught exception that may occur, until https://bugs.php.net/bug.php?id=69240 is fixed.

Obviously the `@` operator is another option, but I'm erring towards the notion that the Symfony authors/maintainers may wish to implement more elegant exception-handling logic than simply using `@`.

Commits
-------

b1bd093 [Process] Workaround buggy PHP warning
2015-10-09 23:59:27 +02:00
Ben b1bd093f8a [Process] Workaround buggy PHP warning 2015-10-09 23:59:27 +02:00
Fabien Potencier 864a58faa3 bug #16173 [FrameworkBundle] Replace PhpFileCache by FilesystemCache (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Replace PhpFileCache by FilesystemCache

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

Commits
-------

a6cb1c0 [FrameworkBundle] Replace PhpFileCache by FilesystemCache
2015-10-08 22:24:56 +02:00
Christophe Coevoet f52b3a0a83 Fix the BC layer for the key->secret renaming for remember_me 2015-10-08 16:14:01 +02:00