Commit Graph

27636 Commits

Author SHA1 Message Date
Fabien Potencier
f2ed5fc71b feature #20094 added Twig runtimes for "critical" Twig extensions (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

added Twig runtimes for "critical" Twig extensions

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

This PR converts some Twig extensions to use a separate runtime. It also contains some optimizations to not load extensions when the associated component is not installed.

Commits
-------

c541804 fixed tests
812fbb4 decoupled the Twig HttpKernelExtension runtime from the extension
79efb4c [TwigBundle] removed ExpressionLanguage Twig extension when the ExpressionLanguage component is not available
3d4ad0b [TwigBundle] removed Stopwatch Twig extension when the Stopwatch component is not available
d0792e4 [TwigBundle] removed YAML Twig extension when the YAML component is not available
2016-09-30 11:39:02 -07:00
Fabien Potencier
8da0c5ada7 feature #20097 [FrameworkBundle] removed the Doctrine Annotations lib dependency on FrameworkBundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] removed the Doctrine Annotations lib dependency on FrameworkBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | yes (fixing this is easy by adding doctrine/annotations explicitly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15748 partially
| License       | MIT
| Doc PR        | n/a

Another PR to reduce the number of required dependencies on FrameworkBundle. This PR removes the Doctrine annotations library from the list.

Commits
-------

c2d8356 [FrameworkBundle] removed the Doctrine Annotations lib dependency on FrameworkBundle
2016-09-30 11:37:17 -07:00
Fabien Potencier
c541804ee7 fixed tests 2016-09-30 11:15:51 -07:00
Fabien Potencier
812fbb444f decoupled the Twig HttpKernelExtension runtime from the extension 2016-09-30 11:15:51 -07:00
Fabien Potencier
79efb4c841 [TwigBundle] removed ExpressionLanguage Twig extension when the ExpressionLanguage component is not available 2016-09-30 11:15:51 -07:00
Fabien Potencier
3d4ad0b084 [TwigBundle] removed Stopwatch Twig extension when the Stopwatch component is not available 2016-09-30 11:15:51 -07:00
Fabien Potencier
d0792e454e [TwigBundle] removed YAML Twig extension when the YAML component is not available 2016-09-30 11:15:51 -07:00
Fabien Potencier
1b9131c00b minor #20109 added missing dep (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

added missing dep

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

663eea8 added missing dep
2016-09-30 10:31:13 -07:00
Fabien Potencier
663eea860a added missing dep 2016-09-30 10:17:31 -07:00
Fabien Potencier
c2d8356cb6 [FrameworkBundle] removed the Doctrine Annotations lib dependency on FrameworkBundle 2016-09-30 09:58:09 -07:00
Fabien Potencier
533c11cf7d feature #20019 [FrameworkBundle] Add phpstorm ide (hason)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] Add phpstorm ide

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

