[Bugfix] Fix generator command in Laravel 5.5

lindyhopchris · lindyhopchris · commit b5e59b103865 · 2018-01-24T09:40:01.000Z
Fixes cloudcreativity#138
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## Unreleased
+
+### Fixed
+- [#138](https://github.com/cloudcreativity/laravel-json-api/issues/138)
+Generator commands not working since Laravel v5.5.28
+
 ## [0.11.3] - 2017-12-01
 
 ### Fixed
diff --git a/src/Console/Commands/AbstractGeneratorCommand.php b/src/Console/Commands/AbstractGeneratorCommand.php
@@ -89,7 +89,7 @@ public function __construct(Filesystem $files, Repository $apiRepository)
     }
 
     /**
-     * @return bool|null
+     * @return int
      */
     public function handle()
     {
@@ -99,8 +99,8 @@ public function handle()
         }
 
         /** @todo remove when removing support for Laravel 5.4 */
-        if (is_callable(['parent', 'fire'])) {
-            return (parent::fire() !== false) ? 0 : 1;
+        if (method_exists($this, 'fire')) {
+            return ($this->fire() !== false) ? 0 : 1;
         }
 
         return (parent::handle() !== false) ? 0 : 1;

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function __construct(Filesystem $files, Repository $apiRepository)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`92`		`- * @return bool\|null`
	`92`	`+ * @return int`
`93`	`93`	`*/`
`94`	`94`	`public function handle()`
`95`	`95`	`{`
`@@ -99,8 +99,8 @@ public function handle()`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/** @todo remove when removing support for Laravel 5.4 */`
`102`		`- if (is_callable(['parent', 'fire'])) {`
`103`		`- return (parent::fire() !== false) ? 0 : 1;`
	`102`	`+ if (method_exists($this, 'fire')) {`
	`103`	`+ return ($this->fire() !== false) ? 0 : 1;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`return (parent::handle() !== false) ? 0 : 1;`