From 4e7d4b9a49629443936918b13b96156e47faa46c Mon Sep 17 00:00:00 2001 From: Andreas Heigl Date: Sun, 5 Oct 2025 15:09:04 +0200 Subject: [PATCH 1/2] Replace tokenizer with maintained fork Currently the nette/tokenizer is abandoned. This commit replaces that dependency with a maintained fork of the nette-tokenizer. The fork is tested up to PHP8.5 at this time of writing --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4aa7230..35a6844 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require": { "php": "^8.1", - "nette/tokenizer": "^3.1" + "stella-maris/tokenizer": "^1.0.1" }, "require-dev": { From 77f8e671bdb8d1798340adf7fe53e76642a7cf1d Mon Sep 17 00:00:00 2001 From: Andreas Heigl Date: Sun, 5 Oct 2025 15:57:46 +0200 Subject: [PATCH 2/2] Replace Nette with StellaMaris namespace This replaces also the code-occurences of the Nette-Tokenizer with the StellaMaris one. As the StellaMaris\Tokenizer is a drop in replacement for the Nette\Tokenitzer there is no need to modify any function calls as the two are functionaly identical --- src/AbstractParser.php | 2 +- src/Exception/UnexpectedValueException.php | 2 +- src/FilterParser.php | 2 +- src/FilterParserInterface.php | 2 +- src/PathParser.php | 2 +- src/PathParserInterface.php | 2 +- tests/FilterParserTest.php | 2 +- tests/PathParserTest.php | 14 +++++++------- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/AbstractParser.php b/src/AbstractParser.php index 91c61a7..371e40b 100644 --- a/src/AbstractParser.php +++ b/src/AbstractParser.php @@ -5,7 +5,7 @@ namespace Cloudstek\SCIM\FilterParser; use Cloudstek\SCIM\FilterParser\Exception\UnexpectedValueException; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; /** * Abstract parser. diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php index 4c6ab99..a6b9ead 100644 --- a/src/Exception/UnexpectedValueException.php +++ b/src/Exception/UnexpectedValueException.php @@ -4,7 +4,7 @@ namespace Cloudstek\SCIM\FilterParser\Exception; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; /** * Unexpected value exception. diff --git a/src/FilterParser.php b/src/FilterParser.php index 9865ed5..c72b309 100644 --- a/src/FilterParser.php +++ b/src/FilterParser.php @@ -4,7 +4,7 @@ namespace Cloudstek\SCIM\FilterParser; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; /** * SCIM Filter Parser. diff --git a/src/FilterParserInterface.php b/src/FilterParserInterface.php index ccaca82..49820a4 100644 --- a/src/FilterParserInterface.php +++ b/src/FilterParserInterface.php @@ -16,7 +16,7 @@ interface FilterParserInterface * * @param string $input SCIM filter. * - * @throws \Nette\Tokenizer\Exception + * @throws \StellaMaris\Tokenizer\Exception * * @return AST\Node|null */ diff --git a/src/PathParser.php b/src/PathParser.php index 48c7989..a6631ed 100644 --- a/src/PathParser.php +++ b/src/PathParser.php @@ -5,7 +5,7 @@ namespace Cloudstek\SCIM\FilterParser; use Cloudstek\SCIM\FilterParser\Exception\UnexpectedValueException; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; /** * SCIM Path Parser. diff --git a/src/PathParserInterface.php b/src/PathParserInterface.php index 8abff70..4fa3536 100644 --- a/src/PathParserInterface.php +++ b/src/PathParserInterface.php @@ -5,7 +5,7 @@ namespace Cloudstek\SCIM\FilterParser; use Cloudstek\SCIM\FilterParser\Exception\TokenizerException; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; /** * SCIM Path Parser interface. diff --git a/tests/FilterParserTest.php b/tests/FilterParserTest.php index 910080a..5ac9468 100644 --- a/tests/FilterParserTest.php +++ b/tests/FilterParserTest.php @@ -7,7 +7,7 @@ use Cloudstek\SCIM\FilterParser\AST; use Cloudstek\SCIM\FilterParser\FilterParser; use Cloudstek\SCIM\FilterParser\FilterParserInterface; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; use PHPUnit\Framework\TestCase; /** diff --git a/tests/PathParserTest.php b/tests/PathParserTest.php index 8f72f0a..1114bb7 100644 --- a/tests/PathParserTest.php +++ b/tests/PathParserTest.php @@ -7,7 +7,7 @@ use Cloudstek\SCIM\FilterParser\AST; use Cloudstek\SCIM\FilterParser\PathParser; use Cloudstek\SCIM\FilterParser\PathParserInterface; -use Nette\Tokenizer; +use StellaMaris\Tokenizer; use PHPUnit\Framework\TestCase; /** @@ -179,7 +179,7 @@ public function testCompareStringValuePathNegatedConjunction() */ public function testConjunctionThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 9.' ); @@ -193,7 +193,7 @@ public function testConjunctionThrowsException() */ public function testDisjunctionThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 9.' ); @@ -209,7 +209,7 @@ public function testDisjunctionThrowsException() */ public function testComparisonThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 9.' ); @@ -224,7 +224,7 @@ public function testComparisonThrowsException() */ public function testSubAttributeComparisonThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 15.' ); @@ -238,7 +238,7 @@ public function testSubAttributeComparisonThrowsException() */ public function testAttributeWithSchemeComparisonThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 68.' ); @@ -252,7 +252,7 @@ public function testAttributeWithSchemeComparisonThrowsException() */ public function testSubAttributeWithSchemeComparisonThrowsException() { - $this->expectException(\Nette\Tokenizer\Exception::class); + $this->expectException(\StellaMaris\Tokenizer\Exception::class); $this->expectExceptionMessage( 'Unexpected eq on line 1, column 74.' );