Commit Graph

24235 Commits

Author SHA1 Message Date
Fabien Potencier
8956ed50a4 Merge pull request #17143 from fabpot/release-2.8.1
released v2.8.1
2015-12-26 16:56:52 +01:00
Fabien Potencier
156e801303 updated VERSION for 2.8.1 2015-12-26 16:56:42 +01:00
Fabien Potencier
8b4a252d90 updated CHANGELOG for 2.8.1 2015-12-26 16:56:37 +01:00
Fabien Potencier
d222bd3213 bumped Symfony version to 2.7.9 2015-12-26 16:49:24 +01:00
Fabien Potencier
ad264021e4 Merge pull request #17142 from fabpot/release-2.7.8
released v2.7.8
2015-12-26 16:02:06 +01:00
Fabien Potencier
e680b91f6e updated VERSION for 2.7.8 2015-12-26 16:01:55 +01:00
Fabien Potencier
7fa9f72574 updated CHANGELOG for 2.7.8 2015-12-26 16:01:50 +01:00
Fabien Potencier
f409dd2589 bumped Symfony version to 2.3.37 2015-12-26 15:52:28 +01:00
Fabien Potencier
b72ca4bdc7 Merge pull request #17141 from fabpot/release-2.3.36
released v2.3.36
2015-12-26 15:08:08 +01:00
Fabien Potencier
b7362dc730 updated VERSION for 2.3.36 2015-12-26 15:07:57 +01:00
Fabien Potencier
2f21e288db update CONTRIBUTORS for 2.3.36 2015-12-26 15:07:37 +01:00
Fabien Potencier
3ebbb15d4e updated CHANGELOG for 2.3.36 2015-12-26 15:07:27 +01:00
Fabien Potencier
778884acdd Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
This reverts commit e60889ac4d.
2015-12-26 15:05:15 +01:00
Fabien Potencier
3c907cebed Merge branch '2.3' into 2.7
* 2.3:
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
2015-12-26 15:02:48 +01:00
Fabien Potencier
e60889ac4d Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
This reverts commit af3f4eaa2b, reversing
changes made to 021ab8a7b3.
2015-12-26 15:02:40 +01:00
Fabien Potencier
a9fe244b0b fixed previous merge 2015-12-26 14:42:31 +01:00
Fabien Potencier
77f37fb077 Merge branch '2.8' into 3.0
* 2.8:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:39:53 +01:00
Fabien Potencier
27129228eb Merge branch '2.7' into 2.8
* 2.7:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Also transform inline mappings to objects
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Security] Run tests on all PHP versions
  [Serializer] Make metadata interfaces internal
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:56 +01:00
Fabien Potencier
97cf53f9bd Merge branch '2.3' into 2.7
* 2.3:
  [2.7] Fixed flatten exception recursion with errors
  Embedded identifier support
  Change the ExtensionInterface load method definition to bo identical to the documentation.
  add and correct armenian translations
  [Config] Fix array sort on normalization in edge case
  [Yaml] fix indented line handling in folded blocks
  improve BrowserKit test coverage p1
2015-12-26 14:37:43 +01:00
Fabien Potencier
7660fb8c89 bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fix indented line handling in folded blocks

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

Commits
-------

756834c [Yaml] fix indented line handling in folded blocks
2015-12-26 13:21:40 +01:00
Fabien Potencier
af3f4eaa2b bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #17052).

Discussion
----------

[2.7] Fixed flatten exception recursion with errors

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

Consider the following code:

```php
$error = new ParseError();

$exception = new RuntimeException($error->getMessage(), $error->getCode(), $error);

$flat = new Symfony\Component\Debug\Exception\FlattenException($exception);
```

Without this fix, that code is broken.

You'll end up with something like this:

```
FatalThrowableError in FlattenException.php line 76:
Type error: Argument 1 passed to Symfony\Component\Debug\Exception\FlattenException::create() must be an instance of Exception, instance of ParseError given
```

