Commit Graph

6933 Commits

Author SHA1 Message Date
Alexander M. Turek 6172a42e9e Fix method visibility 2024-09-04 10:04:33 +02:00
Fabien Potencier b02a8b5eb5 Merge branch '3.x' into 4.x
* 3.x:
  Fix Xdebug detection
2024-09-04 07:58:13 +02:00
Fabien Potencier fb2663eb69 bug #4267 Fix Xdebug detection (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Fix Xdebug detection

The ini setting `xdebug.overload_var_dump` has been removed in Xdebug 3. The `var_dump()` method is now always overloaded if the Xdebug runs in develop mode. I've adjusted our detection logic accordingly.

Since our minimum PHP version is 8.0 now, we can stop caring about Xdebug 2 which has never received a PHP 8 compatible release.

Commits
-------

1e87185d Fix Xdebug detection
2024-09-04 07:57:05 +02:00
Fabien Potencier 6f885353f3 Make NodeTestCase::getEnvironment() final 2024-09-04 07:56:08 +02:00
Fabien Potencier 09d2b155d2 minor #4274 Switch to static data provides for integration tests (derrabus)
This PR was merged into the 4.x branch.

Discussion
----------

Switch to static data provides for integration tests

This change should make our integration test case compatible with PHPUnit 10 and 11. Merging the PR will hopefully give us a green build on #4269. 🤞🏻

Commits
-------

9282dbcc Switch to static data provides for integration tests
2024-09-04 07:55:01 +02:00
Alexander M. Turek 9282dbcc42 Switch to static data provides for integration tests 2024-09-03 23:24:35 +02:00
Fabien Potencier 6f9f7e2d29 Merge branch '3.x' into 4.x
* 3.x:
  Fix tests that don't perform assertions
2024-09-03 22:59:28 +02:00
Fabien Potencier b80ce5eceb minor #4273 Fix tests that don't perform assertions (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Fix tests that don't perform assertions

The method `doesNotPerformAssertions()` is a getter that tells us if the current test is expected to perform assertions. I think the method that the author _wanted_ to call is `expectNotToPerformAssertions()` which tells PHPUnit not to complain if the current test does not perform any assertions.

Commits
-------

db22abfa Fix tests that don't perform assertions
2024-09-03 22:58:49 +02:00
Alexander M. Turek db22abfadf Fix tests that don't perform assertions 2024-09-03 22:51:23 +02:00
Fabien Potencier 65fc44bce5 Remove deprecated code 2024-09-03 22:22:04 +02:00
Fabien Potencier a789eca738 Merge branch '3.x' into 4.x
* 3.x:
  Validate the input of CoreExtension::map()
  Rename AbstractTest to ProfilerTestCase
  Make data providers static
  Prepare IntegrationTestCase for static data providers
2024-09-03 22:20:28 +02:00
Fabien Potencier 722a5fb027 feature #4266 Prepare IntegrationTestCase for static data providers (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Prepare IntegrationTestCase for static data providers

Data providers need to be static in PHPUnit 11. Because of this, I'd like to declare the two methods we use as data providers in `IntegrationTestCase` as static in 4.0. This PR prepares that change:

* The non-static `getFixturesDir()` method is replaced with a static `getFixturesDirectory()`.
* Both methods `getTests()` and `getLegacyTests()` are marked as final, so we can declare them static in the next major.

This however means that we're delaying PHPUnit 11 compatibility of integration tests to Twig 4.0. If that's too late for us, we could deprecate the whole `IntegrationTestCase` in favor of a compatible replacement. That's a bigger change, but I would work on it if you think it's worth it.

Commits
-------

18f42038 Prepare IntegrationTestCase for static data providers
2024-09-03 22:17:35 +02:00
Fabien Potencier e829b26dc8 minor #4272 Validate the input of CoreExtension::map() (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Validate the input of CoreExtension::map()

Fixes https://github.com/twigphp/Twig/pull/4269#discussion_r1742182828

As discovered in #4269, we have a test that checks if the map filter fails if we pass a non-iterable value. However, this test relies on an active error handler that throws on PHP warnings.

This PR adds input validation the the `map()` function like we can already find it in similar functions.

Commits
-------

a035204a Validate the input of CoreExtension::map()
2024-09-03 22:14:48 +02:00
Alexander M. Turek a035204afb Validate the input of CoreExtension::map() 2024-09-03 17:18:47 +02:00
Fabien Potencier 3349175e72 minor #4270 Make data providers static (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Make data providers static

