Commit Graph

26605 Commits

Author SHA1 Message Date
Fabien Potencier 76e30a9881 bumped Symfony version to 3.1.1 2016-05-30 09:57:32 +02:00
Nicolas Grekas b59664bc42 feature #18726 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ (teohhanhui)
This PR was submitted for the 2.8 branch but it was merged into the 3.2-dev branch instead (closes #18726).

Discussion
----------

[PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\

| 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        | symfony/symfony-docs#6546

See symfony/symfony-standard#969

Commits
-------

2630c13 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\
2016-05-30 09:55:31 +02:00
Teoh Han Hui 2630c13671 [PhpUnitBridge] Make ClockMock match namespaces that begin with Tests\\ 2016-05-30 09:55:22 +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 f0953dab1d Merge branch '3.1'
* 3.1:
  [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:55 +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
Maxime Steinhausser b78fff417b [Console] [SymfonyStyle] Replace long word wrapping test to directly test output 2016-05-29 22:16:56 +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
Christian Flothmann 142b1a4b46 force enabling the external XML entity loaders 2016-05-29 13:17:50 +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 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