Merge pull request #54 from ivanhrytsaim/13311-Magento248-Php84-Сompatibility

magefan · web-flow · commit f3473bbff2ae · 2025-05-06T14:28:57.000+03:00
13311-Magento248-Php84-Сompatibility
diff --git a/Api/ContainerInterface.php b/Api/ContainerInterface.php
@@ -19,5 +19,5 @@ interface ContainerInterface
      * @return array
      * @throws NoSuchEntityException
      */
-    public function generate(string $storeId = null): array;
+    public function generate(?string $storeId = null): array;
 }
diff --git a/Block/AbstractDataLayer.php b/Block/AbstractDataLayer.php
@@ -35,7 +35,7 @@ public function __construct(
         Context $context,
         Config $config,
         array $data = [],
-        SecureHtmlRendererInterface $mfSecureRenderer = null
+        ?SecureHtmlRendererInterface $mfSecureRenderer = null
     ) {
         $this->config = $config;
         $this->mfSecureRenderer = $mfSecureRenderer ?: \Magento\Framework\App\ObjectManager::getInstance()
diff --git a/Model/AbstractDataLayer.php b/Model/AbstractDataLayer.php
@@ -78,10 +78,10 @@ public function __construct(
         Config                      $config,
         StoreManagerInterface       $storeManager,
         CategoryRepositoryInterface $categoryRepository,
-        RequestInterface            $request = null,
-        Registry                    $registry = null,
-        Session                     $session = null,
-        GroupRepository             $groupRepository = null
+        ?RequestInterface            $request = null,
+        ?Registry                    $registry = null,
+        ?Session                     $session = null,
+        ?GroupRepository             $groupRepository = null
     ) {
         $this->config = $config;
         $this->storeManager = $storeManager;
diff --git a/Model/Config.php b/Model/Config.php
@@ -97,7 +97,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);
     }
@@ -108,7 +108,7 @@ public function isEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isWebContainerEnabled(string $storeId = null): bool
+    public function isWebContainerEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_WEB_CONTAINER_ENABLED, $storeId);
     }
@@ -119,7 +119,7 @@ public function isWebContainerEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return string
      */
-    public function getAccountId(string $storeId = null): string
+    public function getAccountId(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_ACCOUNT_ID, $storeId));
     }
@@ -130,7 +130,7 @@ public function getAccountId(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getContainerId(string $storeId = null): string
+    public function getContainerId(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_CONTAINER_ID, $storeId));
     }
@@ -139,7 +139,7 @@ public function getContainerId(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getPublicId(string $storeId = null): string
+    public function getPublicId(?string $storeId = null): string
     {
         if ('use_public_id' === $this->getInstallGtm()) {
             return trim((string)$this->getConfig(self::XML_PATH_WEB_PUBLIC_ID, $storeId));
@@ -162,7 +162,7 @@ public function getPublicId(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getGtmScript(string $storeId = null): string
+    public function getGtmScript(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_SCRIPT_CONTENT, $storeId));
     }
@@ -171,7 +171,7 @@ public function getGtmScript(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getGtmNoScript(string $storeId = null): string
+    public function getGtmNoScript(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_NO_SCRIPT_CONTENT, $storeId));
     }
@@ -182,7 +182,7 @@ public function getGtmNoScript(string $storeId = null): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isAnalyticsEnabled(string $storeId = null): bool
+    public function isAnalyticsEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_ANALYTICS_ENABLE, $storeId);
     }
@@ -193,7 +193,7 @@ public function isAnalyticsEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return string
      */
-    public function getMeasurementId(string $storeId = null): string
+    public function getMeasurementId(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_ANALYTICS_MEASUREMENT_ID, $storeId));
     }
@@ -202,7 +202,7 @@ public function getMeasurementId(string $storeId = null): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isPurchaseTaxEnabled(string $storeId = null): bool
+    public function isPurchaseTaxEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_TAX_ENABLED, $storeId);
     }
@@ -211,7 +211,7 @@ public function isPurchaseTaxEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isPurchaseShippingEnabled(string $storeId = null): bool
+    public function isPurchaseShippingEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_SHIPPING_ENABLED, $storeId);
     }
@@ -222,7 +222,7 @@ public function isPurchaseShippingEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return string
      */
-    public function getProductAttribute(string $storeId = null): string
+    public function getProductAttribute(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_PRODUCT, $storeId));
     }
