Commit Graph

26286 Commits

Author SHA1 Message Date
Fabien Potencier
60b83dc2fe bug #18949 [3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar (romainneutron)
This PR was merged into the 3.1 branch.

Discussion
----------

[3.1][Security] Fix DebugAccessDecisionManager when object is not a scalar

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

Commits
-------

ff2d189 [Security] Fix DebugAccessDecisionManager when object is not a scalar
2016-06-03 07:23:02 +02:00
Fabien Potencier
af6ada5df8 bug #18959 [WebProfilerBundle] Fixed forwarded request data in templates (HeahDude)
This PR was merged into the 3.1 branch.

Discussion
----------

[WebProfilerBundle] Fixed forwarded request data in templates

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/issues/92
| License       | MIT
| Doc PR        | ~

Fixes a bug occurring  when the `FrameworkBundle` is not part of the dependencies (i.e using Silex).

Commits
-------

078c8b6 Fixed forwarded request data in templates
2016-06-03 07:16:26 +02:00
Jules Pietri
078c8b6b8a Fixed forwarded request data in templates 2016-06-03 02:46:43 +02:00
Romain Neutron
ff2d189f34 [Security] Fix DebugAccessDecisionManager when object is not a scalar 2016-06-02 16:45:44 +02:00
Fabien Potencier
d1b0301c71 bug #18943 [Ldap][Security] The Ldap user provider abstract service now has the correct number of arguments (csarrazi)
This PR was merged into the 3.1 branch.

Discussion
----------

[Ldap][Security] The Ldap user provider abstract service now has the correct number of arguments

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

Commits
-------

