Merge pull request #77 from extcode/76-add-php-85-support

[TASK] Add PHP 8.5 support

Author: extcode

.github/workflows/ci.yaml

@@ -17,6 +17,8 @@ jobs:
         php-version:
           - 8.2
           - 8.3
+          - 8.4
+          - 8.5
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -59,6 +61,7 @@ jobs:
           - php-version: '8.2'
           - php-version: '8.3'
           - php-version: '8.4'
+          - php-version: '8.5'
     steps:
       - uses: actions/checkout@v4
 
@@ -77,15 +80,15 @@ jobs:
       - name: Code Quality (by PHPStan)
         run: vendor/bin/phpstan analyse -c Build/phpstan.neon
 
-  tests-acceptance:
+  test-unit-and-functional:
     runs-on: ubuntu-latest
     needs:
       - coding-guideline
       - code-quality
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
@@ -98,6 +101,20 @@ jobs:
       - name: Run Unit Tests PHP8.4
         run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-unit
 
+      - name: Run Unit Tests PHP8.5
+        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-unit
+
+  test-acceptance:
+    runs-on: ubuntu-latest
+    needs:
+      - test-unit-and-functional
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
       - name: Run Acceptance Tests PHP8.2
         run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-acceptance
 
@@ -106,3 +123,7 @@ jobs:
 
       - name: Run Acceptance Tests PHP8.4
         run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-acceptance
+
+      - name: Run Acceptance Tests PHP8.5
+        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-acceptance
+

.gitlab-ci.yml

@@ -84,8 +84,8 @@ public function getBestSpecialPrice(array $frontendUserGroupIds = []): float
 
         foreach ($this->getSpecialPrices() as $specialPrice) {
             if ($specialPrice->getPrice() < $bestSpecialPrice) {
-                if (!$specialPrice->getFrontendUserGroup() ||
-                    in_array($specialPrice->getFrontendUserGroup()->getUid(), $frontendUserGroupIds)
+                if (!$specialPrice->getFrontendUserGroup()
+                    || in_array($specialPrice->getFrontendUserGroup()->getUid(), $frontendUserGroupIds)
                 ) {
                     $bestSpecialPrice = $specialPrice->getPrice();
                 }

Classes/Domain/Model/Book.php

@@ -47,10 +47,10 @@ public function __invoke(CheckProductAvailabilityEvent $event): void
         $book = $this->bookRepository->findByIdentifier($cartProduct->getProductId());
 
         if (
-            !$book instanceof Book ||
-            (
-                $book->isHandleStock() &&
-                ($quantity > $book->getStock())
+            !$book instanceof Book
+            || (
+                $book->isHandleStock()
+                && ($quantity > $book->getStock())
             )
         ) {
             $event->setAvailable(false);

Classes/EventListener/CheckProductAvailability.php

@@ -87,7 +87,6 @@ public function getTaxClassIdReturnsValueForTaxClassId(): void
     private function setProperty(object $instance, string $propertyName, mixed $propertyValue)
     {
         $reflection = new \ReflectionProperty($instance, $propertyName);
-        $reflection->setAccessible(true);
         $reflection->setValue($instance, $propertyValue);
     }
 }

Tests/Unit/Domain/Model/BookTest.php

@@ -45,7 +45,7 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-json": "*",
         "ext-pdo": "*",
         "extcode/cart": "^11.0",
@@ -55,7 +55,7 @@
         "typo3/cms-fluid": "^13.4"
     },
     "require-dev": {
-        "codappix/typo3-php-datasets": "^1.5",
+        "codappix/typo3-php-datasets": "^2.1",
         "codeception/codeception": "^5.0",
         "codeception/module-db": "^3.1",
         "codeception/module-webdriver": "^4.0",

composer.json

@@ -156,8 +156,6 @@ in pkgs.mkShell {
   packages = [ pkgs.gnumake pkgs.busybox ];
 
   shellHook = ''
-    export TMPDIR=$HOME/.cache/development/cart_books
-
     export PROJECT_ROOT="$(pwd)"
 
     export typo3DatabaseDriver=pdo_sqlite