feat: php74 compat

Author: SamJUK

.github/workflows/ci.yml

@@ -36,8 +36,8 @@ jobs:
             MAGENTO_VERSION: 2.4.5-p10
           - PHP_VERSION: php81-fpm
             MAGENTO_VERSION: 2.4.4-p11
-          # - PHP_VERSION: php74-fpm
-          #   MAGENTO_VERSION: 2.4.3-p2   # @TODO: -p3 missing from upstream containers
+          - PHP_VERSION: php74-fpm
+            MAGENTO_VERSION: 2.4.3-p2   # @TODO: -p3 missing from upstream containers
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

Api/ConfigInterface.php

@@ -4,8 +4,6 @@
 
 namespace SamJUK\MediaProxy\Api;
 
-use SamJUK\MediaProxy\Enum\Mode;
-
 interface ConfigInterface
 {
 
@@ -23,9 +21,9 @@ public function getUpstreamHost(): string;
 
     /**
      * Get the current mode the module is operating in.
-     * @return Mode
+     * @return string
      */
-    public function getMode(): Mode;
+    public function getMode(): string;
 
     /**
      * Is the module enabled & operating in proxy mode for the current store.

Enum/Mode.php

@@ -4,7 +4,7 @@
 
 namespace SamJUK\MediaProxy\Model;
 
-use SamJUK\MediaProxy\Enum\Mode;
+use SamJUK\MediaProxy\Model\Config\Source\Mode;
 use SamJUK\MediaProxy\Api\ConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
@@ -14,7 +14,8 @@ class Config implements ConfigInterface
     private const XML_PATH_MODE = 'samjuk_media_proxy/general/mode';
     private const XML_PATH_UPSTREAM_HOST = 'samjuk_media_proxy/general/upstream_host';
 
-    private readonly ScopeConfigInterface $scopeConfig;
+    /** @readonly */
+    private ScopeConfigInterface $scopeConfig;
 
     public function __construct(
         ScopeConfigInterface $scopeConfigInterface
@@ -32,19 +33,19 @@ public function getUpstreamHost(): string
         return rtrim($this->getValue(self::XML_PATH_UPSTREAM_HOST), '/');
     }
 
-    public function getMode(): Mode
+    public function getMode(): string
     {
-        return Mode::from($this->getValue(self::XML_PATH_MODE));
+        return $this->getValue(self::XML_PATH_MODE);
     }
 
     public function isProxyMode(): bool
     {
-        return $this->isEnabled() && $this->getMode() === Mode::Proxy;
+        return $this->isEnabled() && $this->getMode() === Mode::PROXY;
     }
 
     public function isCacheMode(): bool
     {
-        return $this->isEnabled() && $this->getMode() === Mode::Cache;
+        return $this->isEnabled() && $this->getMode() === Mode::CACHE;
     }
 
     private function getFlag($path, $scope = 'default', $scopeCode = null): bool
@@ -56,7 +57,8 @@ private function getFlag($path, $scope = 'default', $scopeCode = null): bool
         );
     }
 
-    private function getValue($path, $scope = 'default', $scopeCode = null): mixed
+    /** @return mixed */
+    private function getValue($path, $scope = 'default', $scopeCode = null)
     {
         return $this->scopeConfig->getValue(
             $path,

Model/Config.php

@@ -1,17 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SamJUK\MediaProxy\Model\Config\Source;
 
-use SamJUK\MediaProxy\Enum\Mode as ModeEnum;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 
 class Mode extends AbstractSource
 {
+    public const PROXY = 'proxy';
+    public const CACHE = 'cache';
+
     public function getAllOptions()
     {
         $this->_options = [
-            ['label' => 'Proxy', 'value' => ModeEnum::Proxy->value],
-            ['label' => 'Cache', 'value' => ModeEnum::Cache->value]
+            ['label' => 'Proxy', 'value' => static::PROXY],
+            ['label' => 'Cache', 'value' => static::CACHE]
         ];
         return $this->_options;
     }

Model/Config/Source/Mode.php

@@ -10,10 +10,14 @@
 
 class RequestedMedia implements RequestedMediaInterface
 {
-    private readonly string $relativePath;
-    private readonly string $absolutePubPath;
-    private readonly string $upstreamHost;
-    private readonly FilesystemDriverInterface $filesystem;
+    /** @readonly */
+    private string $relativePath;
+    /** @readonly */
+    private string $absolutePubPath;
+    /** @readonly */
+    private string $upstreamHost;
+    /** @readonly */
+    private FilesystemDriverInterface $filesystem;
 
     public function __construct(
         FilesystemDriverInterface $filesystem,

Model/RequestedMedia.php

@@ -11,8 +11,10 @@
 
 class Media
 {
-    private readonly ConfigInterface $config;
-    private readonly RequestedMediaInterface $requestedMedia;
+    /** @readonly */
+    private ConfigInterface $config;
+    /** @readonly */
+    private RequestedMediaInterface $requestedMedia;
 
     public function __construct(
         ConfigInterface $config,