tests: fix compatability error

czernika · Mar 20, 2024 · c123f8f · c123f8f
1 parent 376c23a
commit c123f8f
Show file tree

Hide file tree

Showing 91 changed files with 36 additions and 5,649 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 /.github  export-ignore
+/workbench export-ignore
 /skeleton export-ignore
 /tests    export-ignore
 testbench.yaml export-ignore

diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
     ],
     "require": {
         "php": "^8.1",
+        "laravel/framework": "^10.0|^11.0",
         "orchid/platform": "^14.21",
         "rap2hpoutre/laravel-log-viewer": "^2.3"
     },
@@ -29,13 +30,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "skeleton/app/",
-            "Database\\Factories\\": "skeleton/database/factories/",
-            "Database\\Seeders\\": "skeleton/database/seeders/",
-            "Tests\\": "tests/",
-            "Workbench\\App\\": "workbench/app/",
-            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
-            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
+            "App\\": "vendor/orchestra/testbench-core/laravel/app/",
+            "Tests\\": "tests/"
         }
     },
     "config": {
@@ -59,6 +55,10 @@
         "build": "@php vendor/bin/testbench workbench:build --ansi",
         "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
         "coverage": "XDEBUG_MODE=coverage ./vendor/bin/pest --coverage",
+        "lint": [
+            "@php vendor/bin/pint",
+            "@php vendor/bin/phpstan analyse"
+        ],
         "pint": "./vendor/bin/pint",
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "serve": [

diff --git a/composer.lock b/composer.lock
diff --git a/skeleton/.env.example b/skeleton/.env.example
diff --git a/skeleton/.gitignore b/skeleton/.gitignore
diff --git a/skeleton/app/.gitkeep b/skeleton/app/.gitkeep
diff --git a/skeleton/app/Models/User.php b/skeleton/app/Models/User.php
diff --git a/skeleton/app/Orchid/Filters/RoleFilter.php b/skeleton/app/Orchid/Filters/RoleFilter.php
diff --git a/skeleton/app/Orchid/Layouts/Examples/ChartBarExample.php b/skeleton/app/Orchid/Layouts/Examples/ChartBarExample.php
diff --git a/skeleton/app/Orchid/Layouts/Examples/ChartLineExample.php b/skeleton/app/Orchid/Layouts/Examples/ChartLineExample.php
diff --git a/skeleton/app/Orchid/Layouts/Examples/ChartPercentageExample.php b/skeleton/app/Orchid/Layouts/Examples/ChartPercentageExample.php
diff --git a/skeleton/app/Orchid/Layouts/Examples/ChartPieExample.php b/skeleton/app/Orchid/Layouts/Examples/ChartPieExample.php