Merge pull request #6 from erikaheidi/upgrade-php8

Upgrading to Minicli 3

bin/command/Generate/CoverController.php

@@ -8,7 +8,10 @@
 
 class CoverController extends CommandController
 {
-    public function handle()
+    /**
+     * @throws \Exception
+     */
+    public function handle(): void
     {
         $template_file = $this->getApp()->config->default_template;
 
@@ -17,18 +20,15 @@ public function handle()
         }
 
         if (!is_file($template_file)) {
-            $this->getPrinter()->error("Template not found.");
-            return 1;
+            throw new \Exception("Template file not found.");
         }
 
         if (!isset($this->getArgs()[3])) {
-            $this->getPrinter()->error("You must provide the URL as second parameter.");
-            return 1;
+            throw new \Exception("You must provide the URL as second parameter.");
         }
 
         if (!isset($this->getArgs()[4])) {
-            $this->getPrinter()->error("You must provide the Output location as third parameter.");
-            return 1;
+            throw new \Exception("You must provide the Output location as third parameter.");
         }
 
         $template = Template::create($template_file);
@@ -57,8 +57,6 @@ public function handle()
 
         $template->write($dest);
         $this->getPrinter()->info("Image saved to $dest.");
-
-        return 0;
     }
 
     function get_page_title(string $url) {

bin/command/Generate/DefaultController.php

@@ -6,7 +6,7 @@
 
 class DefaultController extends CommandController
 {
-    public function handle()
+    public function handle(): void
     {
         $this->getPrinter()->out("To generate a new cover based on the default template:");
         $this->getPrinter()->info("gdaisy generate cover [cover-url] [output-path]");

bin/command/Help/DefaultController.php

@@ -10,13 +10,13 @@ class DefaultController extends CommandController
     /** @var  array */
     protected $command_map = [];
 
-    public function boot(App $app)
+    public function boot(App $app): void
     {
         parent::boot($app);
         $this->command_map = $app->command_registry->getCommandMap();
     }
 
-    public function handle()
+    public function handle(): void
     {
         $this->getPrinter()->info('Available Commands');
 

bin/command/Resize/CropController.php

@@ -8,35 +8,33 @@
 
 class CropController extends CommandController
 {
-    public function handle()
+    /**
+     * @throws \Exception
+     */
+    public function handle(): void
     {
         if (!$this->hasParam('size')) {
-            $this->getPrinter()->error("You must provide a valid 'size' argument such as size=square.");
-            return 1;
+            throw new \Exception("You must provide a valid 'size' argument such as size=square.");
         }
 
         $template_file = dirname(__DIR__,3) . '/resources/templates/resize-' . $this->getParam('size') . '.json';
 
         if (!is_file($template_file)) {
-            $this->getPrinter()->error("Invalid Size/Template not found.");
-            return 1;
+            throw new \Exception("Invalid Size/Template not found.");
         }
 
         if (!$this->hasParam('input')) {
-            $this->getPrinter()->error("You must provide an input image as input=full/path/to/image.png");
-            return 1;
+            throw new \Exception("You must provide an input image as input=full/path/to/image.png");
         }
 
         $input_file = $this->getParam('input');
 
         if (!is_file($input_file)) {
-            $this->getPrinter()->error("Input file not found.");
-            return 1;
+            throw new \Exception("Input file not found.");
         }
 
         if (!$this->hasParam('output')) {
-            $this->getPrinter()->error("You must provide an output image as output=full/path/to/output.png");
-            return 1;
+            throw new \Exception("You must provide an output image as output=full/path/to/output.png");
         }
 
 
@@ -48,7 +46,5 @@ public function handle()
 
         $template->write($this->getParam('output'));
         $this->getPrinter()->info("Image saved to " . $this->getParam('output'));
-
-        return 0;
     }
 }

bin/command/Resize/DefaultController.php

@@ -6,7 +6,7 @@
 
 class DefaultController extends CommandController
 {
-    public function handle()
+    public function handle(): void
     {
         $this->getPrinter()->out("To create a cropped thumbnail:");
         $this->getPrinter()->info("gdaisy resize crop size=[format] input=[input-path] output=[output-path]");

bin/gdaisy

@@ -40,8 +40,13 @@ $gdaisy->setSignature($signature);
 
 try {
     $gdaisy->runCommand($argv);
-    return 0;
-} catch (CommandNotFoundException $e) {
-    $gdaisy->getPrinter()->error("Command not found.");
+} catch (CommandNotFoundException $notFoundException) {
+    $gdaisy->getPrinter()->error("Command Not Found.");
+    return 1;
+} catch (Exception $exception) {
+    if ($gdaisy->config->debug) {
+        $gdaisy->getPrinter()->error("An error occurred:");
+        $gdaisy->getPrinter()->error($exception->getMessage());
+    }
     return 1;
 }

composer.json

@@ -13,7 +13,7 @@
         "php": "^8.1",
         "ext-gd": "*",
         "ext-json": "*",
-        "minicli/minicli": "^2.2"
+        "minicli/minicli": "^3.2"
     },
     "require-dev": {
         "pestphp/pest": "^1.0"