Share container-cached readonly services via #[ScopeShared]; exercise the suite on PHP 8.1

.github/workflows/tests.yml

@@ -31,6 +31,9 @@ jobs:
       matrix:
         php: [ 8.2, 8.3, 8.4, 8.5 ]
         dependencies: [ lowest , highest ]
+        include:
+          - php: 8.1
+            dependencies: highest
       max-parallel: 2
 
     name: Tests PHP${{ matrix.php }}-${{ matrix.dependencies }}
@@ -52,10 +55,19 @@ jobs:
           coverage: none
 
       - name: Install Composer dependencies
+        if: matrix.php != '8.1'
         uses: ramsey/composer-install@v3
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
+      - name: Install and downgrade for PHP 8.1
+        if: matrix.php == '8.1'
+        uses: php-internal/actions/downgrade@v1
+        with:
+          php-version: '8.1'
+          dependency-versions: ${{ matrix.dependencies }}
+          paths: core plugin bridge tests testo.php
+
       # Bin tools carry deps with a higher PHP floor than the matrix (e.g. tools/double).
       # They install everywhere but only load where the platform allows, so ignore the check.
       - name: Install bin tools

bridge/symfony-console/src/Command/Init.php

@@ -27,7 +27,7 @@
 )]
 final class Init extends Command
 {
-    private const STUB = __DIR__ . '/../../resources/stubs/testo.php';
+    private const STUB = __DIR__ . '/../../resources/stubs/testo.php.stub';
     private const CONFIG_FILENAME = 'testo.php';
     private const KNOWN_SUITES = ['Unit', 'Integration', 'Functional', 'Acceptance', 'Feature', 'E2E', 'Contract'];
     private const SCRIPT_ALL_KEY = 'test';

composer.json

@@ -30,7 +30,7 @@
     "require": {
         "php": ">=8.2",
         "ext-tokenizer": "*",
-        "internal/container": "^1.0",
+        "internal/container": "^1.1",
         "internal/destroy": "^1.0",
         "internal/path": "^1.3",
         "psr/container": "1 - 2",
@@ -217,7 +217,7 @@
         "test:cc": [
             "@putenv TESTO_CI=1",
             "@putenv XDEBUG_MODE=coverage",
-            "testo --coverage --coverage-clover=runtime/clover.xml"
+            "testo --coverage --coverage-clover=runtime/clover.xml --type=!bench"
         ]
     }
 }

core/Application/Config/ApplicationConfig.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Config;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Path;
 use Testo\Application\Config\Plugin\ApplicationPlugins;
 use Testo\Common\PluginConfigurator;
@@ -13,6 +14,7 @@
  *
  * @api
  */