Data providers must be static in PHPUnit 11. This PR fixes all the low hanging fruit.

Commits
-------

6ddb76bb Make data providers static
2024-09-03 16:53:53 +02:00
Fabien Potencier 3371d6e2b1 minor #4271 Rename AbstractTest to ProfilerTestCase (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Rename AbstractTest to ProfilerTestCase

PHPUnit 11 doesn't allow abstract test classes to have the suffix "Test". This PR renames a class that violates that rule.

Commits
-------

fc20997c Rename AbstractTest to ProfilerTestCase
2024-09-03 16:53:09 +02:00
Alexander M. Turek fc20997c9e Rename AbstractTest to ProfilerTestCase 2024-09-03 16:34:13 +02:00
Alexander M. Turek 6ddb76bb76 Make data providers static 2024-09-03 16:32:00 +02:00
Alexander M. Turek 18f4203827 Prepare IntegrationTestCase for static data providers 2024-09-03 15:08:40 +02:00
Fabien Potencier 2f757a3616 Remove deprecated clode 2024-09-03 14:55:56 +02:00
Fabien Potencier fe7bac8989 Merge branch '3.x' into 4.x
* 3.x:
  Migrate NodeTestCase to static data providers
2024-09-03 14:51:02 +02:00
Fabien Potencier dd9af8ec25 feature #4265 Migrate NodeTestCase to static data providers (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Migrate NodeTestCase to static data providers

PHPUnit 11 requires data providers to be static. This PR prepares our abstract `NodeTestCase` by deprecating the non-static `getTests()` and adding a static `provideTests()` as a replacement. I've also added PHPUnit attributes which newer PHPUnit releases prefer over PHPDoc annotations.

Commits
-------

f555a33c Migrate NodeTestCase to static data providers
2024-09-03 14:03:04 +02:00
Fabien Potencier b47b03d237 minor #4268 Remove obsolete "requires PHP" annotation (derrabus)
This PR was merged into the 4.x branch.

Discussion
----------

Remove obsolete "requires PHP" annotation

Commits
-------

fe2803d2 Remove obsolete "requires PHP" annotation
2024-09-03 14:00:43 +02:00
Fabien Potencier 50f8b13adf Fix tests 2024-09-03 13:58:52 +02:00
Alexander M. Turek fe2803d245 Remove obsolete "requires PHP" annotation 2024-09-03 13:58:34 +02:00
Fabien Potencier cc1045e4e4 Merge branch '3.x' into 4.x
* 3.x:
  Replace `return; yield` with `yield from []`
  Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate
  Fix MacroTest
2024-09-03 13:55:51 +02:00
Alexander M. Turek f555a33caf Migrate NodeTestCase to static data providers 2024-09-03 13:51:42 +02:00
Fabien Potencier f0c337690f minor #4259 Replace return; yield with yield from [] (ruudk)
This PR was merged into the 3.x branch.

Discussion
----------

Replace `return; yield` with `yield from []`

This has the same effect, but looks less hacky and makes PHPStan happy.
https://phpstan.org/r/df7fcc88-1df8-428e-b675-5dc6965c34d6

Previously this was needed to work properly with output capturing.

/cc `@fabpot` `@nicolas`-grekas

https://3v4l.org/KXste

Commits
-------

09a43a9f Replace `return; yield` with `yield from []`
2024-09-03 13:17:04 +02:00
Alexander M. Turek 1e87185d26 Fix Xdebug detection 2024-09-03 10:17:14 +02:00
Ruud Kamphuis 09a43a9f6f Replace return; yield with yield from []
This has the same effect, but looks less hacky and makes PHPStan happy.
https://phpstan.org/r/df7fcc88-1df8-428e-b675-5dc6965c34d6

Previously this was needed to work properly with output capturing.
2024-09-03 09:55:58 +02:00
Fabien Potencier c0f11545fd minor #4263 Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate

I stumbled over this test while checking for PHPUnit deprecations. In this case, we need to do something about the `setMethods()` call which has been removed in PHPUnit 11.

However, we add an expectation for a method `initExtensions()` which has been removed a long time ago. So, if that method was actually called, we'd get an error anyway. Expecting this method not to be called feels a little redundant. ~~This basically means, we can run this test against an unmocked `Environment`. But if we do so, the test does not really test what it's supposed to test which is why I decided to remove the whole test.~~

Update: Instead, I'm now registering an extension that throws if we try to initialize it.

Commits
-------

