add files

src/Illuminate/Bus/DatabaseBatchRepository.php

@@ -9,7 +9,7 @@
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Str;
 
-class DatabaseBatchRepository implements BatchRepository, Prunable
+class DatabaseBatchRepository implements PrunableBatchRepository
 {
     /**
      * The batch factory instance.
@@ -231,23 +231,10 @@ public function delete(string $batchId)
         $this->connection->table($this->table)->where('id', $batchId)->delete();
     }
 
-    /**
-     * Execute the given Closure within a storage specific transaction.
-     *
-     * @param  \Closure  $callback
-     * @return mixed
-     */
-    public function transaction(Closure $callback)
-    {
-        return $this->connection->transaction(function () use ($callback) {
-            return $callback();
-        });
-    }
-
     /**
      * Prune all of the entries older than the given date.
      *
-     * @param  DateTimeInterface  $before
+     * @param  \DateTimeInterface  $before
      * @return int
      */
     public function prune(DateTimeInterface $before)
@@ -267,6 +254,19 @@ public function prune(DateTimeInterface $before)
         return $totalDeleted;
     }
 
+    /**
+     * Execute the given Closure within a storage specific transaction.
+     *
+     * @param  \Closure  $callback
+     * @return mixed
+     */
+    public function transaction(Closure $callback)
+    {
+        return $this->connection->transaction(function () use ($callback) {
+            return $callback();
+        });
+    }
+
     /**
      * Convert the given raw batch to a Batch object.
      *

src/Illuminate/Bus/Prunable.php → src/Illuminate/Bus/PrunableBatchRepository.php

@@ -4,12 +4,12 @@
 
 use DateTimeInterface;
 
-interface Prunable
+interface PrunableBatchRepository extends BatchRepository
 {
     /**
      * Prune all of the entries older than the given date.
      *
-     * @param  DateTimeInterface  $before
+     * @param  \DateTimeInterface  $before
      * @return int
      */
     public function prune(DateTimeInterface $before);

src/Illuminate/Queue/Console/PruneBatchesCommand.php

@@ -35,11 +35,7 @@ public function handle()
         $repository = $this->laravel[BatchRepository::class];
 
         if ($repository instanceof Prunable) {
-            $hours = $this->option('hours');
-
-            $before = Carbon::now()->subHours($hours);
-
-            $count = $repository->prune($before);
+            $count = $repository->prune(Carbon::now()->subHours($this->option('hours')));
         }
 
         $this->info("{$count} entries deleted!");