Merge pull request #39 from dlubitz/task/upmerge-ci-config

Upmerge 5.0 and adapt CI configuration

Author: dlubitz

.github/workflows/tests.yml

@@ -4,20 +4,40 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, '[0-9]+.[0-9]' ]
 
 jobs:
   build:
     env:     
-      FLOW_TARGET_VERSION: "7.0"
+      FLOW_TARGET_VERSION: "9.0"
       FLOW_CONTEXT: Testing
       FLOW_FOLDER: ../flow-base-distribution
+      PACKAGE_FOLDER: redirecthandler-databasestorage
+
+    strategy:
+      matrix:
+        php-versions: ['8.2', '8.3']
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
 
+    - name: Set package branch name
+      run: echo "PACKAGE_TARGET_VERSION=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
+      working-directory: .
+
+    - name: Set alias branch name
+      run: if [ "${PACKAGE_TARGET_VERSION}" == "main" ]; then echo "PACKAGE_BRANCH_ALIAS=dev-main"; else echo "PACKAGE_BRANCH_ALIAS=${PACKAGE_TARGET_VERSION}.x-dev"; fi >> $GITHUB_ENV
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: mbstring, xml, json, zlib, iconv, intl, pdo_sqlite, mysql
+        coverage: xdebug #optional
+        ini-values: opcache.fast_shutdown=0
+
     - name: Update Composer
       run: |
         sudo composer self-update
@@ -39,14 +59,15 @@ jobs:
       run: |
         git clone https://github.com/neos/flow-base-distribution.git -b "${FLOW_TARGET_VERSION}" "${FLOW_FOLDER}"
         cd ${FLOW_FOLDER} 
-        composer require --no-update --no-interaction neos/redirecthandler-databasestorage:dev-main
+        
+        git -C ../${{ env.PACKAGE_FOLDER }} checkout -b build
+        composer config repositories.package '{ "type": "path", "url": "../${{ env.PACKAGE_FOLDER }}", "options": { "symlink": false } }'
+        composer require --no-update --no-interaction neos/redirecthandler-databasestorage:"dev-build as ${PACKAGE_BRANCH_ALIAS}"
 
     - name: Install distribution
       run: |
-        cd ${FLOW_FOLDER} 
+        cd ${FLOW_FOLDER}
         composer install --no-interaction --no-progress
-        rm -rf Packages/Application/Neos.RedirectHandler.DatabaseStorage
-        cp -r ../redirecthandler-databasestorage Packages/Application/Neos.RedirectHandler.DatabaseStorage
 
     - name: Run Unit tests
       run: | 

Classes/Domain/Repository/RedirectRepository.php

@@ -17,12 +17,13 @@
 use Doctrine\ORM\Internal\Hydration\IterableResult;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use Neos\RedirectHandler\DatabaseStorage\Domain\Model\Redirect;
-use Neos\RedirectHandler\RedirectInterface;
-use Neos\RedirectHandler\Redirect as RedirectDto;
+use InvalidArgumentException;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\QueryInterface;
 use Neos\Flow\Persistence\Repository;
+use Neos\RedirectHandler\DatabaseStorage\Domain\Model\Redirect;
+use Neos\RedirectHandler\Redirect as RedirectDto;
+use Neos\RedirectHandler\RedirectInterface;
 
 /**
  * Repository for redirect instances.
@@ -280,7 +281,11 @@ public function persistEntities(): void
         foreach ($this->entityManager->getUnitOfWork()->getIdentityMap() as $className => $entities) {
             if ($className === $this->entityClassName) {
                 foreach ($entities as $entityToPersist) {
-                    $this->entityManager->flush($entityToPersist);
+                    try {
+                        $this->entityManager->flush($entityToPersist);
+                    } catch (InvalidArgumentException $e) {
+                        // Do nothing here, as we assume just changes to the state of the entities in the identity map
+                    }
                 }
                 $this->emitRepositoryObjectsPersisted();
                 break;