Merge pull request #147 from utopia-php/remove-console-logs

Author: abnegate

composer.json

@@ -29,7 +29,6 @@
         "utopia-php/database": "5.*",
         "utopia-php/storage": "0.18.*",
         "utopia-php/dsn": "0.2.*",
-        "utopia-php/console": "0.0.*",
         "halaxa/json-machine": "^1.2"
     },
     "require-dev": {

composer.lock

@@ -2,14 +2,14 @@
 
 namespace Utopia\Migration\Destinations;
 
-use Utopia\Console;
 use Utopia\Database\Exception\Authorization;
 use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Structure;
 use Utopia\Migration\Destination;
 use Utopia\Migration\Resource as UtopiaResource;
 use Utopia\Migration\Resources\Database\Row;
 use Utopia\Migration\Transfer;
+use Utopia\Migration\Warning;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 
@@ -185,7 +185,12 @@ public function shutdown(): void
         } finally {
             // Clean up the temporary directory
             if (!$this->local->deletePath('') || $this->local->exists($this->local->getRoot())) {
-                Console::error('Error cleaning up: ' . $this->local->getRoot());
+                $this->addWarning(new Warning(
+                    UtopiaResource::TYPE_ROW,
+                    Transfer::GROUP_DATABASES,
+                    'Error cleaning up: ' . $this->local->getRoot(),
+                    $this->resourceId
+                ));
             }
         }
     }

src/Migration/Destinations/CSV.php

@@ -3,7 +3,6 @@
 namespace Utopia\Migration\Destinations;
 
 use Exception;
-use Utopia\Console;
 use Utopia\Database\Exception\Authorization;
 use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Structure;
@@ -12,6 +11,7 @@
 use Utopia\Migration\Resource as UtopiaResource;
 use Utopia\Migration\Resources\Database\Row;
 use Utopia\Migration\Transfer;
+use Utopia\Migration\Warning;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 
@@ -212,7 +212,12 @@ public function shutdown(): void
         } finally {
             // Clean up the temporary directory
             if (!$this->local->deletePath('') || $this->local->exists($this->local->getRoot())) {
-                Console::error('Error cleaning up: ' . $this->local->getRoot());
+                $this->addWarning(new Warning(
+                    UtopiaResource::TYPE_ROW,
+                    Transfer::GROUP_DATABASES,
+                    'Error cleaning up: ' . $this->local->getRoot(),
+                    $this->resourceId
+                ));
             }
         }
     }

src/Migration/Destinations/JSON.php

@@ -2,7 +2,6 @@
 
 namespace Utopia\Migration\Sources;
 
-use Utopia\Console;
 use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Migration\Exception;
 use Utopia\Migration\Resource as UtopiaResource;
@@ -15,6 +14,7 @@
 use Utopia\Migration\Sources\Appwrite\Reader;
 use Utopia\Migration\Sources\Appwrite\Reader\Database as DatabaseReader;
 use Utopia\Migration\Transfer;
+use Utopia\Migration\Warning;
 use Utopia\Storage\Device;
 use Utopia\Storage\Storage;
 
@@ -438,7 +438,12 @@ private function validateCSVHeaders(array $headers, array $columnTypes, array $r
             $messages[] = "$label: '" . \implode("', '", $unknown) . "' (will be ignored)";
         }
         if (!empty($unknown)) {
-            Console::warning(\implode(', ', $messages));
+            $this->addWarning(new Warning(
+                UtopiaResource::TYPE_ROW,
+                Transfer::GROUP_DATABASES,
+                \implode(', ', $messages),
+                $this->resourceId
+            ));
         }
     }