Merge pull request #13 from mikebarlow/support-php7

Fix PHP7 support

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-20.04]
-        php: ['8.0', '8.1']
+        php: ['7.4', '8.0', '8.1']
 
     name: P${{ matrix.php }}
     steps:

CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.1] - TBC
 
 * Fix: Spelling mistake in template caused bug with justified items [PR #5](https://github.com/mikebarlow/megaphone/pull/5)
+* Fix: Added support for PHP7.4 [PR #13](https://github.com/mikebarlow/megaphone/pull/13)
 
 ## [1.0.0] - 2022-09-19
 

composer.json

@@ -12,14 +12,14 @@
         }
     ],
     "require": {
+        "php": "^7.4 || ^8.0",
         "livewire/livewire": "^2.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.7",
         "pestphp/pest-plugin-livewire": "^1.0",
-        "orchestra/testbench": "^7.7",
-        "pestphp/pest-plugin-faker": "^1.0",
-        "spatie/pest-plugin-test-time": "^1.1"
+        "orchestra/testbench": "^6.0",
+        "pestphp/pest-plugin-faker": "^1.0"
     },
     "autoload": {
         "psr-4": {

src/Livewire/Megaphone.php

@@ -29,7 +29,7 @@ public function loadAnnouncements($user)
     {
         $this->unread = $this->announcements = collect([]);
 
-        if ($user === null || $user::class !== config('megaphone.model')) {
+        if ($user === null || get_class($user) !== config('megaphone.model')) {
             return;
         }
 

tests/ConsoleClearNotificationsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use function Spatie\PestPluginTestTime\testTime;
+use Carbon\Carbon;
 
 it('can render clear out old notifications', function () {
     $user = $this->createTestUser();
@@ -12,7 +12,9 @@
     $this->assertDatabaseCount('notifications', 1);
     $user->unreadNotifications->markAsRead();
 
-    testTime()->addWeeks(3);
+    Carbon::setTestNow(
+        Carbon::now()->addWeeks(3)
+    );
 
     $this->artisan('megaphone:clear-announcements')->assertSuccessful();
 
@@ -29,7 +31,9 @@
     $this->assertDatabaseCount('notifications', 1);
     $user->unreadNotifications->markAsRead();
 
-    testTime()->addWeeks(1);
+    Carbon::setTestNow(
+        Carbon::now()->addWeeks(1)
+    );
 
     $this->artisan('megaphone:clear-announcements')->assertSuccessful();
 
@@ -45,7 +49,9 @@
     );
     $this->assertDatabaseCount('notifications', 1);
 
-    testTime()->addWeeks(3);
+    Carbon::setTestNow(
+        Carbon::now()->addWeeks(3)
+    );
 
     $this->artisan('megaphone:clear-announcements')->assertSuccessful();