Fix type check in model name resolution

huntie · May 1, 2017 · ed4ef14 · ed4ef14
1 parent 1f7cc75
commit ed4ef14
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Http/Controllers/JsonApiController.php b/src/Http/Controllers/JsonApiController.php
@@ -43,7 +43,7 @@ abstract class JsonApiController extends Controller
      */
     public function __construct()
     {
-        if (is_string($this->model)) {
+        if (is_null($this->model) || is_string($this->model)) {
             if (!is_subclass_of($this->model, Model::class)) {
                 $this->model = str_finish(config('jsonapi.model_namespace', app()->getNamespace()), '\\')
                     . preg_replace('/Controller$/', '', class_basename($this));