@@ -233,7 +233,7 @@ public function getProductAttribute(string $storeId = null): string
      * @param string|null $storeId
      * @return string
      */
-    public function getBrandAttribute(string $storeId = null): string
+    public function getBrandAttribute(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_BRAND, $storeId));
     }
@@ -244,7 +244,7 @@ public function getBrandAttribute(string $storeId = null): string
      * @param string|null $storeId
      * @return bool
      */
-    public function isProtectCustomerDataEnabled(string $storeId = null): bool
+    public function isProtectCustomerDataEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_PROTECT_CUSTOMER_DATA, $storeId);
     }
@@ -255,7 +255,7 @@ public function isProtectCustomerDataEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isLoadBeforeConsent(string $storeId = null): bool
+    public function isLoadBeforeConsent(?string $storeId = null): bool
     {
         return $this->getConfig(self::XML_PATH_LOAD_BEFORE_CONSENT, $storeId) ||
             !$this->isCookieRestrictionModeEnabled($storeId);
@@ -268,7 +268,7 @@ public function isLoadBeforeConsent(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isCookieRestrictionModeEnabled(string $storeId = null)
+    public function isCookieRestrictionModeEnabled(?string $storeId = null)
     {
         return (bool)$this->getConfig(Custom::XML_PATH_WEB_COOKIE_RESTRICTION, $storeId);
     }
@@ -279,7 +279,7 @@ public function isCookieRestrictionModeEnabled(string $storeId = null)
      * @param string|null $storeId
      * @return bool
      */
-    public function isMfCookieConsentExtensionEnabled(string $storeId = null)
+    public function isMfCookieConsentExtensionEnabled(?string $storeId = null)
     {
         return $this->moduleManager->isEnabled('Magefan_CookieConsent')
             && $this->getConfig(self::XML_PATH_MF_COOKIE_CONSENT_EXTENSION_ENABLED, $storeId);
@@ -291,7 +291,7 @@ public function isMfCookieConsentExtensionEnabled(string $storeId = null)
      * @param string|null $storeId
      * @return string
      */
-    public function getCategoriesAttribute(string $storeId = null): string
+    public function getCategoriesAttribute(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_CATEGORIES, $storeId));
     }
@@ -300,7 +300,7 @@ public function getCategoriesAttribute(string $storeId = null): string
      * @param string|null $storeId
      * @return int
      */
-    public function getInstallGtm(string $storeId = null): string
+    public function getInstallGtm(?string $storeId = null): string
     {
         return trim((string)$this->getConfig(self::XML_PATH_INSTALL_GTM, $storeId));
     }
@@ -312,7 +312,7 @@ public function getInstallGtm(string $storeId = null): string
      * @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);
     }
@@ -323,7 +323,7 @@ public function getConfig(string $path, string $storeId = null)
      * @param string|null $storeId
      * @return bool
      */
-    public function isSpeedOptimizationEnabled(string $storeId = null): bool
+    public function isSpeedOptimizationEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_SPEED_OPTIMIZATION_ENABLED, $storeId);
     }
@@ -332,7 +332,7 @@ public function isSpeedOptimizationEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isThirdPartyGaEnabled(string $storeId = null): bool
+    public function isThirdPartyGaEnabled(?string $storeId = null): bool
     {
         return (bool)$this->getConfig(self::XML_PATH_THIRD_PARTY_GA, $storeId);
     }
