Updated tests to pass with PHP 8.3, also updated minimum PHP version …

…to 8.
smuuf · Oct 13, 2024 · 3141cd2 · 3141cd2
1 parent dbf646a
commit 3141cd2
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 46 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
           matrix:
-            php-versions: ['7.4', '8.0', '8.1', 'latest']
+            php-versions: ['8.0', '8.1', '8.2', '8.3', 'latest']
           fail-fast: false
     steps:
     - uses: actions/checkout@v1

diff --git a/bin/phpstan b/bin/phpstan
@@ -2,5 +2,5 @@
 
 cd $(dirname $0)
 
-../vendor/bin/phpstan analyze --level=5 ../lib $@
+../vendor/bin/phpstan analyze -c ../phpstan.neon $@
 
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.0"
     },
     "autoload": {
         "psr-0": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/hafriedlander/Peg/Compiler/Rule.php b/lib/hafriedlander/Peg/Compiler/Rule.php
@@ -171,7 +171,7 @@ public function tokenize($str, &$tokens, $o = 0) {
 			}
 			/* Handle expression labels */
 			elseif (\preg_match('/\G(\w*):/', $str, $match, 0, $o)) {
-				$pending->set('tag', $match[1] ?? '');
+				$pending->set('tag', $match[1] ?: '');
 				$o += \strlen($match[0]);
 			}
 			/* Handle descent token */

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,5 @@
+parameters:
+	level: 5
+	paths:
+		- ./lib
+		- ./tests
diff --git a/tests/CachedRegexp.phpt b/tests/CachedRegexp.phpt
@@ -1,9 +1,11 @@
 <?php
 
-use \Tester\Assert;
+declare(strict_types=1);
 
-use \hafriedlander\Peg\Parser\Basic;
-use \hafriedlander\Peg\Parser\CachedRegexp;
+use Tester\Assert;
+
+use hafriedlander\Peg\Parser\Basic;
+use hafriedlander\Peg\Parser\CachedRegexp;
 
 require __DIR__ . '/bootstrap.php';
 

diff --git a/tests/ParserInheritance.phpt b/tests/ParserInheritance.phpt
@@ -1,6 +1,8 @@
 <?php
 
-use \Tester\Assert;
+declare(strict_types=1);
+
+use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 

diff --git a/tests/ParserPackrat.phpt b/tests/ParserPackrat.phpt
@@ -1,5 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
+use hafriedlander\Peg\Parser\Packrat;
+
 require __DIR__ . '/bootstrap.php';
 
 class ParserPackratTest extends ParserTestBase {
@@ -22,7 +26,7 @@ class ParserPackratTest extends ParserTestBase {
 
 			Expression: Add
 			*/
-		', 'Packrat');
+		', Packrat::class);
 
 		$parser->assertMatches('Expression', '1 + 2 * 3 + 4 + 4 + 4 + 4 + 4 / 5 - 6 + 7 * 8 - 9');
 		$parser->assertDoesntMatch('Expression', 'variables + do + not + exist');

diff --git a/tests/ParserSyntax.phpt b/tests/ParserSyntax.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/bootstrap.php';
 
 class ParserSyntaxTest extends ParserTestBase {

diff --git a/tests/ParserVariables.phpt b/tests/ParserVariables.phpt
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/bootstrap.php';
 
 class ParserVariablesTest extends ParserTestBase {
@@ -25,15 +27,15 @@ class ParserVariablesTest extends ParserTestBase {
 	public function testRecurseOnVariables() {
 
 		$parser = $this->buildParser('
-		/*!* RecurseOnVariablesParser
-		A: "a"
-		B: "b"
-		Foo: $Template
-		Bar: Foo
-			function __construct(&$res){ $res["Template"] = "A"; }
-		Baz: Foo
-			function __construct(&$res){ $res["Template"] = "B"; }
-		*/
+			/*!* RecurseOnVariablesParser
+			A: "a"
+			B: "b"
+			Foo: $Template
+			Bar: Foo
+				function __construct(&$res){ $res["Template"] = "A"; }
+			Baz: Foo
+				function __construct(&$res){ $res["Template"] = "B"; }
+			*/
 		');
 
 		$parser->assertMatches('Bar', 'a');

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require __DIR__ . '/../vendor/autoload.php';
 require __DIR__ . '/bootstrap.utils.php';
 

diff --git a/tests/bootstrap.utils.php b/tests/bootstrap.utils.php
@@ -1,12 +1,20 @@
 <?php
 
-use \Tester\Assert;
-use \Tester\TestCase;
+declare(strict_types=1);
 
-use \hafriedlander\Peg;
+use Tester\Assert;
+use Tester\TestCase;
+
+use hafriedlander\Peg;
+use hafriedlander\Peg\Parser\Basic;
 
 class ParserTestWrapper {
 
+	/**
+	 * @var class-string<Basic>
+	 */
+	private string $parserClass;
+
 	function __construct(string $parserClass) {
 		$this->parserClass = $parserClass;
 	}
@@ -59,11 +67,14 @@ function assertDoesntMatch($method, $string, $message = null) {
 
 class ParserTestBase extends TestCase {
 
-	function buildParser($grammar, $baseClass = 'Basic') {
+	function buildParser(
+		string $grammar,
+		string $baseClass = Basic::class,
+	): ParserTestWrapper {
 
 		$class = 'Parser_' . md5(uniqid());
 		eval(Peg\Compiler::compile("
-			class $class extends hafriedlander\Peg\Parser\\$baseClass {
+			class $class extends $baseClass {
 				$grammar
 			}
 		"));