Dom v4 (#159)

* build: upgrade to phpgt/dom v4 * tweak: correct namespaces for tests * build: require php 8.1 * ci: upgrade ci to php 8.1
PhpGt · Jul 2, 2022 · 42bd6f3 · 42bd6f3
1 parent 5333c31
commit 42bd6f3
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,10 @@ jobs:
           path: /tmp/composer-cache
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
 
-      - uses: php-actions/composer@v5
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: '8.1'
 
       - name: Archive build
         run: mkdir /tmp/github-actions/ && tar -cvf /tmp/github-actions/build.tar ./
@@ -40,9 +43,9 @@ jobs:
         run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Unit tests
-        uses: php-actions/phpunit@v2
+        uses: php-actions/phpunit@v3
         with:
-          php_version: 8.0
+          php_version: '8.1'
           php_extensions: xdebug
           configuration: test/phpunit/phpunit.xml
           bootstrap: vendor/autoload.php
@@ -61,6 +64,7 @@ jobs:
         run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Static Analysis
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
-          path: src/
+          php_version: '8.1'
+          path: src/
diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
 	"license": "MIT",
 
 	"require": {
-		"php": ">=7.4",
-		"phpgt/dom": "^3.0.0",
+		"php": ">=8.1",
+		"phpgt/dom": "^4.0.0",
 		"phpgt/session": "1.*"
 	},
 	"require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/phpunit/ArrayTokenStoreTest.php b/test/phpunit/ArrayTokenStoreTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
 use Exception;
+use Gt\Csrf\ArrayTokenStore;
 use Gt\Csrf\Exception\CsrfTokenInvalidException;
 use Gt\Csrf\Exception\CsrfTokenSpentException;
 use PHPUnit\Framework\TestCase;
@@ -90,4 +91,4 @@ public function testChangeTokenLimit() {
 		$this->expectException(CSRFTokenInvalidException::class);
 		$sut->verifyToken($firstToken);
 	}
-}
+}
diff --git a/test/phpunit/HTMLDocumentProtectorTest.php b/test/phpunit/HTMLDocumentProtectorTest.php
@@ -1,6 +1,8 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
+use Gt\Csrf\ArrayTokenStore;
+use Gt\Csrf\HTMLDocumentProtector;
 use Gt\Dom\HTMLDocument;
 use PHPUnit\Framework\TestCase;
 

diff --git a/test/phpunit/TokenStoreTest.php b/test/phpunit/TokenStoreTest.php
@@ -1,10 +1,12 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
+use Gt\Csrf\ArrayTokenStore;
 use Gt\Csrf\Exception\CsrfException;
 use Gt\Csrf\Exception\CsrfTokenInvalidException;
 use Gt\Csrf\Exception\CsrfTokenMissingException;
 use Gt\Csrf\Exception\CsrfTokenSpentException;
+use Gt\Csrf\HTMLDocumentProtector;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
@@ -157,4 +159,4 @@ public function testTokenLengthChange() {
 
 		self::assertNull($exception);
 	}
-}
+}