Merge pull request #46 from valguss/magento2

Magento2

Author: sprankhub

Console/Command/RemoveUnusedMediaCommand.php

@@ -70,6 +70,10 @@ public function execute(InputInterface $input, OutputInterface $output) : void
         );
 
         $directoryIterator = new \RecursiveDirectoryIterator($imageDir);
+        
+        $imagesToKeep = $connection->fetchCol(
+            'SELECT value FROM ' . $mediaGalleryTable
+        );
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
 
@@ -89,10 +93,7 @@ public function execute(InputInterface $input, OutputInterface $output) : void
                 continue;
             }
 
-            $imageFound = $connection->fetchOne(
-                'SELECT value FROM ' . $mediaGalleryTable . ' WHERE value = ?', array($filePath)
-            );
-            if ($imageFound) {
+            if (in_array($filePath, $imagesToKeep)) {
                 continue;
             }
 

Console/Command/RestoreUseDefaultValueCommand.php

@@ -1,6 +1,7 @@
 <?php
 namespace Hackathon\EAVCleaner\Console\Command;
 
+use Magento\Framework\App\ProductMetadataInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -10,6 +11,20 @@ class RestoreUseDefaultValueCommand extends Command
 {
     public $questionHelper;
 
+    /**
+     * @var ProductMetaDataInterface
+     */
+    protected $productMetaData;
+
+    public function __construct(
+        ProductMetaDataInterface $productMetaData,
+        string $name = null
+    )
+    {
+        parent::__construct($name);
+        $this->productMetaData = $productMetaData;
+    }
+
     /**
      * Init command
      */
@@ -52,6 +67,8 @@ public function execute(InputInterface $input, OutputInterface $output)
         $counts = array();
         $i = 0;
         $tables = array('varchar', 'int', 'decimal', 'text', 'datetime');
+        $column = $this->productMetaData->getEdition() === 'Enterprise' ? 'row_id' : 'entity_id';
+
 
         foreach ($tables as $table) {
             // Select all non-global values
@@ -62,8 +79,8 @@ public function execute(InputInterface $input, OutputInterface $output)
                 // Select the global value if it's the same as the non-global value
                 $results = $db->fetchAll(
                     'SELECT * FROM ' . $fullTableName
-                    . ' WHERE attribute_id = ? AND store_id = ? AND entity_id = ? AND value = ?',
-                    array($row['attribute_id'], 0, $row['entity_id'], $row['value'])
+                    . ' WHERE attribute_id = ? AND store_id = ? AND ' . $column . ' = ? AND value = ?',
+                    array($row['attribute_id'], 0, $row[$column], $row['value'])
                 );
 
                 if (count($results) > 0) {