Merge tag 'v0.5.3' into develop

lindyhopchris · lindyhopchris · commit e81937cf10b1 · 2016-12-01T17:39:44.000Z
Fix PHP 5.5 bug in abstract generator
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 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/).
 
+## [0.5.3] - 2016-12-01
+
+### Fixed
+- #31 Fix expression in abstract generator command that is not compatible with PHP 5.5
+
 ## [0.5.2] - 2016-11-11
 
 ### Added
diff --git a/src/Console/Commands/AbstractGeneratorCommand.php b/src/Console/Commands/AbstractGeneratorCommand.php
@@ -85,7 +85,7 @@ abstract class AbstractGeneratorCommand extends GeneratorCommand
      *
      * @var string
      */
-    private $stubsDirectory = __DIR__ . '/../../../stubs';
+    private $stubsDirectory;
 
     /**
      * Create a new config clear command instance.
@@ -99,6 +99,7 @@ public function __construct(Filesystem $files)
         $this->useEloquent = config('json-api.generator.use-eloquent', true);
         $this->subNamespace = config('json-api.generator.namespace', 'JsonApi');
         $this->namespaceByResource = config('json-api.generator.by-resource', true);
+        $this->stubsDirectory = __DIR__ . '/../../../stubs';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ abstract class AbstractGeneratorCommand extends GeneratorCommand`
`85`	`85`	`*`
`86`	`86`	`* @var string`
`87`	`87`	`*/`
`88`		`- private $stubsDirectory = __DIR__ . '/../../../stubs';`
	`88`	`+ private $stubsDirectory;`
`89`	`89`
`90`	`90`	`/**`
`91`	`91`	`* Create a new config clear command instance.`
`@@ -99,6 +99,7 @@ public function __construct(Filesystem $files)`
`99`	`99`	`$this->useEloquent = config('json-api.generator.use-eloquent', true);`
`100`	`100`	`$this->subNamespace = config('json-api.generator.namespace', 'JsonApi');`
`101`	`101`	`$this->namespaceByResource = config('json-api.generator.by-resource', true);`
	`102`	`+ $this->stubsDirectory = __DIR__ . '/../../../stubs';`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`/**`