Commit Graph

32928 Commits

Author SHA1 Message Date
Nicolas Grekas
f2fc7bfccc Merge branch '2.8' into 3.3
* 2.8:
  Remove function_exists(__phpunit_run_isolated_test) checks
2017-11-19 21:07:30 +02:00
Nicolas Grekas
c23adaec43 Merge branch '2.7' into 2.8
* 2.7:
  Remove function_exists(__phpunit_run_isolated_test) checks
2017-11-19 21:05:05 +02:00
Nicolas Grekas
4c5d9cf06b minor #25034 Remove function_exists(__phpunit_run_isolated_test) checks (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Remove function_exists(__phpunit_run_isolated_test) checks

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

As now permitted by #25032

Commits
-------

a512217 Remove function_exists(__phpunit_run_isolated_test) checks
2017-11-19 21:01:54 +02:00
Nicolas Grekas
a512217431 Remove function_exists(__phpunit_run_isolated_test) checks 2017-11-19 20:49:57 +02:00
Nicolas Grekas
a3d398e825 Merge branch '2.8' into 3.3
* 2.8:
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  bumped Symfony version to 2.8.32
  bumped Symfony version to 2.7.39
  updated VERSION for 2.8.31
  updated CHANGELOG for 2.8.31
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  Fix ambiguous pattern
2017-11-19 20:40:28 +02:00
Nicolas Grekas
7215acb66f Merge branch '2.7' into 2.8
* 2.7:
  [SecurityBundle] Fix syntax error in test
  [Console] Remove remaining dead code
  bumped Symfony version to 2.7.39
  updated VERSION for 2.7.38
  updated CHANGELOG for 2.7.38
  Replace array|\Traversable by iterable
  Fix ambiguous pattern
2017-11-19 20:39:05 +02:00
Nicolas Grekas
146cefda2e bug #25032 [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit

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

It took me all the flight back from Cluj to figure out this is the only way to solve this nasty issue created by phpunit generating inlined `require_once` in the global scope for isolated tests.
This mechanism predates the autoloading mechanism, and it's behavior is just hardcoded.
Needs to be merged in 3.4, where the split container triggers this situation very quickly.

Will allow removing the `function_exists('__phpunit_run_isolated_test')` workarounds already in place in the code base (2.7 up to master.)

Commits
-------

0577d20 [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit
2017-11-19 19:34:10 +02:00
Nicolas Grekas
0577d20ade [Bridge\PhpUnit] Disable broken auto-require mechanism of phpunit 2017-11-19 19:07:02 +02:00
Amrouche Hamza
1f8db731a0
[Console] Fix global console flag when used in chain 2017-11-18 15:50:49 +02:00
Fabien Potencier
86986b41b0 minor #24969 Replace array|\Traversable by iterable (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

Replace array|\Traversable by iterable

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Replace `array|\Traversable` by `iterable`, favoring pure API (or less mixed at least :)) and be clear whenever phpdoc is replaced.

https://secure.php.net/manual/en/language.types.iterable.php

Commits
-------

278088931b Replace array|\Traversable by iterable
2017-11-18 09:48:31 +02:00
Fabien Potencier
9447016979 minor #25008 [Console] Remove remaining dead code (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Remove remaining dead code

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

Since they are always re-thrown, no need to catch `\Error` instances at all.

Commits
-------

3822c07f65 [Console] Remove remaining dead code
2017-11-18 09:40:15 +02:00
Fabien Potencier
c247717a9f minor #25009 [SecurityBundle] Fix syntax error in test (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[SecurityBundle] Fix syntax error in test

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

Should make appveyor green.

Commits
-------

20f9b75857 [SecurityBundle] Fix syntax error in test
2017-11-18 09:38:33 +02:00
Robin Chalas
20f9b75857 [SecurityBundle] Fix syntax error in test 2017-11-17 15:26:00 +01:00
Christophe Coevoet
11d79cbb12 bug #24956 Fix ambiguous pattern (weltling)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix ambiguous pattern

[Validator][Constraints][UrlValidator] Fix domain name pattern.

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

`\pS` is a unicode character class, `\pS-\.` pretends to be a range which is not. This pattern fails with PCRE2.

Thanks.

Commits
-------

