Laravel 9 tests and styling fixed (#327)

* allow constraints

* fix contract break

* reverted types to get tests to pass

* remove unneeded element

Co-authored-by: James Freeman <me@james-freeman.info>

Author: albanh

composer.json

@@ -19,18 +19,18 @@
     "php": "^8.0.0|^8.1.0",
     "ext-json": "*",
     "doctrine/dbal": "^3.1",
-    "illuminate/bus": "^8.11",
-    "illuminate/console": "^8.11",
-    "illuminate/contracts": "^8.11",
-    "illuminate/database": "^8.11",
-    "illuminate/events": "^8.11",
-    "illuminate/notifications": "^8.11",
+    "illuminate/bus": "^8.11|^9.0",
+    "illuminate/console": "^8.11|^9.0",
+    "illuminate/contracts": "^8.11|^9.0",
+    "illuminate/database": "^8.11|^9.0",
+    "illuminate/events": "^8.11|^9.0",
+    "illuminate/notifications": "^8.11|^9.0",
     "laravelcollective/html": "^6.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "orchestra/database": "^6.0",
-    "orchestra/testbench" : "^6.0",
+    "orchestra/database": "^6.0|^7.0",
+    "orchestra/testbench" : "^6.0|^7.0",
     "phpunit/phpunit": "^9.0"
   },
   "suggest": {

src/Contracts/TaskInterface.php

@@ -21,7 +21,7 @@ public function builder(): Builder;
      * @param  int|Task  $id
      * @return Task
      */
-    public function find(Task|int $id): Task;
+    public function find(Task|int $id);
 
     /**
      * Returns all tasks.

src/Http/Middleware/Authenticate.php

@@ -16,7 +16,7 @@ class Authenticate
      * @param  Closure  $next
      * @return Response
      */
-    public function handle(Request $request, Closure $next): Response
+    public function handle($request, $next)
     {
         return Totem::check($request) ? $next($request) : abort(403);
     }

src/Http/Requests/ImportRequest.php

@@ -51,6 +51,7 @@ public function messages()
      *
      * @param  array|mixed  $keys
      * @return array
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function all($keys = null)
@@ -68,9 +69,10 @@ public function all($keys = null)
      * Get the validated data from the request.
      *
      * @return array
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    public function validated()
+    public function validated($key = null, $default = null)
     {
         $content = '';
 
@@ -84,7 +86,7 @@ public function validated()
     /**
      * * Handle a failed validation attempt.
      *
-     * @param Validator $validator
+     * @param  Validator  $validator
      */
     protected function failedValidation(Validator $validator)
     {

src/Repositories/EloquentTaskRepository.php

@@ -48,7 +48,7 @@ public function builder(): Builder
      * @param  int|Task  $id
      * @return Task
      */
-    public function find(Task|int $id): Task
+    public function find(Task|int $id)
     {
         if ($id instanceof Task) {
             return $id;

src/Totem.php

@@ -23,10 +23,10 @@ class Totem
     /**
      * Determine if the given request can access the Totem dashboard.
      *
-     * @param  Request  $request
+     * @param  Request|string|null  $request
      * @return bool
      */
-    public static function check(Request $request): bool
+    public static function check($request): bool
     {
         return (static::$authUsing ?: function () {
             return app()->environment('local');
@@ -36,8 +36,7 @@ public static function check(Request $request): bool
     /**
      * Set the callback that should be used to authenticate Totem users.
      *
-     * @param Closure $callback
-     *
+     * @param  Closure  $callback
      * @return static
      */
     public static function auth(Closure $callback)

tests/Feature/TaskExecutionTest.php

@@ -43,7 +43,8 @@ public function it_executes_a_scheduled_task()
 
         Event::fake();
 
-        $this->get(route('totem.task.execute', $task->id))
+        $this->signIn()
+            ->get(route('totem.task.execute', $task->id))
             ->assertSuccessful();
 
         $this->assertEquals(1, Result::count());