Merge pull request #13 from ivanhrytsaim/13311-Magento248-Php84-Compatibility

13311-Magento248-Php84-Compatibility

Author: magefan

Model/Config.php

@@ -64,7 +64,7 @@ public function __construct(
      * @param string|null $storeId
      * @return bool
      */
-    public function isEnabled(string $storeId = null): bool
+    public function isEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_EXTENSION_ENABLED, $storeId);
     }
@@ -75,7 +75,7 @@ public function isEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isDeferredEnabled(string $storeId = null): bool
+    public function isDeferredEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_DEFERRED_ENABLED, $storeId);
     }
@@ -86,7 +86,7 @@ public function isDeferredEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return string
      */
-    public function getDisallowedPages(string $storeId = null): string
+    public function getDisallowedPages(?string $storeId = null): string
     {
         return (string)$this->getConfig(self::XML_PATH_DEFERRED_DISALLOWED_PAGES, $storeId);
     }
@@ -97,7 +97,7 @@ public function getDisallowedPages(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getIgnoreJavaScript(string $storeId = null): string
+    public function getIgnoreJavaScript(?string $storeId = null): string
     {
         return (string)$this->getConfig(self::XML_PATH_DEFERRED_IGNORE_JAVASCRIPT, $storeId);
     }
@@ -108,7 +108,7 @@ public function getIgnoreJavaScript(string $storeId = null): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isBundlingEnabled(string $storeId = null): bool
+    public function isBundlingEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(MagentoConfig::XML_PATH_JS_BUNDLING, $storeId);
     }
@@ -137,7 +137,7 @@ public function getIncludedInBundling(): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isAmpRequest(string $storeId = null): bool
+    public function isAmpRequest(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_PLUMROCKET_AMP_ENABLED, $storeId);
     }
@@ -149,7 +149,7 @@ public function isAmpRequest(string $storeId = null): bool
      * @param string|null $storeId
      * @return mixed
      */
-    public function getConfig(string $path, string $storeId = null)
+    public function getConfig(string $path, ?string $storeId = null)
     {
         return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
     }

Model/Config/Backend/DevSettings.php

@@ -50,8 +50,8 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         RequestInterface $request,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->request = $request;

Model/Controller/ResultPlugin.php

@@ -47,7 +47,7 @@ class ResultPlugin
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
         \Magefan\RocketJavaScript\Model\Config $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager = null
+        ?\Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->request = $request;
         $this->config = $config;

Observer/AdminSystemConfigChangedSection.php

@@ -135,7 +135,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         MagentoConfig $magentoConfig,
         ReinitableConfigInterface $appConfig,
-        SettingChecker $settingChecker = null
+        ?SettingChecker $settingChecker = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->configLoader = $configLoader;