059f59a106 Fix ambiguous pattern
2017-11-17 14:57:47 +01:00
Robin Chalas
3822c07f65 [Console] Remove remaining dead code 2017-11-17 13:59:02 +01:00
Fabien Potencier
3b6c22e86a bumped Symfony version to 3.3.14 2017-11-17 07:39:26 +01:00
Fabien Potencier
58352f2f02 bumped Symfony version to 2.8.32 2017-11-17 07:34:32 +01:00
Fabien Potencier
c963178206 bumped Symfony version to 2.7.39 2017-11-17 07:26:23 +01:00
Fabien Potencier
9b02263407
Merge pull request #25002 from fabpot/release-3.3.13
released v3.3.13
2017-11-16 19:15:01 +01:00
Fabien Potencier
c41da93c91 updated VERSION for 3.3.13 2017-11-16 19:14:43 +01:00
Fabien Potencier
cf140018b2 updated CHANGELOG for 3.3.13 2017-11-16 19:14:38 +01:00
Fabien Potencier
fa9fa59d7b
Merge pull request #25000 from fabpot/release-2.8.31
released v2.8.31
2017-11-16 18:44:10 +01:00
Fabien Potencier
762b8d85f3 updated VERSION for 2.8.31 2017-11-16 18:43:55 +01:00
Fabien Potencier
b2febb4688 updated CHANGELOG for 2.8.31 2017-11-16 18:43:51 +01:00
Nicolas Grekas
64225778e6 fix merge 2017-11-16 18:56:40 +02:00
Nicolas Grekas
45a0cd93fc fix deps=low (bis) 2017-11-16 18:31:29 +02:00
Fabien Potencier
b95964ae88
Merge pull request #24997 from fabpot/release-2.7.38
released v2.7.38
2017-11-16 17:26:07 +01:00
Fabien Potencier
330c5e5577 updated VERSION for 2.7.38 2017-11-16 17:24:22 +01:00
Fabien Potencier
ddffd6163f updated CHANGELOG for 2.7.38 2017-11-16 17:24:08 +01:00
Nicolas Grekas
e4f00cc6be Merge branch '2.8' into 3.3
* 2.8:
  fix deps=low
2017-11-16 18:14:18 +02:00
Nicolas Grekas
1c026e0a5b Merge branch '2.7' into 2.8
* 2.7:
  fix deps=low
2017-11-16 18:08:43 +02:00
Nicolas Grekas
7993ce57a4 fix deps=low 2017-11-16 17:51:27 +02:00
Nicolas Grekas
ea2447f0b8 Merge branch '2.8' into 3.3
* 2.8:
  fixed CS
  fixed CS
  [Security] Namespace generated CSRF tokens depending of the current scheme
  ensure that submitted data are uploaded files
  [Console] remove dead code
  bumped Symfony version to 2.8.31
  updated VERSION for 2.8.30
  updated CHANGELOG for 2.8.30
  bumped Symfony version to 2.7.38
  updated VERSION for 2.7.37
  updated CHANGELOG for 2.7.37
  [Security] Validate redirect targets using the session cookie domain
  prevent bundle readers from breaking out of paths
2017-11-16 17:24:32 +02:00
Nicolas Grekas
44c5d7f405 Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  fixed CS
  [Security] Namespace generated CSRF tokens depending of the current scheme
  ensure that submitted data are uploaded files
  [Console] remove dead code
  bumped Symfony version to 2.7.38
  updated VERSION for 2.7.37
  updated CHANGELOG for 2.7.37
  [Security] Validate redirect targets using the session cookie domain
  prevent bundle readers from breaking out of paths
2017-11-16 17:20:19 +02:00
Fabien Potencier
b67b807164 fixed CS 2017-11-16 17:17:32 +02:00
Fabien Potencier
4d288439bc security #24995 Validate redirect targets using the session cookie domain (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Validate redirect targets using the session cookie domain

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

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

52b06f1c21 [Security] Validate redirect targets using the session cookie domain
2017-11-16 17:16:56 +02:00
Fabien Potencier
097ce09140 security #24994 Prevent bundle readers from breaking out of paths (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

Prevent bundle readers from breaking out of paths

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

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

c8f9f916b4 prevent bundle readers from breaking out of paths
2017-11-16 17:15:44 +02:00
Fabien Potencier
0a1ea85998 security #24993 Ensure that submitted data are uploaded files (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

Ensure that submitted data are uploaded files

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

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

f9e210cc7b ensure that submitted data are uploaded files
2017-11-16 17:14:44 +02:00
Fabien Potencier
07fc11cd65 fixed CS 2017-11-16 17:13:44 +02:00
Fabien Potencier
b4dbdd7cd8 security #24992 Namespace generated CSRF tokens depending of the current scheme (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

Namespace generated CSRF tokens depending of the current scheme

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

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

cdb4271975 [Security] Namespace generated CSRF tokens depending of the current scheme
2017-11-16 17:12:07 +02:00
Kévin Dunglas
cdb4271975
[Security] Namespace generated CSRF tokens depending of the current scheme 2017-11-16 15:51:08 +02:00
Roland Franssen
278088931b Replace array|\Traversable by iterable 2017-11-16 13:37:27 +01:00
Christian Flothmann
f9e210cc7b ensure that submitted data are uploaded files 2017-11-16 09:58:50 +01:00
Robin Chalas
2c2253df8c minor #24962 [Console] remove dead code (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] remove dead code

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Part of #24961 for 2.7

Commits
-------

65f2b13 [Console] remove dead code
2017-11-15 10:26:39 +01:00
Tobias Schultze
65f2b13e6b [Console] remove dead code 2017-11-13 22:35:01 +01:00
Fabien Potencier
73ef74aa8c bumped Symfony version to 3.3.13 2017-11-13 11:43:22 -08:00
Fabien Potencier
1452970fc2
Merge pull request #24958 from fabpot/release-3.3.12
released v3.3.12
2017-11-13 11:37:31 -08:00
Fabien Potencier
63f69f0c89 updated VERSION for 3.3.12 2017-11-13 11:37:21 -08:00
Fabien Potencier
7c9c05371c updated CHANGELOG for 3.3.12 2017-11-13 11:37:14 -08:00
Fabien Potencier
db6da75a8d bumped Symfony version to 2.8.31 2017-11-13 11:36:26 -08:00