Laravel 12 updates (#402)

qschmick · web-flow · commit 837273b5a821 · 2025-07-10T11:42:03.000-04:00
* Updating composer deps for laravel 12; Removed old versions from readme; Updating workflows; updated phpunit version
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -9,34 +9,26 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.1, 8.2 ]
-        laravel: [ 10.*, 11.* ]
+        php: [ 8.2, 8.3, 8.4 ]
+        laravel: [ 10.*, 11.*, 12.* ]
         stability: [ prefer-stable ]
-        include:
-          - laravel: 10.*
-            testbench: ^8.0
-          - laravel: 11.*
-            testbench: ^9.0
-        exclude:
-          - laravel: 11.*
-            php: 8.1
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
         coverage: none
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.composer/cache/files
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-composer-
+          ${{ runner.os }}-${{ matrix.php }}-composer-
     - name: Install dependencies
       run: |
         composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
diff --git a/README.md b/README.md
@@ -17,22 +17,14 @@ Manage your `Laravel Schedule` from a pretty dashboard. Schedule your `Laravel C
 #### Compatiblity Matrix
 
 | <span align="left">Laravel</span> | <span align="left">Totem</span> |
-| :-------------------------------- | ------------------------------: |
+|:----------------------------------|--------------------------------:|
+| 12.x                              |                            11.x |
 | 11.x                              |                            11.x |
 | 10.x                              |                            10.x |
-| 9.x                               |                             9.x |
-| 8.x                               |                             8.x |
-| 7.x                               |                             7.x |
-| 6.x                               |                             6.x |
-| 5.8                               |                             5.x |
-| 5.7                               |                             4.x |
-| 5.6                               |                             3.x |
-| 5.5                               |                             2.x |
-| 5.4                               |                             1.x |
 
 #### Installing
 
-`Totem` requires Laravel v5.4 and above, please refer to the above table for compatability. Use composer to install totem to your Laravel project
+`Totem` requires Laravel v10 and above, please refer to the above table for compatability. Use composer to install totem to your Laravel project
 
 ```
 composer require studio/laravel-totem
diff --git a/composer.json b/composer.json
@@ -5,31 +5,33 @@
     "laravel",
     "schedule",
     "manager",
