Sanitize

Author: thomas-kl1

Controller/Adminhtml/Export/CategoryDownload.php

@@ -7,13 +7,13 @@
 
 namespace Opengento\CategoryImportExport\Controller\Adminhtml\Export;
 
-use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 use Exception;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\Phrase;
+use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 
 class CategoryDownload extends Action implements HttpGetActionInterface
 {

Controller/Adminhtml/Export/CategoryPost.php

@@ -7,15 +7,15 @@
 
 namespace Opengento\CategoryImportExport\Controller\Adminhtml\Export;
 
-use Opengento\CategoryImportExport\Model\Csv\Options;
-use Opengento\CategoryImportExport\Model\Export\ToCsv;
-use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 use Exception;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use Opengento\CategoryImportExport\Model\Csv\Options;
+use Opengento\CategoryImportExport\Model\Export\ToCsv;
+use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 
 class CategoryPost extends Action implements HttpPostActionInterface
 {

Controller/Adminhtml/Import/CategoryPost.php

@@ -7,8 +7,6 @@
 
 namespace Opengento\CategoryImportExport\Controller\Adminhtml\Import;
 
-use Opengento\CategoryImportExport\Model\Csv\Options;
-use Opengento\CategoryImportExport\Model\Import\FromCsv;
 use Exception;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpPostActionInterface;
@@ -18,6 +16,8 @@
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Phrase;
+use Opengento\CategoryImportExport\Model\Csv\Options;
+use Opengento\CategoryImportExport\Model\Import\FromCsv;
 
 class CategoryPost extends Action implements HttpPostActionInterface
 {

Model/Export/ToCsv.php

@@ -7,13 +7,13 @@
 
 namespace Opengento\CategoryImportExport\Model\Export;
 
-use Opengento\CategoryImportExport\Model\Csv\Options;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\File\Csv;
 use Magento\Framework\Filesystem;
+use Opengento\CategoryImportExport\Model\Csv\Options;
 
 class ToCsv
 {

Model/Import/Categories.php

@@ -7,7 +7,6 @@
 
 namespace Opengento\CategoryImportExport\Model\Import;
 
-use Opengento\CategoryImportExport\Model\Config\Source\Category\Attributes;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;

Model/Import/FromCsv.php

@@ -5,12 +5,12 @@
  */
 namespace Opengento\CategoryImportExport\Model\Import;
 
-use Opengento\CategoryImportExport\Model\Csv\Options;
 use Exception;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\File\Csv;
+use Opengento\CategoryImportExport\Model\Csv\Options;
 
 class FromCsv
 {

Setup/Patch/Data/AddCategoryCodeAttributeV1.php

@@ -6,10 +6,10 @@
 namespace Opengento\CategoryImportExport\Setup\Patch\Data;
 
 use Magento\Catalog\Model\Category;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Zend_Validate_Exception;
 

Setup/Patch/Data/PopulateCategoriesIdentifierV1.php renamed to Setup/Patch/Data/PopulateCategoryCodeV1.php

@@ -13,7 +13,7 @@
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 
-class PopulateCategoriesIdentifierV1 implements DataPatchInterface
+class PopulateCategoryCodeV1 implements DataPatchInterface
 {
     public function __construct(
         private CollectionFactory $collecionFactory,
@@ -60,9 +60,9 @@ public function apply(): void
 
         /** @var Category $category */
         foreach ($categories as $category) {
-            if ($category->getId() !== '1' && !$category->getData('category_code')) {
+            if (!$category->getData('category_code')) {
                 $code = '';
-                foreach($category->getPathIds() as $pathId) {
+                foreach ($category->getPathIds() as $pathId) {
                     if ($pathId !== '1') {
                         if ($code === '') {
                             $code = $idsToName[$pathId];

Ui/Component/Form/Button/Download.php

@@ -7,10 +7,10 @@
 
 namespace Opengento\CategoryImportExport\Ui\Component\Form\Button;
 
-use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 use Magento\Framework\Phrase;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Opengento\CategoryImportExport\Model\Session\DownloadContext;
 
 class Download implements ButtonProviderInterface
 {