+#[ScopeShared]
 final readonly class ApplicationConfig
 {
     /**

core/Application/Config/RunConfiguration.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Config;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Path;
 
 /**
@@ -22,6 +23,7 @@
  * @psalm-immutable
  * @api
  */
+#[ScopeShared]
 final readonly class RunConfiguration
 {
     /**

core/Application/Internal/MessengerHub.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Testo\Application\Internal\Messenger\State;
 use Testo\Application\Internal\Messenger\MutableContainer;
@@ -23,6 +24,7 @@
  *
  * @internal
  */
+#[ScopeShared]
 final readonly class MessengerHub implements Messenger
 {
     private MutableContainer $state;

core/Application/Internal/Runner/CaseRunner.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Internal\Runner;
 
+use Internal\Container\Attribute\ScopeShared;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Testo\Core\Context\CaseInfo;
 use Testo\Core\Context\CaseResult;
@@ -25,6 +26,7 @@
  * @internal
  * @psalm-internal Testo\Application
  */
+#[ScopeShared]
 final readonly class CaseRunner
 {
     public function __construct(

core/Application/Internal/Runner/SuiteRunner.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Internal\Runner;
 
+use Internal\Container\Attribute\ScopeShared;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Testo\Application\Internal\SimpleCaseInstantiator;
 use Testo\Common\ErrorReporter;
@@ -30,6 +31,7 @@
  * @internal
  * @psalm-internal Testo\Application
  */
+#[ScopeShared]
 final readonly class SuiteRunner
 {
     public function __construct(

core/Application/Internal/Runner/TestRunner.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Application\Internal\Runner;
 
+use Internal\Container\Attribute\ScopeShared;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Testo\Application\Exception\PipelineFailure;
 use Testo\Core\Context\TestInfo;
@@ -37,6 +38,7 @@
  * @internal
  * @psalm-internal Testo\Application
  */
+#[ScopeShared]
 final readonly class TestRunner
 {
     public function __construct(

core/Common/ErrorReporter.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Common;
 
+use Internal\Container\Attribute\ScopeShared;
 use Testo\Core\Log\Level;
 
 /**
@@ -17,6 +18,7 @@
  *
  * @internal
  */
+#[ScopeShared]
 final readonly class ErrorReporter
 {
     public function __construct(

core/Output/ConsoleStreams.php

@@ -4,6 +4,8 @@
 
 namespace Testo\Output;
 
+use Internal\Container\Attribute\ScopeShared;
+
 /**
  * The process's stdout/stderr as an injectable pair of streams.
  *
@@ -12,6 +14,7 @@
  *
  * @api
  */
+#[ScopeShared]
 final readonly class ConsoleStreams
 {
     /** @var resource */

core/Pipeline/Internal/AttributesInterceptor.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Pipeline\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Testo\Common\Reflection;
 use Testo\Core\Context\CaseInfo;
 use Testo\Core\Context\CaseResult;
@@ -25,6 +26,7 @@
  * @psalm-internal Testo\Pipeline
  */
 #[InterceptorOptions(order: InterceptorOptions::ORDER_ATTRIBUTES)]
+#[ScopeShared]
 final readonly class AttributesInterceptor implements TestRunInterceptor, TestCaseRunInterceptor
 {
     public function __construct(

core/Testing/Internal/InjectInterceptor.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Testing\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Container\Container;
 use Testo\Core\Context\CaseInfo;
 use Testo\Core\Context\CaseResult;
@@ -21,6 +22,7 @@
  * @psalm-internal Testo
  */
 #[InterceptorOptions(order: InterceptorOptions::ORDER_DEFAULT)]
+#[ScopeShared]
 final readonly class InjectInterceptor implements TestCaseRunInterceptor
 {
     public function __construct(

plugin/assert/composer.json

@@ -21,6 +21,7 @@
     ],
     "require": {
         "php": ">=8.2",
+        "internal/container": "^1.1",
         "testo/testo": "0.10.44 - 1"
     },
     "autoload": {

plugin/assert/src/Internal/Middleware/AssertCollectorInterceptor.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Assert\Internal\Middleware;
 
+use Internal\Container\Attribute\ScopeShared;
 use Testo\Assert\AssertPlugin;
 use Testo\Assert\Internal\HistoryRenderer;
 use Testo\Assert\Internal\StaticState;
@@ -28,6 +29,7 @@
  * Supports both synchronous and asynchronous (Fiber-based) environments.
  */
 #[InterceptorOptions(order: InterceptorOptions::ORDER_ASSERTIONS - 10)]
+#[ScopeShared]
 final readonly class AssertCollectorInterceptor implements TestRunInterceptor
 {
     public function __construct(

plugin/bench/composer.json

@@ -21,6 +21,7 @@
     ],
     "require": {
         "php": ">=8.2",
+        "internal/container": "^1.1",
         "testo/data": "^0.1.9",
         "testo/filter": "^0.1.7",
         "testo/inline": "^0.1.9",

plugin/bench/src/Internal/BenchHandler.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Bench\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Testo\Assert\Internal\StaticState;
 use Testo\Assert\State\Assertion\AssertionException;
 use Testo\Assert\State\Assertion\AssertionSuccess;
@@ -21,6 +22,7 @@
 /**
  * @internal
  */
+#[ScopeShared]
 final readonly class BenchHandler
 {
     public function __construct(
@@ -239,7 +241,7 @@ private static function runCase(\Closure $function, int $calls): Snap
         # peak is reset first so it reflects this iteration only, and the collection cycle keeps
         # garbage from a previous case out of the window.
         \gc_collect_cycles();
-        \memory_reset_peak_usage();
+        \function_exists('memory_reset_peak_usage') and \memory_reset_peak_usage();
         $beforeMem = \memory_get_peak_usage();
         $beforeTime = \hrtime(true);
         for ($i = 0; $i < $calls; ++$i) {

plugin/bench/src/Internal/Pipeline/BenchFinder.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Bench\Internal\Pipeline;
 
+use Internal\Container\Attribute\ScopeShared;
 use Testo\Bench;
 use Testo\Bench\Internal\BenchHandler;
 use Testo\Common\Reflection;
@@ -22,6 +23,7 @@
  * @internal
  */
 #[InterceptorOptions(order: -20_000, testType: TestType::BenchInline)]
+#[ScopeShared]
 final readonly class BenchFinder implements FileLocatorInterceptor, CaseLocatorInterceptor
 {
     /** @var \Closure(TestInfo): mixed Invoker for the test method. */

plugin/codecov/composer.json

@@ -22,6 +22,7 @@
     "require": {
         "php": ">=8.2",
         "ext-xmlwriter": "*",
+        "internal/container": "^1.1",
         "testo/data": "^0.1.9",
         "testo/inline": "^0.1.8",
         "testo/testo": "0.10.44 - 1"

plugin/codecov/src/Internal/CoverageCollector.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Codecov\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Destroy\Destroyable;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Testo\Codecov\Result\CoverageResult;
@@ -21,6 +22,7 @@
  *
  * @internal
  */
+#[ScopeShared]
 final readonly class CoverageCollector implements Destroyable
 {
     private Cache $cache;

plugin/filter/Filter.php

@@ -4,6 +4,7 @@
 
 namespace Testo;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Path;
 use Testo\Core\Value\TestType;
 
@@ -15,6 +16,7 @@
  *
  * @api
  */
+#[ScopeShared]
 final readonly class Filter
 {
     /**

plugin/filter/composer.json

@@ -21,6 +21,7 @@
     ],
     "require": {
         "php": ">=8.2",
+        "internal/container": "^1.1",
         "testo/testo": "0.10.46 - 1"
     },
     "autoload": {

plugin/filter/src/Internal/SuiteFilterInterceptor.php

@@ -4,6 +4,7 @@
 
 namespace Testo\Filter\Internal;
 
+use Internal\Container\Attribute\ScopeShared;
 use Internal\Path;
 use Testo\Application\Config\ApplicationConfig;
 use Testo\Application\Config\FinderConfig;
@@ -23,6 +24,7 @@
  * @psalm-internal Testo\Filter
  */
 #[InterceptorOptions(order: InterceptorOptions::ORDER_FILTER, onConflict: ConflictPolicy::First)]
+#[ScopeShared]
 final readonly class SuiteFilterInterceptor implements SuiteLocatorInterceptor
 {
     public function __construct(

tests/Output/Unit/Rendering/Diff/DifferStrategiesTest.php

@@ -6,6 +6,7 @@
 
 use Testo\Assert;
 use Testo\Codecov\Covers;
+use Testo\Core\Exception\SkipTest;
 use Testo\Data\DataCross;
 use Testo\Data\DataProvider;
 use Testo\Output\Rendering\Diff\DiffLine;
@@ -242,6 +243,10 @@ public function ratcliffStaysCorrectWithPopularLines(): void
      */
     public function hirschbergUsesFarLessMemoryThanTheLcsTable(): void
     {
+        \function_exists('memory_reset_peak_usage') or throw new SkipTest(
+            'Per-call peak measurement needs memory_reset_peak_usage() (PHP 8.2+).',
+        );
+
         $expected = \implode("\n", \array_map(static fn(int $i): string => "row {$i}", \range(1, 400)));
         $actual = \str_replace('row 200', 'row CHANGED', $expected);
 

tests/Output/Unit/Rendering/Diff/DifferTest.php

@@ -87,7 +87,7 @@ public function myersScalesToLargeNearlyIdenticalInput(): void
     public function lcsEmitsNoWarnings(): void
     {
         $previous = \set_error_handler(
-            static fn(int $errno, string $errstr): never => throw new \ErrorException($errstr, $errno),
+            static fn(int $errno, string $errstr) => throw new \ErrorException($errstr, $errno),
             \E_WARNING | \E_NOTICE,
         );
         try {