Merge pull request #9 from mtawil/support-laravel-10

JhumanJ · web-flow · commit 88a47ed2a9dd · 2023-08-24T11:08:34.000+03:00
Support laravel 10
diff --git a/composer.json b/composer.json
@@ -16,19 +16,19 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "spatie/laravel-package-tools": "^1.4.3",
-        "illuminate/contracts": "^8.37|^v9.0.0",
-        "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0",
+        "php": "^8.0|^8.1|^8.2",
+        "spatie/laravel-package-tools": "^1.4",
+        "illuminate/contracts": "^8.0|^v9.0|^v10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0",
         "laravel/tinker": "^1.0|^2.0"
     },
     "require-dev": {
-        "brianium/paratest": "^6.2",
-        "nunomaduro/collision": "^5.3",
-        "orchestra/testbench": "^6.15",
-        "phpunit/phpunit": "^9.3",
-        "spatie/laravel-ray": "^1.20",
-        "vimeo/psalm": "^4.4"
+        "brianium/paratest": "^6.2|^7.0",
+        "nunomaduro/collision": "^5.3|^6.0|^7.0",
+        "orchestra/testbench": "^6.15|^7.0|^8.0",
+        "phpunit/phpunit": "^9.3|^10.0",
+        "spatie/laravel-ray": "^1.2",
+        "vimeo/psalm": "^4.4|^5.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/config/model-stats.php b/config/model-stats.php
@@ -16,8 +16,8 @@
     |
     */
 
-    'enabled'            => env('MODEL_STATS_ENABLED', true),
-    'allow_custom_code'  => env('MODEL_STATS_CUSTOM_CODE', false),
+    'enabled' => env('MODEL_STATS_ENABLED', true),
+    'allow_custom_code' => env('MODEL_STATS_CUSTOM_CODE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -29,7 +29,7 @@
     | the existing middleware. Or, you can simply stick with this list.
     |
     */
-    'middleware'         => [
+    'middleware' => [
         'web',
         \Jhumanj\LaravelModelStats\Http\Middleware\Authorize::class,
     ],
@@ -43,7 +43,7 @@
     | this configures the table name based on your connection.
     |
     */
-    'table_name'         => 'model_stats_dashboards',
+    'table_name' => 'model_stats_dashboards',
 
     /*
     |--------------------------------------------------------------------------
@@ -54,7 +54,7 @@
     | This can be used to ensure a read-only connection, by using a custom connection with a read-only user.
     |
     */
-    'query_database_connection'         => env('MODEL_STATS_DB_CONNECTION', env('DB_CONNECTION')),
+    'query_database_connection' => env('MODEL_STATS_DB_CONNECTION', env('DB_CONNECTION')),
 
     /*
     |--------------------------------------------------------------------------
@@ -65,6 +65,6 @@
     | be starting the '/stats' prefix, and names will start with 'stats.'.
     |
     */
-    'routes_prefix'      => 'stats',
+    'routes_prefix' => 'stats',
     'route_names_prefix' => 'stats.',
 ];
diff --git a/database/factories/DashboardFactory.php b/database/factories/DashboardFactory.php
@@ -2,8 +2,8 @@
 
 namespace Jhumanj\LaravelModelStats\Database\Factories;
 
-use Jhumanj\LaravelModelStats\Models\Dashboard;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Jhumanj\LaravelModelStats\Models\Dashboard;
 
 class DashboardFactory extends Factory
 {
@@ -12,9 +12,9 @@ class DashboardFactory extends Factory
     public function definition(): array
     {
         return [
-            'name'        => $this->faker->name,
+            'name' => $this->faker->name,
             'description' => $this->faker->sentence,
-            'body'        => '{"widgets":[]}',
+            'body' => '{"widgets":[]}',
         ];
     }
 }
diff --git a/database/migrations/create_model-stats_table.php b/database/migrations/create_model-stats_table.php
@@ -1,12 +1,12 @@
 <?php
 
-use Illuminate\Support\Facades\Config;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
-
+return new class() extends Migration
+{
     public function up(): void
     {
         Schema::create(Config::get('model-stats.table_name'), function (Blueprint $table) {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,39 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="Jhumanj Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Jhumanj Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/routes/web.php b/routes/web.php
@@ -8,13 +8,19 @@
 
         Route::prefix('api')->name('api.')->group(function () {
             Route::apiResource('dashboards', \Jhumanj\LaravelModelStats\Http\Controllers\DashboardController::class);
-            Route::post('widgets/data',
-                [\Jhumanj\LaravelModelStats\Http\Controllers\StatController::class, 'widgetData']);
-            Route::post('widgets/custom-code/data',
-                [\Jhumanj\LaravelModelStats\Http\Controllers\CustomCodeController::class, 'widgetData']);
+            Route::post(
+                'widgets/data',
+                [\Jhumanj\LaravelModelStats\Http\Controllers\StatController::class, 'widgetData']
+            );
+            Route::post(
+                'widgets/custom-code/data',
+                [\Jhumanj\LaravelModelStats\Http\Controllers\CustomCodeController::class, 'widgetData']
+            );
 
-            Route::post('widgets/custom-code/execute',
-                [\Jhumanj\LaravelModelStats\Http\Controllers\CustomCodeController::class, 'executeCustomCode']);
+            Route::post(
+                'widgets/custom-code/execute',
+                [\Jhumanj\LaravelModelStats\Http\Controllers\CustomCodeController::class, 'executeCustomCode']
+            );
         });
 
         Route::get('/{view?}', [\Jhumanj\LaravelModelStats\Http\Controllers\HomeController::class, 'home'])
diff --git a/src/AuthorizesRequests.php b/src/AuthorizesRequests.php
@@ -9,34 +9,24 @@ trait AuthorizesRequests
 {
     /**
      * The callback that should be used to authenticate ModelStats users.
-     *
-     * @var \Closure
      */
     public static Closure $authUsing;
 
     /**
      * Register the ModelStats authentication callback.
-     *
-     * @param \Closure $callback
-     *
-     * @return static
      */
     public static function auth(Closure $callback): static
     {
         static::$authUsing = $callback;
 
-        return new static;
+        return new static();
     }
 
     /**
      * Determine if the given request can access the ModelStats dashboard.
-     *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return bool
      */
     public static function check(Request $request): bool
     {
-        return (static::$authUsing ?: fn () => app()->environment('local'))($request);
+        return (static::$authUsing)($request);
     }
 }
diff --git a/src/Console/InstallModelStatsPackage.php b/src/Console/InstallModelStatsPackage.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Jhumanj\LaravelModelStats\Console;
 
 use Illuminate\Console\Command;
@@ -32,8 +31,6 @@ public function handle(): void
 
     /**
      * Register the ModelStats service provider in the application configuration file.
-     *
-     * @return void
      */
     private function registerModelStatsServiceProvider(): void
     {
diff --git a/src/Http/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php
@@ -39,7 +39,7 @@ public function destroy(Dashboard $dashboard): JsonResponse
         $dashboard->delete();
 
         return $this->success([
-           'message' => 'Dashboard deleted',
+            'message' => 'Dashboard deleted',
         ]);
     }
 }
diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
@@ -2,15 +2,14 @@
 
 namespace Jhumanj\LaravelModelStats\Http\Controllers;
 
-use Illuminate\Container\Container;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Schema;
 use ReflectionClass;
-use Schema;
 
 class HomeController extends Controller
 {
@@ -41,7 +40,7 @@ private function getModels(): Collection
 
                 return sprintf(
                     '\%s%s',
-                    Container::getInstance()->getNamespace(),
+                    app()->getNamespace(),
                     strtr(substr($path, 0, strrpos($path, '.')), '/', '\\')
                 );
             })
@@ -57,7 +56,6 @@ private function getModels(): Collection
                 return $valid;
             });
 
-
         return $models->map(fn (string $class) => [
             'class' => $class,
             'fields' => $this->getClassFields($class),
@@ -66,6 +64,6 @@ private function getModels(): Collection
 
     private function getClassFields(string $class)
     {
-        return Schema::getColumnListing((new $class)->getTable());
+        return Schema::getColumnListing((new $class())->getTable());
     }
 }
diff --git a/src/Http/Middleware/Authorize.php b/src/Http/Middleware/Authorize.php
@@ -9,9 +9,8 @@ class Authorize
     /**
      * Handle the incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
      * @return \Illuminate\Http\Response
      */
     public function handle($request, $next)
diff --git a/src/Http/Middleware/CustomCodeEnabled.php b/src/Http/Middleware/CustomCodeEnabled.php
@@ -1,17 +1,15 @@
 <?php
 
-
 namespace Jhumanj\LaravelModelStats\Http\Middleware;
 
 class CustomCodeEnabled
 {
     /**
      * Handle the incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     *
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
     public function handle($request, $next)
     {
diff --git a/src/Http/Requests/Dashboard/StoreRequest.php b/src/Http/Requests/Dashboard/StoreRequest.php
@@ -8,8 +8,6 @@ class StoreRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
     public function rules(): array
     {
diff --git a/src/Http/Requests/Dashboard/UpdateRequest.php b/src/Http/Requests/Dashboard/UpdateRequest.php
@@ -8,8 +8,6 @@ class UpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
     public function rules(): array
     {
diff --git a/src/Http/Requests/Widgets/DataRequest.php b/src/Http/Requests/Widgets/DataRequest.php
@@ -2,7 +2,6 @@
 
 namespace Jhumanj\LaravelModelStats\Http\Requests\Widgets;
 
-use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Collection;
@@ -32,8 +31,6 @@ class DataRequest extends FormRequest
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
     public function rules(): array
     {
@@ -53,15 +50,18 @@ private function getModels(): Collection
             ->map(function ($item) {
                 $path = $item->getRelativePathName();
 
-                return sprintf('\%s%s', Container::getInstance()
-                                                 ->getNamespace(), strtr(substr($path, 0, strrpos($path, '.')), '/', '\\'));
+                return sprintf(
+                    '\%s%s',
+                    app()->getNamespace(),
+                    strtr(substr($path, 0, strrpos($path, '.')), '/', '\\')
+                );
             })->filter(function ($class) {
                 $valid = false;
 
                 if (class_exists($class)) {
                     $reflection = new \ReflectionClass($class);
                     $valid = $reflection->isSubclassOf(Model::class)
-                             && ! $reflection->isAbstract();
+                        && ! $reflection->isAbstract();
                 }
 
                 return $valid;
diff --git a/src/LaravelModelStatsServiceProvider.php b/src/LaravelModelStatsServiceProvider.php
diff --git a/src/ModelStatsServiceProvider.php b/src/ModelStatsServiceProvider.php
diff --git a/src/Services/ModelStats.php b/src/Services/ModelStats.php
diff --git a/src/Services/Tinker.php b/src/Services/Tinker.php

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Jhumanj\LaravelModelStats\Database\Factories;`
`4`	`4`
`5`		`-use Jhumanj\LaravelModelStats\Models\Dashboard;`
`6`	`5`	`use Illuminate\Database\Eloquent\Factories\Factory;`
	`6`	`+use Jhumanj\LaravelModelStats\Models\Dashboard;`
`7`	`7`
`8`	`8`	`class DashboardFactory extends Factory`
`9`	`9`	`{`
`@@ -12,9 +12,9 @@ class DashboardFactory extends Factory`
`12`	`12`	`public function definition(): array`
`13`	`13`	`{`
`14`	`14`	`return [`
`15`		`- 'name' => $this->faker->name,`
	`15`	`+ 'name' => $this->faker->name,`
`16`	`16`	`'description' => $this->faker->sentence,`
`17`		`- 'body' => '{"widgets":[]}',`
	`17`	`+ 'body' => '{"widgets":[]}',`
`18`	`18`	`];`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,34 +9,24 @@ trait AuthorizesRequests`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`	`11`	`* The callback that should be used to authenticate ModelStats users.`
`12`		`- *`
`13`		`- * @var \Closure`
`14`	`12`	`*/`
`15`	`13`	`public static Closure $authUsing;`
`16`	`14`
`17`	`15`	`/**`
`18`	`16`	`* Register the ModelStats authentication callback.`
`19`		`- *`
`20`		`- * @param \Closure $callback`
`21`		`- *`
`22`		`- * @return static`
`23`	`17`	`*/`
`24`	`18`	`public static function auth(Closure $callback): static`
`25`	`19`	`{`
`26`	`20`	`static::$authUsing = $callback;`
`27`	`21`
`28`		`- return new static;`
	`22`	`+ return new static();`
`29`	`23`	`}`
`30`	`24`
`31`	`25`	`/**`
`32`	`26`	`* Determine if the given request can access the ModelStats dashboard.`
`33`		`- *`
`34`		`- * @param \Illuminate\Http\Request $request`
`35`		`- *`
`36`		`- * @return bool`
`37`	`27`	`*/`
`38`	`28`	`public static function check(Request $request): bool`
`39`	`29`	`{`
`40`		`- return (static::$authUsing ?: fn () => app()->environment('local'))($request);`
	`30`	`+ return (static::$authUsing)($request);`
`41`	`31`	`}`
`42`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function destroy(Dashboard $dashboard): JsonResponse`
`39`	`39`	`$dashboard->delete();`
`40`	`40`
`41`	`41`	`return $this->success([`
`42`		`- 'message' => 'Dashboard deleted',`
	`42`	`+ 'message' => 'Dashboard deleted',`
`43`	`43`	`]);`
`44`	`44`	`}`
`45`	`45`	`}`