58996ac Fixed issue with missing argument in the abstract service definition for the ldap user provider
2016-06-01 21:56:09 +02:00
Charles Sarrazin
58996ac0bf Fixed issue with missing argument in the abstract service definition for the ldap user provider 2016-06-01 21:35:13 +02:00
Fabien Potencier
c7f1f7810c bug #18925 [Console] Fix BC break introduced by #18101 (dunglas)
This PR was squashed before being merged into the 3.1 branch (closes #18925).

Discussion
----------

[Console] Fix BC break introduced by #18101

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | https://github.com/symfony/symfony/pull/18101#issuecomment-222736460
| License       | MIT
| Doc PR        | n/a

* [x] Fix tests

Commits
-------

7a5a139 [Console] Fix BC break introduced by #18101
2016-06-01 08:04:30 +02:00
Kévin Dunglas
7a5a139135 [Console] Fix BC break introduced by #18101 2016-06-01 08:04:28 +02:00
Fabien Potencier
44f5283a21 minor #18928 add missing hint for vote() argument type (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

add missing hint for vote() argument type

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

This somehow got lost when the `3.0` branch was merged up.

Commits
-------

d14f0bf add missing hint for vote() argument type
2016-06-01 07:48:53 +02:00
Christian Flothmann
d14f0bf71f add missing hint for vote() argument type 2016-05-31 21:27:35 +02:00
Christophe Coevoet
691f19ff34 minor #18914 [#18838] add a test to avoid regressions (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[#18838] add a test to avoid regressions

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

Commits
-------

240cf0a [#18838] add a test to avoid regressions
2016-05-30 10:42:44 +02:00
Christian Flothmann
240cf0aaa8 [#18838] add a test to avoid regressions 2016-05-30 10:23:04 +02:00
Fabien Potencier
76e30a9881 bumped Symfony version to 3.1.1 2016-05-30 09:57:32 +02:00
Fabien Potencier
e71d4713c5 Merge pull request #18913 from fabpot/release-3.1.0
released v3.1.0
2016-05-30 09:24:54 +02:00
Fabien Potencier
e62f832521 updated VERSION for 3.1.0 2016-05-30 09:24:26 +02:00
Fabien Potencier
3dce1d40d5 updated CHANGELOG for 3.1.0 2016-05-30 09:24:18 +02:00
Fabien Potencier
73ca90db53 Merge branch '3.0' into 3.1
* 3.0:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:39 +02:00
Fabien Potencier
7b7c9b86a1 Merge branch '2.8' into 3.0
* 2.8:
  [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:58:27 +02:00
Fabien Potencier
e617502ba2 Merge branch '2.7' into 2.8
* 2.7:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:57:11 +02:00
Fabien Potencier
00763f6e41 Merge branch '2.3' into 2.7
* 2.3:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:56:59 +02:00
Fabien Potencier
dfc0c815e8 bug #18889 [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments

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

Pointed in https://github.com/symfony/symfony/issues/18564#issuecomment-210861051.

Very-long-line comment:
```php
SymfonyStyle::comment('Lorem ipsum ...');
```

Before:
![](http://image.prntscr.com/image/9190081d7fd740a89d17a7247dbbb244.png)

After:
![](http://image.prntscr.com/image/109c8c19c1574172bc22199ac90b6dd6.png)

Multi-line comment:
```php
SymfonyStyle::comment(['Lorem ipsum...', 'Lorem ipsum...']);
```

Before:
![](http://image.prntscr.com/image/24228f7e89e647b3a5d66fd83c7216cd.png)

After:
![](http://image.prntscr.com/image/fe9320369fad45acab92564f0e5de344.png)

Commits
-------

1c94fea [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
2016-05-30 08:56:30 +02:00
Robin Chalas
1c94fea42f [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
CS Fixes

Add tests

Add docblock

Fix side effect on FrameworkBundle tests

Remove useless '\n' from TextDescriptor since comments are block
2016-05-29 20:12:27 +02:00
Fabien Potencier
ab621ee574 bug #18907 [Routing] Fix the annotation loader taking a class constant as a beginning of a class name (jakzal, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix the annotation loader taking a class constant as a beginning of a class name

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

Code copy/pasted from ClassMapGenerator.php

Commits
-------

8d4f35d [Routing] Finish annotation loader taking a class constant as a beginning of a class name
43c7f9b [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-29 18:07:21 +02:00
Nicolas Grekas
8d4f35d12c [Routing] Finish annotation loader taking a class constant as a beginning of a class name 2016-05-29 12:13:06 +02:00
Nicolas Grekas
8c65c0e6ec Merge branch '3.0' into 3.1
* 3.0:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:31 +02:00
Nicolas Grekas
0929c7b91c Merge branch '2.8' into 3.0
* 2.8:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:50:11 +02:00
Nicolas Grekas
56b5f4196b Merge branch '2.7' into 2.8
* 2.7:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:49:47 +02:00
Nicolas Grekas
a350459d70 Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Fix for PHP 7.0.7

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-05-29 11:49:32 +02:00
Nicolas Grekas
b576fe1b85 minor #18906 [PropertyAccess] Fix for PHP 7.0.7 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Fix for PHP 7.0.7

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

This is what break travis currently.
See https://3v4l.org/r37rY

Commits
-------

a125af7 [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:47:26 +02:00
Nicolas Grekas
a125af74f8 [PropertyAccess] Fix for PHP 7.0.7 2016-05-29 11:41:46 +02:00
Christian Flothmann
922f1b0e60 bug #18899 [Yaml] search for colons in strings only (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[Yaml] search for colons in strings only

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

Since the parser is able to return `\DateTime` instances when the
`Yaml::PARSE_DATETIME` flag is passed, we need to ensure that the parsed
value actually is a string before passing the parsed value to string
functions.

Commits
-------

0ea2228 [Yaml] search for colons in strings only
2016-05-28 18:37:43 +02:00
Christian Flothmann
0ea2228228 [Yaml] search for colons in strings only
Since the parser is able to return `\DateTime` instances when the
`Yaml::PARSE_DATETIME` flag is passed, we need to ensure that the parsed
value actually is a string before passing the parsed value to string
functions.
2016-05-26 23:46:24 +02:00
Fabien Potencier
91a4de32c3 bumped Symfony version to 3.1.0 2016-05-26 15:07:51 +02:00
Fabien Potencier
52f75d852f Merge pull request #18885 from fabpot/release-3.1.0-RC1
released v3.1.0-RC1
2016-05-26 10:31:29 +02:00
Fabien Potencier
ebcbca0ba2 updated VERSION for 3.1.0-RC1 2016-05-26 10:31:07 +02:00
Fabien Potencier
73914a391e updated CHANGELOG for 3.1.0-RC1 2016-05-26 10:30:54 +02:00
Fabien Potencier
af79ff69bc Merge branch '3.0' into 3.1
* 3.0:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:36 +02:00
Fabien Potencier
ee4b4aeedc Merge branch '2.8' into 3.0
* 2.8:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:30 +02:00
Fabien Potencier
fc32e6a794 Merge branch '2.7' into 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:20 +02:00
Fabien Potencier
a842b97087 fixed PHP 5.3 compat in tests 2016-05-26 10:21:12 +02:00
Fabien Potencier
defe88fee1 Merge branch '3.0' into 3.1
* 3.0:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:35 +02:00
Fabien Potencier
afece71f7c Merge branch '2.8' into 3.0
* 2.8:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:28 +02:00
Fabien Potencier
1567ce6d9e Merge branch '2.7' int pusto 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:20 +02:00
Fabien Potencier
557bc51c5b Merge branch '2.3' into 2.7
* 2.3:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:14 +02:00
Fabien Potencier
c59a3da606 fixed PHP 5.3 compat in tests 2016-05-26 10:04:58 +02:00
Fabien Potencier
c968257472 Merge branch '3.0' into 3.1
* 3.0:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:52 +02:00
Fabien Potencier
26f2c8718e Merge branch '2.8' into 3.0
* 2.8:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:45 +02:00
Fabien Potencier
e89e1656b9 Merge branch '2.7' into 2.8
* 2.7:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:38 +02:00
Fabien Potencier
13394f81f7 Merge branch '2.3' into 2.7
* 2.3:
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
2016-05-26 09:56:29 +02:00
Fabien Potencier
6f7ed8c316 minor #18878 [Serializer][#18837] adding a test (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[Serializer][#18837] adding a test

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

Commits
-------

37cacc4 [Serializer][#18837] adding a test
2016-05-26 09:55:01 +02:00