Update composer.json (#46)

* Update composer.json

* Update .travis.yml

* Update composer.json

* Update ApiMakeCommand.php

* Apply fixes from StyleCI (#47)

* update for non id columns as id

Author: phpsa

.travis.yml

@@ -14,6 +14,7 @@ php:
 
 env:
   - LARAVEL_VERSION=6.*
+  - LARAVEL_VERSION=7.*
 
 before_install:
   - travis_retry composer self-update --stable -n

composer.json

@@ -16,10 +16,10 @@
   ],
   "require": {
     "php": ">=7.2",
-    "illuminate/support": "^6.0"
+    "illuminate/support": "^6.0|^7.0"
   },
   "require-dev": {
-    "orchestra/testbench": "^4.0",
+    "orchestra/testbench": "^4.0|^5.0",
     "phpunit/phpunit": "^8.0"
   },
   "autoload": {

src/Generator/ApiMakeCommand.php

@@ -3,16 +3,13 @@
 namespace Phpsa\LaravelApiController\Generator;
 
 use Illuminate\Console\Command;
-use Illuminate\Console\DetectsApplicationNamespace;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 
 class ApiMakeCommand extends Command
 {
-    use DetectsApplicationNamespace;
-
     /**
      * The filesystem instance.
      *
@@ -113,7 +110,7 @@ protected function createOptionals()
      */
     protected function prepareVariablesForStubs($name)
     {
-        $this->stubVariables['app']['namespace'] = $this->getAppNamespace();
+        $this->stubVariables['app']['namespace'] = $this->laravel->getNamespace();
         $baseDir = config('laravel-api-controller.models_base_dir');
         $this->modelsBaseNamespace = $baseDir ? trim($baseDir, '\\').'\\' : '';
         $this->setModelData($name)

src/Http/Controllers/Api/Controller.php

@@ -168,7 +168,7 @@ public function handleStoreAction($request, array $extraParams = [])
 
             DB::commit();
 
-            return $this->respondItemCreated($this->repository->getById($item->id));
+            return $this->respondItemCreated($this->repository->getById($item->getKey()));
         } catch (\Illuminate\Database\QueryException $exception) {
             $message = config('app.debug') ? $exception->getMessage() : 'Failed to create Record';
 
@@ -238,7 +238,7 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
             return $this->errorNotFound('Record does not exist');
         }
 
-        $this->validate($request, $this->rulesForUpdate($item->id));
+        $this->validate($request, $this->rulesForUpdate($item->getKey()));
 
         $data = $this->qualifyUpdateQuery($data);
 
@@ -262,7 +262,7 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
 
             DB::commit();
 
-            return $this->respondWithOne($this->repository->getById($item->id));
+            return $this->respondWithOne($this->repository->getById($item->getKey()));
         } catch (\Illuminate\Database\QueryException $exception) {
             $message = config('app.debug') ? $exception->getMessage() : 'Failed to update Record';