Merge pull request #264 from Nosto/release/2.5.2

Release/2.5.2
Nosto · Dec 27, 2023 · 0fe23ea · 0fe23ea
2 parents 70a56fd + 7f8014a
commit 0fe23ea
Show file tree

Hide file tree

Showing 12 changed files with 3,690 additions and 2,915 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -14,8 +14,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo
+        php-version: '7.4'
+        tools: composer:v2
         extensions: ast
         coverage: none
 
@@ -64,8 +64,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo
+        php-version: '7.4'
+        tools: composer:v2
         extensions: ast
         coverage: none
 
@@ -111,8 +111,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo
+        php-version: '7.4'
+        tools: composer:v2
         extensions: ast
         coverage: none
 
@@ -162,8 +162,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo
+        php-version: '7.4'
+        tools: composer:v2
         extensions: ast
         coverage: none
 

diff --git a/.github/workflows/ide.yml b/.github/workflows/ide.yml
@@ -15,8 +15,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo, pecl
+        php-version: '7.4'
+        tools: composer:v2, pecl
         coverage: none
 
       #https://github.com/actions/cache/blob/master/examples.md#php---composer

diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
@@ -15,8 +15,8 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
-        tools: composer:v1, prestissimo, pecl
+        php-version: '7.4'
+        tools: composer:v2, pecl
         coverage: none
 
       #https://github.com/actions/cache/blob/master/examples.md#php---composer

diff --git a/Bootstrap.php b/Bootstrap.php
@@ -85,7 +85,7 @@
 class Shopware_Plugins_Frontend_NostoTagging_Bootstrap extends Shopware_Components_Plugin_Bootstrap
 {
     const PLATFORM_NAME = 'shopware';
-    const PLUGIN_VERSION = '2.5.1';
+    const PLUGIN_VERSION = '2.5.2';
     const MENU_PARENT_ID = 23;  // Configuration
     const NEW_ATTRIBUTE_MANAGER_VERSION = '5.2.0';
     const SUPPORT_SHOW_REVIEW_SUB_SHOP_ONLY_VERSION = '5.3.0';
@@ -487,6 +487,7 @@ public function getShopwareVersion()
      * Creates Nosto emotions for Shopping World templates
      *
      * @see Shopware_Plugins_Frontend_NostoTagging_Bootstrap::install
+     * @suppress PhanTypeMismatchArgument
      */
     protected function createMyEmotions()
     {
@@ -1070,6 +1071,7 @@ public function generateCustomerTagging()
      *
      * @see Shopware_Controllers_Frontend_NostoTagging::noCacheTaggingAction
      * @return NostoCartModel|null
+     * @suppress PhanDeprecatedFunction
      */
     public function generateCartTagging()
     {
@@ -1334,6 +1336,7 @@ public function onPostDispatchFrontendCheckout(Enlight_Controller_ActionEventArg
      * @param Enlight_View_Default $view the view.
      *
      * @throws Enlight_Event_Exception
+     * @suppress PhanDeprecatedFunction
      * @see Shopware_Plugins_Frontend_NostoTagging_Bootstrap::onPostDispatchFrontendCheckout
      */
     protected function addOrderTagging(Enlight_View_Default $view)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.5.2
+- Fix a bug that would cause the order tagging to get article items that are not products
+- Add exception handling when checking for a payment provider in orders (@Forestsoft-de)
+
 ## 2.5.1
 - Change Nosto script from `const` to `var` to be globally accessible by the browser.
 - Remove all references to non-existent `Shopware()->SessionID()` method.

diff --git a/Components/Helper/Price.php b/Components/Helper/Price.php
@@ -161,6 +161,8 @@ public static function calcArticlePriceInclTax(
      * @param Price $price
      * @param Tax $tax
      * @return float|int
+     * @suppress PhanTypeMismatchReturnNullable
+     * @suppress PhanTypeInvalidLeftOperandOfNumericOp
      */
     public static function applyTaxes(
         $priceWithoutTax,

diff --git a/Components/Model/Order.php b/Components/Model/Order.php
@@ -71,8 +71,14 @@ public function loadData(Order $order)
         try {
             $paymentProvider = $payment->getName();
             $paymentPlugin = $payment->getPlugin();
-            if ($paymentPlugin !== null && $paymentPlugin->getVersion()) {
-                $paymentProvider .= sprintf(' [%s]', $paymentPlugin->getVersion());
+            if ($payment instanceof \Shopware\Models\Payment\Payment) {
+                $paymentProvider = $payment->getName();
+                $paymentPlugin = $payment->getPlugin();
+                if ($paymentPlugin !== null && $paymentPlugin->getVersion()) {
+                    $paymentProvider .= sprintf(' [%s]', $paymentPlugin->getVersion());
+                }
+            } else {
+                throw new \InvalidArgumentException(sprintf("Could not determine payment method of order %s", $order->getNumber()));
             }
         } catch (Exception $e) {
             $paymentProvider = 'unknown';

diff --git a/Components/Model/Order/LineItem.php b/Components/Model/Order/LineItem.php
@@ -69,7 +69,8 @@ public function loadData(OrderDetail $detail)
                     ->Models()
                     ->getRepository('\Shopware\Models\Article\Detail')
                     ->findOneBy(array('articleId' => $detail->getArticleId()));
-                if ($articleDetail !== null) {
+                // Check if the article is a product
+                if ($articleDetail !== null && $articleDetail->getKind() === 1) {
                     $this->setProductId($articleDetail->getNumber());
                 }
             } catch (Exception $e) {

diff --git a/Components/Model/Repository/ProductStreams.php b/Components/Model/Repository/ProductStreams.php
@@ -65,6 +65,7 @@ public function __construct()
      *
      * @param Article $article
      * @return array
+     * @suppress PhanDeprecatedFunction
      */
     public function getProductStreamsSelectionName(Article $article)
     {

diff --git a/Controllers/frontend/NostoTagging.php b/Controllers/frontend/NostoTagging.php
@@ -141,6 +141,7 @@ public function oauthAction()
                         $shop->getId()
                     ));
                 }
+                // @phan-suppress-next-line PhanTypeMismatchArgument
                 $token = $this->getAuthenticatedToken($shop, $code);
                 $result = $this->fireRequest($token);
                 $nostoAccount = new NostoAccount($token->getMerchantName());

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "license": [
     "BSD-3-Clause"
   ],
-  "version": "2.5.1",
+  "version": "2.5.2",
   "require": {
     "php": ">=5.4.0",
     "nosto/php-sdk": "3.15.*",
@@ -16,7 +16,7 @@
     "phpmd/phpmd": "^2.6",
     "sebastian/phpcpd": "4.1.0",
     "phing/phing": "2.*",
-    "shopware/shopware": "~5.6",
+    "shopware/shopware": "~5.7",
     "wimg/php-compatibility": "^9.0",
     "staabm/annotate-pull-request-from-checkstyle": "^1.1",
     "mridang/pmd-annotations": "^0.0.2",