Commit Graph

5056 Commits

Author SHA1 Message Date
Christophe Coevoet 5a0eaccc70 Fix the Travis config again
The parenthesis around the statements are isolating the directory changes in a sub-command. So the right fix was not to remove the closing parenthesis, but to re-add the opening one.
2019-11-04 15:16:40 +01:00
Fabien Potencier 0a07efff39 minor #3187 Fix the Travis setup (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the Travis setup

This looks like a bad merge from 2.x to 3.x

Commits
-------

d601081b Fix the Travis setup
2019-11-04 15:06:56 +01:00
Christophe Coevoet d601081b6b Fix the Travis setup
This looks like a bad merge from 2.x to 3.x
2019-11-04 15:00:03 +01:00
Fabien Potencier c38d104978 Merge branch '2.x' into 3.x
* 2.x:
  Allow Symfony 5
  Fix small typo
  Bump version to 2.12.2-DEV
  Prepare the 2.12.1 release
2019-10-23 17:58:03 +02:00
Fabien Potencier d073fed7f1 minor #3183 Allow Symfony 5 (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Allow Symfony 5

Commits
-------

4ab02e3e Allow Symfony 5
2019-10-23 17:56:47 +02:00
Nicolas Grekas 4ab02e3e9f Allow Symfony 5 2019-10-23 17:53:29 +02:00
Fabien Potencier d86b8ea580 minor #3180 Fix small typo (kevin-verschaeve)
This PR was merged into the 2.x branch.

Discussion
----------

Fix small typo

Commits
-------

d48aceb8 Fix small typo
2019-10-17 13:01:59 +02:00
Kevin Verschaeve d48aceb870 Fix small typo 2019-10-17 11:30:47 +02:00
Fabien Potencier e657c11599 Bump version to 2.12.2-DEV 2019-10-17 09:37:40 +02:00
Fabien Potencier ddd4134af9 Prepare the 2.12.1 release v2.12.1 2019-10-17 09:34:53 +02:00
Fabien Potencier 9e0b90b27b Merge branch '2.x' into 3.x
* 2.x:
  Add .gitattributes
  Add missing .gitattributes for string-extra
  Update .gitattributes to remove tests from \"dist\"
  Fix CS
  doc: number_format add math calculation hint
2019-10-17 09:30:08 +02:00
Fabien Potencier e07296fbaa Merge branch '1.x' into 2.x
* 1.x:
  Add .gitattributes
