Merge pull request #76 from joselfonseca/feature/remove-dingo

Re write with less dependencies and easier set up

Author: joselfonseca

.env.example

@@ -1,25 +1,49 @@
+APP_NAME=Laravel
 APP_ENV=local
+APP_KEY=
 APP_DEBUG=true
-APP_KEY=base64:JqyMTmt5qr1CW6BH+GG+4iKfU4RiNjZTLy33TdTT7+4=
+APP_URL=http://localhost
 
-API_STANDARDS_TREE=vnd
-API_SUBTYPE=api
-API_PREFIX=api
-API_VERSION=v1
-API_DEBUG=true
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
 
-DB_HOST=mysql
-DB_DATABASE=api
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=laravel
 DB_USERNAME=root
-DB_PASSWORD=secret
+DB_PASSWORD=
 
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
+SESSION_LIFETIME=120
 
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.github/workflows/run-tests.yml

@@ -0,0 +1,39 @@
+name: "Run Tests - Current"
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0, 7.4]
+
+    name: P${{ matrix.php }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer install
+          php -r "copy('.env.example', '.env');"
+          php artisan key:generate
+          php artisan passport:keys
+      - name: Execute tests
+        run: vendor/bin/phpunit

.php_cs.dist

@@ -0,0 +1,20 @@
+<?php
+
+use PhpCsFixer\Finder;
+
+$project_path = getcwd();
+$finder = Finder::create()
+    ->in([
+        $project_path . '/app',
+        $project_path . '/config',
+        $project_path . '/database',
+        $project_path . '/resources',
+        $project_path . '/routes',
+        $project_path . '/tests',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return \ShiftCS\styles($finder);

.travis.yml

@@ -2,7 +2,6 @@
 
 namespace App\Console;
 
-use App\Console\Commands\InstallApp;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -14,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        InstallApp::class,
+
     ];
 
     /**
@@ -26,7 +25,6 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->call('demo:reset')->hourly();
     }
 
     /**

app/Console/Commands/InstallApp.php

@@ -2,7 +2,10 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
 /**
@@ -47,6 +50,39 @@ public function report(Throwable $exception)
      */
     public function render($request, Throwable $exception)
     {
+        if ($exception instanceof AuthenticationException) {
+            return response()->json([
+                'message' => 'Unauthenticated.',
+                'status_code' => 401,
+            ], 401);
+        }
+        if ($exception instanceof BodyTooLargeException) {
+            return response()->json([
+                'message' => 'The body is too large',
+                'status_code' => 413,
+            ], 413);
+        }
+        if ($exception instanceof ValidationException) {
+            return response()->json([
+                'message' => $exception->getMessage(),
+                'status_code' => 422,
+                'errors' => $exception->errors(),
+            ], 422);
+        }
+        if ($exception instanceof StoreResourceFailedException) {
+            return response()->json([
+                'message' => $exception->getMessage(),
+                'status_code' => 422,
+                'errors' => $exception->errors,
+            ], 422);
+        }
+        if ($exception instanceof NotFoundHttpException) {
+            return response()->json([
+                'message' => '404 Not Found',
+                'status_code' => 404,
+            ], 404);
+        }
+
         return parent::render($request, $exception);
     }
 }

app/Console/Kernel.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+use Throwable;
+
+class StoreResourceFailedException extends Exception
+{
+    public $errors = [];
+
+    public function __construct($message = '', $errors = [], $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+        $this->errors = $errors;
+    }
+}

app/Exceptions/Handler.php

@@ -9,31 +9,15 @@
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Facades\Image;
 
-/**
- * Class RenderFileController.
- */
 class RenderFileController extends Controller
 {
-    /**
-     * @var \App\Models\Asset
-     */
     protected $model;
 
-    /**
-     * RenderFileController constructor.
-     *
-     * @param \App\Models\Asset $model
-     */
     public function __construct(Asset $model)
     {
         $this->model = $model;
     }
 
-    /**
-     * @param $uuid
-     * @param \Illuminate\Http\Request $request
-     * @return mixed
-     */
     public function show($uuid, Request $request)
     {
         try {
@@ -45,24 +29,13 @@ public function show($uuid, Request $request)
         }
     }
 
-    /**
-     * @param $model
-     * @param $width
-     * @param $height
-     * @return mixed
-     */
     public function renderFile($model, $width, $height)
     {
         $image = $this->makeFromPath($width, $height, $model->path);
 
         return $image->response();
     }
 
-    /**
-     * @param $width
-     * @param $height
-     * @return mixed
-     */
     public function renderPlaceholder($width, $height)
     {
         $image = Image::cache(function ($image) use ($width, $height) {
@@ -75,28 +48,6 @@ public function renderPlaceholder($width, $height)
         return $image->response();
     }
 
-    /**
-     * @param $width
-     * @param $height
-     * @param $path
-     * @return mixed
-     */
-    protected function makeFromPath($width, $height, $path)
-    {
-        return Image::cache(function ($image) use ($path, $width, $height) {
-            $img = $image->make(Storage::get($path));
-            $this->resize($img, $width, $height);
-
-            return $img;
-        }, 10, true);
-    }
-
-    /**
-     * @param $img
-     * @param $width
-     * @param $height
-     * @return mixed
-     */
     protected function resize($img, $width, $height)
     {
         if (! empty($width) && ! empty($height)) {
@@ -113,4 +64,14 @@ protected function resize($img, $width, $height)
 
         return $img;
     }
+
+    protected function makeFromPath($width, $height, $path)
+    {
+        return Image::cache(function ($image) use ($path, $width, $height) {
+            $img = $image->make(Storage::get($path));
+            $this->resize($img, $width, $height);
+
+            return $img;
+        }, 10, true);
+    }
 }