-    "Code Studio",
-    "totem"
+    "totem",
+    "cron"
   ],
   "license": "MIT",
   "authors": [
+    {
+      "name": "Quentin Schmick",
+      "email": "qschmick@gmail.com"
+    },
     {
       "name": "Roshan Gautam",
       "email": "roshan.gautam@hotmail.com"
     }
   ],
   "require": {
-    "php": "^8.1.0",
+    "php": "^8.2.0",
     "ext-json": "*",
-    "doctrine/dbal": "^3.1",
-    "illuminate/bus": "^9.0|^10.0|^11.0",
-    "illuminate/console": "^9.0|^10.0|^11.0",
-    "illuminate/contracts": "^9.0|^10.0|^11.0",
-    "illuminate/database": "^9.0|^10.0|^11.0",
-    "illuminate/events": "^9.0|^10.0|^11.0",
-    "illuminate/notifications": "^9.0|^10.0|^11.0"
+    "illuminate/bus": "^10.0|^11.0|^12.0",
+    "illuminate/console": "^10.0|^11.0|^12.0",
+    "illuminate/contracts": "^10.0|^11.0|^12.0",
+    "illuminate/database": "^10.0|^11.0|^12.0",
+    "illuminate/events": "^10.0|^11.0|^12.0",
+    "illuminate/notifications": "^10.0|^11.0|^12.0"
   },
   "require-dev": {
-    "mockery/mockery": "^1.0",
-    "orchestra/testbench" : "^8.0|^9.0",
-    "phpunit/phpunit": "^9.0|^10.0|^11.0"
+    "orchestra/testbench" : "^8.0|^9.0|^10.0",
+    "phpunit/phpunit": "^10.0|^11.0|^12.0"
   },
   "suggest": {
     "nexmo/client": "Required for sms notifications."
@@ -46,9 +48,6 @@
   },
   "extra": {
     "component": "package",
-    "branch-alias": {
-      "dev-8.0": "8.0.x-dev"
-    },
     "laravel": {
       "providers": [
         "Studio\\Totem\\Providers\\TotemServiceProvider"
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-    <exclude>
-      <file>./src/ServiceProvider.php</file>
-    </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="Laravel Totem Test Suite">
-      <directory suffix="Test.php">./tests/</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <env name="APP_ENV" value="testing"/>
-    <env name="CACHE_DRIVER" value="array"/>
-    <env name="SESSION_DRIVER" value="array"/>
-    <env name="QUEUE_DRIVER" value="sync"/>
-    <env name="DB_CONNECTION" value="sqlite"/>
-    <env name="DB_DATABASE" value=":memory:"/>
-    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-  </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php"
+         colors="true" processIsolation="false" stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.2/phpunit.xsd" cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
+    <testsuites>
+        <testsuite name="Laravel Totem Test Suite">
+            <directory suffix="Test.php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src/</directory>
+        </include>
+        <exclude>
+            <file>./src/ServiceProvider.php</file>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/src/Task.php b/src/Task.php
@@ -146,7 +146,7 @@ public function results(): HasMany
      *
      * @return Result|null
      */
-    public function getLastResultAttribute(): Result|null
+    public function getLastResultAttribute(): ?Result
     {
         return $this->results()->orderBy('id', 'desc')->first();
     }
diff --git a/tests/Feature/AuthTest.php b/tests/Feature/AuthTest.php
@@ -8,8 +8,7 @@
 
 class AuthTest extends TestCase
 {
-    /** @test */
-    public function auth_callback_works()
+    public function test_auth_callback_works()
     {
         $this->assertFalse(Totem::check('roshan'));
 
@@ -22,8 +21,7 @@ public function auth_callback_works()
         $this->assertFalse(Totem::check(null));
     }
 
-    /** @test */
-    public function auth_middleware_works()
+    public function test_auth_middleware_works()
     {
         Totem::auth(function () {
             return true;
@@ -42,10 +40,7 @@ function ($value) {
         $this->assertEquals('response', $response);
     }
 
-    /**
-     * @test
-     */
-    public function auth_middleware_responds_with_403_on_failure()
+    public function test_auth_middleware_responds_with_403_on_failure()
     {
         $this->expectException('\Symfony\Component\HttpKernel\Exception\HttpException');
         Totem::auth(function () {
diff --git a/tests/Feature/CreateTaskTest.php b/tests/Feature/CreateTaskTest.php
@@ -6,8 +6,7 @@
 
 class CreateTaskTest extends TestCase
 {
-    /** @test */
-    public function user_can_view_create_task_form()
+    public function test_user_can_view_create_task_form()
     {
         $this->disableExceptionHandling()->signIn();
 
@@ -16,16 +15,14 @@ public function user_can_view_create_task_form()
         $response->assertStatus(200);
     }
 
-    /** @test */
-    public function guest_can_not_view_create_task_form()
+    public function test_guest_can_not_view_create_task_form()
     {
         $response = $this->get(route('totem.task.create'));
 
         $response->assertStatus(403);
     }
 
-    /** @test */
-    public function user_can_create_task_with_cron_expression()
+    public function test_user_can_create_task_with_cron_expression()
     {
         $this->disableExceptionHandling()->signIn();
 
@@ -39,8 +36,7 @@ public function user_can_create_task_with_cron_expression()
         $response->assertRedirect(route('totem.tasks.all'));
     }
 
-    /** @test */
-    public function user_can_create_task_with_frequencies()
+    public function test_user_can_create_task_with_frequencies()
     {
         $this->disableExceptionHandling()->signIn();
 
diff --git a/tests/Feature/EditTaskTest.php b/tests/Feature/EditTaskTest.php
@@ -7,8 +7,7 @@
 
 class EditTaskTest extends TestCase
 {
-    /** @test */
-    public function user_can_view_edit_task_form()
+    public function test_user_can_view_edit_task_form()
     {
         $this->disableExceptionHandling()->signIn();
         $task = Task::factory()->create();
@@ -18,16 +17,14 @@ public function user_can_view_edit_task_form()
         $response->assertSee($task->expression);
     }
 
-    /** @test */
-    public function guest_can_not_view_edit_task_form()
+    public function test_guest_can_not_view_edit_task_form()
     {
         $task = Task::factory()->create();
         $response = $this->get(route('totem.task.edit', $task));
         $response->assertStatus(403);
     }
 
-    /** @test */
-    public function user_can_edit_task()
+    public function test_user_can_edit_task()
     {
         $this->disableExceptionHandling()->signIn();
         $task = Task::factory()->create();
diff --git a/tests/Feature/ExportTasksTest.php b/tests/Feature/ExportTasksTest.php
@@ -8,8 +8,7 @@
 
 class ExportTasksTest extends TestCase
 {
-    /** @test */
-    public function it_exports_tasks_as_json()
+    public function test_it_exports_tasks_as_json()
     {
         $tasks = Task::factory()->count(5)->create();
 
diff --git a/tests/Feature/ImportTasksTest.php b/tests/Feature/ImportTasksTest.php
@@ -11,8 +11,7 @@
 
 class ImportTasksTest extends TestCase
 {
-    /** @test */
-    public function it_imports_tasks_from_a_json_file()
+    public function test_it_imports_tasks_from_a_json_file()
     {
         Event::fake();
 
diff --git a/tests/Feature/TaskExecutionTest.php b/tests/Feature/TaskExecutionTest.php
@@ -13,8 +13,7 @@
 
 class TaskExecutionTest extends TestCase
 {
-    /** @test */
-    public function it_runs_a_scheduled_task()
+    public function test_it_runs_a_scheduled_task()
     {
         $task = Task::factory()->create();
 
@@ -36,8 +35,7 @@ public function it_runs_a_scheduled_task()
         Event::assertDispatched(Executed::class);
     }
 
-    /** @test */
-    public function it_executes_a_scheduled_task()
+    public function test_it_executes_a_scheduled_task()
     {
         $task = Task::factory()->create();
 
diff --git a/tests/Feature/ViewDashboardTest.php b/tests/Feature/ViewDashboardTest.php
@@ -11,23 +11,20 @@ class ViewDashboardTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
-    public function user_can_view_dashboard()
+    public function test_user_can_view_dashboard()
     {
         $this->signIn();
         $response = $this->get(route('totem.dashboard'));
         $response->assertStatus(302);
     }
 
-    /** @test */
-    public function guest_can_not_view_dashboard()
+    public function test_guest_can_not_view_dashboard()
     {
         $response = $this->get(route('totem.dashboard'));
         $response->assertStatus(403);
     }
 
-    /** @test */
-    public function view_dashboard_single_task_no_results()
+    public function test_view_dashboard_single_task_no_results()
     {
         $this->signIn();
         $task = Task::factory()->create();
@@ -38,8 +35,7 @@ public function view_dashboard_single_task_no_results()
         $response->assertSee($task->description);
     }
 
-    /** @test */
-    public function view_dashboard_single_task_with_results()
+    public function test_view_dashboard_single_task_with_results()
     {
         $this->signIn();
         $tasks = $this->_get_task_with_results();
@@ -51,8 +47,7 @@ public function view_dashboard_single_task_with_results()
         $response->assertSee($tasks[0]->description);
     }
 
-    /** @test */
-    public function view_dashboard_single_task_with_multiple_results()
+    public function test_view_dashboard_single_task_with_multiple_results()
     {
         $this->signIn();
         $tasks = $this->_get_task_with_results(1, 9);
@@ -64,8 +59,7 @@ public function view_dashboard_single_task_with_multiple_results()
         $response->assertSee($tasks[0]->description);
     }
 
-    /** @test */
-    public function view_dashboard_multiple_tasks_with_multiple_results()
+    public function test_view_dashboard_multiple_tasks_with_multiple_results()
     {
         $this->signIn();
         $tasks = $this->_get_task_with_results(4, 5);
@@ -84,7 +78,7 @@ public function view_dashboard_multiple_tasks_with_multiple_results()
      * @param  int  $result_count
      * @return mixed
      */
-    private function _get_task_with_results($task_count = 1, $result_count = 1)
+    private function _get_task_with_results(int $task_count = 1, int $result_count = 1): mixed
     {
         return Task::factory()->times($task_count)
             ->create()
diff --git a/tests/Feature/ViewTaskTest.php b/tests/Feature/ViewTaskTest.php

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function results(): HasMany`
`146`	`146`	`*`
`147`	`147`	`* @return Result\|null`
`148`	`148`	`*/`
`149`		`- public function getLastResultAttribute(): Result\|null`
	`149`	`+ public function getLastResultAttribute(): ?Result`
`150`	`150`	`{`
`151`	`151`	`return $this->results()->orderBy('id', 'desc')->first();`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`
`9`	`9`	`class AuthTest extends TestCase`
`10`	`10`	`{`
`11`		`- /** @test */`
`12`		`- public function auth_callback_works()`
	`11`	`+ public function test_auth_callback_works()`
`13`	`12`	`{`
`14`	`13`	`$this->assertFalse(Totem::check('roshan'));`
`15`	`14`
`@@ -22,8 +21,7 @@ public function auth_callback_works()`
`22`	`21`	`$this->assertFalse(Totem::check(null));`
`23`	`22`	`}`
`24`	`23`
`25`		`- /** @test */`
`26`		`- public function auth_middleware_works()`
	`24`	`+ public function test_auth_middleware_works()`
`27`	`25`	`{`
`28`	`26`	`Totem::auth(function () {`
`29`	`27`	`return true;`
`@@ -42,10 +40,7 @@ function ($value) {`
`42`	`40`	`$this->assertEquals('response', $response);`
`43`	`41`	`}`
`44`	`42`
`45`		`- /**`
`46`		`- * @test`
`47`		`- */`
`48`		`- public function auth_middleware_responds_with_403_on_failure()`
	`43`	`+ public function test_auth_middleware_responds_with_403_on_failure()`
`49`	`44`	`{`
`50`	`45`	`$this->expectException('\Symfony\Component\HttpKernel\Exception\HttpException');`
`51`	`46`	`Totem::auth(function () {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`
`7`	`7`	`class CreateTaskTest extends TestCase`
`8`	`8`	`{`
`9`		`- /** @test */`
`10`		`- public function user_can_view_create_task_form()`
	`9`	`+ public function test_user_can_view_create_task_form()`
`11`	`10`	`{`
`12`	`11`	`$this->disableExceptionHandling()->signIn();`
`13`	`12`
`@@ -16,16 +15,14 @@ public function user_can_view_create_task_form()`
`16`	`15`	`$response->assertStatus(200);`
`17`	`16`	`}`
`18`	`17`
`19`		`- /** @test */`
`20`		`- public function guest_can_not_view_create_task_form()`
	`18`	`+ public function test_guest_can_not_view_create_task_form()`
`21`	`19`	`{`
`22`	`20`	`$response = $this->get(route('totem.task.create'));`
`23`	`21`
`24`	`22`	`$response->assertStatus(403);`
`25`	`23`	`}`
`26`	`24`
`27`		`- /** @test */`
`28`		`- public function user_can_create_task_with_cron_expression()`
	`25`	`+ public function test_user_can_create_task_with_cron_expression()`
`29`	`26`	`{`
`30`	`27`	`$this->disableExceptionHandling()->signIn();`
`31`	`28`
`@@ -39,8 +36,7 @@ public function user_can_create_task_with_cron_expression()`
`39`	`36`	`$response->assertRedirect(route('totem.tasks.all'));`
`40`	`37`	`}`
`41`	`38`
`42`		`- /** @test */`
`43`		`- public function user_can_create_task_with_frequencies()`
	`39`	`+ public function test_user_can_create_task_with_frequencies()`
`44`	`40`	`{`
`45`	`41`	`$this->disableExceptionHandling()->signIn();`
`46`	`42`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@`
`7`	`7`
`8`	`8`	`class EditTaskTest extends TestCase`
`9`	`9`	`{`
`10`		`- /** @test */`
`11`		`- public function user_can_view_edit_task_form()`
	`10`	`+ public function test_user_can_view_edit_task_form()`
`12`	`11`	`{`
`13`	`12`	`$this->disableExceptionHandling()->signIn();`
`14`	`13`	`$task = Task::factory()->create();`
`@@ -18,16 +17,14 @@ public function user_can_view_edit_task_form()`
`18`	`17`	`$response->assertSee($task->expression);`
`19`	`18`	`}`
`20`	`19`
`21`		`- /** @test */`
`22`		`- public function guest_can_not_view_edit_task_form()`
	`20`	`+ public function test_guest_can_not_view_edit_task_form()`
`23`	`21`	`{`
`24`	`22`	`$task = Task::factory()->create();`
`25`	`23`	`$response = $this->get(route('totem.task.edit', $task));`
`26`	`24`	`$response->assertStatus(403);`
`27`	`25`	`}`
`28`	`26`
`29`		`- /** @test */`
`30`		`- public function user_can_edit_task()`
	`27`	`+ public function test_user_can_edit_task()`
`31`	`28`	`{`
`32`	`29`	`$this->disableExceptionHandling()->signIn();`
`33`	`30`	`$task = Task::factory()->create();`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`
`9`	`9`	`class ExportTasksTest extends TestCase`
`10`	`10`	`{`
`11`		`- /** @test */`
`12`		`- public function it_exports_tasks_as_json()`
	`11`	`+ public function test_it_exports_tasks_as_json()`
`13`	`12`	`{`
`14`	`13`	`$tasks = Task::factory()->count(5)->create();`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`
`12`	`12`	`class ImportTasksTest extends TestCase`
`13`	`13`	`{`
`14`		`- /** @test */`
`15`		`- public function it_imports_tasks_from_a_json_file()`
	`14`	`+ public function test_it_imports_tasks_from_a_json_file()`
`16`	`15`	`{`
`17`	`16`	`Event::fake();`
`18`	`17`