Merge pull request #26 from ingenerator/support-php83

Support PHP 8.3
ingenerator · Sep 25, 2024 · af76133 · af76133
2 parents 4618793 + fdf2645
commit af76133
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 43 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -29,4 +29,7 @@ README  text eol=lf
 *.sqlite binary
 
 # Ignore paths that should not be included in an archive (eg for a distribution version)
-/test
+/.github export-ignore
+/test export-ignore
+/koharness.php export-ignore
+/phpunit.xml export-ignore
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,11 +15,14 @@ jobs:
       matrix:
         php_version:
         - '8.2'
+        - '8.3'
         dependencies:
         - 'default'
         include:
         - php_version: '8.2'
           dependencies: 'lowest'
+        - php_version: '8.3'
+          dependencies: 'lowest'
 
     steps:
     - name: Setup PHP
@@ -60,7 +63,3 @@ jobs:
     - name: Run unit tests
       run: |
         vendor/bin/phpunit --testsuite=Unit
-
-    - name: Run integration tests
-      run: |
-        vendor/bin/phpunit --testsuite=Integration
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### Unreleased
 
+### v3.0.0 (2024-09-25)
+
+* Support PHP 8.3
+* Support warden-core v2 which allows us to drop warden-validator-symfony
+
 ### v2.2.0 (2024-02-13)
 
 * Update min requirements of kohana-extras to provide a symfony validator factory which explicitly enables a doctrine annotation reader. Additionally require min versions of warden-core and warden-validator-symfony that are compatible with symfony validator > v5 to use the Assert/Email mode=strict option.

diff --git a/composer.json b/composer.json
@@ -17,17 +17,16 @@
     }
   ],
   "require": {
-    "php": "~8.2.0",
+    "php": "~8.2.0 || ~8.3.0",
     "ext-json": "*",
     "composer/installers": "^1.9",
     "doctrine/annotations": "^1.13",
     "ingenerator/kohana-core": "^4.7",
     "ingenerator/kohana-extras": "^3.1",
     "ingenerator/kohana-view": "^4.4",
     "ingenerator/tokenista": "^1.4",
-    "ingenerator/warden-core": "^1.2.1",
-    "ingenerator/warden-persistence-doctrine": "^1.2",
-    "ingenerator/warden-validator-symfony": "^1.2.1",
+    "ingenerator/warden-core": "^2.0",
+    "ingenerator/warden-persistence-doctrine": "^2.0",
     "symfony/mailer": "^6.3 || ^7.0"
   },
   "require-dev": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -9,9 +9,6 @@
          convertDeprecationsToExceptions="true"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <testsuites>
-    <testsuite name="Integration">
-      <directory>test/integration</directory>
-    </testsuite>
     <testsuite name="Unit">
       <directory>test/unit</directory>
     </testsuite>

diff --git a/src/DependencyFactory/WardenKohanaDependencyFactory.php b/src/DependencyFactory/WardenKohanaDependencyFactory.php
@@ -8,6 +8,7 @@
 
 
 use Ingenerator\KohanaExtras\DependencyFactory\RequestExecutorFactory;
+use Ingenerator\Warden\Core\Validator\SymfonyValidatorFactory;
 use Ingenerator\Warden\UI\Kohana\Controller\CompleteActivateAccountController;
 use Ingenerator\Warden\UI\Kohana\Controller\ChangeEmailController;
 use Ingenerator\Warden\UI\Kohana\Controller\ChangePasswordController;
@@ -200,10 +201,8 @@ public static function definitions()
                 'validator'    => [
                     'validator' => [
                         '_settings' => [
-                            'class'     => \Ingenerator\Warden\Validator\Symfony\SymfonyValidator::class,
-                            'arguments' => [
-                                '%validation.validator%',
-                            ],
+                            'class'       => SymfonyValidatorFactory::class,
+                            'constructor' => 'factory',
                         ],
                     ],
                 ],

diff --git a/test/integration/SymfonyValidatorAnnotationTest.php b/test/integration/SymfonyValidatorAnnotationTest.php
diff --git a/test/unit/UserSession/KohanaUserSessionTest.php b/test/unit/UserSession/KohanaUserSessionTest.php
@@ -13,9 +13,9 @@
 use Ingenerator\Warden\UI\Kohana\Entity\LastLoginTrackingUser;
 use Ingenerator\Warden\UI\Kohana\UserSession\KohanaUserSession;
 use test\mock\Ingenerator\Warden\Core\Entity\UserStub;
-use test\unit\Ingenerator\Warden\Core\UserSession\UserSessionTest;
+use test\unit\Ingenerator\Warden\Core\UserSession\UserSessionTestCase;
 
-class KohanaUserSessionTest extends UserSessionTest
+class KohanaUserSessionTest extends UserSessionTestCase
 {
     /**
      * @var \Session_Array