---

I came across this error issue in https://github.com/laravel/framework/issues/11329.

Commits
-------

2b0721d [2.7] Fixed flatten exception recursion with errors
2015-12-26 13:17:23 +01:00
Graham Campbell
2b0721d0e4 [2.7] Fixed flatten exception recursion with errors 2015-12-26 13:17:22 +01:00
Fabien Potencier
021ab8a7b3 bug #16826 Embedded identifier support (mihai-stancu)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16826).

Discussion
----------

Embedded identifier support

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

If you define your entity identifier using an embeddable class the identifier name will contain period symbols in it such as `id.value` which will generate a syntax error in the DQL lexer because parameter names are not allowed to contain period symbols.

Example to reproduce described bug:

```php
/**
 * @ORM\Embeddable
 */
class Identifier {
    /**
     * @ORM\Column(type="integer")
     */
    protected $value;
}

/**
 * @ORM\Entity
 */
class Entity {
    /**
     * @ORM\Id @ORM\Embedded(class="Identifier")
     */
    protected $id;
}
```

Commits
-------

38fdda6 Embedded identifier support
2015-12-26 13:11:49 +01:00
Mihai Stancu
38fdda669f Embedded identifier support 2015-12-26 13:11:49 +01:00
Fabien Potencier
5fa5c874a0 bug #17079 Also transform inline mappings to objects (WouterJ)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #17079).

Discussion
----------

Also transform inline mappings to objects

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

`$objectForMapping` was only applied to inlined mappings. It should be applied for multi-line mappings as well.

Commits
-------

61b863b Also transform inline mappings to objects
2015-12-26 13:08:47 +01:00
WouterJ
61b863b7ba Also transform inline mappings to objects 2015-12-26 13:08:46 +01:00
Fabien Potencier
494b4a466d minor #17114 [Serializer] Make metadata interfaces internal (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Make metadata interfaces internal

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

Introducing such interfaces was a (my) mistake. Serializer metadata are value objects. Nobody will (nor should) implement these interfaces. Composition is better for "extending" metadata.

They were not marked as `@api` and should now be marked as `@internal` (or even deprecated but it will cause some maintenance headaches).

Commits
-------

3f6cfcd [Serializer] Make metadata interfaces internal
2015-12-26 13:07:05 +01:00
Fabien Potencier
f24690e493 bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Fix array sort on normalization in edge case

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

Commits
-------

