#9 Update to allow PHP versions higher than 8.1 / Pimcore 11.* (#10)

Co-authored-by: Luka Dschaak <[email protected]>

.github/workflows/qa.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: PHP Setup
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Validate composer.json
         run: composer validate --ansi --strict

.github/workflows/tests.yaml

@@ -22,9 +22,13 @@ jobs:
       matrix:
         include:
           - php-version: "8.1"
-            dependencies: "lowest"
+            dependencies: "lowest" # Pimcore 10.5.0
           - php-version: "8.1"
-            dependencies: "highest"
+            dependencies: "highest" # Pimcore 11.*
+          - php-version: "8.2"
+            dependencies: "lowest" # Pimcore 10.5.0
+          - php-version: "8.2"
+            dependencies: "highest" # Pimcore 11.*
 
     env:
       MYSQL_HOST: 127.0.0.1
@@ -61,5 +65,9 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
+      - name: Add Pimcore Admin UI
+        run: composer require --dev pimcore/admin-ui-classic-bundle --no-interaction
+        if: matrix.dependencies == 'highest'
+
       - name: Execute tests
         run: composer tests

composer.json

@@ -12,8 +12,8 @@
     }
   ],
   "require": {
-    "php": "~8.1.0",
-    "pimcore/pimcore": "^10.5"
+    "php": "~8.1.0 || ~8.2.0",
+    "pimcore/pimcore": "^10.5 || ^11.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.42",
@@ -25,7 +25,7 @@
     "phpstan/phpstan-phpunit": "^1.1",
     "phpstan/phpstan-symfony": "^1.2",
     "phpunit/phpunit": "^9.5",
-    "teamneusta/pimcore-testing-framework": "^0.11"
+    "teamneusta/pimcore-testing-framework": "^0.12"
   },
   "conflict": {
     "presta/sitemap-bundle": "<3.2",

config/services.yaml

@@ -1,7 +1,10 @@
 services:
+
+  Symfony\Component\DependencyInjection\ContainerInterface: '@service_container'
+
   Neusta\Pimcore\FixtureBundle\Command\LoadFixturesCommand:
     arguments:
-      $container: '@Symfony\Component\DependencyInjection\ContainerInterface'
+      $container: '@service_container'
       $eventDispatcher: '@event_dispatcher'
       $fixtureClass: !abstract defined in extension
     tags:

phpstan-baseline.neon

@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: src/Command/LoadFixturesCommand.php
 
-		-
-			message: "#^Method Neusta\\\\Pimcore\\\\FixtureBundle\\\\Helper\\\\AssetHelper\\:\\:createAssetFolder\\(\\) should return Pimcore\\\\Model\\\\Asset\\\\Folder but returns Pimcore\\\\Model\\\\Asset\\\\Folder\\|Pimcore\\\\Model\\\\DataObject\\\\Folder\\|Pimcore\\\\Model\\\\Document\\\\Folder\\.$#"
-			count: 1
-			path: src/Helper/AssetHelper.php
-
 		-
 			message: "#^Cannot call method getId\\(\\) on Pimcore\\\\Model\\\\DataObject\\\\Classificationstore\\\\GroupConfig\\|null\\.$#"
 			count: 1
@@ -44,13 +39,3 @@ parameters:
 			message: "#^Parameter \\#4 \\$storeId of static method Neusta\\\\Pimcore\\\\FixtureBundle\\\\Helper\\\\ClassificationstoreHelper\\:\\:createKeyConfig\\(\\) expects int, int\\|null given\\.$#"
 			count: 1
 			path: src/Helper/ClassificationstoreHelper.php
-
-		-
-			message: "#^Method Neusta\\\\Pimcore\\\\FixtureBundle\\\\Helper\\\\DataObjectHelper\\:\\:createFolderByPath\\(\\) should return Pimcore\\\\Model\\\\DataObject\\\\Folder but returns Pimcore\\\\Model\\\\Asset\\\\Folder\\|Pimcore\\\\Model\\\\DataObject\\\\Folder\\|Pimcore\\\\Model\\\\Document\\\\Folder\\.$#"
-			count: 1
-			path: src/Helper/DataObjectHelper.php
-
-		-
-			message: "#^Method Neusta\\\\Pimcore\\\\FixtureBundle\\\\Helper\\\\DocumentHelper\\:\\:createFolderByPath\\(\\) should return Pimcore\\\\Model\\\\Document\\\\Folder but returns Pimcore\\\\Model\\\\Asset\\\\Folder\\|Pimcore\\\\Model\\\\DataObject\\\\Folder\\|Pimcore\\\\Model\\\\Document\\\\Folder\\.$#"
-			count: 1
-			path: src/Helper/DocumentHelper.php

src/Helper/AssetHelper.php

@@ -13,6 +13,10 @@ public function __construct(private readonly string $prefix)
 
     public function createAssetFolder(string $path = ''): Asset\Folder
     {
-        return Service::createFolderByPath('/' . trim($this->prefix, '/') . '/' . ltrim($path, '/'));
+        $assetFolder = Service::createFolderByPath('/' . trim($this->prefix, '/') . '/' . ltrim($path, '/'));
+        if ($assetFolder instanceof Asset\Folder) {
+            return $assetFolder;
+        }
+        throw new \Exception(sprintf('No asset folder with path %s could be created.', $path));
     }
 }

src/Helper/DataObjectHelper.php

@@ -12,7 +12,11 @@ public function __construct(private readonly string $prefix)
 
     public function createFolderByPath(string $path = ''): DataObject\Folder
     {
-        return DataObject\Service::createFolderByPath($this->getFullPathByPath($path));
+        $dataObjectFolder = DataObject\Service::createFolderByPath($this->getFullPathByPath($path));
+        if ($dataObjectFolder instanceof DataObject\Folder) {
+            return $dataObjectFolder;
+        }
+        throw new \Exception(sprintf('No data object folder with path %s could be created.', $path));
     }
 
     public function getFullPathByPath(string $path): string

src/Helper/DocumentHelper.php

@@ -12,7 +12,11 @@ public function __construct(private readonly string $prefix)
 
     public function createFolderByPath(string $path, string $locale = ''): Document\Folder
     {
-        return Document\Service::createFolderByPath($this->getFullPathByPath($path, $locale));
+        $documentFolder = Document\Service::createFolderByPath($this->getFullPathByPath($path, $locale));
+        if ($documentFolder instanceof Document\Folder) {
+            return $documentFolder;
+        }
+        throw new \Exception(sprintf('No document folder with path %s could be created.', $path));
     }
 
     public function getFullPathByPath(string $path, string $locale = ''): string

tests/app/TestKernel.php

@@ -5,7 +5,7 @@
 
 final class TestKernel extends Neusta\Pimcore\TestingFramework\Kernel\TestKernel
 {
-    public function registerBundlesToCollection(BundleCollection $collection)
+    public function registerBundlesToCollection(BundleCollection $collection): void
     {
         $collection->addBundle(NeustaPimcoreFixtureBundle::class);
     }