!!! FEATURE: Compatibility for Neos 9

.github/workflows/tests.yml

@@ -6,14 +6,33 @@ on:
   pull_request:
     branches: [ main ]
 
+env:
+  PACKAGE_FOLDER: Shel.Neos.Terminal
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
+        php-versions:
+          - '8.2'
         neosVersion:
-          - '8.3'
+          - '9.0'
+
+    services:
+      mariadb:
+        # see https://mariadb.com/kb/en/mariadb-server-release-dates/
+        # this should be a current release, e.g. the LTS version
+        image: mariadb:10.8
+        env:
+          MYSQL_USER: neos
+          MYSQL_PASSWORD: neos
+          MYSQL_DATABASE: neos_functional_testing
+          MYSQL_ROOT_PASSWORD: neos
+        ports:
+          - "3306:3306"
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     name: 'Terminal with Neos ${{ matrix.neosVersion }} test'
 
@@ -23,40 +42,57 @@ jobs:
       FLOW_FOLDER: ../neos-base-distribution
 
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.1
-        tools: composer:v2
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ matrix.neosVersion }}-${{ hashFiles('**/composer.json') }}
-        restore-keys: ${{ runner.os }}-composer-${{ matrix.neosVersion }}-
-
-    - name: Prepare Flow distribution
-      run: |
-        git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION} ${FLOW_FOLDER}
-        cd ${FLOW_FOLDER}
-        composer require --no-update --no-interaction shel/neos-terminal
-
-    - name: Install distribution
-      run: |
-        cd ${FLOW_FOLDER}
-        composer config --no-plugins allow-plugins.neos/composer-plugin true
-        composer install --no-interaction --no-progress
-        rm -rf Packages/Plugins/Shel.Neos.Terminal
-        cp -r ../Shel.Neos.Terminal Packages/Plugins/Shel.Neos.Terminal
-
-    - name: Run Functional tests
-      run: |
-        cd ${FLOW_FOLDER}
-        bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Plugins/Shel.Neos.Terminal/Tests/Functional/*
+      - uses: actions/checkout@v3
+
+      - name: Set package branch name
+        run: echo "PACKAGE_TARGET_VERSION=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
+        working-directory: .
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, xml, json, zlib, iconv, intl, pdo_sqlite, mysql
+          tools: composer:v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.composer/cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Prepare Flow distribution
+        run: |
+          git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION} ${FLOW_FOLDER}
+          cd ${FLOW_FOLDER}
+
+          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 shel/neos-terminal:"dev-build as dev-${PACKAGE_TARGET_VERSION}"
+          composer require --no-update --no-interaction neos/contentgraph-doctrinedbaladapter:"~9.0.0"
+
+      - name: Composer Install
+        run: |
+          cd ${FLOW_FOLDER}
+          composer update --no-interaction --no-progress
+
+      - name: Setup Flow configuration
+        run: |
+          cd ${FLOW_FOLDER}
+          rm -f Configuration/Testing/Settings.yaml
+          cat <<EOF >> Configuration/Testing/Settings.yaml
+          Neos:
+            Flow:
+              persistence:
+                backendOptions:
+                  host: '127.0.0.1'
+                  driver: pdo_mysql
+                  user: 'neos'
+                  password: 'neos'
+                  dbname: 'neos_functional_testing'
+          EOF
+
+      - name: Run Functional tests
+        run: |
+          cd ${FLOW_FOLDER}
+          bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Plugins/Shel.Neos.Terminal/Tests/Functional/*

.yarnrc.yml

@@ -1,8 +1,9 @@
+compressionLevel: mixed
+
 enableGlobalCache: true
+
 nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-3.3.1.cjs
+
 pnpMode: loose
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

Classes/Command/EvaluateEelExpressionCommand.php

@@ -24,11 +24,8 @@
 
 class EvaluateEelExpressionCommand implements TerminalCommandInterface
 {
-    /**
-     * @Flow\Inject
-     * @var EelEvaluationService
-     */
-    protected $eelEvaluationService;
+    #[Flow\Inject]
+    protected EelEvaluationService $eelEvaluationService;
 
     public static function getCommandName(): string
     {

Classes/Command/FlushCacheCommand.php

@@ -15,6 +15,8 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cache\CacheManager;
+use Neos\Flow\I18n\Exception\IndexOutOfBoundsException;
+use Neos\Flow\I18n\Exception\InvalidFormatPlaceholderException;
 use Neos\Flow\I18n\Translator;
 use Shel\Neos\Terminal\Domain\CommandContext;
 use Shel\Neos\Terminal\Domain\CommandInvocationResult;
@@ -26,17 +28,11 @@
 class FlushCacheCommand implements TerminalCommandInterface
 {
 
-    /**
-     * @Flow\Inject
-     * @var CacheManager
-     */
-    protected $cacheManager;
+    #[Flow\Inject]
+    protected CacheManager $cacheManager;
 
-    /**
-     * @Flow\Inject
-     * @var Translator
-     */
-    protected $translator;
+    #[Flow\Inject]
+    protected Translator $translator;
 
     public static function getCommandName(): string
     {
@@ -77,16 +73,19 @@ public function invokeCommand(string $argument, CommandContext $commandContext):
         if ($cacheIdentifier) {
             if ($this->cacheManager->hasCache($cacheIdentifier)) {
                 $this->cacheManager->getCache($cacheIdentifier)->flush();
-                $result = $this->translator->translateById('command.flushCache.flushedOne',
-                    ['cacheIdentifier' => $cacheIdentifier], null, null, 'Main', 'Shel.Neos.Terminal');
+                $result = $this->translateById(
+                    'command.flushCache.flushedOne',
+                    ['cacheIdentifier' => $cacheIdentifier]
+                );
             } else {
                 $success = false;
-                $result = $this->translator->translateById('command.flushCache.cacheDoesNotExist',
-                    ['cacheIdentifier' => $cacheIdentifier], null, null, 'Main', 'Shel.Neos.Terminal');
+                $result = $this->translateById(
+                    'command.flushCache.cacheDoesNotExist',
+                    ['cacheIdentifier' => $cacheIdentifier]
+                );
             }
         } else {
-            $result = $this->translator->translateById('command.flushCache.flushedAll', [], null, null, 'Main',
-                'Shel.Neos.Terminal');
+            $result = $this->translateById('command.flushCache.flushedAll');
             $this->cacheManager->flushCaches();
         }
 
@@ -97,7 +96,23 @@ public function invokeCommand(string $argument, CommandContext $commandContext):
         echo json_encode([
             'success' => $success,
             'result' => $result,
-        ]);
+        ], JSON_THROW_ON_ERROR);
         exit;
     }
+
+    protected function translateById(string $identifier, array $arguments = []): ?string
+    {
+        try {
+            return $this->translator->translateById(
+                $identifier,
+                $arguments, null,
+                null,
+                'Main',
+                'Shel.Neos.Terminal'
+            );
+        } catch (\Exception) {
+            // Noop
+        }
+        return $identifier;
+    }
 }