Update PHPUnit and fix tests

Author: nicoSWD

.github/workflows/phpqa.yml

@@ -8,14 +8,14 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: PHPStan
-        uses: docker://jakzal/phpqa:php8.1
+        uses: docker://jakzal/phpqa:php8.4
         with:
           args: phpstan analyze src/ -l 1
       - name: PHP-CS-Fixer
-        uses: docker://jakzal/phpqa:php8.1
+        uses: docker://jakzal/phpqa:php8.4
         with:
           args: php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
       - name: Deptrac
-        uses: docker://jakzal/phpqa:php8.1
+        uses: docker://jakzal/phpqa:php8.4
         with:
           args: deptrac --no-interaction --ansi --formatter-graphviz-display=0

.scrutinizer.yml

@@ -37,7 +37,7 @@ tools:
 build:
   image: default-bionic
   environment:
-    php: 8.1.0
+    php: 8.4.0
   nodes:
     analysis:
       tests:

.styleci.yml

@@ -1,7 +1,7 @@
 ---
 preset: psr2
 risky: true
-version: 8.1
+version: 8.4
 finder:
   name:
     - "*.php"

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 8.1
+  - 8.4
 
 script:
   - composer install --dev

README.md

@@ -1,6 +1,5 @@
 ## PHP Rule Engine
 
