Reduce to PHP 8 as minimum version to match twig

squirrelphp · Nov 20, 2024 · 72c4f38 · 72c4f38
1 parent ddc1c2a
commit 72c4f38
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
         }
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.0.2",
         "twig/twig": "^3.15"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.0",
         "captainhook/hook-installer": "^1.0",
-        "phpunit/phpunit": "^10.0",
-        "symfony/finder": "^7.0",
-        "symfony/process": "^7.0"
+        "phpunit/phpunit": "^9.0",
+        "symfony/finder": "^6.0|^7.0",
+        "symfony/process": "^6.0|^7.0"
     },
     "config": {
         "sort-packages": false,

diff --git a/docker/compose/composer.yml b/docker/compose/composer.yml
@@ -1,6 +1,6 @@
 services:
     composer:
-        image: thecodingmachine/php:8.2-v4-cli
+        image: thecodingmachine/php:8.0-v4-cli
         container_name: squirrel_composer
         working_dir: /usr/src/app
         command: [ "composer", "${COMPOSER_COMMAND}", "--ansi" ]

diff --git a/src/TokenParser/BreakNode.php b/src/TokenParser/BreakNode.php
@@ -10,7 +10,7 @@
 class BreakNode extends Node
 {
     public function __construct(
-        private readonly int $loopNumber,
+        private int $loopNumber,
         int $lineno,
     ) {
         parent::__construct([], [], $lineno);

diff --git a/src/TokenParser/ContinueNode.php b/src/TokenParser/ContinueNode.php
@@ -10,7 +10,7 @@
 class ContinueNode extends Node
 {
     public function __construct(
-        private readonly int $loopNumber,
+        private int $loopNumber,
         int $lineno,
     ) {
         parent::__construct([], [], $lineno);

diff --git a/tools/phpunit.xml.dist b/tools/phpunit.xml.dist
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="../vendor/autoload.php" cacheDirectory="cache/.phpunit.cache" displayDetailsOnIncompleteTests="true" displayDetailsOnSkippedTests="true" displayDetailsOnTestsThatTriggerDeprecations="true" displayDetailsOnPhpunitDeprecations="true" displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerErrors="true" displayDetailsOnTestsThatTriggerWarnings="true">
-    <coverage includeUncoveredFiles="true"/>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="../vendor/autoload.php" cacheResultFile="cache/.phpunit.result.cache">
+    <coverage>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+    </coverage>
     <testsuites>
-        <testsuite name="unit">
+        <testsuite name="Unit Tests">
             <directory>../tests</directory>
         </testsuite>
     </testsuites>
-    <source>
-        <include>
-            <directory>../src</directory>
-        </include>
-    </source>
 </phpunit>