Commit Graph

26538 Commits

Author SHA1 Message Date
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
bfdd905744 Merge branch '3.1'
* 3.1:
  [PropertyAccess] Fix for PHP 7.0.7
  [Yaml] search for colons in strings only
  bumped Symfony version to 3.1.0
  updated VERSION for 3.1.0-RC1
  updated CHANGELOG for 3.1.0-RC1
  fixed PHP 5.3 compat in tests
2016-05-29 11:50:57 +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
Piotr Stankowski
14bcd799c7 [Cache] Added PhpFilesAdapter 2016-05-29 11:12:17 +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
Nicolas Grekas
48710790af feature #18825 [Cache] Create NullAdapter to disable cache if needed (tgalopin)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Cache] Create NullAdapter to disable cache if needed

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

Tthis PR aims to implement a Symfony Cache Null adapter able to disable cache if needed (very useful in tests or in the case of the fallback of the OpCacheAdapter for instance).

This PR is required by https://github.com/symfony/symfony/pull/18823 and https://github.com/symfony/symfony/pull/18533

Commits
-------

0519d22 [Cache] Create NullAdapter to disable cache if needed
2016-05-26 17:18:31 +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
50427884b9 Merge branch '3.1'
* 3.1:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:40 +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
5f328e0915 Merge branch '3.1'
* 3.1:
  [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
  [Ldap] Fixed issue with Entry password attribute containing array of values and made password attribute configurable
  [Serializer][#18837] adding a test
  [Cache] Drop counting hit/miss in ProxyAdapter
  [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called
  [Serializer] ObjectNormalizer: add missing parameters
2016-05-26 09:56:59 +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
Fabien Potencier
71863eae1c bug #18879 [Console] SymfonyStyle: Align multi-line/very-long-line blocks (chalasr)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #18879).

Discussion
----------

[Console] SymfonyStyle: Align multi-line/very-long-line blocks

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

This PR makes all lines aligned in multi-line blocks.

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

Before:
![before-1](http://image.prntscr.com/image/d8443d3a85924a0182a62bd6d3dc1086.png)
After:
![after-1](http://image.prntscr.com/image/dbbdd275bff140bdad06de336f032ec1.png)

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

Before:
![before-2](http://image.prntscr.com/image/6d7c05b4ab3a42f0b0be652527aed7c8.png)
After:
![after-2](http://image.prntscr.com/image/bba017309f4a4dd09e0147d5917cb0ae.png)

Also @javiereguiluz pointed the case of `SymfonyStyle::comment()` in #18564, I needed to make it calling `SymfonyStyle::block()` with ` // ` as prefix to fit the first intention of this one.
So if this one is merged I'll propose the changes for comments in a second PR (out of this scope).

Commits
-------

963fe1d [Console] SymfonyStyle: Align multi-line/very-long-line blocks
2016-05-26 09:53:24 +02:00
Robin Chalas
963fe1d635 [Console] SymfonyStyle: Align multi-line/very-long-line blocks
Remove SymfonyStyle::comment() changes (out of scope)

CS Fixes

Add tests
2016-05-26 09:53:24 +02:00
Fabien Potencier
424141349b bug #18881 [Security][Ldap] Fixed issue with password attribute containing an array of values. (csarrazi)
This PR was merged into the 3.1 branch.

Discussion
----------

[Security][Ldap] Fixed issue with password attribute containing an array of values.

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

This PR fixes #18401, as well as other possible issues:
* First, the user provider no longer requires a password attribute by default. While this is not mandatory, it is more explicit to not set a password when using the `form_login_ldap` or `http_basic_ldap`, as these two providers don't use a password comparison mechanism, but `ldap_bind()` instead.
* Second, the attribute is now configurable. Some implementations actually use different properties to store the user's password attribute. This will enable some users to correctly work with specific configurations.
* Third, the user provider normalises the attribute array into a single string. Also, if the attribute has more than one value (which should not be possible), or if is not set, an exception will be thrown, with a clear error message.

Commits
-------

dbf45e4 [Ldap] Fixed issue with Entry password attribute containing array of values and made password attribute configurable
2016-05-26 09:52:05 +02:00
Fabien Potencier
60e6ccd702 bug #18864 [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut (peterrehm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #18864).

Discussion
----------

[Console][DX] Fixed ambiguous error message when using a duplicate option shortcut

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

I assume this should be merged into 2.3 as per @stof's comment.

There is a race condition when you run a command which has a duplicate option shortcut. Simply changing the order so that Options are merged before the Arguments solves that race condition.

````php
$this->setName('my:super:command')
->setAliases(['my:super:commandalias'])
->setDescription('Performs some irrelevant work.')
->addOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')
````

Gives the error message:

```
  [Symfony\Component\Console\Exception\LogicException]
  An argument with name "command" already exists.
```

This happens as the first time the definition is merged happens here:

https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Application.php#L820

As this throws an error here:

https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Command/Command.php#L309

The commans are merged but not the options.

Merging it then again when the command is run

https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Command/Command.php#L217

throws an error due to the duplicate argument as the arguments already have been merged. This time the error message is not surpressed and will confuse the user.

Changing the order should fix the issue for duplicate arguments as well as for duplicate options.

Commits
-------

7cb7655 [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
2016-05-26 09:43:26 +02:00
Peter Rehm
7cb76558ce [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut 2016-05-26 09:43:25 +02:00
Fabien Potencier
5dcbbd0e9c bug #18883 Fix js comment in profiler (linnaea)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix js comment in profiler

| 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        |

Single line comment introduced in #18413 causes the toolbar to fail to load with a syntax error.

Commits
-------

91a2f5d Fix js comment in profiler
2016-05-26 09:39:18 +02:00
Linnaea Von Lavia
91a2f5dea1 Fix js comment in profiler 2016-05-26 10:56:28 +08:00
Charles Sarrazin
dbf45e4a76 [Ldap] Fixed issue with Entry password attribute containing array of values and made password attribute configurable 2016-05-26 04:36:36 +02:00
Christian Flothmann
37cacc4874 [Serializer][#18837] adding a test 2016-05-25 22:21:27 +02:00
Fabien Potencier
4974a8b5f5 feature #18867 [Cache] Drop counting hit/miss in ProxyAdapter (nicolas-grekas)
This PR was merged into the 3.1 branch.

Discussion
----------

[Cache] Drop counting hit/miss in ProxyAdapter

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

We have no use case for these methods yet. Let's drop them and save some BC constraints.

Commits
-------

9461750 [Cache] Drop counting hit/miss in ProxyAdapter
2016-05-25 17:27:34 +02:00
Christophe Coevoet
93139f6f5d bug #18858 [Yaml] fix falsely triggered deprecation (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Yaml] fix falsely triggered deprecation

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/18785/files#r64390640
| License       | MIT
| Doc PR        |

Commits
-------

89dd69a [Yaml] fix falsely triggered deprecation
2016-05-25 14:43:00 +02:00
Titouan Galopin
0519d22e7e [Cache] Create NullAdapter to disable cache if needed 2016-05-25 13:35:08 +02:00
Nicolas Grekas
c2f3b1e9c9 feature #18675 [VarDumper] Add Redis caster (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[VarDumper] Add Redis caster

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

Helps working on Redis connections

Commits
-------

56ae8c8 [VarDumper] Add Redis caster
2016-05-25 10:18:05 +02:00
Nicolas Grekas
9461750bd0 [Cache] Drop counting hit/miss in ProxyAdapter 2016-05-25 09:47:04 +02:00
Francis Besset
0d14aac880 Removed UTC specification with timestamp 2016-05-24 22:23:23 +02:00
Christian Flothmann
89dd69ac27 [Yaml] fix falsely triggered deprecation 2016-05-24 20:14:09 +02:00
Fabien Potencier
7dc1491ec0 bug #18837 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called (dunglas)
This PR was submitted for the master branch but it was merged into the 3.1 branch instead (closes #18837).

Discussion
----------

[Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called

| 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
| Doc PR        | n/a

Please merge before the release of 3.1 (potential bug fix)

Commits
-------

29b4115 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called
2016-05-24 12:12:38 +02:00
Kévin Dunglas
29b4115d1a [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called 2016-05-24 12:12:38 +02:00