Merge master into beta

Controller/Ajax/Analytics.php

@@ -38,7 +38,7 @@ public function __construct(
     /**
      * @return ResponseInterface|Json|ResultInterface
      */
-    public function execute()
+    public function execute(): ResponseInterface|Json|ResultInterface
     {
         $result = $this->resultJsonFactory->create();
         if ($this->config->isAnalyticsEnabled()) {

Model/Client/Request.php

@@ -330,7 +330,7 @@ public function setProfileKey(string $profileKey)
     /**
      * @return string|null
      */
-    public function setParameterArray(string $parameter, array $value)
+    public function setParameterArray(string $parameter, array $value): Request
     {
         $this->parameters[$parameter] = $value;
         return $this;
@@ -339,7 +339,7 @@ public function setParameterArray(string $parameter, array $value)
     /**
      * @return string|null
      */
-    public function isPostRequest()
+    public function isPostRequest(): bool
     {
         return false;
     }

Model/Client/Request/AnalyticsRequest.php

@@ -24,39 +24,39 @@ class AnalyticsRequest extends Request
     /**
      * @return string
      */
-    public function isPostRequest()
+    public function isPostRequest(): bool
     {
         return true;
     }
 
     /**
      * @return string
      */
-    public function getApiurl()
+    public function getApiurl(): string
     {
         return $this->apiUrl;
     }
 
     /**
      * @return void
      */
-    public function setProfileKey(string $profileKey)
+    public function setProfileKey(string $profileKey): void
     {
         $this->setParameter('ProfileKey', $profileKey);
     }
 
     /**
      * @return void
      */
-    public function setPath($path)
+    public function setPath($path): void
     {
         $this->path = $path;
     }
 
     /**
      * @return string
      */
-    public function getProfileKey()
+    public function getProfileKey(): string
     {
         $profileKey = $this->getCookie($this->config->getPersonalMerchandisingCookieName());
         if (!$profileKey) {

Model/Client/Request/PurchaseRequest.php

@@ -29,15 +29,15 @@ class PurchaseRequest extends Request
     /**
      * @return true
      */
-    public function isPostRequest()
+    public function isPostRequest(): bool
     {
         return true;
     }
 
     /**
      * @return mixed|string
      */
-    public function getApiurl()
+    public function getApiurl(): string
     {
         return $this->apiUrl;
     }
@@ -47,7 +47,7 @@ public function getApiurl()
      *
      * @return void
      */
-    public function setProfileKey(string $profileKey)
+    public function setProfileKey(string $profileKey): void
     {
         $this->setParameter('ProfileKey', $profileKey);
     }

Model/PersonalMerchandisingConfig.php

@@ -31,15 +31,15 @@ public function __construct(
      * @param Store|null $store
      * @return bool
      */
-    public function isAnalyticsEnabled(Store $store = null)
+    public function isAnalyticsEnabled(Store $store = null): bool
     {
         return (bool)$this->getStoreConfig('tweakwise/personal_merchandising/analytics_enabled', $store);
     }
 
     /**
      * @return string|null
      */
-    public function getProfileKey()
+    public function getProfileKey(): ?string
     {
         $profileKey = $this->cookieManager->getCookie(
             $this->getPersonalMerchandisingCookieName(),
@@ -61,9 +61,9 @@ public function getProfileKey()
     }
 
     /**
-     * @return string
+     * @return CookieMetadataInterface
      */
-    private function getCookieMetadata()
+    private function getCookieMetadata(): CookieMetadataInterface
     {
         return $this->cookieMetadataFactory
             ->createPublicCookieMetadata()
@@ -75,7 +75,7 @@ private function getCookieMetadata()
     /**
      * @return string
      */
-    private function generateProfileKey()
+    private function generateProfileKey(): string
     {
         return uniqid('', true);
     }

Observer/TweakwiseCheckout.php

@@ -43,9 +43,9 @@ public function __construct(
      * @return void
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(Observer $observer)
+    public function execute(Observer $observer): void
     {
-        if ($this->config->isAnalyticsEnabled('tweakwise/personal_merchandising/analytics_enabled')) {
+        if ($this->config->isAnalyticsEnabled()) {
             $order = $observer->getEvent()->getOrder();
             // Get the order items
             $items = $order->getAllItems();
@@ -60,7 +60,7 @@ public function execute(Observer $observer)
      * @return void
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    private function sendCheckout($items)
+    private function sendCheckout($items): void
     {
         $storeId = (int)$this->storeManager->getStore()->getId();
         $profileKey = $this->config->getProfileKey();