Commit Graph

22937 Commits

Author SHA1 Message Date
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
Jáchym Toušek 4ad1e205b4 [Validator] Add expressionLanguage to ExpressionValidator constructor 2015-10-10 14:25:38 +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
Nicolas Grekas a6cb1c0d97 [FrameworkBundle] Replace PhpFileCache by FilesystemCache 2015-10-08 11:44:44 +02:00
Fabien Potencier 491c12c510 minor #16165 [FrameworkBundle] composer suggest fix (Miliooo)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] composer suggest fix

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | no
Since cache is now required (See https://github.com/symfony/symfony/pull/16159), it makes no sense to suggest it

Commits
-------

9786868 [FrameworkBundle] composer suggest fix
2015-10-07 17:35:44 +02:00
Michiel Boeckaert 97868686a8 [FrameworkBundle] composer suggest fix
| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [yes|no]
| BC breaks?    | [yes|no]

Since cache is now required, it makes no sense to suggest it
2015-10-07 17:07:32 +02:00
Fabien Potencier 2406cc7b43 bug #16095 [Console] Add additional ways to detect OS400 platform (johnkary)
This PR was squashed before being merged into the 2.3 branch (closes #16095).

Discussion
----------

[Console] Add additional ways to detect OS400 platform

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

This PR adds support for detecting the OS400 platform when the PHP function `php_uname()` is disabled. OS400 platform detection was added in #15058 to fix character encoding issues present on OS400. See that PR for more info.

This PR fixes regression introduced in #16053, which did not work on the IBM OS400 server I have access to. The constant `PHP_OS` being checked outputs "AIX" on my IBM OS400 server. I can't say for sure if it works on other IBM platforms... but I preserved this check just in case.

User @eloigranado [commented here](https://github.com/symfony/symfony/pull/15058#issuecomment-130743928) asking if we could switch to using `PHP_OS` constant instead of `php_uname()` because he claims some admins might "[hide] the exact kernel build from any attacker who discovers a remote PHP code execution vulnerability". I personally don't think we should accommodate this use case, but I was able to find alternate approaches.

### Why use case insensitive string matching stristr() instead of in_array()?

Here are the various outputs on my OS400 server:

    echo PHP_OS; // "AIX"
    echo getenv('OSTYPE'); // "os400"
    echo php_uname('s'); // "OS400"

So we have various case issues here, and possible blank values on platforms where OSTYPE var doesn't exist or php_uname() is disabled. Concatenating these optional values together delimited by ; then case-insensitive searching the string for "OS400" seemed like a fair compromise. I would've probably done `in_array()` if case wasn't an issue.

Commits
-------

96a4071 [Console] Add additional ways to detect OS400 platform
2015-10-07 14:28:08 +02:00
John Kary 96a4071891 [Console] Add additional ways to detect OS400 platform 2015-10-07 14:28:06 +02:00
Fabien Potencier a954fea00e minor #16155 Added more tests for PropertyAccess (pierredup)
This PR was merged into the 2.7 branch.

Discussion
----------

Added more tests for PropertyAccess

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

This is a follow up for [16090#issuecomment-145183635](https://github.com/symfony/symfony/pull/16090#issuecomment-145183635)

Commits
-------

378db75 Added more tests for PropertyAccess
2015-10-07 14:25:40 +02:00
Fabien Potencier bd9997e5e7 bug #15793 [Yaml] Allow tabs before comments at the end of a line (superdav42)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Allow tabs before comments at the end of a line

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

If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test.
Recently caused an odd and hard to find bug in our project.

See spec:
http://www.yaml.org/spec/1.2/spec.html#s-b-comment
http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line
http://www.yaml.org/spec/1.2/spec.html#s-white

This is a new PR replacing https://github.com/symfony/symfony/pull/15747

@fabpot

Commits
-------

d040be7 [Yaml] Allow tabs before comments at the end of a line
2015-10-07 12:28:58 +02:00
Nicolas Grekas 5326df084e cs fix 2015-10-07 12:24:12 +02:00
Fabien Potencier bd275a1b09 minor #16160 [FrameworkBundle] Deprecate the security.secure_random service (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Deprecate the security.secure_random service

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

Since the SecureRandom class and interface are already deprecated, so should be the service.

Commits
-------

8b55520 [FrameworkBundle] Deprecate the security.secure_random service
2015-10-07 12:14:23 +02:00
Nicolas Grekas 8b555209af [FrameworkBundle] Deprecate the security.secure_random service 2015-10-07 09:47:15 +02:00
Nicolas Grekas f35a0d202f Merge branch '2.7' into 2.8
Conflicts:
	appveyor.yml
2015-10-07 09:09:15 +02:00
Nicolas Grekas 508ff48999 minor #16159 [FraworkBundle] Add missing doctrine/cache to composer.json (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[FraworkBundle] Add missing doctrine/cache to composer.json

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

Commits
-------

f377643 [FraworkBundle] Add missing doctrine/cache to composer.json
2015-10-07 09:08:23 +02:00
Nicolas Grekas 481f39d9e6 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/Validator/Constraints/UrlValidator.php
2015-10-07 09:06:36 +02:00
Nicolas Grekas 65b9adc9c6 minor #16158 [ci] fix phpunit wrapper (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] fix phpunit wrapper

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

Our phpunit wrapper doing the root composer up was a mistake as it breaks testing deps=low.

Commits
-------

25fbcc3 [ci] fix phpunit wrapper
2015-10-07 09:04:51 +02:00
Nicolas Grekas f377643544 [FraworkBundle] Add missing doctrine/cache to composer.json 2015-10-07 08:40:17 +02:00
Nicolas Grekas 25fbcc3746 [ci] fix phpunit wrapper 2015-10-07 08:18:38 +02:00
David Stone d040be773c [Yaml] Allow tabs before comments at the end of a line
In Yaml 1.2 spec white space is space or tab
2015-10-06 20:53:26 -06:00
Pierre du Plessis 378db759e0 Added more tests for PropertyAccess 2015-10-07 01:02:43 +02:00
Fabien Potencier 141f9eb46d feature #15879 Deprecate the SecureRandom class (pierredup)
This PR was merged into the 2.8 branch.

Discussion
----------

Deprecate the SecureRandom class

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

Deprecate the `Symfony\Component\Security\Core\Util\SecureRandom` and encourage the usage of the `random_bytes` function instead

Commits
-------

f02973a Deprecate the SecureRandom class
2015-10-06 20:17:23 +02:00
Pierre du Plessis f02973acd8 Deprecate the SecureRandom class 2015-10-06 20:09:25 +02:00
Fabien Potencier 2dc28eaaf0 bug #16152 Fix URL validator failure with empty string (fabpot, bocharsky-bw)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix URL validator failure with empty string

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

Fix validator failure if method `__toString` of passed object return an empty string.

Commits
-------

e0910d9 Fix URL validator failure with empty string
0f61859 [Validator] added a failing test
2015-10-06 19:41:54 +02:00