Merge pull request #9 from mike4git/feature/update-php-and-pimcore

Update PHP 8.2 & Pimcore 11

Author: nsd0sneumann

.github/workflows/php.yml

@@ -1,4 +1,4 @@
-name: PHP Composer
+name: test-and-qa
 
 on:
   push:
@@ -10,41 +10,70 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    name: Build
-
+  TestsCompatibilityJobs:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php-version: "8.0"
+            dependencies: "lowest"
+
     steps:
-      - uses: actions/checkout@v3
+      - name: Git Checkout
+        uses: actions/checkout@v3
+
+      - name: PHP Setup
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
 
       - name: Validate composer.json and composer.lock
-        run: bin/composer validate --strict
+        run: composer validate --strict
 
-      - name: Cache Composer packages
-        id: composer-cache
-        uses: actions/cache@v3
+      - name: Install dependencies
+        uses: ramsey/composer-install@v2
         with:
-          path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-
+          dependency-versions: ${{ matrix.dependencies }}
 
-      - name: Install dependencies
-        run: bin/composer install --prefer-dist --no-progress
+      - name: Execute tests
+        run: composer tests
+
+  TestsAndQaJobs:
+    runs-on: ubuntu-latest
 
-      - name: Run tests with phpunit
-        run: bin/composer tests
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php-version: "8.1"
+            dependencies: "highest"
+          - php-version: "8.2"
+            dependencies: "highest"
 
-      - name: Send code coverage report to Codecov.io
-        uses: codecov/codecov-action@v2
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v3
+
+      - name: PHP Setup
+        uses: shivammathur/setup-php@v2
         with:
-          token: 56f489e7-c92b-4851-bfc6-5fa9a93f0426
-          files: reports/clover.xml
+          php-version: ${{ matrix.php-version }}
 
-      - name: Check CS-Fixer
-        run: bin/composer fix-cs:check
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Install dependencies
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
 
+      - name: Check CS-Fixer
+        run: composer cs:check
 
       - name: Check PHPStan
-        run: bin/composer phpstan-gitlab
+        run: composer phpstan
+
+      - name: Execute tests
+        run: composer tests

compose.yaml

@@ -0,0 +1,9 @@
+services:
+  php:
+    image: pimcore/pimcore:php8.2.8-v2.0
+    volumes:
+      - ./:/var/www/html/
+    environment:
+      XDEBUG_MODE: coverage
+    expose:
+      - 9003 # xdebug 3 port!

composer.json

@@ -33,8 +33,8 @@
     }
   },
   "require": {
-    "php": "^8.0",
-    "pimcore/pimcore": "^10.0"
+    "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+    "pimcore/pimcore": "^10.0 || ^11.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.8",
@@ -52,8 +52,8 @@
     }
   },
   "scripts": {
-    "fix-cs:fix": "php-cs-fixer fix",
-    "fix-cs:check": "php-cs-fixer fix --dry-run --diff",
+    "cs:fix": "php-cs-fixer fix",
+    "cs:check": "php-cs-fixer fix --dry-run --diff",
     "phpstan": "phpstan analyse --level=${PHPSTAN_LEVEL:-8} -c phpstan.neon",
     "phpstan-gitlab": "phpstan analyse -c phpstan.neon --memory-limit=1G --no-progress --level=${PHPSTAN_LEVEL:-8} --error-format=gitlab > reports/codeclimate.json",
     "tests": "phpunit --coverage-text --colors=never --log-junit=reports/junit.xml --coverage-clover=reports/clover.xml --coverage-html=reports/coverage tests"

docker-compose.yml

@@ -44,7 +44,7 @@ public function generateClassBox(ClassDefinition $classDefinition): void
                 /** @var ClassDefinition\Data $definition */
                 foreach ($locFieldDef->getChildren() as $definition) {
                     $attribute = new Attribute();
-                    $attribute->setName($definition->getName())
+                    $attribute->setName($definition->getName() ?? self::UNKNOWN)
                         ->setType($definition->getPhpdocReturnType() ?? self::UNKNOWN)
                         ->setModifier('protected')
                         ->setAdditionalInfo('localized');

src/Service/ClassDefinition2UMLService.php

@@ -7,6 +7,9 @@
 
 class UMLGenerationBundle extends AbstractPimcoreBundle
 {
+    /**
+     * @return array<string>
+     */
     public function getJsPaths(): array
     {
         return [

src/UMLGenerationBundle.php

@@ -61,6 +61,7 @@ public function sampleAttribute(): iterable
 
     /**
      * @test
+     *
      * @dataProvider sampleAttribute
      */
     public function format_regular_case(

tests/Unit/Formatter/AttributeFormatterTest.php

@@ -43,11 +43,8 @@ public function sampleClass(): iterable
 
     /**
      * @test
-     * @dataProvider sampleClass
      *
-     * @param $className
-     * @param $classId
-     * @param $stereotype
+     * @dataProvider sampleClass
      */
     public function format_regular_case(
         string $className,

tests/Unit/Formatter/ClassFormatterTest.php

@@ -61,6 +61,7 @@ public function sampleRelations(): iterable
 
     /**
      * @test
+     *
      * @dataProvider sampleRelations
      */
     public function format_regular_case(

tests/Unit/Formatter/RelationsFormatterTest.php

@@ -28,6 +28,7 @@ public function sampleScenarios(): iterable  //@phpstan-ignore-line
 
     /**
      * @test
+     *
      * @dataProvider sampleScenarios
      *
      * @param class-string<mixed> $class

tests/Unit/Handler/Relation/ManyToManyRelationHandlerTest.php

@@ -68,6 +68,7 @@ public function sampleAttributes(): iterable
 
     /**
      * @test
+     *
      * @dataProvider sampleAttributes
      */
     public function generateClassBoxForClass(int $attributeIndex, string $name, string $type, string $modifier, bool $static): void
@@ -108,6 +109,7 @@ public function sampleRelations(): iterable  //@phpstan-ignore-line
 
     /**
      * @test
+     *
      * @dataProvider sampleRelations
      */
     public function generateRelationsForClasses(

tests/Unit/Service/Class2UMLServiceTest.php

@@ -141,9 +141,8 @@ public function combinationsOfFieldDefs(): iterable
 
     /**
      * @test
-     * @dataProvider combinationsOfFieldDefs
      *
-     * @param $mandatory
+     * @dataProvider combinationsOfFieldDefs
      */
     public function generateClassBox_classdefinition_with_manytomany_relation_field(bool $mandatory, ?int $maxItems, string $cardinality): void
     {