Commit Graph

31578 Commits

Author SHA1 Message Date
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
mcorteel
b576f46c26 Misspelled word
The French word "chaine" should be spelled "chaîne".
2017-07-03 10:29:33 +03:00
Fabien Potencier
4c00279360 minor #23107 [Security] Fix annotation (enumag)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Fix annotation

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

Commits
-------

8a4d4eb563 [Security] Fix annotation
2017-07-03 10:26:42 +03:00
Christian Flothmann
aaaf64ddde [Dotenv] parse concatenated variable values 2017-07-03 09:16:11 +02:00
Fabien Potencier
64ea580eae bug #23274 Display a better error design when the toolbar cannot be displayed (yceruto)
This PR was squashed before being merged into the 2.7 branch (closes #23274).

Discussion
----------

Display a better error design when the toolbar cannot be displayed

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (failure unrelated)
| Fixed tickets | https://github.com/symfony/symfony/pull/23266
| License       | MIT
| Doc PR        | n/a

Fixing the left position of the bar (tested in app without style) and escaping the literal newline (ES5) as some IDEs fails with previous syntax (and Github diff too). Btw, I have added the Symfony icon to make clear that this message comes from Symfony ;)

**Before:**
![current_toolbar_error](https://user-images.githubusercontent.com/2028198/27466735-cd5f0da8-57aa-11e7-8431-3025c41557e6.png)

**After:**
![after_toolbar_27](https://user-images.githubusercontent.com/2028198/27467928-75e45d4e-57b4-11e7-9e1f-e252d9085596.png)

Commits
-------

ed3e403b4b Display a better error design when the toolbar cannot be displayed
2017-07-03 10:01:20 +03:00
Yonel Ceruto
ed3e403b4b Display a better error design when the toolbar cannot be displayed 2017-07-03 10:01:07 +03:00
Fabien Potencier
bfd4173860 bug #23342 [Dotenv] parse escaped quotes in unquoted env var values (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Dotenv] parse escaped quotes in unquoted env var values

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

Commits
-------

66a4fd749d parse escaped quotes in unquoted env var values
2017-07-03 09:56:41 +03:00
Fabien Potencier
03945c7d20 minor #23309 Identify tty tests in Component/Process (pmmaga)
This PR was merged into the 2.7 branch.

Discussion
----------

Identify tty tests in Component/Process

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| 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
-------

65d89ec224 Identify tty tests in Component/Process
2017-07-03 09:43:33 +03:00
Fabien Potencier
1b0e920e08 bug #23291 [Security] Fix Firewall ExceptionListener priority (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[Security] Fix Firewall ExceptionListener priority

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

When making EventDispatcher able to lazy load listeners, we stopped using `ContainerAwareEventDispatcher::addListenerService/addSubcriberService`, we use `EventDispatcher::addListener()` instead. This change makes that the order of listeners is different than before, because `ContainerAwareEventDispatcher` calls `addListener()` tardily so that factories are never stored in `EventDispatcher::$listeners`.

Example diff due to the behavior change in 3.3 (registering an `AppBundle\ExceptionListener::doCatch()` exception listener in the fullstack):

3.2
----

```php
array:5
  0 => "Symfony\Component\Security\Http\Firewall\ExceptionListener::onKernelException"
  1 => "AppBundle\ExceptionListener::doCatch"
  2 => "Symfony\Component\HttpKernel\EventListener\ProfilerListener::onKernelException"
  3 => "Symfony\Bundle\SwiftmailerBundle\EventListener\EmailSenderListener::onException"
  4 => "Symfony\Component\HttpKernel\EventListener\ExceptionListener::onKernelException"
]
```

3.3
----

```php
array:5 [
  0 => "AppBundle\ExceptionListener::doCatch"
  1 => "Symfony\Component\HttpKernel\EventListener\ProfilerListener::onKernelException"
  2 => "Symfony\Bundle\SwiftmailerBundle\EventListener\EmailSenderListener::onException"
  3 => "Symfony\Component\Security\Http\Firewall\ExceptionListener::onKernelException"
  4 => "Symfony\Component\HttpKernel\EventListener\ExceptionListener::onKernelException"
]
```
(that is what breaks #23253, the lazy listener is called before the runtime firewall exception listener on dispatch).

This fixes the order by increasing the security exception listener priority.

Commits
-------

8014b38055 [Security] Fix Firewall ExceptionListener priority
2017-07-03 09:18:56 +03:00
Fabien Potencier
3ccef6edc3 bug #23296 [WebProfilerBundle] Fix css trick used for offsetting html anchor from fixed header (ogizanagi)
This PR was merged into the 3.2 branch.

Discussion
----------

[WebProfilerBundle] Fix css trick used for offsetting html anchor from fixed header

| Q             | A
| ------------- | ---
| Branch?       | 3.2 <!-- see comment below -->
| Bug fix?      | yes (minor DX)
| 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 | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

The css trick used was incomplete (missing `display: block;`), which is probably why it has been changed in https://github.com/symfony/symfony/pull/22455/files#diff-7d417267ae50374356ab990c58233a9bR67.
Despite the current version works well, it behaves quite ugly specifically on Chrome:

|Before|After|
|--|--|
|![juin-25-2017 18-07-01](https://user-images.githubusercontent.com/2211145/27517785-60cbd3a4-59d2-11e7-8e82-b8bb29ae15bb.gif)|![juin-25-2017 18-07-26](https://user-images.githubusercontent.com/2211145/27517786-60d165f8-59d2-11e7-9d9e-83aa2211041d.gif)|

For ref about the trick: https://stackoverflow.com/questions/10732690/offsetting-an-html-anchor-to-adjust-for-fixed-header/13184714#13184714

Commits
-------

9f9697a57d [WebProfilerBundle] Fix css trick used for offsetting html anchor from fixed header
2017-07-03 09:14:27 +03:00
Fabien Potencier
4a66db42fc minor #23297 [Validator] Remove property path suggestion for using the Expression validator (ogizanagi)
This PR was merged into the 3.2 branch.

Discussion
----------

[Validator] Remove property path suggestion for using the Expression validator

| Q             | A
| ------------- | ---
| Branch?       | 3.2 <!-- see comment below -->
| Bug fix?      | no
| 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 | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

This suggestion is erroneous since #17398 removed any usage of the PropertyAccess component within the Validator one, so it's not even required anymore by the ExpressionValidator.

Commits
-------

e9e1534cde [Validator] Remove property path suggestion for using the Expression validator
2017-07-03 09:13:14 +03:00
Fabien Potencier
c1e8183f1b bug #23333 [PropertyAccess] Fix TypeError discard (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[PropertyAccess] Fix TypeError discard

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? |no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Given the following code:

```php
class Bar
{
    private $foos = [];

    public function getFoos(): array
    {
        return 'It doesn\'t respect the return type';
    }

    public function addFoo(Foo $foo)
    {
        // ...
    }

    public function removeFoo(Foo $dateTime)
    {
        // ...
    }
}

$object = new Bar();
$this->propertyAccessor->setValue($object, 'foos', array(new \DateTime()));
```

The `PropertyAccessor` will  crash (`[Symfony\Component\Debug\Exception\ContextErrorException]  Notice: Undefined offset: 0`) instead of displaying the (valid) PHP error.

This PR fixes the issue.

Commits
-------

e0c5040398 [PropertyAccess] Fix TypeError discard
2017-07-03 09:09:23 +03:00
Fabien Potencier
44c3f58265 minor #23327 [Validator] Throw exception on Comparison constraints null options (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Throw exception on Comparison constraints null options

| Q             | A
| ------------- | ---
| Branch?       | 2.7 <!-- see comment below -->
| Bug fix?      | no. There is no bug, but the constraint can be silently created in an invalid state.
| 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 (failure unrelated)
| Fixed tickets | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Commits
-------

2de59a7381 [Validator] Throw exception on Comparison constraints null options
2017-07-03 08:46:34 +03:00
Fabien Potencier
07c38df9e9 bug #23326 [Cache] fix cleanup of expired items for PdoAdapter (dmaicher)
This PR was merged into the 3.2 branch.

Discussion
----------

[Cache] fix cleanup of expired items for PdoAdapter

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/23313
| License       | MIT
| Doc PR        | -

This fixes the query being executed to cleanup expired items from the `cache_items` table using the `PdoAdapter`.

I also added a test case to make sure we do the cleanup successfully.

Commits
-------

c183b0e06d [Cache] fix cleanup of expired items for PdoAdapter
2017-07-03 08:43:08 +03:00
Fabien Potencier
cd8d4e68d4 bug #23345 [Console] fix description of INF default values (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] fix description of INF default values

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

Commits
-------

d8ba440def [Console] fix description of INF default values
2017-07-03 07:26:10 +02:00
Fabien Potencier
10120cf331 minor #23347 [Dotenv] clean up before running assertions (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Dotenv] clean up before running assertions

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

If one of the assertions failed, the clean up part would never happen.

Commits
-------

baafc7b409 [Dotenv] clean up before running assertions
2017-07-03 07:23:50 +02:00
Christian Flothmann
fd7ad234bc do not validate empty values 2017-07-02 09:03:13 +02:00
David Maicher
c183b0e06d [Cache] fix cleanup of expired items for PdoAdapter 2017-07-01 12:17:16 +02:00
Christian Flothmann
baafc7b409 [Dotenv] clean up before running assertions
If one of the assertions failed, the clean up part would never happen.
2017-07-01 11:58:14 +02:00
Christian Flothmann
d8ba440def [Console] fix description of INF default values 2017-07-01 11:26:27 +02:00
Christian Flothmann
66a4fd749d parse escaped quotes in unquoted env var values 2017-06-30 21:14:02 +02:00
Fabien Potencier
8b6cb57d87 bug #23328 [FrameworkBundle] Display a proper warning on cache:clear without the --no-warmup option (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] Display a proper warning on cache:clear without the --no-warmup option

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | no
| 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 | https://github.com/symfony/recipes/pull/105 and others reports related to cache warming issues with final/custom kernel classes <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

I'd suggest to simply make this more obvious for everyone, as the deprecation is only shown when executing the command with `-vv` or by inspecting logs otherwise:

<img width="970" alt="screenshot 2017-06-29 a 20 08 21" src="https://user-images.githubusercontent.com/2211145/27703182-db734150-5d06-11e7-9306-f5837bf240ed.PNG">

Commits
-------

6cd188bd72 [FrameworkBundle] Display a proper warning on cache:clear without the --no-warmup option
2017-06-30 13:22:10 +02:00
Kévin Dunglas
e0c5040398
[PropertyAccess] Fix TypeError discard 2017-06-30 11:24:55 +02:00
Maxime Steinhausser
2de59a7381 [Validator] Throw exception on Comparison constraints null options 2017-06-30 08:56:32 +02:00
Maxime Steinhausser
6cd188bd72 [FrameworkBundle] Display a proper warning on cache:clear without the --no-warmup option 2017-06-29 20:05:44 +02:00
Robin Chalas
8014b38055 [Security] Fix Firewall ExceptionListener priority 2017-06-28 17:08:40 +02:00
Pedro Magalhães
65d89ec224 Identify tty tests in Component/Process 2017-06-27 18:14:10 +02:00
Grégoire Pineau
25ab3390d3 bug #23299 [Workflow] Added more events to the announce function (Nyholm)
This PR was submitted for the master branch but it was merged into the 3.2 branch instead (closes #23299).

Discussion
----------

[Workflow] Added more events to the announce function

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

This PR will fix #23275

The documentation states that we dispatch events `workflow.announce` and `workflow.[name].announce`. It was me who wrongly added it to the docs... sorry about that.

We could either: Change the docs or add these events. I choose to add these event to the source since the same events are dispatched for "guard", "leave", "transition", "enter" and "entered".

Commits
-------

c5042f35e1 [Workflow] Added more events to the announce function
2017-06-26 14:40:45 +02:00
Tobias Nyholm
c5042f35e1 [Workflow] Added more events to the announce function 2017-06-26 14:40:44 +02:00
Maxime Steinhausser
e9e1534cde [Validator] Remove property path suggestion for using the Expression validator 2017-06-25 18:46:33 +02:00
Maxime Steinhausser
9f9697a57d [WebProfilerBundle] Fix css trick used for offsetting html anchor from fixed header 2017-06-25 18:11:43 +02:00
Fabien Potencier
7093fc1f24 Merge branch '3.2' into 3.3
* 3.2:
  fixed tests
  swiftmailer bridge is gone
  [TwigBundle] add back exception check
  Dont call count on non countable object
  Fix undefined variable $filesystem
2017-06-24 09:45:30 -07:00
Fabien Potencier
59094b406a Merge branch '2.8' into 3.2
* 2.8:
  fixed tests
  [TwigBundle] add back exception check
  Dont call count on non countable object
  Fix undefined variable $filesystem
2017-06-24 09:45:17 -07:00
Fabien Potencier
bf0063e3d3 fixed tests 2017-06-24 09:45:07 -07:00
Fabien Potencier
bddf9be8ce Merge branch '2.7' into 2.8
* 2.7:
  [TwigBundle] add back exception check
  Dont call count on non countable object
2017-06-24 09:44:49 -07:00
Fabien Potencier
7acc34537b bug #23279 Don't call count on non countable object (pierredup)
This PR was merged into the 2.7 branch.

Discussion
----------

Don't call count on non countable object

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

From PHP 7.2, calling `count` on a non-countable object will emit a warning (https://wiki.php.net/rfc/counting_non_countables).
Based on the current test suit, this is the only place where I found this warning

Commits
-------

635bccdf8f Dont call count on non countable object
2017-06-24 09:42:08 -07:00
Fabien Potencier
73e9348237 bug #23283 [TwigBundle] add back exception check (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] add back exception check

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

#23268 introduced a regression in that the full exception page was not shown anymore in case a template for the given format (if not `html`) could not be found.

Commits
-------

46c38df0fd [TwigBundle] add back exception check
2017-06-24 09:41:09 -07:00
Ben Davies
2e435228d1 swiftmailer bridge is gone 2017-06-24 09:39:01 -07:00
Fabien Potencier
87601ba852 minor #23287 respect the API in FirewallContext map (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

respect the API in FirewallContext map

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

When being merged up, this will make the SecurityBundle tests on master
green again.

Commits
-------

ddf4368444 respect the API in FirewallContext map
2017-06-24 09:35:02 -07:00
Christian Flothmann
ddf4368444 respect the API in FirewallContext map
When being merged up, this will make the SecurityBundle tests on master
green again.
2017-06-24 15:53:39 +02:00
Christian Flothmann
46c38df0fd [TwigBundle] add back exception check 2017-06-24 11:40:57 +02:00
Christian Flothmann
22723dafd4 Merge branch '3.2' into 3.3
* 3.2: (42 commits)
  Show exception is checked twice in ExceptionController of twig
  allow SSI fragments configuration in XML files
  Display a better error message when the toolbar cannot be displayed
  render hidden _method field in form_rest()
  Add Doctrine Cache to dev dependencies to fix failing unit tests.
  return fallback locales whenever possible
  [Console] Fix catching exception type in QuestionHelper
  [WebProfilerBundle] Eliminate line wrap on count columnt (routing)
  [Routing] Fix XmlFileLoader exception message
  [Translation] Fix FileLoader::loadResource() php doc
  Sessions: configurable "use_strict_mode" option for NativeSessionStorage
  [FrameworkBundle] [Command] Clean bundle directory, fixes #23177
  Reset redirectCount when throwing exception
  [TwigBundle] Remove template.xml services when templating is disabled
  add content-type header on exception response
  Embedding a response that combines expiration and validation, that should not defeat expiration on the combined response
  fixed bad merge
  Fix two edge cases in ResponseCacheStrategy
  [Routing] Expose request in route conditions, if needed and possible
  [Routing] Expose request in route conditions, if needed and possible
  ...
2017-06-24 11:29:48 +02:00
Fabien Potencier
9a9c3d1837 minor #23277 Fix undefined variable $filesystem (NVasse)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix undefined variable $filesystem

| Q             | A
| ------------- | ---
| Branch?       | >= 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

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

0724ebc5d2 Fix undefined variable $filesystem
2017-06-23 07:26:34 -07:00