Commit Graph

4770 Commits

Author SHA1 Message Date
Fabien Potencier 336d69c166 fixed CS 2019-08-07 20:54:50 +02:00
Fabien Potencier d0c0f7e3b0 Merge branch '1.x' into 2.x
* 1.x:
  fixed the "empty" test on Traversable instances
  avoid confusion between .. and ..
2019-08-07 17:07:59 +02:00
Fabien Potencier c87fe47373 bug #3104 Fix the "empty" test on Traversable instances (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix the "empty" test on Traversable instances

closes #3101

Commits
-------

b202fe38 fixed the "empty" test on Traversable instances
2019-08-07 17:07:43 +02:00
Fabien Potencier b202fe3809 fixed the "empty" test on Traversable instances 2019-08-07 17:02:01 +02:00
Fabien Potencier 20d60b5f25 avoid confusion between .. and .. 2019-08-07 16:28:20 +02:00
Fabien Potencier 2a32f38be7 fixed phpdocs 2019-08-07 16:22:21 +02:00
Fabien Potencier 472cb913fd feature #3094 Add extra argument to filter column (DarkBee)
This PR was merged into the 2.x branch.

Discussion
----------

Add extra argument to filter column

Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`

Commits
-------

7ca47f2e Update CoreExtension.php
2019-08-07 16:21:35 +02:00
Fabien Potencier ee153554bd fixed CHANGELOG 2019-08-07 16:15:40 +02:00
Fabien Potencier ca821656cd feature #2798 Added support for css_class function (lyrixx, fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Added support for `css_class` function

fixes #2797

Commits
-------

6ce9beb9 moved css_class function to html_classes filter
2200d837 Added support for `css_class` function
2019-08-07 16:14:42 +02:00
Fabien Potencier 6ce9beb9fd moved css_class function to html_classes filter 2019-08-07 16:09:15 +02:00
Grégoire Pineau 2200d837ef Added support for css_class function 2019-08-07 15:57:33 +02:00
Fabien Potencier ad2ddd68ef added missing docs 2019-08-07 15:56:57 +02:00
Fabien Potencier debc5c3ca5 fixed wrong registration 2019-08-07 15:44:55 +02:00
Fabien Potencier a8f3be3a26 feature #3102 Add the data_uri filter (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add the data_uri filter

Implemented as a popular request here: closes https://github.com/twigphp/Twig-extensions/issues/54

Commits
-------

220e7506 added the data_uri filter
2019-08-07 15:06:49 +02:00
Fabien Potencier 220e75065a added the data_uri filter 2019-08-07 14:42:44 +02:00
Fabien Potencier 87391f5692 bumped version 2019-08-07 14:00:00 +02:00
Fabien Potencier 03dbdb9683 Merge branch '1.x' into 2.x
* 1.x:
  Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-02 10:10:18 +02:00
Fabien Potencier 18458930a5 bug #3097 Fix using array_key_exists() on objects, it is deprecated in PHP 7.4 (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Fix using array_key_exists() on objects, it is deprecated in PHP 7.4

Found as part of https://github.com/symfony/symfony/issues/32844

Commits
-------

d0550b7a Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-02 10:08:07 +02:00
Nicolas Grekas d0550b7a68 Fix using array_key_exists() on objects, it is deprecated in PHP 7.4 2019-08-01 16:18:22 +02:00
DarkBee 7ca47f2edd Update CoreExtension.php
Added optional argument to `twig_array_column`, `$index_key`, to reflect proper arguments for underlaying `PHP` function `column`
2019-07-24 14:07:14 +02:00
Fabien Potencier 5bfe590de5 updated CHANGELOG 2019-07-12 09:13:06 +03:00
Fabien Potencier 744af47848 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
  tweaked code
  Extend opcache check if it is enabled
2019-07-12 09:12:46 +03:00
Fabien Potencier ef4ae447f9 updated CHANGELOG 2019-07-12 09:12:11 +03:00
Fabien Potencier 5c8c41853b tweaked code 2019-07-12 09:11:27 +03:00
Fabien Potencier dfde2f4e85 bug #3087 Extend opcache check if it is enabled (vosco88)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3087).

Discussion
----------

Extend opcache check if it is enabled

When trying to deploy October on shared hosting (www.websupport.sk) I received following error when accessing the frontend pages - ErrorException:> Zend OPcache API is restricted by "restrict_api" configuration directive.
Backend was working normally.
I propose the following change to check not only if the opcache_invalidate exists but also if opcache is enabled.
The change was also needed in octobercms files, but to correspond I am also proposing to add it directly to twig.

Commits
-------

6e68bd08 Extend opcache check if it is enabled
2019-07-12 09:09:49 +03:00
vosco88 6e68bd0815 Extend opcache check if it is enabled
When trying to deploy October on shared hosting (www.websupport.sk) I received following error when accessing the frontend pages - ErrorException:> Zend OPcache API is restricted by "restrict_api" configuration directive.
Backend was working normally. 
I propose the following change to check not only if the opcache_invalidate exists but also if opcache is enabled.
The change was also needed in octobercms files, but to correspond I am also proposing to add it directly to twig.
2019-07-12 09:09:42 +03:00
Fabien Potencier 188d402752 minor #3086 Update include.rst (Chrysweel)
This PR was merged into the 2.x branch.

Discussion
----------

Update include.rst

Fix in function include to set a filter

Commits
-------

21fde2f7 Update include.rst
2019-07-11 08:17:32 +03:00
Chrysweel 21fde2f781 Update include.rst
Fix in function include to set a filter
2019-07-10 14:14:10 +02:00
Fabien Potencier e74d477c54 bug #3084 Fix using macros in arrow functions (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix using macros in arrow functions

Closes #3083

Commits
-------

95352743 fixed using macros in arrow functions
2019-07-03 20:24:58 +02:00
Fabien Potencier 95352743eb fixed using macros in arrow functions 2019-07-03 20:17:43 +02:00
Fabien Potencier f1b1b87912 Merge branch '1.x' into 2.x
* 1.x:
  fixed tests for PHP 7.4
2019-06-30 15:36:34 +02:00
Fabien Potencier c41d567956 minor #3081 Fix tests for PHP 7.4 (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix tests for PHP 7.4

Commits
-------

0947777b fixed tests for PHP 7.4
2019-06-30 15:34:28 +02:00
Fabien Potencier 0947777bc6 fixed tests for PHP 7.4 2019-06-30 15:21:28 +02:00
Fabien Potencier 53d056c861 fixed typo 2019-06-30 15:11:45 +02:00
Fabien Potencier 1e3bb75010 moved test under tests/ 2019-06-30 14:51:54 +02:00
Fabien Potencier c0936a6fbd Merge branch '1.x' into 2.x
* 1.x:
  moved tests under tests/
2019-06-30 14:49:24 +02:00
Fabien Potencier 22a1317249 moved tests under tests/ 2019-06-30 14:48:27 +02:00
Fabien Potencier e933f00091 Merge branch '1.x' into 2.x
* 1.x:
  fixed typo
2019-06-30 14:41:53 +02:00
Fabien Potencier 08513fe422 fixed typo 2019-06-30 14:41:41 +02:00
Fabien Potencier ebbf5e662e Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-06-30 13:33:03 +02:00
Fabien Potencier e175aebc96 fixed CS 2019-06-30 13:31:59 +02:00
Fabien Potencier 34bdab4d37 moved FQDN in tests to use statemetns 2019-06-30 13:29:34 +02:00
Fabien Potencier 920a4f5f24 fixed CS 2019-06-30 13:25:10 +02:00
Fabien Potencier ccf27274ea Merge branch '1.x' into 2.x
* 1.x:
  moved tests to a namespace structure
2019-06-30 12:58:40 +02:00
Fabien Potencier af3526735c minor #3080 Move tests to a namespace structure (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Move tests to a namespace structure

Commits
-------

2119e60c moved tests to a namespace structure
2019-06-30 12:40:14 +02:00
Fabien Potencier 2119e60cf7 moved tests to a namespace structure 2019-06-30 12:39:00 +02:00
Fabien Potencier a271832c90 Merge branch '1.x' into 2.x
* 1.x:
  added Blackfire as a sponsor
2019-06-28 17:39:03 +02:00
Fabien Potencier ded92c0bc2 minor #3078 Add Blackfire as a sponsor (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add Blackfire as a sponsor

Commits
-------

8c7a0e9a added Blackfire as a sponsor
2019-06-28 17:38:31 +02:00
Fabien Potencier 8c7a0e9a50 added Blackfire as a sponsor 2019-06-28 17:37:46 +02:00
Fabien Potencier c9b21be6b9 Merge branch '1.x' into 2.x
* 1.x:
  tweaked an example in the docs
  Use dir constant for fixtures
2019-06-27 07:33:08 +02:00