Remove job ID from title

.travis.yml

@@ -5,22 +5,16 @@ services:
   - redis-server
 
 php:
-  - 7.1
   - 7.2
   - 7.3
   - 7.4
 
 env:
   matrix:
-    - LARAVEL=5.7.*
-    - LARAVEL=5.8.*
-    - LARAVEL=^6.0
+    - LARAVEL=^7.0
 
 matrix:
   fast_finish: true
-  exclude:
-    - php: 7.1
-      env: LARAVEL=^6.0
 
 before_install:
   - phpenv config-rm xdebug.ini || true

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/horizon/compare/v3.6.1...3.0)
+## [Unreleased](https://github.com/laravel/horizon/compare/v3.6.1...master)
+
+### Changed
+- Dropped support for Laravel 5.8 ([8216c34](https://github.com/laravel/horizon/commit/8216c34736564998380f97252c117716020aee0a))
+- Bumped minimum Symfony dependencies to 4.3 ([2eb9d6d](https://github.com/laravel/horizon/commit/2eb9d6d77acd5e8b42da0a8146c9e8d8105fbd8a))
 
 
 ## [v3.6.1 (2020-02-12)](https://github.com/laravel/horizon/compare/v3.6.0...v3.6.1)

composer.json

@@ -10,23 +10,27 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": "^7.2",
         "ext-json": "*",
         "ext-pcntl": "*",
         "ext-posix": "*",
         "cakephp/chronos": "^1.0",
-        "illuminate/contracts": "~5.7.0|~5.8.0|^6.0",
-        "illuminate/queue": "~5.7.0|~5.8.0|^6.0",
-        "illuminate/support": "~5.7.0|~5.8.0|^6.0",
-        "predis/predis": "^1.1",
+        "illuminate/contracts": "^7.0",
+        "illuminate/queue": "^7.0",
+        "illuminate/support": "^7.0",
         "ramsey/uuid": "^3.5",
-        "symfony/process": "^4.2",
-        "symfony/debug": "^4.2"
+        "symfony/process": "^5.0",
+        "symfony/error-handler": "^5.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^3.7|^4.0",
-        "phpunit/phpunit": "^7.0|^8.0"
+        "orchestra/testbench": "^5.0",
+        "phpunit/phpunit": "^8.0",
+        "predis/predis": "^1.1"
+    },
+    "suggest": {
+        "ext-redis": "Required to use the Redis PHP driver.",
+        "predis/predis": "Required when not using the Redis PHP driver (^1.1)."
     },
     "autoload": {
         "psr-4": {
@@ -40,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "4.x-dev"
         },
         "laravel": {
             "providers": [

config/horizon.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -52,7 +54,10 @@
     |
     */
 
-    'prefix' => env('HORIZON_PREFIX', 'horizon:'),
+    'prefix' => env(
+        'HORIZON_PREFIX',
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_horizon:'
+    ),
 
     /*
     |--------------------------------------------------------------------------

resources/js/screens/failedJobs/index.vue

@@ -224,7 +224,7 @@
                         <br>
 
                         <small class="text-muted">
-                            Queue: {{job.queue}} | Tags: {{ job.payload.tags && job.payload.tags.length ? job.payload.tags.join(', ') : '' }}
+                            Queue: {{job.queue}} | Attempts: {{ job.payload.attempts }} | Tags: {{ job.payload.tags && job.payload.tags.length ? job.payload.tags.join(', ') : '' }}
                         </small>
                     </td>
 

resources/js/screens/recentJobs/job-row.vue

@@ -7,8 +7,6 @@
                 {{ jobBaseName(job.name) }}
             </router-link>
 
-            {{ job.id }}
-
             <small class="badge badge-secondary badge-sm"
                     v-tooltip:top="`Delayed for ${delayed}`"
                     v-if="delayed && (job.status == 'reserved' || job.status == 'pending')">

src/Console/InstallCommand.php

@@ -3,13 +3,10 @@
 namespace Laravel\Horizon\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Console\DetectsApplicationNamespace;
 use Illuminate\Support\Str;
 
 class InstallCommand extends Command
 {
-    use DetectsApplicationNamespace;
-
     /**
      * The name and signature of the console command.
      *
@@ -52,7 +49,7 @@ public function handle()
      */
     protected function registerHorizonServiceProvider()
     {
-        $namespace = Str::replaceLast('\\', '', $this->getAppNamespace());
+        $namespace = Str::replaceLast('\\', '', $this->laravel->getNamespace());
 
         $appConfig = file_get_contents(config_path('app.php'));
 

src/Console/AssetsCommand.php → src/Console/PublishCommand.php

@@ -4,21 +4,21 @@
 
 use Illuminate\Console\Command;
 
-class AssetsCommand extends Command
+class PublishCommand extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'horizon:assets';
+    protected $signature = 'horizon:publish';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Re-publish the Horizon assets';
+    protected $description = 'Publish all of the Horizon resources';
 
     /**
      * Execute the console command.

src/HorizonServiceProvider.php

@@ -171,13 +171,13 @@ protected function registerCommands()
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
-                Console\InstallCommand::class,
-                Console\AssetsCommand::class,
+                Console\ContinueCommand::class,
                 Console\HorizonCommand::class,
+                Console\InstallCommand::class,
                 Console\ListCommand::class,
-                Console\PurgeCommand::class,
                 Console\PauseCommand::class,
-                Console\ContinueCommand::class,
+                Console\PublishCommand::class,
+                Console\PurgeCommand::class,
                 Console\StatusCommand::class,
                 Console\SupervisorCommand::class,
                 Console\SupervisorsCommand::class,

src/MasterSupervisor.php

@@ -15,7 +15,6 @@
 use Laravel\Horizon\Contracts\SupervisorRepository;
 use Laravel\Horizon\Contracts\Terminable;
 use Laravel\Horizon\Events\MasterSupervisorLooped;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Throwable;
 
 class MasterSupervisor implements Pausable, Restartable, Terminable
@@ -246,10 +245,8 @@ public function loop()
             $this->persist();
 
             event(new MasterSupervisorLooped($this));
-        } catch (Exception $e) {
-            app(ExceptionHandler::class)->report($e);
         } catch (Throwable $e) {
-            app(ExceptionHandler::class)->report(new FatalThrowableError($e));
+            app(ExceptionHandler::class)->report($e);
         }
     }
 

src/Supervisor.php

@@ -13,7 +13,6 @@
 use Laravel\Horizon\Contracts\SupervisorRepository;
 use Laravel\Horizon\Contracts\Terminable;
 use Laravel\Horizon\Events\SupervisorLooped;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Throwable;
 
 class Supervisor implements Pausable, Restartable, Terminable
@@ -308,10 +307,8 @@ public function loop()
             $this->persist();
 
             event(new SupervisorLooped($this));
-        } catch (Exception $e) {
-            app(ExceptionHandler::class)->report($e);
         } catch (Throwable $e) {
-            app(ExceptionHandler::class)->report(new FatalThrowableError($e));
+            app(ExceptionHandler::class)->report($e);
         }
     }