Works on Windows, Mac (https://github.com/aik099/PhpStormProtocol) and Linux (8f7a8dff04).

Commits
-------

450c37c [FrameworkBundle] Add phpstorm ide
2016-09-30 07:52:05 -07:00
Martin Hasoň
450c37cb49 [FrameworkBundle] Add phpstorm ide 2016-09-30 14:10:15 +02:00
Fabien Potencier
fbc8682d96 minor #20096 [TwigBundle] removed unneeded required dep (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[TwigBundle] removed unneeded required dep

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

6547869 [TwigBundle] removed unneeded required dep
2016-09-29 16:55:53 -07:00
Fabien Potencier
654786980a [TwigBundle] removed unneeded required dep 2016-09-29 16:34:39 -07:00
Fabien Potencier
348d1f6653 removed duplicate entry in composer.json 2016-09-29 15:37:38 -07:00
Fabien Potencier
f97f737175 feature #20092 added a Twig runtime loader (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

added a Twig runtime loader

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | see Twigphp/twig#1913
| License       | MIT
| Doc PR        | not yet

This is the Symfony part of Twigphp/twig#1913. It introduces a Twig runtime loader.

Commits
-------

7fc174b [TwigBundle] added a Twig runtime loader
2016-09-29 14:13:12 -07:00
Fabien Potencier
7fc174b0ad [TwigBundle] added a Twig runtime loader 2016-09-29 13:59:59 -07:00
Nicolas Grekas
2e35a016d4 Merge branch '3.1'
* 3.1:
  [SecurityBundle] Fix Twig master dep
2016-09-29 11:15:34 +01:00
Nicolas Grekas
ea2da4f248 Merge branch '2.8' into 3.1
* 2.8:
  [SecurityBundle] Fix Twig master dep
2016-09-29 11:14:33 +01:00
Nicolas Grekas
536da69a49 minor #20085 [SecurityBundle] Fix Twig master dep (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[SecurityBundle] Fix Twig master dep

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

Since Twig 2 is not tagged yet, it's free to do not-BC changes, which it did recently. Our unmaintained `3.0.*` bridge+bundle don't work with it anymore. Let's skip them.

Commits
-------

9a2672e [SecurityBundle] Fix Twig master dep
2016-09-29 10:45:16 +01:00
Nicolas Grekas
9a2672e7fc [SecurityBundle] Fix Twig master dep 2016-09-29 10:23:02 +01:00
Fabien Potencier
c1cf76a28a [SecurityBundle] fixed missing dependency 2016-09-28 19:15:54 -07:00
Fabien Potencier
3ee28b5629 Merge branch '3.1'
* 3.1:
  fixed Twig support for 1.26 and 2.0
  Fix indexBy type extraction
2016-09-28 18:19:22 -07:00
Fabien Potencier
6d1d35d83f Merge branch '2.8' into 3.1
* 2.8:
  fixed Twig support for 1.26 and 2.0
  Fix indexBy type extraction
2016-09-28 18:19:09 -07:00
Fabien Potencier
28571d2cfb Merge branch '2.7' into 2.8
* 2.7:
  fixed Twig support for 1.26 and 2.0
2016-09-28 18:16:22 -07:00
Fabien Potencier
b4d5827b2c bug #20079 fixed Twig support for 1.26 and 2.0 (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

fixed Twig support for 1.26 and 2.0

| 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

Removes the deprecation notices for Twig 1.26.

Commits
-------

24e9cf2 fixed Twig support for 1.26 and 2.0
2016-09-28 18:14:48 -07:00
Fabien Potencier
24e9cf2155 fixed Twig support for 1.26 and 2.0 2016-09-28 18:04:26 -07:00
Fabien Potencier
469818cceb feature #20075 [FrameworkBundle] removed the Security Core and Security CSRF component dependencies on FrameworkBundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] removed the Security Core and Security CSRF component dependencies on FrameworkBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no (except for people using FrameworkBundle without requiring symfony/symfony which should be pretty rare; and fixing this is easy by adding symfony/security-core and symfony/security-csrf explicitly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15748 partially
| License       | MIT
| Doc PR        | n/a

Another PR to reduce the number of required dependencies on FrameworkBundle. This PR removes the Security Core and CSRF components from the list.

Commits
-------

d703784 [FrameworkBundle] removed the Security Core and Security CSRF component dependencies on FrameworkBundle
2016-09-28 10:27:44 -07:00
Fabien Potencier
0e4523fc31 feature #20072 [FrameworkBundle] removed the Templating component dependency on FrameworkBundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] removed the Templating component dependency on FrameworkBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no (except for people using FrameworkBundle without requiring symfony/symfony which should be pretty rare; and fixing this is easy by adding symfony/templating explicitly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15748 partially
| License       | MIT
| Doc PR        | n/a

Another PR to reduce the number of required dependencies on FrameworkBundle. This PR removes the Templating component from the list.

I made most of the work in previous version, so this change is really just about adding a good error message when templating is not enabled. For the record, this is also in the path of making possible to use Symfony with Twig without using the Templating component indirection (I think that this is in fact the last step).

Commits
-------

b3de62f [FrameworkBundle] removed the Templating component dependency on FrameworkBundle
2016-09-28 10:25:38 -07:00
Fabien Potencier
828570d1e4 feature #20070 [FrameworkBundle] removed the Translation component dependency on FrameworkBundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] removed the Translation component dependency on FrameworkBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no (except for people using FrameworkBundle without requiring symfony/symfony which should be pretty rare; and fixing this is easy by adding symfony/translation explicitly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15748 partially
| License       | MIT
| Doc PR        | n/a

Another PR to reduce the number of required dependencies on FrameworkBundle. This PR removes the Translation component from the list.

Commits
-------

a496a2a [FrameworkBundle] removed the Translation component dependency on FrameworkBundle
2016-09-28 10:21:13 -07:00
Fabien Potencier
d703784d1f [FrameworkBundle] removed the Security Core and Security CSRF component dependencies on FrameworkBundle 2016-09-28 10:11:47 -07:00
Fabien Potencier
b3de62f0b3 [FrameworkBundle] removed the Templating component dependency on FrameworkBundle 2016-09-28 08:53:44 -07:00
Fabien Potencier
a496a2a1ad [FrameworkBundle] removed the Translation component dependency on FrameworkBundle 2016-09-28 08:31:25 -07:00
Fabien Potencier
6acf54f26b bug #20066 [FrameworkBundle] fix yaml:lint when yaml is not installed along side framework-bundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] fix yaml:lint when yaml is not installed along side framework-bundle

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

YAML is not an explicit dependency of FrameworkBundle. If it is not installed, the console is broken as the yaml:lint commands tries to extends the one in the YAML component. This bug only exists in master as this refactoring happened in 3.2

Commits
-------

b1c5a68 [FrameworkBundle] fixed yaml:lint when yaml is not installed along side framwork-bundle
2016-09-28 07:37:20 -07:00
Fabien Potencier
b1c5a686c8 [FrameworkBundle] fixed yaml:lint when yaml is not installed along side framwork-bundle 2016-09-28 07:20:56 -07:00
Fabien Potencier
57310e943c feature #20067 [FrameworkBundle] removed the Asset component dependency on FrameworkBundle (fabpot)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] removed the Asset component dependency on FrameworkBundle

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no (except for people using FrameworkBundle without requiring symfony/symfony which should be pretty rare; and fixing this is easy by adding symfony/asset explicitly)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15748 partially
| License       | MIT
| Doc PR        | n/a

Trying to reduce the number of required dependencies on FrameworkBundle. This PR removes the Asset component from the list.

Commits
-------

1dd4e21 [FrameworkBundle] removed the Asset component dependency on FrameworkBundle
2016-09-28 07:18:21 -07:00
Fabien Potencier
1dd4e21fad [FrameworkBundle] removed the Asset component dependency on FrameworkBundle 2016-09-28 06:51:58 -07:00
Fabien Potencier
6717f2c4e5 bug #20051 Fix indexBy type extraction (lemoinem)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix indexBy type extraction

| 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

Bug found and patched by @ksom

Since 3008228b48, the Doctrine Bridge's PropertyInfo Extractor tries to extract the type of the key in an indexed association. However, as you can see in 3008228b48 (diff-7a8fb8072d57f95ea6e37898b05895bcR91), the extractor was using the metadata of the class containing the association instead of the target entity's metadata to retrieve the type of the index.

The tests were green because in 3008228b48 (diff-c7e914ed89ceffd939733efe08c039c2R44), the property used to `indexBy` was present in the classes on both sides of the relation with the same type.

Once the test is fixed (by renaming the property in the targetEntity), the test provided at 3008228b48 (diff-1b2e044d1df011c00caf802a07895bdbR88) gives the error

    1) Symfony\Bridge\Doctrine\PropertyInfo\Tests\DoctrineExtractorTest::testExtract with data set #9 ('indexedBar', array(Symfony\Component\PropertyInfo\Type Object (...)))
    InvalidArgumentException: "" is not a valid PHP type.