2019-10-17 09:30:01 +02:00
Fabien Potencier e05aa6a489 Add .gitattributes 2019-10-17 09:29:33 +02:00
Fabien Potencier 5750a13b40 Add missing .gitattributes for string-extra 2019-10-17 09:28:42 +02:00
Fabien Potencier 38adb199ea minor #3153 Update .gitattributes to remove tests from "dist" (barryvdh)
This PR was squashed before being merged into the 2.x branch (closes #3153).

Discussion
----------

Update .gitattributes to remove tests from "dist"

This was proposed many times before, but considering https://github.com/symfony/symfony/pull/33579 is now merged, I propose this again. I refer to that issue as for the reasoning, as it applies here also.

I did not add the `docs` directory as there was much discussion about that before (discussion in  #942)

Related: #942 #1776 #1981 #2292 #2799 2905

Commits
-------

5cde1f50 Update .gitattributes to remove tests from \"dist\"
2019-10-17 09:27:12 +02:00
Barry vd. Heuvel 5cde1f50bb Update .gitattributes to remove tests from \"dist\" 2019-10-17 09:27:07 +02:00
Fabien Potencier 8fc2999a40 Fix CS 2019-10-17 09:25:45 +02:00
Fabien Potencier a7057700ec minor #3170 doc: number_format add math calculation hint (gimler)
This PR was merged into the 2.x branch.

Discussion
----------

doc: number_format add math calculation hint

Add hint about number_format and math calculation

Commits
-------

954ab4b8 doc: number_format add math calculation hint
2019-10-17 09:25:09 +02:00
Fabien Potencier 035649b70b Merge branch '2.x' into 3.x
* 2.x:
  Add string extra in the bundle
  Add missing docs
  Add twig/string-extra extension
2019-10-17 09:21:36 +02:00
Fabien Potencier 5bda1f1eff bug #3179 Add string extra in the bundle (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add string extra in the bundle

Commits
-------

069fd6db Add string extra in the bundle
2019-10-17 09:16:43 +02:00
Fabien Potencier 069fd6db49 Add string extra in the bundle 2019-10-17 09:13:47 +02:00
Fabien Potencier 94cc1fda80 feature #3178 Add twig/string-extra extension (nicolas-grekas, fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add twig/string-extra extension

Last step before deprecating https://github.com/twigphp/Twig-extensions entirely.

Commits
-------

00e0b531 Add missing docs
e300e379 Add twig/string-extra extension
2019-10-17 08:55:29 +02:00
Fabien Potencier 00e0b53100 Add missing docs 2019-10-17 08:49:30 +02:00
Nicolas Grekas e300e37940 Add twig/string-extra extension 2019-10-16 19:46:20 +02:00
Fabien Potencier 241f8dffb9 Merge branch '2.x' into 3.x
* 2.x:
  Update documentation for inky_to_html
  Bump version to 2.12.1-DEV
  Prepare the 2.12.0 release
  Update CHANGELOG
2019-10-16 10:32:27 +02:00
Fabien Potencier c59567371a minor #3175 Update documentation for inky_to_html (tucksaun)
This PR was merged into the 2.x branch.

Discussion
----------

Update documentation for `inky_to_html`

Commits
-------

ae50257d Update documentation for inky_to_html
2019-10-16 10:31:29 +02:00
Tugdual Saunier ae50257dd0 Update documentation for inky_to_html 2019-10-16 10:29:01 +02:00
Gordon Franke 954ab4b8e3 doc: number_format add math calculation hint 2019-10-13 13:36:48 +02:00
Fabien Potencier 23419a9408 Bump version to 2.12.1-DEV 2019-10-05 18:44:39 +02:00
Fabien Potencier c7a85fd083 Prepare the 2.12.0 release v2.12.0 2019-10-05 18:42:38 +02:00
Fabien Potencier 231a365471 Update CHANGELOG 2019-10-05 18:41:19 +02:00
Fabien Potencier 6a50ca0639 Revert previous merge partially 2019-10-01 12:35:06 +02:00
Fabien Potencier 92c4287b81 Merge branch '2.x' into 3.x
* 2.x:
  Twig 2 is compatible with PHP 7.0
2019-10-01 12:33:23 +02:00
Fabien Potencier 4625774716 feature #3157 Twig 2 is compatible with PHP 7.0 (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Twig 2 is compatible with PHP 7.0

7.1 was needed for #3102, but this is not the case anymore since #3113

Commits
-------

b845ed96 Twig 2 is compatible with PHP 7.0
2019-10-01 12:31:38 +02:00
Fabien Potencier b50062d269 Merge branch '2.x' into 3.x
* 2.x:
  Fix issue #3159
  Fix issue #3160
2019-10-01 12:18:56 +02:00
Fabien Potencier f8c5f86761 Merge branch '1.x' into 2.x
* 1.x:
  Fix issue #3159
  Fix issue #3160
2019-10-01 12:18:48 +02:00
Fabien Potencier 8909a16264 minor #3163 Fix issue #3159 (ericmorand)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3163).

Discussion
----------

Fix issue #3159

Commits
-------

cfac11e9 Fix issue #3159
2019-10-01 12:18:05 +02:00
Eric MORAND cfac11e98a Fix issue #3159 2019-10-01 12:18:00 +02:00
Fabien Potencier 0d2b2aabf6 minor #3164 Fix issue #3160 (ericmorand)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3164).

Discussion
----------

Fix issue #3160

Commits
-------

4eb40f2f Fix issue #3160
2019-10-01 12:13:33 +02:00
Eric MORAND 4eb40f2fc8 Fix issue #3160 2019-10-01 12:13:28 +02:00
Fabien Potencier 21033f1348 minor #3158 [3] Fix leftover (nicolas-grekas)
This PR was merged into the 3.x branch.

Discussion
----------

[3] Fix leftover

Commits
-------

551a6c1c [3] Fix leftover
2019-09-22 19:18:32 +02:00
Nicolas Grekas 551a6c1cb8 [3] Fix leftover 2019-09-20 15:26:44 +02:00
Nicolas Grekas b845ed969e Twig 2 is compatible with PHP 7.0 2019-09-20 15:13:40 +02:00
Fabien Potencier a22e04e35f feature #3156 [3.0] remove the most blocking return types (nicolas-grekas)
This PR was merged into the 3.x branch.

Discussion
----------

[3.0] remove the most blocking return types

These return types make it needlessly hard to move to Twig 3.
This should make Symfony 4.4 compatible with Twig 3, and should help make the CI of Symfony 5 green.
> `Declaration of Twig\Extra\CssInliner\CssInlinerExtension::getFilters() must be compatible with Twig\Extension\AbstractExtension::getFilters(): array in /home/travis/build/symfony/symfony/vendor/twig/cssinliner-extra/src/CssInlinerExtension.php`

Commits
-------

ac0f5125 [3.0] remove the most blocking return types
2019-09-20 15:05:43 +02:00
Nicolas Grekas ac0f512553 [3.0] remove the most blocking return types 2019-09-20 15:04:28 +02:00
Fabien Potencier aab339e211 Fix code 2019-09-20 15:04:21 +02:00
Fabien Potencier ada0355047 Merge branch '2.x' into 3.x
* 2.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
2019-09-20 14:54:03 +02:00
Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x
* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
2019-09-20 14:53:54 +02:00
Fabien Potencier 4d766ec17b bug #3155 Optimize block('foo') ?? 'bar' (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Optimize block('foo') ?? 'bar'

closes #3154

Commits
-------

7a99a4e7 Optimize block('foo') ?? 'bar'
2019-09-20 14:45:25 +02:00
Fabien Potencier 7a99a4e7e5 Optimize block('foo') ?? 'bar' 2019-09-20 12:40:56 +02:00