!!! FEATURE: Compatibility with neos/metadata 3

.github/workflows/tests.yml

@@ -0,0 +1,154 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  FLOW_FOLDER: ../flow-base-distribution
+  # The neos/metadata 3.x API this package targets is not released yet, so both jobs pull the
+  # `feature/extensible-metadata-properties` branch and alias it to the version the package requires.
+  NEOS_METADATA_PACKAGE_BRANCH: 'dev-feature/extensible-metadata-properties'
+  PACKAGE_FOLDER: metadata-extractor
+
+jobs:
+  codestyle:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.4']
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: exif, mbstring
+
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.composer/cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Install dependencies
+        run: composer require --no-interaction --no-progress "neos/metadata:${NEOS_METADATA_PACKAGE_BRANCH} as 3.0.0"
+
+      - name: PHPStan
+        run: php vendor/bin/phpstan analyse -c phpstan.ci.neon --no-progress --memory-limit=1G
+
+  php-unit-tests:
+    env:
+      FLOW_CONTEXT: Testing
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.4']
+        flow-versions: ['8.4']
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - 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: exif, mbstring, xml, json, zlib, iconv, intl, pdo_sqlite, mysql
+          coverage: xdebug #optional
+          ini-values: opcache.fast_shutdown=0
+
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.composer/cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Prepare Flow distribution
+        run: |
+          git clone https://github.com/neos/flow-base-distribution.git -b ${{ matrix.flow-versions }} ${FLOW_FOLDER}
+          cd ${FLOW_FOLDER}
+          composer require --no-update --dev --no-interaction phpunit/phpunit:"^11.0"
+
+          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/metadata-extractor:"dev-build as dev-${PACKAGE_TARGET_VERSION}"
+          # required for the resolution of the not yet released neos/metadata 3.x
+          composer require --no-update --no-interaction neos/metadata:"${NEOS_METADATA_PACKAGE_BRANCH} as 3.0.0"
+
+      - name: Composer Install
+        run: |
+          cd ${FLOW_FOLDER}
+          composer install --no-interaction --no-progress
+
+      - name: Run Unit tests
+        run: |
+          cd ${FLOW_FOLDER}
+          bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Neos.MetaData.Extractor/Tests/Unit/
+
+  php-functional-tests:
+    env:
+      FLOW_CONTEXT: Testing
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.4']
+        flow-versions: ['8.4']
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - 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: exif, mbstring, xml, json, zlib, iconv, intl, pdo_sqlite, mysql
+          coverage: xdebug #optional
+          ini-values: opcache.fast_shutdown=0
+
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        with:
+          path: ~/.composer/cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Prepare Flow distribution
+        run: |
+          git clone https://github.com/neos/flow-base-distribution.git -b ${{ matrix.flow-versions }} ${FLOW_FOLDER}
+          cd ${FLOW_FOLDER}
+          composer require --no-update --dev --no-interaction phpunit/phpunit:"^11.0"
+
+          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/metadata-extractor:"dev-build as dev-${PACKAGE_TARGET_VERSION}"
+          # required for the resolution of the not yet released neos/metadata 3.x
+          composer require --no-update --no-interaction neos/metadata:"${NEOS_METADATA_PACKAGE_BRANCH} as 3.0.0"
+
+      - name: Composer Install
+        run: |
+          cd ${FLOW_FOLDER}
+          composer install --no-interaction --no-progress
+
+      - name: Run Functional tests
+        run: |
+          cd ${FLOW_FOLDER}
+          bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Neos.MetaData.Extractor/Tests/Functional/

Classes/Command/MetaDataCommandController.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 namespace Neos\MetaData\Extractor\Command;
 
 /*
@@ -11,49 +13,37 @@
 use Neos\Media\Domain\Model\Asset;
 use Neos\Media\Domain\Repository\AssetRepository;
 use Neos\MetaData\Extractor\Domain\ExtractionManager;
-use Neos\MetaData\Extractor\Exception\ExtractorException;
 
-/**
- * @Flow\Scope("singleton")
- */
+#[Flow\Scope('singleton')]
 class MetaDataCommandController extends CommandController
 {
-    /**
-     * @Flow\Inject
-     * @var AssetRepository
-     */
-    protected $assetRepository;
+    #[Flow\Inject]
+    protected AssetRepository $assetRepository;
 
-    /**
-     * @Flow\Inject
-     * @var ExtractionManager
-     */
-    protected $extractionManager;
+    #[Flow\Inject]
+    protected ExtractionManager $extractionManager;
 
-    /**
-     * @Flow\Inject
-     * @var PersistenceManager
-     */
-    protected $persistenceManager;
+    #[Flow\Inject]
+    protected PersistenceManager $persistenceManager;
 
     /**
      * Extracts MetaData from Assets
-     *
-     * @return void
      */
-    public function extractCommand()
+    public function extractCommand(): void
     {
         $iterator = $this->assetRepository->findAllIterator();
         $assetCount = $this->assetRepository->countAll();
 
+        $assets = $this->assetRepository->iterate($iterator);
+        if ($assets === null) {
+            $this->output->outputLine('No assets found.');
+            return;
+        }
+
         $this->output->progressStart($assetCount);
-        foreach ($this->assetRepository->iterate($iterator) as $asset) {
+        foreach ($assets as $asset) {
             /** @var Asset $asset */
-            try {
-                $this->extractionManager->extractMetaData($asset);
-            } catch (ExtractorException $exception) {
-                $this->output->outputLine(' ' . $exception->getMessage());
-            }
+            $this->extractionManager->extractMetaData($asset);
 
             $this->output->progressAdvance(1);
 

Classes/Converter/CoordinatesConverter.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 namespace Neos\MetaData\Extractor\Converter;
 
 /*
@@ -11,13 +13,10 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
-
 /**
- * @Flow\Scope("singleton")
  * @see http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf data type definitions
  */
-class CoordinatesConverter
+final class CoordinatesConverter
 {
     /**
      * Converts coordinates in DMS (degrees, minutes, seconds) and the cardinal direction reference (E,W,N,S) into