Commit Graph

32842 Commits

Author SHA1 Message Date
Nicolas Grekas
23256802d7 Merge branch '3.3' into 3.4
* 3.3:
  [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4
2017-08-21 10:21:30 +02:00
Nicolas Grekas
b4612c23e2 minor #23933 [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4 (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4

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

Current tests on branch 3.3 fail because the "cache:clear" command relies on internal details that did change in HttpKernel 3.4.
I propose to add this soft conflict logic to warn users about it.
I prefer doing so than adding a real conflict in composer.json because that would prevent us from testing other features across versions.

Commits
-------

ec8f56a [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4
2017-08-21 10:14:42 +02:00
Nicolas Grekas
ec8f56acd0 [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4 2017-08-18 18:06:08 +02:00
Nicolas Grekas
c8d7a6fea0 Merge branch '3.4'
* 3.4:
  [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup
  [DI] Fix merging of env vars in configs
  Allow to get alternatives when ServiceNotFoundException occurs.
  [DI] Rererence parameter arrays when possible
  Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
2017-08-18 17:05:10 +02:00
Grégoire Pineau
1d10857179 [WebProfilerBundle] Re add missing link to the controller 2017-08-18 16:34:09 +02:00
Nicolas Grekas
3fa5b3aeba Merge branch '3.3' into 3.4
* 3.3:
  [DI] Fix merging of env vars in configs
2017-08-18 16:18:15 +02:00
Nicolas Grekas
1732cc8489 bug #23903 [DI] Fix merging of env vars in configs (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix merging of env vars in configs

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

Commits
-------

00b9273 [DI] Fix merging of env vars in configs
2017-08-18 16:05:00 +02:00
Fabien Potencier
50fe6a3c76 feature #23915 [DI] Allow get available services from service locator (Koc)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Allow get available services from service locator

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

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

Sometimes we are using service locators and throw context specific exceptions if service not found inside it. Would be nice inform user about available services in our custom exception, like:

```php
try {
    return $this->transports->get($transport);
} catch (NotFoundExceptionInterface $e) {
    $availableTransports = method_exists($e, 'getAlternatives') ? $e->getAlternatives() : [];

    throw TransportNotFoundException::create($transport, $availableTransports, $e);
}
```

Commits
-------

4993b1c14c Allow to get alternatives when ServiceNotFoundException occurs.
2017-08-18 14:05:45 +02:00
Fabien Potencier
19e6f0ce6c feature #23792 [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup

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

This PR fixes the reasons why we deprecated cache:clear without --no-warmup.

Internally, it requires some cooperation from the Kernel, so that a deprecation is needed.
This allows the same kernel instance to be rebooted under a new cache directory, used during the warmup.
It leverages the new capability to create two independent non colliding containers.

Commits
-------

a4fc49294e [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup
2017-08-18 14:00:38 +02:00
Nicolas Grekas
a4fc49294e [HttpKernel][FrameworkBundle] Add RebootableInterface, fix and un-deprecate cache:clear with warmup 2017-08-18 13:51:16 +02:00
Nicolas Grekas
00b927322c [DI] Fix merging of env vars in configs 2017-08-18 13:25:49 +02:00
Nicolas Grekas
f751ac9ac1 Merge branch '3.3' into 3.4
* 3.3:
  Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
2017-08-18 10:17:34 +02:00
Fabien Potencier
9306fec43e minor #23912 [DI] Rererence parameter arrays when possible (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Rererence parameter arrays when possible

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no (perf optim)
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This a minor optim that might save memory and CPU for cases where big array parameters are inlined by DI extensions. This re-references them when possible.

Commits
-------

62c1bb5d3b [DI] Rererence parameter arrays when possible
2017-08-18 10:12:20 +02:00
Fabien Potencier
4fdaa3a981 bug #23825 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)" (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"

This reverts commit 3495b35e4f, reversing
changes made to 7f7b897ee2.

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

Sibling to #23792: there is no need to trigger the deprecation in 3.3 if we un-deprecate in 3.4.

Commits
-------

90099706c6 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
2017-08-18 10:05:51 +02:00
Nicolas Grekas
8a58d96111 Merge branch '3.4'
* 3.4:
  [VarDumper] Fix tests with phpredis 3.1.3
  [Routing] Use "controller" keyword for configuring routes controllers
  [VarDumper] Fix interval caster with PT3600S-like spec
  [DI] Fix reading env vars from fastcgi params
  [HttpKernel] Remove old container files
  Allow phpdocumentor/reflection-docblock 4.
  [VarDumper] play nice with open_basedir when looking for composer.json
2017-08-17 15:45:39 +02:00
Nicolas Grekas
16d34ebcae Merge branch '3.3' into 3.4
* 3.3:
  [VarDumper] Fix tests with phpredis 3.1.3
  [DI] Fix reading env vars from fastcgi params
  Allow phpdocumentor/reflection-docblock 4.
  [VarDumper] play nice with open_basedir when looking for composer.json
2017-08-17 15:38:59 +02:00
Nicolas Grekas
3f81dd1837 minor #23917 [VarDumper] Fix tests with phpredis 3.1.3 (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] Fix tests with phpredis 3.1.3

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

The "socket" property is gone with phpredis 3.1.3.

Commits
-------

773f166 [VarDumper] Fix tests with phpredis 3.1.3
2017-08-17 15:36:17 +02:00
Nicolas Grekas
773f166d5e [VarDumper] Fix tests with phpredis 3.1.3 2017-08-17 15:29:00 +02:00
Konstantin.Myakshin
4993b1c14c Allow to get alternatives when ServiceNotFoundException occurs. 2017-08-17 15:22:42 +03:00
Nicolas Grekas
a014222113 bug #23899 [DI] Fix reading env vars from fastcgi params (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix reading env vars from fastcgi params

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

Values in fastcgi_param populate `$_SERVER`, never `$_ENV`.
This PR makes `$container->getEnv()` read from `$_SERVER`, excluding any vars whose name start by `HTTP_` as that would be a security issue (values injection via HTTP headers.)

Embeds a few other fixes found meanwhile.

Commits
-------

adff65a [DI] Fix reading env vars from fastcgi params
2017-08-17 14:09:40 +02:00
Robin Chalas
d22d924c3b bug #23909 [Console] Initialize lazily to render exceptions properly (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Initialize lazily to render exceptions properly

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

When an exception occurs in the constructor of an `Application`, exception handling is not yet set up.
This typically happens when the container cannot be build for some reason, where calling `$this->add()` builds the container and fails.

This PR makes initialization lazy so that it happens later on, when exception handling might be OK.

Before:
![before](https://user-images.githubusercontent.com/243674/29403397-7f7a1fce-8338-11e7-8e62-b6302ff0a65e.png)

After:
![after](https://user-images.githubusercontent.com/243674/29403403-83f7b5c0-8338-11e7-9a22-0c5ee702f1ff.png)

Commits
-------

62174fd [Console] Initialize lazily to render exceptions properly
2017-08-17 13:45:57 +02:00
Nicolas Grekas
62c1bb5d3b [DI] Rererence parameter arrays when possible 2017-08-17 11:23:46 +02:00
Nicolas Grekas
62174fda10 [Console] Initialize lazily to render exceptions properly 2017-08-17 10:44:22 +02:00
Issei.M
b72ced22ad [Validator] Add a property tag for File::$maxSize 2017-08-17 16:14:13 +09:00
Robin Chalas
5d9ae6b56f [Console] Allow commands to provide a default name for compile time registration 2017-08-16 21:44:58 +02:00
Nicolas Grekas
8c4a1e75be feature #23227 Add support for "controller" keyword for configuring routes controllers (voronkovich)
This PR was merged into the 3.4 branch.

Discussion
----------

Add support for "controller" keyword for configuring routes controllers

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

This PR adds a syntax sugar for configuring routes controllers in more user-friendly way by using a `controller` keyword.

```yaml
# Current syntax
# It looks strange and exposes Symfony's internals
blog_show:
    path:     /blog/{slug}
    defaults: { _controller: AppBundle:Blog:show }

# Suggested syntax
blog_show:
    path:       /blog/{slug}
    controller: AppBundle:Blog:show
```
```xml
<?xml version="1.0" encoding="UTF-8" ?>
<routes xmlns="http://symfony.com/schema/routing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

    <!-- Current syntax -->
    <route id="blog_list" path="/blog">
        <default key="_controller">AppBundle:Blog:list</default>
    </route>

    <!-- Suggested syntax -->
    <route id="blog_list" path="/blog" controller="AppBundle:Blog:list" />
</routes>
```

Commits
-------

06bbee8 [Routing] Use "controller" keyword for configuring routes controllers
2017-08-16 18:33:30 +02:00
Oleg Voronkovich
06bbee862f [Routing] Use "controller" keyword for configuring routes controllers 2017-08-16 18:25:34 +02:00
Nicolas Grekas
9026aed89e bug #23793 [VarDumper] Fix interval caster with PT3600S-like spec (maidmaid)
This PR was squashed before being merged into the 3.4 branch (closes #23793).

Discussion
----------

[VarDumper] Fix interval caster with PT3600S-like spec

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

According [ISO 8601](https://fr.wikipedia.org/wiki/ISO_8601):

> The standard does not prohibit date and time values in a duration representation from exceeding their "carry over points" except as noted below. Thus, "PT36H" could be used as well as "P1DT12H" for representing the same duration.

But this *breaks* ``interval`` representation, and this PR improves this.

```php
dump(new DateInterval('PT3600S'));

// before
DateInterval {
  interval: + 00:00:3600.0
}

// after
DateInterval {
  interval: + 01:00:00.0
}
```

Commits
-------

046f8c1 [VarDumper] Fix interval caster with PT3600S-like spec
2017-08-16 18:14:34 +02:00
Dany Maillard
046f8c101b [VarDumper] Fix interval caster with PT3600S-like spec 2017-08-16 18:14:32 +02:00
Nicolas Grekas
befad6315b feature #23815 [FrameworkBundle][SecurityBundle][TwigBundle][Yaml] remove deprecated code (xabbuh)
This PR was merged into the 4.0-dev branch.

Discussion
----------

[FrameworkBundle][SecurityBundle][TwigBundle][Yaml] remove deprecated code

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

Commits
-------

c9ff029 remove deprecated code
2017-08-16 18:10:21 +02:00
Nicolas Grekas
ff628710f9 bug #23873 [HttpKernel] Remove old container files (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[HttpKernel] Remove old container files

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

ping @mvrhov

Commits
-------

2e4e6ad [HttpKernel] Remove old container files
2017-08-16 18:05:40 +02:00
Nicolas Grekas
be7751aba7 bug #23878 [VarDumper] play nice with open_basedir when looking for composer.json (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] play nice with open_basedir when looking for composer.json

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

ping @pounard, can you please confirm this fixes the issue you reported?

Commits
-------

1bea774 [VarDumper] play nice with open_basedir when looking for composer.json
2017-08-16 18:04:18 +02:00
Nicolas Grekas
af0b24e27d bug #23897 Allow phpdocumentor/reflection-docblock 4 (derrabus)
This PR was merged into the 3.3 branch.

Discussion
----------

Allow phpdocumentor/reflection-docblock 4

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

The PHPDocumentor team bumped their reflection-docblock library to version 4 due to a breaking change that should not affect Symfony, as far as I can tell. This PR indicates compatibility with the new major version.

Commits
-------

1a5fd79 Allow phpdocumentor/reflection-docblock 4.
2017-08-16 17:59:07 +02:00
Nicolas Grekas
adff65a602 [DI] Fix reading env vars from fastcgi params 2017-08-16 16:07:29 +02:00
Nicolas Grekas
2e4e6ad626 [HttpKernel] Remove old container files 2017-08-15 15:42:13 +02:00
Nicolas Grekas
50b3d30e10 Merge branch '3.4'
* 3.4:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  [Console] Remove useless http-kernel dev dep
  Fix testHtml method with regexp
  Fixed some param/return annotations in PHPDOC blocks.
  [Workflow] fixed InvalidDefinitionException message for StateMachineValidator
2017-08-15 15:32:56 +02:00
Alexander M. Turek
1a5fd79c21 Allow phpdocumentor/reflection-docblock 4. 2017-08-15 15:32:50 +02:00
Nicolas Grekas
aef502b1a2 Merge branch '3.3' into 3.4
* 3.3:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  [Console] Remove useless http-kernel dev dep
  Fix testHtml method with regexp
  Fixed some param/return annotations in PHPDOC blocks.
  [Workflow] fixed InvalidDefinitionException message for StateMachineValidator
2017-08-15 15:32:22 +02:00
Nicolas Grekas
d32c7060f1 Merge branch '2.8' into 3.3
* 2.8:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:31:09 +02:00
Nicolas Grekas
6434a00f10 Merge branch '2.7' into 2.8
* 2.7:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:30:53 +02:00
Nicolas Grekas
f1c65c0fd9 minor #23896 [Inlt] Fix JsonBundleReader exceptions (ksjogo)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23896).

Discussion
----------

[Inlt] Fix JsonBundleReader exceptions

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

Commits
-------

22a6642 Update JsonBundleReader.php
2017-08-15 15:19:58 +02:00
Johannes Goslar
22a6642632 Update JsonBundleReader.php 2017-08-15 15:19:50 +02:00
Nicolas Grekas
0b613dbb57 minor #23893 [HttpKernel] Clean test directory on tear down (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Clean test directory on tear down

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

I've been bitten by this leftover too often.

Commits
-------

0a3dc11 [HttpKernel] Clean test directory on tear down
2017-08-15 15:15:08 +02:00
Nicolas Grekas
0a3dc11af9 [HttpKernel] Clean test directory on tear down 2017-08-15 15:06:19 +02:00
Nicolas Grekas
712e877d8b minor #23894 [Console] Remove useless http-kernel dev dep (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[Console] Remove useless http-kernel dev dep

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

Commits
-------

8cbf094 [Console] Remove useless http-kernel dev dep
2017-08-15 11:36:39 +02:00
Robin Chalas
8cbf094702 [Console] Remove useless http-kernel dev dep 2017-08-15 11:15:06 +02:00
Nicolas Grekas
501c1b5d0e Merge branch '3.4'
* 3.4:
  Made some SecurityBundle tests case-insensitive to prepare for future Symfony versions
  [Console] Added a case-insensitive fallback for console command names
  fix merge
  [DI] Fix dumping abstract with YamlDumper
  restrict reflection doc block
  [DI] Fix YamlDumper not dumping abstract and autoconfigure
2017-08-15 10:24:11 +02:00
Roland Franssen
8a1d16839e [DI] Case sensitive parameter names 2017-08-14 17:16:04 +02:00
Nicolas Grekas
993546b4ca minor #23859 [DomCrawler] Fix testHtml method with regexp (MatthieuMota)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23859).

Discussion
----------

[DomCrawler] Fix testHtml method with regexp

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

As explained in this issue #23858, adding a regexp in addition to the trim for the testHtml method of [CrawlerTest](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php#L397) class.

Commits
-------

339592d Fix testHtml method with regexp
2017-08-14 12:36:32 +02:00
Matthieu Mota
339592da14 Fix testHtml method with regexp 2017-08-14 12:36:32 +02:00