- [x] add aammui/role-permission

Author: bedus-creation

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,26 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+  style:
+    runs-on: ubuntu-latest
+
+    steps:
+      -   name: Checkout code
+          uses: actions/checkout@v1
+      -   name: Fix style
+          uses: docker://oskarstark/php-cs-fixer-ga
+          with:
+            args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+      -   name: Extract branch name
+          shell: bash
+          run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+          id: extract_branch
+      -   name: Commit changes
+          uses: stefanzweifel/[email protected]
+          with:
+            commit_message: Fix styling
+            branch: ${{ steps.extract_branch.outputs.branch }}
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/psalm.yml

@@ -0,0 +1,33 @@
+name: Psalm
+
+on:
+        push:
+                paths:
+                        - '**.php'
+                        - 'psalm.xml.dist'
+
+jobs:
+        psalm:
+                name: psalm
+                runs-on: ubuntu-latest
+                steps:
+                        - uses: actions/checkout@v2
+
+                        - name: Setup PHP
+                          uses: shivammathur/setup-php@v2
+                          with:
+                                  php-version: '8.0'
+                                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+                                  coverage: none
+
+                        - name: Cache composer dependencies
+                          uses: actions/cache@v2
+                          with:
+                                  path: vendor
+                                  key: composer-${{ hashFiles('composer.lock') }}
+
+                        - name: Run composer install
+                          run: composer install -n --prefer-dist
+
+                        - name: Run psalm
+                          run: ./vendor/bin/psalm --output-format=github

.github/workflows/run-tests.yml

@@ -0,0 +1,45 @@
+name: "Run Tests - Current"
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [ 8.0, 7.4]
+        laravel: [ 8.* ]
+        dependency-version: [ prefer-stable ]
+        include:
+          - laravel: 8.*
+            testbench: 6.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Update apt
+        run: sudo apt-get update --fix-missing
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, zip
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+      - name: Execute tests
+        run: vendor/bin/phpunit

.gitignore

@@ -14,3 +14,4 @@ yarn-error.log
 .env
 
 .phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,35 @@
+<?php
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->in([
+        __DIR__.'/app',
+        __DIR__.'/tests',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR2'                             => true,
+        'array_syntax'                      => ['syntax' => 'short'],
+        'ordered_imports'                   => ['sort_algorithm' => 'alpha'],
+        'no_unused_imports'                 => true,
+        'not_operator_with_successor_space' => true,
+        'trailing_comma_in_multiline'       => true,
+        'phpdoc_scalar'                     => true,
+        'unary_operator_spaces'             => true,
+        'binary_operator_spaces'            => true,
+        'blank_line_before_statement'       => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        'phpdoc_single_line_var_spacing'    => true,
+        'phpdoc_var_without_name'           => true,
+        'method_argument_space'             => [
+            'on_multiline'                     => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ],
+        'single_trait_insert_per_statement' => true,
+    ])
+    ->setFinder($finder);

app/Application/Admin/Controllers/DashboardController.php

@@ -2,7 +2,7 @@
 
 namespace App\Application\Admin\Controllers;
 
-use App\Http\Controllers\Controller;
+use App\Core\Http\Controllers\Controller;
 
 /**
  * Class AdminController

app/Http/Controllers/PageController.php renamed to app/Application/Front/Controllers/PageController.php

@@ -1,16 +1,22 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Application\Front\Controllers;
 
-use Illuminate\Http\Request;
+use App\Core\Http\Controllers\Controller;
+use App\Domain\Inventory\Models\Product;
 use App\User;
-use App\Models\Product;
 
+/**
+ * Class PageController
+ *
+ * @package App\Application\Front\Controllers
+ */
 class PageController extends Controller
 {
     public function index()
     {
-        $user = \App\User::with('profileImage', 'profile')->limit(10)->get();
+        $user = User::with('profileImage', 'profile')->limit(10)->get();
+
         $data = Product::with('medias')
             ->with('price')
             ->limit(20)
@@ -27,13 +33,16 @@ public function shop($slug, $id)
             ->with('coverImage')
             ->with('profileImage')
             ->firstOrFail();
+
         return view('front/shop/details', compact('shop'));
     }
 
     public function product($name, $id)
     {
-        $data = \App\Models\Product::where(['id' => $id])
-            ->with('price')->first();
+        $data = Product::where(['id' => $id])
+            ->with('price')
+            ->first();
+
         $data->views += 1;
         $data->save();
 

app/Console/Kernel.php renamed to app/Core/Console/Kernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console;
+namespace App\Core\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Core/Constants/TableName.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Core\Constants;
+
+/**
+ * Class TableName
+ *
+ * @package App\Core\Constants
+ */
+interface TableName
+{
+    // Inventory related tables.
+    public const PRODUCT = "products";
+    public const CATEGORY = "categories";
+}

app/Exceptions/Handler.php renamed to app/Core/Exceptions/Handler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exceptions;
+namespace App\Core\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Throwable;

app/Http/Controllers/Controller.php renamed to app/Core/Http/Controllers/Controller.php

@@ -1,13 +1,15 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Core\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }

app/Http/Kernel.php renamed to app/Core/Http/Kernel.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http;
+namespace App\Core\Http;
 
+use Aammui\RolePermission\Middleware\Role;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -14,11 +15,13 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        // \App\Http\Middleware\TrustHosts::class,
+        \App\Core\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
+        \App\Core\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        \App\Core\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -28,12 +31,12 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \App\Core\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            \App\Core\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -51,14 +54,14 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'role' => \App\Http\Middleware\Role::class,
+        "role" => Role::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => \App\Core\Http\Middleware\RedirectIfAuthenticated::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
     ];

app/Core/Http/Middleware/Authenticate.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Core\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+/**
+ * Class Authenticate
+ *
+ * @package App\Core\Http\Middleware
+ */
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return string|null
+     */
+    protected function redirectTo($request)
+    {
+        if (! $request->expectsJson()) {
+            return route('login');
+        }
+    }
+}

app/Http/Middleware/EncryptCookies.php renamed to app/Core/Http/Middleware/EncryptCookies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Core\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
 

app/Core/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Core\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
+
+class PreventRequestsDuringMaintenance extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}

app/Http/Middleware/RedirectIfAuthenticated.php renamed to app/Core/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Core\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Http/Middleware/TrimStrings.php renamed to app/Core/Http/Middleware/TrimStrings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Core\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
 
@@ -12,6 +12,7 @@ class TrimStrings extends Middleware
      * @var array
      */
     protected $except = [
+        'current_password',
         'password',
         'password_confirmation',
     ];