diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 60e1298a8..cbd38ee4a 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -49,7 +49,7 @@ jobs: ./vendor/bin/phpcs --standard=ruleset.xml --report=checkstyle --report-file=chkphpcs.xml - name: Archive code sniffing results - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: phpcs-xml-result path: chkphpcs.xml @@ -100,7 +100,7 @@ jobs: run: ./vendor/bin/phpmd . xml codesize,naming,unusedcode,controversial,design --exclude vendor,var,build,tests --reportfile pmdphpmd.xml --ignore-violations-on-exit - name: Archive mess detection results - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: phpmd-xml-result path: pmdphpmd.xml @@ -153,7 +153,7 @@ jobs: run: composer archive --format=zip --file=archive - name: Archive built arhive - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: composer-zip-archive path: archive.zip diff --git a/.github/workflows/ide.yml b/.github/workflows/ide.yml index c0bd9ffd2..ed18d83b8 100644 --- a/.github/workflows/ide.yml +++ b/.github/workflows/ide.yml @@ -74,7 +74,7 @@ jobs: - name: Archive inspection results if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: inspection-results path: output diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml index ebe9fe77a..61e8cf7cc 100644 --- a/.github/workflows/phan.yml +++ b/.github/workflows/phan.yml @@ -66,7 +66,7 @@ jobs: continue-on-error: true - name: Archive static analysis results - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: phan-analysis-results path: chkphan.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5908b10e7..8558b0e26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning. +### 7.6.1 +* Remove whitespaces from category strings +* Make rabbitmq publishing error message more clear + ### 7.6.0 * Deprecate MySQL as message queue provider, the extension now uses RabbitMQ as the default message queue provider * Add command to clear the Nosto message queue diff --git a/Model/Service/Product/Category/DefaultCategoryService.php b/Model/Service/Product/Category/DefaultCategoryService.php index 03a03f63a..e36cfa8d7 100644 --- a/Model/Service/Product/Category/DefaultCategoryService.php +++ b/Model/Service/Product/Category/DefaultCategoryService.php @@ -130,7 +130,8 @@ public function getCategory(Category $category, StoreInterface $store) ['categoryString' => $nostoCategory, 'magentoCategory' => $category] ); } - return $nostoCategory; + + return $nostoCategory ? trim($nostoCategory) : $nostoCategory; } /** diff --git a/Model/Service/Sync/AbstractBulkPublisher.php b/Model/Service/Sync/AbstractBulkPublisher.php index 13ea007d5..2df16c360 100644 --- a/Model/Service/Sync/AbstractBulkPublisher.php +++ b/Model/Service/Sync/AbstractBulkPublisher.php @@ -153,8 +153,9 @@ private function publishCollectionToMessageQueue( $bulkDescription ); if (!$result) { + $msg = 'Something went wrong while publishing bulk to RabbitMQ. Please check your connection'; /** @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal */ - throw new LocalizedException(__('Something went wrong while processing the request.')); + throw new LocalizedException(__($msg)); } } diff --git a/composer.json b/composer.json index 4a128c076..86278a314 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "nosto/module-nostotagging", "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.", "type": "magento2-module", - "version": "7.6.0", + "version": "7.6.1", "require-dev": { "phpmd/phpmd": "^2.5", "sebastian/phpcpd": "*", diff --git a/etc/module.xml b/etc/module.xml index d7070be90..245439d94 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -37,5 +37,5 @@ - +