Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 7.6.1 - Remove whitespaces from category strings #866

Merged
merged 12 commits into from
Oct 14, 2024
6 changes: 3 additions & 3 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/ide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/phan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Model/Service/Product/Category/DefaultCategoryService.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ public function getCategory(Category $category, StoreInterface $store)
['categoryString' => $nostoCategory, 'magentoCategory' => $category]
);
}
return $nostoCategory;

return $nostoCategory ? trim($nostoCategory) : $nostoCategory;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion Model/Service/Sync/AbstractBulkPublisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
<!--suppress XmlUnboundNsPrefix -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Nosto_Tagging" setup_version="7.6.0"/>
<module name="Nosto_Tagging" setup_version="7.6.1"/>
</config>
Loading