bcda6c3323
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Allow inherited magic method to still run with calling class
2022-08-12 08:33:18 +02:00
f2cb718bdb
Fix CS
2022-08-12 08:33:05 +02:00
d1457a40b6
Allow inherited magic method to still run with calling class
...
If a static method cannot be resolved to the calling class, but the calling class has, or inherits, a `__callStatic` handler, this allows the `__callStatic` handler to be used with the calling class, and not the inherited class as would occur with reflection. This allows systems such as Laravel facades to still work.
Fixes https://github.com/twigphp/Twig/issues/3716
2022-07-06 10:46:46 +02:00
09760aa689
Merge branch '2.x' into 3.x
...
* 2.x:
Removed unneeded ext refs
2022-06-02 20:36:43 +02:00
3aba62185d
Removed unneeded ext refs
2022-06-02 20:36:38 +02:00
45a8317e61
Merge branch '2.x' into 3.x
...
* 2.x:
Fixes `CallExpression::reflectCallable()` throwing `TypeError`
2022-06-02 20:35:24 +02:00
e333ccc9f6
Fixes CallExpression::reflectCallable() throwing TypeError
2022-06-02 20:33:33 +02:00
d90435f6be
Merge branch '2.x' into 3.x
...
* 2.x:
Fix optimizing non-public named closures
Bump version
Prepare the 2.15.0 release
2022-05-17 07:45:01 +02:00
dd34e9f5c9
Fix optimizing non-public named closures
2022-05-16 17:47:23 +02:00
9ca7fb8799
Merge branch '2.x' into 3.x
...
* 2.x:
Fix support for named closures
2022-05-15 08:11:13 +02:00
163f07400a
Fix support for named closures
2022-05-13 17:01:54 +02:00
0fdf96c389
Merge branch '2.x' into 3.x
...
* 2.x:
Add a test
Fix typo
Fix compatibility with PHPUnit 10
Update doc for macro with embed tags
fix typo in ApplyTokenParser PHP doc
Fixes #3351
2020-08-05 16:54:08 +02:00
38bd74d03a
Merge branch '1.x' into 2.x
...
* 1.x:
Add a test
fix typo in ApplyTokenParser PHP doc
Fixes #3351
2020-08-05 16:53:59 +02:00
9a83f7edf6
Fix compatibility with PHPUnit 10
2020-07-29 03:03:03 +02:00
04658c9f59
Fixes #3351
2020-07-09 14:43:36 +02:00
3aa40a42b3
Merge branch '2.x' into 3.x
...
* 2.x:
Try running all tests on nightly
Minor fixes
Fix Travis config
2020-05-21 11:56:39 +02:00
791f001ae6
Merge branch '1.x' into 2.x
...
* 1.x:
Minor fixes
2020-05-21 11:15:20 +02:00
d57e50d778
Merge branch '2.x' into 3.x
...
* 2.x:
Allow dev versions
Allow PHP 8 for extra packages
Fix Travis
Bump version to 2.13
Fix integration tests
Fix PHP 8 compat
Install the phpunit-bridge with PHP 7.4 when testing nightly
Add PHP 8 / nightly in Travis matrix
Drop support for PHP 7.0
2020-05-19 15:23:33 +02:00
2d5e36b759
Merge branch '1.x' into 2.x
...
* 1.x:
Fix integration tests
Fix PHP 8 compat
Install the phpunit-bridge with PHP 7.4 when testing nightly
Add PHP 8 / nightly in Travis matrix
Drop support for PHP 7.0
2020-05-19 15:03:51 +02:00
6a0ab744d2
Fix PHP 8 compat
2020-05-19 14:22:31 +02:00
879fb0adcc
Merge branch '2.x' into 3.x
...
* 2.x:
removed usage of getmockBuilder() when not needed
removed usage of getmockBuilder() when not needed
2019-08-08 13:35:34 +02:00
656c295ed9
Merge branch '1.x' into 2.x
...
* 1.x:
removed usage of getmockBuilder() when not needed
2019-08-08 13:33:07 +02:00
5861a539e4
removed usage of getmockBuilder() when not needed
2019-08-08 11:59:51 +02:00
5e3ede955b
Merge branch '2.x' into 3.x
...
* 2.x:
Fix PHPUnit deprecations
Update to PhpUnitBridge and fix deprecations
2019-08-08 11:05:13 +02:00
5ebcecf24b
Fix PHPUnit deprecations
2019-08-08 11:03:05 +02:00
c829dafd75
Merge branch '1.x' into 2.x
...
* 1.x:
Update to PhpUnitBridge and fix deprecations
2019-08-08 10:19:01 +02:00
b776e41f5a
Update to PhpUnitBridge and fix deprecations
2019-08-08 09:39:49 +02:00
6823b64cad
moved test under tests/
2019-06-30 14:56:12 +02:00
1e3bb75010
moved test under tests/
2019-06-30 14:51:54 +02:00
22a1317249
moved tests under tests/
2019-06-30 14:48:27 +02:00
Fabien Potencier
Ben Thomson
ju1ius
Nicolas Grekas
Jérôme TAMARELLE
Bozhidar Hristov
Jérémy Derussé