volldigital
diff --git a/‎src/Api/Repository.php
Lines changed: 9 additions & 0 deletions b/‎src/Api/Repository.php
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Console/Commands/AbstractGeneratorCommand.php
Lines changed: 29 additions & 2 deletions b/‎src/Console/Commands/AbstractGeneratorCommand.php
Lines changed: 29 additions & 2 deletions
diff --git a/‎src/Console/Commands/MakeResourceCommand.php
Lines changed: 19 additions & 14 deletions b/‎src/Console/Commands/MakeResourceCommand.php
Lines changed: 19 additions & 14 deletions
@@ -59,6 +59,15 @@ public function __construct(Config $config, Factory $factory)
         $this->factory = $factory;
     }
 
+    /**
+     * @param $apiName
+     * @return bool
+     */
+    public function isApi($apiName)
+    {
+        return !empty($this->retrieveConfig($apiName));
+    }
+
     /**
      * @param $apiName
      * @param string|null $host
 
@@ -88,6 +88,19 @@ public function __construct(Filesystem $files, Repository $apiRepository)
         $this->stubsDirectory = __DIR__ . '/../../../stubs';
     }
 
+    /**
+     * @return bool|null
+     */
+    public function fire()
+    {
+        if (!$this->apiRepository->isApi($api = $this->argument('api'))) {
+            $this->error("JSON API '$api' does not exist.");
+            return 1;
+        }
+
+        return (parent::fire() !== false) ? 0 : 1;
+    }
+
     /**
      * Get the desired class name from the input.
      *
@@ -103,10 +116,24 @@ protected function getNameInput()
     }
 
     /**
-     * @param string $name
-     * @return mixed
+     * Laravel 5.3 name parsing.
+     *
+     * @param $name
+     * @return string
+     * @todo remove when dropping support for Laravel 5.3
      */
     protected function parseName($name)
+    {
+        return $this->qualifyClass($name);
+    }
+
+    /**
+     * Laravel 5.4 name parsing.
+     *
+     * @param string $name
+     * @return string
+     */
+    protected function qualifyClass($name)
     {
         return call_user_func(
             Fqn::class . '::' . $this->type,
 
@@ -97,19 +97,22 @@ public function handle()
         }
 
         // Run commands that cannot accept Eloquent parameters.
-        $this->runCommandsWithParameters($commands->only([
-            'make:json-api:validators',
-        ]), $resourceParameter);
+        $notEloquent = ['make:json-api:validators'];
+
+        if (!$this->runCommandsWithParameters($commands->only($notEloquent), $resourceParameter)) {
+            return 1;
+        }
 
         // Run commands that can accept Eloquent parameters.
-        $this->runCommandsWithParameters($commands->only([
-            'make:json-api:adapter',
-            'make:json-api:hydrator',
-            'make:json-api:schema',
-        ]), $eloquentParameters);
+        $eloquent = ['make:json-api:adapter', 'make:json-api:hydrator', 'make:json-api:schema'];
+
+        if (!$this->runCommandsWithParameters($commands->only($eloquent), $eloquentParameters)) {
+            return 1;
+        }
 
         // Give the user a digial high-five.
         $this->comment('All done, keep doing what you do.');
+
         return 0;
     }
 
@@ -118,7 +121,6 @@ public function handle()
      *
      * @param Collection $commands
      * @param string $type
-     *
      * @return Collection
      */
     private function filterCommands(Collection $commands, $type)
@@ -139,14 +141,17 @@ private function filterCommands(Collection $commands, $type)
      *
      * @param Collection $commands
      * @param array $parameters
-     *
-     * @return void
+     * @return bool
      */
     private function runCommandsWithParameters(Collection $commands, array $parameters)
     {
-        $commands->keys()->each(function ($command) use ($parameters) {
-            $this->call($command, $parameters);
-        });
+        foreach ($commands->keys() as $command) {
+            if (0 !== $this->call($command, $parameters)) {
+           
56A3
     return false;
+            }
+        }
+
+        return true;
     }
 
 }