✅ Add fpm reloading when using forge

lorisleiva · lorisleiva · commit b4c7671f0cf3 · 2018-03-10T13:39:05.000+01:00
diff --git a/src/LaravelDeployer/DeployFileGenerator.php b/src/LaravelDeployer/DeployFileGenerator.php
@@ -24,6 +24,7 @@ class DeployFileGenerator
         'npm_build' => 'production',
         'hook_horizon_command' => 'before',
         'hook_horizon_other_hook' => 'deploy:symlink',
+        'hook_fpm_version' => 'php7.1-fpm',
     ];
 
     protected $blocks = [
@@ -35,6 +36,7 @@ class DeployFileGenerator
         'hook_npm' => false,
         'hook_migrations' => false,
         'hook_horizon' => false,
+        'hook_fpm' => false,
         'hook_empty' => true,
     ];
 
@@ -231,12 +233,26 @@ public function useForge()
     {
         $this->useForge = true;
         $this->localhost();
+        $this->reloadFpm();
         $this->user('forge');
         $this->updateUnchangedDeploymentPathForForge();
 
         return $this;
     }
 
+    /**
+     * Set up to reload php-fpm when deploying.
+     *
+     * @return DeployFileGenerator
+     */
+    public function reloadFpm()
+    {
+        $this->blocks['hook_fpm'] = true;
+        $this->blocks['hook_empty'] = false;
+
+        return $this;
+    }
+
     /**
      * Return the current value of a replacement variable.
      *
diff --git a/src/LaravelDeployer/stubs/deploy.stub b/src/LaravelDeployer/stubs/deploy.stub
@@ -85,4 +85,8 @@ before('deploy:symlink', 'artisan:migrate');}}
 {{hook_horizon:// Horizon
 {{hook_horizon_command}}('{{hook_horizon_other_hook}}', 'artisan:horizon:terminate');}}
 
+{{hook_fpm:// Reload php-fpm 
+set('php_fpm_service', '{{hook_fpm_version}}');
+after('cleanup', 'fpm:reload');}}
+
 {{hook_empty:// before('deploy:symlink', 'artisan:migrate');}}
diff --git a/tests/DeployFileGeneratorTest.php b/tests/DeployFileGeneratorTest.php
@@ -177,13 +177,13 @@ function when_no_hooks_are_used_it_display_the_migration_hook_commented()
         $stubNpm = (new DeployFileGenerator)->useNpm()->getParsedStub();
         $stubMigrate = (new DeployFileGenerator)->migrate()->getParsedStub();
         $stubHorizon = (new DeployFileGenerator)->terminateHorizon()->getParsedStub();
-        $stubFull = (new DeployFileGenerator)->useNpm()->migrate()->terminateHorizon()->getParsedStub();
+        $stubFpm = (new DeployFileGenerator)->reloadFpm()->getParsedStub();
 
         $this->assertContains("// before('deploy:symlink', 'artisan:migrate');", $stubEmpty);
         $this->assertNotContains("// before('deploy:symlink', 'artisan:migrate');", $stubNpm);
         $this->assertNotContains("// before('deploy:symlink', 'artisan:migrate');", $stubMigrate);
         $this->assertNotContains("// before('deploy:symlink', 'artisan:migrate');", $stubHorizon);
-        $this->assertNotContains("// before('deploy:symlink', 'artisan:migrate');", $stubFull);
+        $this->assertNotContains("// before('deploy:symlink', 'artisan:migrate');", $stubFpm);
     }
 
     /** @test */
@@ -253,4 +253,26 @@ function it_returns_current_values_of_replacement_variables()
 
         $this->assertEquals('Elegon', $appName);
     }
+
+    /** @test */
+    function it_can_be_set_to_use_fpm_reloading()
+    {
+        $stub = (new DeployFileGenerator)
+            ->reloadFpm()
+            ->getParsedStub();
+
+        $this->assertContains("set('php_fpm_service', 'php7.1-fpm');", $stub);
+        $this->assertContains("after('cleanup', 'fpm:reload');", $stub);
+    }
+
+    /** @test */
+    function it_automatically_use_fpm_reloading_when_using_forge()
+    {
+        $stub = (new DeployFileGenerator)
+            ->useForge()
+            ->getParsedStub();
+
+        $this->assertContains("set('php_fpm_service', 'php7.1-fpm');", $stub);
+        $this->assertContains("after('cleanup', 'fpm:reload');", $stub);
+    }
 }
