Merge pull request #23 from mmunz/development

v1.1.0

Author: mmunz

.github/workflows/ci.yml

@@ -4,18 +4,18 @@ on: [push, pull_request]
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Linting
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up PHP Version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           coverage: none
           tools: composer:v2
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: dependencies-composer-${{ runner.os }}-${{ hashFiles('composer.json') }}
@@ -24,7 +24,7 @@ jobs:
       - name: Install composer dependencies
         run: |
           rm -f composer.lock
-          composer require typo3/minimal:^11.0
+          composer require typo3/minimal:^12.4
       - name: phpstan
         run: composer phpstan
       - name: PHPCS
@@ -33,27 +33,31 @@ jobs:
         run: composer ts:lint
 
   build_doc:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     name: Build documentation
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build doc
         run: composer build:doc
 
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         env:
-          - { php: 8.2, TYPO3_VERSION: ^12.0 }
-          - { php: 8.1, TYPO3_VERSION: ^12.0 }
-          - { php: 8.1, TYPO3_VERSION: ^11.0 }
-          - { php: 8.0, TYPO3_VERSION: ^11.0 }
-          - { php: 7.4, TYPO3_VERSION: ^11.0 }
+          - { php: 8.4, TYPO3_VERSION: ^13.4 }
+          - { php: 8.3, TYPO3_VERSION: ^13.4 }
+          - { php: 8.2, TYPO3_VERSION: ^13.4 }
+          - { php: 8.4, TYPO3_VERSION: ^12.4 }
+          - { php: 8.3, TYPO3_VERSION: ^12.4 }
+          - { php: 8.2, TYPO3_VERSION: ^12.4 }
+          - { php: 8.1, TYPO3_VERSION: ^12.4 }
     name: Tests on TYPO3 ${{ matrix.env.TYPO3_VERSION }} / PHP${{ matrix.env.php }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Install ImageMagick
+        run: sudo apt-get update && sudo apt-get install -y imagemagick
       - name: Set up PHP Version
         uses: shivammathur/setup-php@v2
         with:
@@ -62,7 +66,7 @@ jobs:
           tools: composer:v2
           coverage: none
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: dependencies-composer-${{ runner.os }}-${{ hashFiles('composer.json') }}
@@ -74,7 +78,7 @@ jobs:
            apt update && apt install -y wget sqlite3 && \
            wget "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" && \
            apt install -y ./google-chrome-stable_current_amd64.deb
-      - uses: nanasess/setup-chromedriver@v1
+      - uses: nanasess/setup-chromedriver@v2
       - name: Install composer dependencies
         run: |
           rm -f composer.lock
@@ -88,8 +92,8 @@ jobs:
       - name: Start chromedriver
         run: |
           export DISPLAY=:99
-          sudo Xvfb -ac :99 -screen 0 1920x1080x24 > /dev/null 2>&1 &
-          chromedriver --url-base=/wd/hub &
+          sudo Xvfb -ac :99 -screen 0 2560x1440x24 > /dev/null 2>&1 &
+          chromedriver --url-base=/wd/hub --port=9515 &
           sleep 10
       - name: Unit tests (TYPO3 ${{ matrix.env.TYPO3_VERSION }} with PHP${{ matrix.env.php }})
         run: |
@@ -110,7 +114,7 @@ jobs:
           composer tests:acceptance
       - name: Upload Codeception output
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: codeception-results
           path: Tests/Acceptance/_output/

.php-cs-fixer.php

@@ -66,4 +66,3 @@
         'no_unneeded_control_parentheses' => true
     ])
     ->setFinder($finder);
-

Classes/Service/SettingsService.php

