Merge pull request #7 from deimarhc/GM-117

Laravel 10 support
friendsofcat · Sep 15, 2023 · 0af709d · 0af709d
2 parents 70af5c7 + 5329f7a
commit 0af709d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -4,11 +4,11 @@
     "type": "library",
     "require": {
         "php": "^8.0",
-        "laravel/framework": "^9.0"
+        "laravel/framework": "^9.0|^10.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "orchestra/testbench": "^5.0|^6.0|^7.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
         "mockery/mockery": "^1.1",
         "squizlabs/php_codesniffer": "^3.3",
         "php-coveralls/php-coveralls": "^2.1",

diff --git a/src/Http/Middleware/CheckDbMaintenance.php b/src/Http/Middleware/CheckDbMaintenance.php
@@ -3,8 +3,8 @@
 namespace FriendsOfCat\LaravelDbMaintenance\Http\Middleware;
 
 use FriendsOfCat\LaravelDbMaintenance\Maintenance;
-use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 class CheckDbMaintenance
 {
@@ -35,7 +35,7 @@ public function handle(Request $request, $next)
     {
         if ($this->maintenance->isDown()) {
             $latest = $this->maintenance->getLatest();
-            throw new MaintenanceModeException($latest->created_at, $latest->retry_after, $latest->message);
+            throw new ServiceUnavailableHttpException($latest->retry_after, $latest->message);
         }
 
         return $next($request);

diff --git a/src/Maintenance.php b/src/Maintenance.php
@@ -9,9 +9,9 @@
 class Maintenance
 {
 
-  /**
-   * @var string
-   */
+    /**
+     * @var string
+     */
     protected $tableName = 'maintenance';
 
     /**
@@ -55,11 +55,11 @@ public function up()
         $max = $this->getTableBuilder()->max('id');
 
         return (bool) $this->getTableBuilder()
-      ->where('id', $max)
-      ->update([
-        'status' => false,
-        'updated_at' => $this->nowTimestamp(),
-      ]);
+            ->where('id', $max)
+            ->update([
+                'status' => false,
+                'updated_at' => $this->nowTimestamp(),
+            ]);
     }
 
     /**
@@ -87,12 +87,12 @@ public function down($message = '', $retry_after = 60)
         $now = $this->nowTimestamp();
 
         return $this->getTableBuilder()->insert([
-      'created_at' => $now,
-      'updated_at' => $now,
-      'status' => true,
-      'retry_after' => $retry_after,
-      'message' => $message,
-    ]);
+            'created_at' => $now,
+            'updated_at' => $now,
+            'status' => true,
+            'retry_after' => $retry_after,
+            'message' => $message,
+        ]);
     }
 
     /**
@@ -110,9 +110,9 @@ public function getLatest()
     {
         if (!isset($this->latest)) {
             $this->latest = $this->getTableBuilder()
-        ->orderBy('id', 'desc')
-        ->limit(1)
-        ->first();
+                ->orderBy('id', 'desc')
+                ->limit(1)
+                ->first();
 
             if (is_null($this->latest)) {
                 $this->latest = $this->defaultLatest();

diff --git a/tests/src/Http/Middleware/CheckDbMaintenanceTest.php b/tests/src/Http/Middleware/CheckDbMaintenanceTest.php
@@ -5,10 +5,10 @@
 use Carbon\Carbon;
 use FriendsOfCat\LaravelDbMaintenance\Http\Middleware\CheckDbMaintenance;
 use FriendsOfCat\LaravelDbMaintenance\Maintenance;
-use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Request;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 /**
  * @coversDefaultClass \FriendsOfCat\LaravelDbMaintenance\Http\Middleware\CheckDbMaintenance
@@ -43,7 +43,7 @@ public function testHandleWhenUp()
      */
     public function testHandleWhenDown()
     {
-        $this->expectException(MaintenanceModeException::class);
+        $this->expectException(ServiceUnavailableHttpException::class);
 
         Carbon::setTestNow();