3a4d513f Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate
2024-09-02 22:20:58 +02:00
Alexander M. Turek 3a4d513ffe Fix testExtensionsAreNotInitializedWhenRenderingACompiledTemplate 2024-09-02 20:07:39 +02:00
Fabien Potencier 6b37522774 minor #4264 Fix MacroTest (derrabus)
This PR was merged into the 3.x branch.

Discussion
----------

Fix MacroTest

Because of a typo in a variable name, `MacroTest` was never executed. This PR fixes the typo and adjusts the expected compiled PHP code, assuming that the current behavior is correct.

Commits
-------

1e5dea44 Fix MacroTest
2024-09-02 19:26:05 +02:00
Alexander M. Turek 1e5dea44f9 Fix MacroTest 2024-09-02 18:57:57 +02:00
Fabien Potencier ebb66610c9 Move back Environment::getGlobals() to public/internal 2024-09-02 17:23:35 +02:00
Fabien Potencier b7ded5c569 bug #4260 don't read current key and value when end of iterator is reached (xabbuh)
This PR was merged into the 4.x branch.

Discussion
----------

don't read current key and value when end of iterator is reached

see failures in symfony/symfony#58145

Commits
-------

12b4cdcf don't read current key and value when end of iterator is reached
2024-09-02 16:35:38 +02:00
Fabien Potencier 5513a89ec2 minor #4261 remove no longer needed PHP version checks (xabbuh)
This PR was merged into the 4.x branch.

Discussion
----------

remove no longer needed PHP version checks

Commits
-------

038d70f2 remove no longer needed PHP version checks
2024-09-02 16:34:36 +02:00
Fabien Potencier dad61f1960 minor #4262 Switch to expectUserDeprecationMessage() (derrabus)
This PR was merged into the 4.x branch.

Discussion
----------

Switch to expectUserDeprecationMessage()

This PR leverages symfony/symfony#54593. This will make it easier to switch to a vanilla PHPUnit 11 in the future.

Commits
-------

0ab26b08 Switch to expectUserDeprecationMessage()
2024-09-02 16:34:13 +02:00
Alexander M. Turek 0ab26b08b9 Switch to expectUserDeprecationMessage() 2024-09-02 15:38:53 +02:00
Christian Flothmann 038d70f2aa remove no longer needed PHP version checks 2024-09-02 15:38:31 +02:00
Christian Flothmann 12b4cdcf5e don't read current key and value when end of iterator is reached 2024-09-02 15:31:28 +02:00
Fabien Potencier 06ac86e3dd Merge branch '3.x' into 4.x
* 3.x:
  Fix tests
  Allow extra extensions to use Twig 4
2024-09-01 23:00:16 +02:00
Fabien Potencier 54590ec86b minor #4258 Allow extra extensions to use Twig 4 (on 3.x) (fabpot)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Allow extra extensions to use Twig 4 (on 3.x)

Commits
-------

976cea04 Fix tests
031c7bda Allow extra extensions to use Twig 4
2024-09-01 22:59:50 +02:00
Fabien Potencier 976cea0403 Fix tests 2024-09-01 22:54:59 +02:00
Fabien Potencier 031c7bda4d Allow extra extensions to use Twig 4 2024-09-01 22:39:12 +02:00
Fabien Potencier 5e9d905866 Fix wrong merge 2024-09-01 09:48:10 +02:00
Fabien Potencier 05ea8f073c Merge branch '3.x' into 4.x
* 3.x:
  Only unset `_iterated` when there is an `else` node
2024-09-01 09:47:37 +02:00
Fabien Potencier d55f7adcbe minor #4257 Only unset _iterated when there is an else node (ruudk)
This PR was merged into the 3.x branch.

Discussion
----------

Only unset `_iterated` when there is an `else` node

Same as #4249

Even though PHP does not complain, PHPStan does.
> Cannot unset offset '_iterated' on array{ ... the context values ... }

Since this is compiled code, we can easily produce a bit more valid code in the eyes of PHPStan.

Commits
-------

a16910e1 Only unset `_iterated` when there is an `else` node
2024-09-01 09:43:32 +02:00
Ruud Kamphuis a16910e14d Only unset _iterated when there is an else node
Same as #4249

Even though PHP does not complain, PHPStan does.
> Cannot unset offset '_iterated' on array{ ... the context values ... }

Since this is compiled code, we can easily produce a bit more valid code in the eyes of PHPStan.
2024-09-01 08:53:55 +02:00
Fabien Potencier 5c0b2d8478 Remove obsolete code 2024-08-30 20:45:16 +02:00