Commit Graph

32672 Commits

Author SHA1 Message Date
Nicolas Grekas
56f72d7f8f Merge branch '3.2' into 3.3
* 3.2:
  fixed bad merge
  [Cache] Handle APCu failures gracefully
  [FrameworkBundle] Do not remove files from assets dir
  bumped Symfony version to 3.2.11
  updated VERSION for 3.2.10
  updated CHANGELOG for 3.2.10
  bumped Symfony version to 2.8.24
  updated VERSION for 2.8.23
  updated CHANGELOG for 2.8.23
  bumped Symfony version to 2.7.31
  updated VERSION for 2.7.30
  update CONTRIBUTORS for 2.7.30
  updated CHANGELOG for 2.7.30
2017-07-05 09:39:29 +03:00
Fabien Potencier
8a7b7e4286 Merge branch '2.8' into 3.2
* 2.8:
  fixed bad merge
2017-07-05 09:34:04 +03:00
Fabien Potencier
d879eed12a fixed bad merge 2017-07-05 09:33:38 +03:00
Fabien Potencier
285a6ac36d Merge branch '2.8' into 3.2
* 2.8:
  [FrameworkBundle] Do not remove files from assets dir
  bumped Symfony version to 2.8.24
  updated VERSION for 2.8.23
  updated CHANGELOG for 2.8.23
  bumped Symfony version to 2.7.31
  updated VERSION for 2.7.30
  update CONTRIBUTORS for 2.7.30
  updated CHANGELOG for 2.7.30
2017-07-05 09:33:08 +03:00
Fabien Potencier
ecaae2368d Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Do not remove files from assets dir
  bumped Symfony version to 2.7.31
  updated VERSION for 2.7.30
  update CONTRIBUTORS for 2.7.30
  updated CHANGELOG for 2.7.30
2017-07-05 09:32:23 +03:00
Fabien Potencier
227b81d9f3 bug #23390 [Cache] Handle APCu failures gracefully (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[Cache] Handle APCu failures gracefully

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

When APCu memory is full, or when APCu is used in CLI but `apc.enable_cli` is off, it behaves in a special way that this PR now handles.
When `apc.enable_cli` is off, we also completely silence failures with a `NullLogger` - that's just noise and that happens a lot during warmups, when filling the seeding FilesystemAdapter cache in the chain.

Commits
-------

47020c4904 [Cache] Handle APCu failures gracefully
2017-07-05 09:22:22 +03:00
Dariusz
58ba4818a6 Fix indent of methods 2017-07-04 23:00:55 +02:00
Nicolas Grekas
47020c4904 [Cache] Handle APCu failures gracefully 2017-07-04 18:20:09 +03:00
Fabien Potencier
452c56a730 bug #23371 [FrameworkBundle] 3.3: Don't get() private services from debug:router (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] 3.3: Don't get() private services from debug:router

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #23366 <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Same as https://github.com/symfony/symfony/pull/23366 but another place exist in upper branches.

However, the original fix prevents using the proper name parser in case it was replaced 😕 .

Commits
-------

c75e486413 [FrameworkBundle] 3.3: Don't get() private services from debug:router
2017-07-04 16:03:51 +03:00
Robin Chalas
9737bcc024 [DoctrineBridge] Use normalizedIds for resetting entity manager services 2017-07-04 14:04:47 +02:00
Fabien Potencier
6298e69f29 bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Do not remove files from assets dir

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

The patch introduced in https://github.com/symfony/symfony/pull/23195 removes files from `web/bundles` (eg. `.gitignore`) which is unintentional I think.

Commits
-------