@@ -7,50 +7,20 @@
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 
-/**
- * Class SettingsService
- *
- */
 class SettingsService
 {
-    /**
-     * @var mixed
-     */
-    protected $frameworkConfiguration = null;
+    protected ?array $frameworkConfiguration = null;
+    protected ?array $settings = null;
 
-    /**
-     * @var mixed
-     */
-    protected $settings = null;
-
-    /**
-     * @var ConfigurationManagerInterface
-     */
-    protected $configurationManager;
-
-    public function __construct(ConfigurationManager $configurationManager)
-    {
-        $this->configurationManager = $configurationManager;
+    public function __construct(
+        private readonly ConfigurationManager $configurationManager
+    ) {
     }
 
-//    /**
-//     * Injects the Configuration Manager and loads the settings
-//     *
-//     * @param ConfigurationManagerInterface $configurationManager
-//     * @return void
-//     */
-//    public function injectConfigurationManager(
-//        ConfigurationManagerInterface $configurationManager
-//    ) {
-//        $this->configurationManager = $configurationManager;
-//    }
-
     /**
      * Returns the framework configuration.
-     *
-     * @return array
      */
-    public function getFrameworkConfiguration()
+    public function getFrameworkConfiguration(): array
     {
         if ($this->frameworkConfiguration === null) {
             $this->frameworkConfiguration = $this->configurationManager->getConfiguration(
@@ -67,21 +37,16 @@ public function getFrameworkConfiguration()
      * "settings.foo" would return $this->frameworkConfiguration['settings']['foo'].
      *
      * If the path is invalid or no entry is found, false is returned.
-     *
-     * @param string $path
-     * @return mixed
      */
-    public function getByPath($path)
+    public function getByPath(string $path): mixed
     {
         return ObjectAccess::getPropertyPath($this->getFrameworkConfiguration(), $path);
     }
 
     /**
      * Returns all TypoScript settings.
-     *
-     * @return array
      */
-    public function getSettings()
+    public function getSettings(): array
     {
         if ($this->settings === null) {
             $this->settings = $this->getByPath('settings');

Classes/Utility/CropVariantUtility.php

@@ -6,38 +6,20 @@
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
 use TYPO3\CMS\Core\Resource\FileInterface;
 
-/**
- * Class CropVariantUtility
- */
 class CropVariantUtility
 {
-    /**
-     * @var CropVariantCollection $cropVariantCollection
-     */
-    protected $cropVariantCollection;
-
-    /**
-     * @var FileInterface $file
-     */
-    protected $file;
+    protected CropVariantCollection $cropVariantCollection;
+    protected FileInterface $file;
 
-    /**
-     * @var MathUtility
-     */
-    protected $mathUtility;
-
-    public function __construct(MathUtility $mathUtility)
-    {
-        $this->mathUtility = $mathUtility;
+    public function __construct(
+        private readonly MathUtility $mathUtility
+    ) {
     }
 
     /**
      * Create a CropVariantCollection from file reference.
-     *
-     * @param FileInterface $file
-     * @return void
      */
-    public function setCropVariantCollection(FileInterface $file)
+    public function setCropVariantCollection(FileInterface $file): void
     {
         $cropString = '';
         $this->file = $file;
@@ -49,32 +31,25 @@ public function setCropVariantCollection(FileInterface $file)
 
     /**
      * Get property cropVariantCollection
-     * @return CropVariantCollection
      */
-    public function getCropVariantCollection()
+    public function getCropVariantCollection(): CropVariantCollection
     {
         return $this->cropVariantCollection;
     }
 
     /**
      * Returns a calculated Area with coordinates for cropping the actual image
-     *
-     * @param string $key
-     * @return null|Area
      */
-    public function getCropAreaForVariant(string $key)
+    public function getCropAreaForVariant(string $key): ?Area
     {
         $cropArea = $this->cropVariantCollection->getCropArea($key);
         return $cropArea->isEmpty() ? null : $cropArea->makeAbsoluteBasedOnFile($this->file);
     }
 
     /**
      * Returns a calculated array with coordinates for cropping the actual image
-     *
-     * @param string $key
-     * @return null|array
      */
-    public function getCropAreaForVariantAsArray(string $key)
+    public function getCropAreaForVariantAsArray(string $key): ?array
     {
         $area = $this->getCropAreaForVariant($key);
         if (!is_null($area)) {
@@ -85,10 +60,8 @@ public function getCropAreaForVariantAsArray(string $key)
 
     /**
      * Return a CropVariants array (beware: not related to TYPO3's CropVariants, needs a better naming - ToDo)
-     * @param array $mediaQueries
-     * @return array
      */
-    public function getCropVariants(array $mediaQueries)
+    public function getCropVariants(array $mediaQueries): array
     {
         $cropVariants = [];
 

Classes/Utility/DebugUtility.php

@@ -2,20 +2,12 @@
 declare(strict_types=1);
 namespace C1\AdaptiveImages\Utility;
 
-/**
- * Class DebugUtility
- */
 class DebugUtility
 {
     /**
      * returns a string with debug information for additionalParameters of a processing configuration
-     * @param int $height
-     * @param int $width
-     * @param int|float $ratio
-     * @param string $processor
-     * @return string
      */
-    public function getDebugAnnotation($width, $height, $ratio, $processor = null)
+    public function getDebugAnnotation(int|string $width, int|string $height, float|int $ratio, ?string $processor = null): string
     {
         if (!$processor) {
             $processor = $GLOBALS['TYPO3_CONF_VARS']['GFX']['processor'] ?? null;