Merge pull request #47 from xparse/add-php-8

Add php8 support

Author: funivan

.github/workflows/test.yaml

@@ -7,7 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
+        package-stability: ['stable', 'alpha']
     name: PHP ${{ matrix.php-versions }}
     steps:
       - name: Checkout
@@ -28,6 +29,9 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
+
+      - name: Configure stability
+        run: composer config minimum-stability ${{ matrix.package-stability }}
       - name: Install dependencies
         run: composer install --prefer-dist --dev
 

composer.json

@@ -2,23 +2,23 @@
   "name": "xparse/css-expression-translator",
   "description": "Translate css to xpath",
   "keywords": [],
-  "homepage": "https://github.com/",
+  "homepage": "https://github.com/xparse/CssExpressionTranslator",
   "license": "MIT",
   "authors": [
     {
-      "name": "funivan",
-      "email": "dev@funivan.com",
+      "name": "Ivan Shcherbak @funivan",
+      "email": "alotofall@gmail.com",
       "homepage": "http://funivan.com",
       "role": "Developer"
     }
   ],
   "require": {
-    "php": ">=7.1",
-    "xparse/expression-translator": "0.0.*",
-    "symfony/css-selector": "^3.0"
+    "php": "^7.1 || ^8.0",
+    "symfony/css-selector": "^3.0",
+    "xparse/expression-translator": "0.0.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0"
+    "phpunit/phpunit": "^9.3"
   },
   "autoload": {
     "psr-4": {

src/CssExpressionTranslator.php

@@ -18,9 +18,9 @@ public function convertToXpath(string $expression): string
         foreach (explode(', ', $expression) as $part) {
             preg_match('!(.+) (@.+|.+\(\))$!', $part, $matchExpression);
             if (!array_key_exists(2, $matchExpression)) {
-                $xpathExpression[] = parent::toXPath($part);
+                $xpathExpression[] = $this->toXPath($part);
             } else {
-                $xpathExpression[] = parent::toXPath($matchExpression[1]) . '/' . $matchExpression[2];
+                $xpathExpression[] = $this->toXPath($matchExpression[1]) . '/' . $matchExpression[2];
             }
         }
         return implode(' | ', $xpathExpression);

src/CssOrXpathExpressionTranslator.php

@@ -15,7 +15,7 @@ class CssOrXpathExpressionTranslator implements ExpressionTranslatorInterface
 {
 
     /**
-     * @var ExpressionTranslatorInterface
+     * @var ?ExpressionTranslatorInterface
      */
     private static $translator;
 

tests/CssExpressionTranslatorTest.php

@@ -13,7 +13,7 @@ class CssExpressionTranslatorTest extends TestCase
 {
 
     /**
-     * @return array
+     * @return string[][]
      */
     final public function getConvertWithAttributesDataProvider(): array
     {

tests/CssOrXpathExpressionTranslatorTest.php

@@ -1,8 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace Tests\Atl\Http\Parser;
+namespace Xparse\CssExpressionTranslator\Test;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Xparse\CssExpressionTranslator\CssOrXpathExpressionTranslator;
 
@@ -13,7 +14,7 @@ final class CssOrXpathExpressionTranslatorTest extends TestCase
 {
 
     /**
-     * @return array
+     * @return string[][]
      */
     public function getQueriesDataProvider(): array
     {
@@ -97,26 +98,20 @@ public function testQueries(string $input, string $expect): void
     {
         $output = CssOrXpathExpressionTranslator::getTranslator()
             ->convertToXpath($input);
-        static::assertEquals($expect, $output);
+        self::assertEquals($expect, $output);
     }
 
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testEmptyString(): void
     {
-        /** @noinspection UnusedFunctionResultInspection */
+        self::expectException(InvalidArgumentException::class);
         CssOrXpathExpressionTranslator::getTranslator()->convertToXpath('');
     }
 
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testEmptyStringWithSpaces(): void
     {
-        /** @noinspection UnusedFunctionResultInspection */
+        self::expectException(InvalidArgumentException::class);
         CssOrXpathExpressionTranslator::getTranslator()->convertToXpath('     ');
     }