6ed9c8d8c5 [FrameworkBundle] Do not remove files from assets dir
2017-07-04 13:42:29 +03:00
Gábor Egyed
6ed9c8d8c5 [FrameworkBundle] Do not remove files from assets dir 2017-07-04 11:39:25 +02:00
Maxime Steinhausser
c75e486413 [FrameworkBundle] 3.3: Don't get() private services from debug:router 2017-07-04 09:43:54 +02:00
Fabien Potencier
5de56eba9a bumped Symfony version to 3.3.4 2017-07-04 09:15:40 +03:00
Fabien Potencier
098bb166d5 Merge pull request #23369 from fabpot/release-3.3.3
released v3.3.3
2017-07-04 09:03:16 +03:00
Fabien Potencier
5d8d746a10 updated VERSION for 3.3.3 2017-07-04 09:02:59 +03:00
Fabien Potencier
fcb6171d9e updated CHANGELOG for 3.3.3 2017-07-04 09:02:47 +03:00
Fabien Potencier
ddc9d2e313 bumped Symfony version to 3.2.11 2017-07-04 09:01:46 +03:00
Fabien Potencier
bc4a6030c6 Merge pull request #23368 from fabpot/release-3.2.10
released v3.2.10
2017-07-04 08:45:27 +03:00
Fabien Potencier
af3fcc11ed updated VERSION for 3.2.10 2017-07-04 08:45:03 +03:00
Fabien Potencier
e87e64e5e1 updated CHANGELOG for 3.2.10 2017-07-04 08:44:55 +03:00
Fabien Potencier
d011d57f81 bumped Symfony version to 2.8.24 2017-07-04 08:43:52 +03:00
Fabien Potencier
bca31e4e3b Merge pull request #23367 from fabpot/release-2.8.23
released v2.8.23
2017-07-04 08:31:17 +03:00
Fabien Potencier
f9b4223990 updated VERSION for 2.8.23 2017-07-04 08:31:02 +03:00
Fabien Potencier
2299864595 updated CHANGELOG for 2.8.23 2017-07-04 08:30:58 +03:00
Fabien Potencier
8b1f4127c3 Merge branch '3.2' into 3.3
* 3.2:
  Don't access private services from container aware commands (deprecated)
  Improve CircularReferenceException message
2017-07-04 08:29:22 +03:00
Fabien Potencier
04baf86525 Merge branch '2.8' into 3.2
* 2.8:
  Improve CircularReferenceException message
2017-07-04 08:27:49 +03:00
Fabien Potencier
d01e2d157e bug #23366 [FrameworkBundle] Don't get() private services from debug:router (chalasr)
This PR was merged into the 3.2 branch.

Discussion
----------

[FrameworkBundle] Don't get() private services from debug:router

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

Fixes
> php.INFO: User Deprecated: Requesting the "controller_name_converter" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0. {"exception":"[object] (Symfony\\Component\\Debug\\Exception\\ContextErrorException(code: 0): User Deprecated: Requesting the \"controller_name_converter\" private service is deprecated since Symfony 3.2 and won't be supported anymore in Symfony 4.0. at /tmp/name_parser/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Container.php:260)"}

Commits
-------

08a6178e77 Don't access private services from container aware commands (deprecated)
2017-07-04 08:10:49 +03:00
Robin Chalas
08a6178e77 Don't access private services from container aware commands (deprecated) 2017-07-04 01:09:03 +02:00
Fabien Potencier
fa6b45bc58 bumped Symfony version to 2.7.31 2017-07-03 18:37:36 +03:00
Nicolas Grekas
966662dc4d bug #23239 [FrameworkBundle] call setContainer() for autowired controllers (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] call setContainer() for autowired controllers

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #23200, FriendsOfSymfony/FOSRestBundle#1719
| License       | MIT
| Doc PR        |

Previously, you either did not use controllers as services or you explicitly wired everything yourself. In case of a non-service controller the FrameworkBundle took care of calling `setContainer()` inside the `instantiateController()` method:

```php
protected function instantiateController($class)
{
    $controller = parent::instantiateController($class);

    if ($controller instanceof ContainerAwareInterface) {
        $controller->setContainer($this->container);
    }
    if ($controller instanceof AbstractController && null !== $previousContainer = $controller->setContainer($this->container)) {
        $controller->setContainer($previousContainer);
    }

    return $controller;
}
```

With the new autowired controllers as services this is no longer happening as controllers do not need to be instantiated anymore (the container already returns fully built objects).

Commits
-------

1d07a28 call setContainer() for autowired controllers
2017-07-03 17:51:37 +03:00
Fabien Potencier
90fa8a8b1a Merge pull request #23361 from fabpot/release-2.7.30
released v2.7.30
2017-07-03 17:23:07 +03:00
Fabien Potencier
75443d232b updated VERSION for 2.7.30 2017-07-03 17:22:50 +03:00
Fabien Potencier
e688bdc811 update CONTRIBUTORS for 2.7.30 2017-07-03 17:22:39 +03:00
Fabien Potencier
400e76706d updated CHANGELOG for 2.7.30 2017-07-03 17:21:42 +03:00
Christian Flothmann
1d07a28bed call setContainer() for autowired controllers 2017-07-03 16:15:38 +02:00
Fabien Potencier
a40b29b05e Merge branch '3.2' into 3.3
* 3.2:
  gracefully handle missing hinclude renderer
2017-07-03 17:10:11 +03:00
Fabien Potencier
26c5fc0732 Merge branch '2.7' into 2.8
* 2.7:
  Improve CircularReferenceException message