The fix is to fetch the metadata of the target entity and check there for the property type.

Commits
-------

138c6e3 Fix indexBy type extraction
2016-09-27 19:18:40 -07:00
Fabien Potencier
f1c1e37949 Merge branch '3.1'
* 3.1:
  format json fixtures
  cleanup
  apply rtrim
2016-09-27 17:11:20 -07:00
Fabien Potencier
d12c100ece Merge branch '2.8' into 3.1
* 2.8:
  format json fixtures
  apply rtrim
2016-09-27 17:11:12 -07:00
Fabien Potencier
aef5008360 Merge branch '2.7' into 2.8
* 2.7:
  format json fixtures
  apply rtrim
2016-09-27 17:10:16 -07:00
Fabien Potencier
da6c664e98 minor #20064 [Console] Format JSON fixtures (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Format JSON fixtures

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Should make merging upstream easier due better diffs.

```php
foreach (glob('src/Symfony/Component/Console/Tests/Fixtures/*.json') as $file) {
    file_put_contents($file, str_replace(PHP_EOL, "\n", json_encode(json_decode(trim(file_get_contents($file))), JSON_PRETTY_PRINT))."\n");
}
```

Should be re-applied on 2.8, 3.1 and master.

Commits
-------

2ca7823 format json fixtures
2016-09-27 17:09:53 -07:00
Fabien Potencier
40c2cbd12b bug #19951 [Finder] Trim trailing directory slash in ExcludeDirectoryFilterIterator (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

[Finder] Trim trailing directory slash in ExcludeDirectoryFilterIterator

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #19599
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

In this context `path` equals `path/`

Commits
-------

e0e5f0c apply rtrim
2016-09-27 17:07:53 -07:00
Roland Franssen
2ca78233a1 format json fixtures 2016-09-27 17:33:51 +00:00
Fabien Potencier
5aa5a6e1fe minor #20058 [Console] Cleanup legacy fixtures (ro0NL)
This PR was merged into the 3.1 branch.

Discussion
----------

[Console] Cleanup legacy fixtures

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

d50e3fe cleanup
2016-09-26 08:57:56 -07:00
Roland Franssen
d50e3fe104 cleanup 2016-09-25 20:53:54 +00:00
Fabien Potencier
e9e29fa5be Merge branch '3.1'
* 3.1:
  fixed expected exception annotations
2016-09-25 09:21:58 -07:00
Fabien Potencier
8330e9e5c5 minor #20052 @expectedException expects FQCN (ro0NL)
This PR was merged into the 3.1 branch.

Discussion
----------

@expectedException expects FQCN

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Sorry.. almost there :) fixes 1 more false positive in `ObjectNormalizerTest`.

https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/2200 is almost ready :)

Commits
-------

7574a92 fixed expected exception annotations
2016-09-25 09:21:09 -07:00
Roland Franssen
7574a92498 fixed expected exception annotations 2016-09-25 08:27:07 +00:00
Mathieu Lemoine
138c6e3752 Fix indexBy type extraction 2016-09-24 17:32:50 -04:00