eca41a8 [Config] Fix array sort on normalization in edge case
2015-12-26 13:02:10 +01:00
Fabien Potencier
38d4354e3d minor #17131 [DependencyInjection] Change the ExtensionInterface load method definition (mmarchois)
This PR was submitted for the 3.0 branch but it was merged into the 2.3 branch instead (closes #17131).

Discussion
----------

[DependencyInjection] Change the ExtensionInterface load method definition

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5988

This PR change the `Symfony\Component\DependencyInjection\Extension\ExtensionInterface` load method definition to be identical to the documentation :
`public function load(array $configs, ContainerBuilder $container);`

Commits
-------

85c271b Change the ExtensionInterface load method definition to bo identical to the documentation.
2015-12-26 13:00:54 +01:00
Mathieu MARCHOIS
85c271b7a2 Change the ExtensionInterface load method definition to bo identical to the documentation. 2015-12-26 13:00:54 +01:00
Fabien Potencier
e6d5de5dd3 minor #16945 add and correct armenian translations (azatyan)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16945).

Discussion
----------

add and correct armenian translations

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

Commits
-------

54e6fb4 add and correct armenian translations
2015-12-26 12:56:36 +01:00
Tigran Azatyan
54e6fb4911 add and correct armenian translations 2015-12-26 12:56:14 +01:00
Romain Neutron
eca41a8fbf [Config] Fix array sort on normalization in edge case 2015-12-24 14:08:45 +01:00
Tobias Schultze
45a006046d minor #17069 improve BrowserKit test coverage p1 (eventhorizonpl)
This PR was merged into the 2.3 branch.

Discussion
----------

improve BrowserKit test coverage p1

Hi,

This PR improves BrowserKit test coverage.

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

I rebased previous PR https://github.com/symfony/symfony/pull/16549 to 2.3

Commits
-------

0261b48 improve BrowserKit test coverage p1
2015-12-24 02:02:08 +01:00
Tobias Schultze
1230eabe9a minor #17126 [Security] Run tests on all PHP versions (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Run tests on all PHP versions

Symfony 2.7 supports PHP >= 5.3.9. Since #17073 was merged to 2.7 now, we need to remove the checks for 5.3.7 again.

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

Commits
-------

4bec980 [Security] Run tests on all PHP versions
2015-12-24 01:59:57 +01:00
Jakub Zalas
4bec98000f [Security] Run tests on all PHP versions
Symfony 2.7 supports PHP >= 5.3.9
2015-12-23 19:13:52 +01:00
Jakub Zalas
09efd0666b feature #17035 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object (EdgarPE)
This PR was squashed before being merged into the 2.8 branch (closes #17035).

Discussion
----------

[DomCrawler] Revert previous restriction, allow selection of every DOMNode object

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes, revert to previous behaviour
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #16933
| License       | MIT
| Doc PR        |

This is a backport of PR https://github.com/symfony/symfony/pull/17021

Commits
-------

d2872a3 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object
2015-12-23 18:17:26 +01:00
EdgarPE
d2872a3189 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object 2015-12-23 18:16:29 +01:00
Nicolas Grekas
46c0a6afb4 Merge branch '2.8' into 3.0
* 2.8:
  [appveyor] Exit with failing status code
2015-12-23 16:35:39 +01:00
Nicolas Grekas
9d5bd2a3cd Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Exit with failing status code
2015-12-23 16:34:47 +01:00
Nicolas Grekas
90dd3fb6b9 Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Exit with failing status code
2015-12-23 16:34:07 +01:00
Nicolas Grekas
e625f1bb27 minor #17121 [Console][2.7] Fix merge #17040 (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console][2.7] Fix merge #17040

| Q             | A
| ------------- | ---
| Fixed tickets | 6a92f4e03f (commitcomment-15080872)
| License       | MIT

This change should not be merged in upper branches.

Commits
-------

211d589 [Console][2.7] Fix merge #17040
2015-12-23 16:33:43 +01:00
Nicolas Grekas
2f08b28a20 minor #17117 [appveyor] Exit with failing status code (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Exit with failing status code

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

[Sometimes](https://ci.appveyor.com/project/fabpot/symfony/build/1.0.4272#L1103), tests fail on appveyor and I'd like to see the exit code. This does it.

Commits
-------

a6cfff5 [appveyor] Exit with failing status code
2015-12-23 16:06:36 +01:00
Maxime Steinhausser
211d58956f [Console][2.7] Fix merge #17040 2015-12-23 12:17:38 +01:00
Nicolas Grekas
f72f2f01ea Merge branch '2.8' into 3.0
* 2.8:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:04:02 +01:00
Nicolas Grekas
b7d18f9309 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:46 +01:00
Nicolas Grekas
cd94014b07 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:39 +01:00
Nicolas Grekas
774081cc60 minor #17118 [Process] Fix the fix for --enable-sigchild php (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix the fix for --enable-sigchild php

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

https://travis-ci.org/symfony/symfony/jobs/98471329#L2685
https://travis-ci.org/symfony/symfony/jobs/98470780#L2689

Commits
-------

088fcfe [Process] Fix the fix for --enable-sigchild php
2015-12-23 12:03:18 +01:00
Nicolas Grekas
088fcfe093 [Process] Fix the fix for --enable-sigchild php 2015-12-23 12:02:45 +01:00
Nicolas Grekas
a6cfff5570 [appveyor] Exit with failing status code 2015-12-23 09:59:09 +01:00