2017-07-03 17:09:54 +03:00
Fabien Potencier
71a69b40d2 minor #23322 [Serializer] Improve CircularReference detection message (ScullWM)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Improve CircularReference detection message

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

Hi,
I've get a CircularReferenceException error while serializing object with nested levels. Detect a CircularReference is great, but having more information about the object that generate this exception is better.

I simply suggest to add a `get_class` of the current object in the error message.

Before:
`A circular reference has been detected (configured limit: 1).`

After (edit)
`A circular reference has been detected when serializing the object of class "App\Domain\User" (configured limit: 1).`

Commits
-------

3a529e3391 Improve CircularReferenceException message
2017-07-03 16:30:36 +03:00
Fabien Potencier
c25bc248dc minor #23360 [Console] Fix descriptor tests (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[Console] Fix descriptor tests

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| 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 Console tests green from 3.3 up to master

Commits
-------

3ddb6e6aad [Console] Fix descriptor tests
2017-07-03 16:28:34 +03:00
Robin Chalas
3ddb6e6aad [Console] Fix descriptor tests 2017-07-03 15:19:36 +02:00
Thomas Perez
3a529e3391 Improve CircularReferenceException message 2017-07-03 15:09:40 +02:00
Fabien Potencier
5d797b21a5 minor #23356 [TwigBundle] gracefully handle missing hinclude renderer (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[TwigBundle] gracefully handle missing hinclude renderer

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

Since #23272 the `ExtensionPass` from the TwigBundle will error when being used with FrameworkBundle 3.4 thus letting all `deps=high` build jobs fail.

Commits
-------

ebdbecfb8b gracefully handle missing hinclude renderer
2017-07-03 13:05:32 +03:00
Christian Flothmann
ebdbecfb8b gracefully handle missing hinclude renderer 2017-07-03 11:37:02 +02:00
Fabien Potencier
3169e12bbf bug #23351 [Dotenv] parse concatenated variable values (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Dotenv] parse concatenated variable values

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

Commits
-------

aaaf64ddde [Dotenv] parse concatenated variable values
2017-07-03 12:28:08 +03:00
Fabien Potencier
9260a7ba03 Merge branch '3.2' into 3.3
* 3.2:
  Misspelled word
  Display a better error design when the toolbar cannot be displayed
  do not validate empty values
  [Cache] fix cleanup of expired items for PdoAdapter
  [Console] fix description of INF default values
  [PropertyAccess] Fix TypeError discard
  [Validator] Throw exception on Comparison constraints null options
  Identify tty tests in Component/Process
  [Workflow] Added more events to the announce function
  [Validator] Remove property path suggestion for using the Expression validator
  [WebProfilerBundle] Fix css trick used for offsetting html anchor from fixed header
  [Security] Fix annotation
2017-07-03 11:12:02 +03:00
Fabien Potencier
d051ef42b3 Merge branch '2.8' into 3.2
* 2.8:
  Misspelled word
  Display a better error design when the toolbar cannot be displayed
  do not validate empty values
  [Console] fix description of INF default values
  [PropertyAccess] Fix TypeError discard
  [Validator] Throw exception on Comparison constraints null options
  Identify tty tests in Component/Process
  [Security] Fix annotation
2017-07-03 11:06:20 +03:00
Fabien Potencier
2f8eeed5df Merge branch '2.7' into 2.8
* 2.7:
  Misspelled word
  Display a better error design when the toolbar cannot be displayed
  do not validate empty values
  [Console] fix description of INF default values
  [PropertyAccess] Fix TypeError discard
  [Validator] Throw exception on Comparison constraints null options
  Identify tty tests in Component/Process
  [Security] Fix annotation
2017-07-03 11:04:30 +03:00
Fabien Potencier
77d06b5d39 bug #23341 [DoctrineBridge][Security][Validator] do not validate empty values (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DoctrineBridge][Security][Validator] do not validate empty values

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

Nearly all validators operating on scalar values (except for some special constraints) do ignore empty values. If you want to forbid them, you have to use the `NotBlank` constraint instead.

Commits
-------

fd7ad234bc do not validate empty values
2017-07-03 10:38:34 +03:00
Fabien Potencier
4e65c1f4e9 minor #23352 Translation fix (French word chaîne) (mcorteel)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23352).

Discussion
----------

Translation fix (French word chaîne)

The French word "chaine" should be spelled "chaîne".

| Q             | A
| ------------- | ---
| Branch?       | 2.7 <!-- see comment below -->
| Bug fix?      | yes
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| License       | MIT

<!--
- 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 3.4,
  legacy code removals go to 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
-------

b576f46c26 Misspelled word
2017-07-03 10:29:33 +03:00