diff --git a/Model/WebContainer.php b/Model/WebContainer.php
@@ -54,7 +54,7 @@ public function __construct(
      * @return array
      * @throws NoSuchEntityException
      */
-    public function generate(string $storeId = null): array
+    public function generate(?string $storeId = null): array
     {
         $store = $this->storeManager->getStore($storeId);
         $timestamp = (string)$this->dateTime->timestamp();
@@ -192,7 +192,7 @@ private function generateTags(
         string $accountId,
         string $containerId,
         string $timestamp,
-        string $storeId = null
+        ?string $storeId = null
     ): array {
         return [
             [
@@ -300,7 +300,7 @@ private function generateVariable(
         string $accountId,
         string $containerId,
         string $timestamp,
-        string $storeId = null
+        ?string $storeId = null
     ): array {
         return [
             [

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ interface ContainerInterface`
`19`	`19`	`* @return array`
`20`	`20`	`* @throws NoSuchEntityException`
`21`	`21`	`*/`
`22`		`- public function generate(string $storeId = null): array;`
	`22`	`+ public function generate(?string $storeId = null): array;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function __construct(`
`97`	`97`	`* @param string\|null $storeId`
`98`	`98`	`* @return bool`
`99`	`99`	`*/`
`100`		`- public function isEnabled(string $storeId = null): bool`
	`100`	`+ public function isEnabled(?string $storeId = null): bool`
`101`	`101`	`{`
`102`	`102`	`return (bool)$this->getConfig(self::XML_PATH_EXTENSION_ENABLED, $storeId);`
`103`	`103`	`}`
`@@ -108,7 +108,7 @@ public function isEnabled(string $storeId = null): bool`
`108`	`108`	`* @param string\|null $storeId`
`109`	`109`	`* @return bool`
`110`	`110`	`*/`
`111`		`- public function isWebContainerEnabled(string $storeId = null): bool`
	`111`	`+ public function isWebContainerEnabled(?string $storeId = null): bool`
`112`	`112`	`{`
`113`	`113`	`return (bool)$this->getConfig(self::XML_PATH_WEB_CONTAINER_ENABLED, $storeId);`
`114`	`114`	`}`
`@@ -119,7 +119,7 @@ public function isWebContainerEnabled(string $storeId = null): bool`
`119`	`119`	`* @param string\|null $storeId`
`120`	`120`	`* @return string`
`121`	`121`	`*/`
`122`		`- public function getAccountId(string $storeId = null): string`
	`122`	`+ public function getAccountId(?string $storeId = null): string`
`123`	`123`	`{`
`124`	`124`	`return trim((string)$this->getConfig(self::XML_PATH_ACCOUNT_ID, $storeId));`
`125`	`125`	`}`
`@@ -130,7 +130,7 @@ public function getAccountId(string $storeId = null): string`
`130`	`130`	`* @param string\|null $storeId`
`131`	`131`	`* @return string`
`132`	`132`	`*/`
`133`		`- public function getContainerId(string $storeId = null): string`
	`133`	`+ public function getContainerId(?string $storeId = null): string`
`134`	`134`	`{`
`135`	`135`	`return trim((string)$this->getConfig(self::XML_PATH_CONTAINER_ID, $storeId));`
`136`	`136`	`}`
`@@ -139,7 +139,7 @@ public function getContainerId(string $storeId = null): string`
`139`	`139`	`* @param string\|null $storeId`
`140`	`140`	`* @return string`
`141`	`141`	`*/`
`142`		`- public function getPublicId(string $storeId = null): string`
	`142`	`+ public function getPublicId(?string $storeId = null): string`
`143`	`143`	`{`
`144`	`144`	`if ('use_public_id' === $this->getInstallGtm()) {`
`145`	`145`	`return trim((string)$this->getConfig(self::XML_PATH_WEB_PUBLIC_ID, $storeId));`
`@@ -162,7 +162,7 @@ public function getPublicId(string $storeId = null): string`
`162`	`162`	`* @param string\|null $storeId`
`163`	`163`	`* @return string`
`164`	`164`	`*/`
`165`		`- public function getGtmScript(string $storeId = null): string`
	`165`	`+ public function getGtmScript(?string $storeId = null): string`
`166`	`166`	`{`
`167`	`167`	`return trim((string)$this->getConfig(self::XML_PATH_SCRIPT_CONTENT, $storeId));`
`168`	`168`	`}`
`@@ -171,7 +171,7 @@ public function getGtmScript(string $storeId = null): string`
`171`	`171`	`* @param string\|null $storeId`
`172`	`172`	`* @return string`
`173`	`173`	`*/`
`174`		`- public function getGtmNoScript(string $storeId = null): string`
	`174`	`+ public function getGtmNoScript(?string $storeId = null): string`
`175`	`175`	`{`
`176`	`176`	`return trim((string)$this->getConfig(self::XML_PATH_NO_SCRIPT_CONTENT, $storeId));`
`177`	`177`	`}`
`@@ -182,7 +182,7 @@ public function getGtmNoScript(string $storeId = null): string`
`182`	`182`	`* @param string\|null $storeId`
`183`	`183`	`* @return bool`
`184`	`184`	`*/`
`185`		`- public function isAnalyticsEnabled(string $storeId = null): bool`
	`185`	`+ public function isAnalyticsEnabled(?string $storeId = null): bool`
`186`	`186`	`{`
`187`	`187`	`return (bool)$this->getConfig(self::XML_PATH_ANALYTICS_ENABLE, $storeId);`
`188`	`188`	`}`
`@@ -193,7 +193,7 @@ public function isAnalyticsEnabled(string $storeId = null): bool`
`193`	`193`	`* @param string\|null $storeId`
`194`	`194`	`* @return string`
`195`	`195`	`*/`
`196`		`- public function getMeasurementId(string $storeId = null): string`
	`196`	`+ public function getMeasurementId(?string $storeId = null): string`
`197`	`197`	`{`
`198`	`198`	`return trim((string)$this->getConfig(self::XML_PATH_ANALYTICS_MEASUREMENT_ID, $storeId));`
`199`	`199`	`}`
`@@ -202,7 +202,7 @@ public function getMeasurementId(string $storeId = null): string`
`202`	`202`	`* @param string\|null $storeId`
`203`	`203`	`* @return bool`
`204`	`204`	`*/`
`205`		`- public function isPurchaseTaxEnabled(string $storeId = null): bool`
	`205`	`+ public function isPurchaseTaxEnabled(?string $storeId = null): bool`
`206`	`206`	`{`
`207`	`207`	`return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_TAX_ENABLED, $storeId);`
`208`	`208`	`}`
`@@ -211,7 +211,7 @@ public function isPurchaseTaxEnabled(string $storeId = null): bool`
`211`	`211`	`* @param string\|null $storeId`
`212`	`212`	`* @return bool`
`213`	`213`	`*/`
`214`		`- public function isPurchaseShippingEnabled(string $storeId = null): bool`
	`214`	`+ public function isPurchaseShippingEnabled(?string $storeId = null): bool`
`215`	`215`	`{`
`216`	`216`	`return (bool)$this->getConfig(self::XML_PATH_EVENTS_PURCHASE_SHIPPING_ENABLED, $storeId);`
`217`	`217`	`}`
`@@ -222,7 +222,7 @@ public function isPurchaseShippingEnabled(string $storeId = null): bool`
`222`	`222`	`* @param string\|null $storeId`
`223`	`223`	`* @return string`
`224`	`224`	`*/`
`225`		`- public function getProductAttribute(string $storeId = null): string`
	`225`	`+ public function getProductAttribute(?string $storeId = null): string`
`226`	`226`	`{`
`227`	`227`	`return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_PRODUCT, $storeId));`
`228`	`228`	`}`
`@@ -233,7 +233,7 @@ public function getProductAttribute(string $storeId = null): string`
`233`	`233`	`* @param string\|null $storeId`
`234`	`234`	`* @return string`
`235`	`235`	`*/`
`236`		`- public function getBrandAttribute(string $storeId = null): string`
	`236`	`+ public function getBrandAttribute(?string $storeId = null): string`
`237`	`237`	`{`
`238`	`238`	`return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_BRAND, $storeId));`
`239`	`239`	`}`
`@@ -244,7 +244,7 @@ public function getBrandAttribute(string $storeId = null): string`
`244`	`244`	`* @param string\|null $storeId`
`245`	`245`	`* @return bool`
`246`	`246`	`*/`
`247`		`- public function isProtectCustomerDataEnabled(string $storeId = null): bool`
	`247`	`+ public function isProtectCustomerDataEnabled(?string $storeId = null): bool`
`248`	`248`	`{`
`249`	`249`	`return (bool)$this->getConfig(self::XML_PATH_PROTECT_CUSTOMER_DATA, $storeId);`
`250`	`250`	`}`
`@@ -255,7 +255,7 @@ public function isProtectCustomerDataEnabled(string $storeId = null): bool`
`255`	`255`	`* @param string\|null $storeId`
`256`	`256`	`* @return bool`
`257`	`257`	`*/`
`258`		`- public function isLoadBeforeConsent(string $storeId = null): bool`
	`258`	`+ public function isLoadBeforeConsent(?string $storeId = null): bool`
`259`	`259`	`{`
`260`	`260`	`return $this->getConfig(self::XML_PATH_LOAD_BEFORE_CONSENT, $storeId) \|\|`
`261`	`261`	`!$this->isCookieRestrictionModeEnabled($storeId);`
`@@ -268,7 +268,7 @@ public function isLoadBeforeConsent(string $storeId = null): bool`
`268`	`268`	`* @param string\|null $storeId`
`269`	`269`	`* @return bool`
`270`	`270`	`*/`
`271`		`- public function isCookieRestrictionModeEnabled(string $storeId = null)`
	`271`	`+ public function isCookieRestrictionModeEnabled(?string $storeId = null)`
`272`	`272`	`{`
`273`	`273`	`return (bool)$this->getConfig(Custom::XML_PATH_WEB_COOKIE_RESTRICTION, $storeId);`
`274`	`274`	`}`
`@@ -279,7 +279,7 @@ public function isCookieRestrictionModeEnabled(string $storeId = null)`
`279`	`279`	`* @param string\|null $storeId`
`280`	`280`	`* @return bool`
`281`	`281`	`*/`
`282`		`- public function isMfCookieConsentExtensionEnabled(string $storeId = null)`
	`282`	`+ public function isMfCookieConsentExtensionEnabled(?string $storeId = null)`
`283`	`283`	`{`
`284`	`284`	`return $this->moduleManager->isEnabled('Magefan_CookieConsent')`
`285`	`285`	`&& $this->getConfig(self::XML_PATH_MF_COOKIE_CONSENT_EXTENSION_ENABLED, $storeId);`
`@@ -291,7 +291,7 @@ public function isMfCookieConsentExtensionEnabled(string $storeId = null)`
`291`	`291`	`* @param string\|null $storeId`
`292`	`292`	`* @return string`
`293`	`293`	`*/`
`294`		`- public function getCategoriesAttribute(string $storeId = null): string`
	`294`	`+ public function getCategoriesAttribute(?string $storeId = null): string`
`295`	`295`	`{`
`296`	`296`	`return trim((string)$this->getConfig(self::XML_PATH_ATTRIBUTES_CATEGORIES, $storeId));`
`297`	`297`	`}`
`@@ -300,7 +300,7 @@ public function getCategoriesAttribute(string $storeId = null): string`
`300`	`300`	`* @param string\|null $storeId`
`301`	`301`	`* @return int`
`302`	`302`	`*/`
`303`		`- public function getInstallGtm(string $storeId = null): string`
	`303`	`+ public function getInstallGtm(?string $storeId = null): string`
`304`	`304`	`{`
`305`	`305`	`return trim((string)$this->getConfig(self::XML_PATH_INSTALL_GTM, $storeId));`
`306`	`306`	`}`
`@@ -312,7 +312,7 @@ public function getInstallGtm(string $storeId = null): string`
`312`	`312`	`* @param string\|null $storeId`
`313`	`313`	`* @return mixed`
`314`	`314`	`*/`
`315`		`- public function getConfig(string $path, string $storeId = null)`
	`315`	`+ public function getConfig(string $path, ?string $storeId = null)`
`316`	`316`	`{`
`317`	`317`	`return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);`
`318`	`318`	`}`
`@@ -323,7 +323,7 @@ public function getConfig(string $path, string $storeId = null)`
`323`	`323`	`* @param string\|null $storeId`
`324`	`324`	`* @return bool`
`325`	`325`	`*/`
`326`		`- public function isSpeedOptimizationEnabled(string $storeId = null): bool`
	`326`	`+ public function isSpeedOptimizationEnabled(?string $storeId = null): bool`
`327`	`327`	`{`
`328`	`328`	`return (bool)$this->getConfig(self::XML_PATH_SPEED_OPTIMIZATION_ENABLED, $storeId);`
`329`	`329`	`}`
`@@ -332,7 +332,7 @@ public function isSpeedOptimizationEnabled(string $storeId = null): bool`
`332`	`332`	`* @param string\|null $storeId`
`333`	`333`	`* @return bool`
`334`	`334`	`*/`
`335`		`- public function isThirdPartyGaEnabled(string $storeId = null): bool`
	`335`	`+ public function isThirdPartyGaEnabled(?string $storeId = null): bool`
`336`	`336`	`{`
`337`	`337`	`return (bool)$this->getConfig(self::XML_PATH_THIRD_PARTY_GA, $storeId);`
`338`	`338`	`}`