Merge branch 'v1-develop' into v1

baldwin-agency · Mar 16, 2023 · 0cc21c6 · 0cc21c6
2 parents 6b3f9de + c47930b
commit 0cc21c6
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 128 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ check: checkstyle checkquality test
 
 .PHONY: checkstyle
 checkstyle:
-	PHP_CS_FIXER_IGNORE_ENV=1 vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
+	vendor-bin/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff --stop-on-violation --allow-risky=yes
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=Magento2 --exclude=Magento2.Security.InsecureFunction,Magento2.Commenting.ClassPropertyPHPDocFormatting,Magento2.Annotation.MethodAnnotationStructure,Magento2.Annotation.MethodArguments,PSR12.Properties.ConstantVisibility --ignore=./vendor/,./vendor-bin/ .
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.0- --ignore=./vendor/,./vendor-bin/,./Test/ .
 	vendor-bin/phpcs/vendor/bin/phpcs -s --standard=PHPCompatibility --runtime-set testVersion 7.1- ./Test/

diff --git a/Updater/Catalog/Category/UrlKey.php b/Updater/Catalog/Category/UrlKey.php
@@ -33,7 +33,7 @@ public function refresh(string $initiator): array
         $storageIdentifier = UrlKeyChecker::STORAGE_IDENTIFIER;
 
         if ($this->metaStorage->isRefreshing($storageIdentifier)) {
-            $errorMsg = __('We are already refreshing the category url key\'s, just have a little patience 🙂');
+            $errorMsg = __('We are already refreshing the category url key\'s, just have a little patience');
 
             $this->metaStorage->setErrorMessage($storageIdentifier, (string) $errorMsg);
             throw new AlreadyRefreshingException($errorMsg);

diff --git a/Updater/Catalog/Category/UrlPath.php b/Updater/Catalog/Category/UrlPath.php
@@ -33,7 +33,7 @@ public function refresh(string $initiator): array
         $storageIdentifier = UrlPathChecker::STORAGE_IDENTIFIER;
 
         if ($this->metaStorage->isRefreshing($storageIdentifier)) {
-            $errorMsg = __('We are already refreshing the category url path\'s, just have a little patience 🙂');
+            $errorMsg = __('We are already refreshing the category url path\'s, just have a little patience');
 
             $this->metaStorage->setErrorMessage($storageIdentifier, (string) $errorMsg);
             throw new AlreadyRefreshingException($errorMsg);

diff --git a/Updater/Catalog/Product/UrlKey.php b/Updater/Catalog/Product/UrlKey.php
@@ -33,7 +33,7 @@ public function refresh(string $initiator): array
         $storageIdentifier = UrlKeyChecker::STORAGE_IDENTIFIER;
 
         if ($this->metaStorage->isRefreshing($storageIdentifier)) {
-            $errorMsg = __('We are already refreshing the product url key\'s, just have a little patience 🙂');
+            $errorMsg = __('We are already refreshing the product url key\'s, just have a little patience');
 
             $this->metaStorage->setErrorMessage($storageIdentifier, (string) $errorMsg);
             throw new AlreadyRefreshingException($errorMsg);

diff --git a/Updater/Catalog/Product/UrlPath.php b/Updater/Catalog/Product/UrlPath.php
@@ -33,7 +33,7 @@ public function refresh(string $initiator): array
         $storageIdentifier = UrlPathChecker::STORAGE_IDENTIFIER;
 
         if ($this->metaStorage->isRefreshing($storageIdentifier)) {
-            $errorMsg = __('We are already refreshing the product url path\'s, just have a little patience 🙂');
+            $errorMsg = __('We are already refreshing the product url path\'s, just have a little patience');
 
             $this->metaStorage->setErrorMessage($storageIdentifier, (string) $errorMsg);
             throw new AlreadyRefreshingException($errorMsg);