-
 [![Latest Stable Version](https://travis-ci.org/nicoSWD/php-rule-parser.svg?branch=master)](https://travis-ci.org/nicoSWD/php-rule-parser)
 [![Build status][Master coverage image]][Master coverage] 
 [![Code Quality][Master quality image]][Master quality] 
@@ -13,7 +12,6 @@ You're looking at a standalone PHP library to parse and evaluate text based rule
 
 This library has initially been used to change and configure the behavior of certain "Workflows" (without changing actual code) in an intranet application, but it may serve a purpose elsewhere.
 
-
 Find me on Twitter: @[nicoSWD](https://twitter.com/nicoSWD)
 
 (If you're using PHP 5, you might want to take a look at [version 0.4.0](https://github.com/nicoSWD/php-rule-parser/tree/0.4.0))
@@ -39,7 +37,7 @@ This library works best with one of these bundles below, but they're not require
 Test if a value is in a given array
 ```php
 $variables = [
-    'coupon_code' => $_POST['coupon_code'],
+    'coupon_code' => (string) $_POST['coupon_code'],
 ];
 
 $rule = new Rule('coupon_code in ["summer_discount", "summer21"]', $variables);
@@ -49,7 +47,7 @@ var_dump($rule->isTrue()); // bool(true)
 Performing a regular expression
 ```php
 $variables = [
-    'coupon_code' => $_POST['coupon_code'],
+    'coupon_code' => (string) $_POST['coupon_code'],
 ];
 
 $rule = new Rule('coupon_code.test(/^summer20[0-9]{2}$/) == true', $variables);

composer.json

@@ -19,7 +19,7 @@
     {
       "name": "Nicolas Oelgart",
       "role": "Developer",
-      "homepage": "https://nicoswd.com"
+      "homepage": "https://nico.es"
     }
   ],
   "autoload": {
@@ -33,11 +33,11 @@
     }
   },
   "require": {
-    "php": ">=8.1"
+    "php": ">=8.4"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
-    "mockery/mockery": "^1.4"
+    "phpunit/phpunit": "^12.3",
+    "mockery/mockery": "^1.6"
   },
   "scripts": {
     "test": "vendor/bin/phpunit"

tests/integration/HighlighterTest.php

@@ -13,6 +13,7 @@
 use nicoSWD\Rule\Tokenizer\Tokenizer;
 use nicoSWD\Rule\TokenStream\Token\TokenFactory;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 final class HighlighterTest extends TestCase
 {
@@ -23,7 +24,7 @@ protected function setUp(): void
         $this->highlighter = new Highlighter(new Tokenizer(new JavaScript(), new TokenFactory()));
     }
 
-    /** @test */
+    #[Test]
     public function givenAStyleForATokenGroupItShouldBeUsed(): void
     {
         $this->highlighter->setStyle(

tests/integration/ObjectTest.php

@@ -9,10 +9,11 @@
 
 use nicoSWD\Rule\Parser\Exception\ParserException;
 use nicoSWD\Rule\Rule;
+use PHPUnit\Framework\Attributes\Test;
 
 final class ObjectTest extends AbstractTestBase
 {
-    /** @test */
+    #[Test]
     public function givenAnObjectHasMethodsWhenPublicTheyShouldBeAccessible(): void
     {
         $myObj = new class {
@@ -40,7 +41,7 @@ public function cat()
         $this->assertTrue($this->evaluate('my_obj.test2().cat() === "meow"', $variables));
     }
 
-    /** @test */
+    #[Test]
     public function givenAnObjectHasPropertiesWhenPublicTheyShouldBeAccessible(): void
     {
         $myObj = new class {
@@ -54,7 +55,7 @@ public function givenAnObjectHasPropertiesWhenPublicTheyShouldBeAccessible(): vo
         $this->assertTrue($this->evaluate('my_obj.test() === "my string"', $variables));
     }
 
-    /** @test */
+    #[Test]
     public function publicMethodsShouldBeAccessibleMagicallyViaGet(): void
     {
         $myObj = new class {
@@ -71,7 +72,7 @@ public function getString()
         $this->assertTrue($this->evaluate('my_obj.string() === "some string"', $variables));
     }
 
-    /** @test */
+    #[Test]
     public function publicMethodsShouldBeAccessibleMagicallyViaIs(): void
     {
         $myObj = new class {
@@ -93,7 +94,7 @@ public function yes()
         $this->assertTrue($this->evaluate('my_obj.string(my_obj.yes()) === "yes"', $variables));
     }
 
-    /** @test */
+    #[Test]
     public function givenAnObjectWhenMagicMethodCallIsAvailableItShouldBeAccessible(): void
     {
         $myObj = new class {
@@ -129,7 +130,7 @@ public function givenAnObjectWhenMagicMethodsAreCalledDirectlyItShouldThrowAnExc
         $this->evaluate("my_obj.{$magicMethod}()", $variables);
     }
 
-    /** @test */
+    #[Test]
     public function undefinedMethodsShouldThrowAnError(): void
     {
         $myObj = new class() {
@@ -145,7 +146,7 @@ public function undefinedMethodsShouldThrowAnError(): void
         $this->assertSame('Undefined method "nope" at position 6', $rule->getError());
     }
 
-    /** @test */
+    #[Test]
     public function givenAnObjectWithMagicMethodGetWhenPropertyDoesNotExistItShouldNotBeCalled(): void
     {
         $myObj = new class {

tests/integration/ParserTest.php

@@ -7,9 +7,11 @@
  */
 namespace nicoSWD\Rule\tests\integration;
 
+use PHPUnit\Framework\Attributes\Test;
+
 final class ParserTest extends AbstractTestBase
 {
-    /** @test */
+    #[Test]
     public function multipleAnds(): void
     {
         $rule = 'foo=="MA" && bar=="EGP" && baz>50000';
@@ -37,7 +39,7 @@ public function multipleAnds(): void
         ]));
     }
 
-    /** @test */
+    #[Test]
     public function mixedOrsAndAnds(): void
     {
         $rule = '
@@ -53,14 +55,14 @@ public function mixedOrsAndAnds(): void
         ]));
     }
 
-    /** @test */
+    #[Test]
     public function emptyOrIncompleteRuleReturnsFalse(): void
     {
         $rule = '';
         $this->assertFalse($this->evaluate($rule));
     }
 
-    /** @test */
+    #[Test]
     public function freakingLongRule(): void
     {
         $rule = '
@@ -87,7 +89,7 @@ public function freakingLongRule(): void
         ]));
     }
 
-    /** @test */
+    #[Test]
     public function negativeComparison(): void
     {
         $rule = '
@@ -107,7 +109,7 @@ public function negativeComparison(): void
         ]));
     }
 
-    /** @test */
+    #[Test]
     public function spacesBetweenStuff(): void
     {
         $rule = 'foo   !=   3
@@ -120,7 +122,7 @@ public function spacesBetweenStuff(): void
         $this->assertTrue($this->evaluate($rule, ['foo' => '-1']));
     }
 
-    /** @test */
+    #[Test]
     public function singleLineCommentDoesNotKillTheRest(): void
     {
         $rule = ' 2 > 3

tests/integration/RuleTest.php

@@ -9,10 +9,11 @@
 
 use nicoSWD\Rule;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 final class RuleTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function basicRuleWithCommentsEvaluatesCorrectly(): void
     {
         $string = '
@@ -39,7 +40,7 @@ public function basicRuleWithCommentsEvaluatesCorrectly(): void
         $this->assertTrue(!$rule->isFalse());
     }
 
-    /** @test */
+    #[Test]
     public function isValidReturnsFalseOnInvalidSyntax(): void
     {
         $ruleStr = '(2 == 2) && (1 < 3 && 3 > 2 (1 == 1))';
@@ -50,7 +51,7 @@ public function isValidReturnsFalseOnInvalidSyntax(): void
         $this->assertSame('Unexpected "(" at position 28', $rule->getError());
     }
 
-    /** @test */
+    #[Test]
     public function isValidReturnsTrueOnValidSyntax(): void
     {
         $ruleStr = '(2 == 2) && (1 < 3 && 3 > 2 || (1 == 1))';
@@ -61,7 +62,7 @@ public function isValidReturnsTrueOnValidSyntax(): void
         $this->assertEmpty($rule->getError());
         $this->assertTrue($rule->isTrue());
     }
-    /** @test */
+    #[Test]
     public function basicInRule(): void
     {
         $ruleStr = '4 in [4, 6, 7]';
@@ -81,7 +82,7 @@ public function basicInRule(): void
         $this->assertFalse($rule->isTrue());
     }
 
-    /** @test */
+    #[Test]
     public function basicNotInRule(): void
     {
         $ruleStr = '5 not