@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | /** |
| 76 | 76 | * Create a new DeployController instance. |
| 77 | 77 | * |
| 78 | - * @param Morphatic\AutoDeploy\Origins\OriginInterface $origin The origin of the webhook |
|
| 79 | - * @param AdamBrett\ShellWrapper\Runners\Exec $exec The shell command execution class |
|
| 78 | + * @param OriginInterface $origin The origin of the webhook |
|
| 79 | + * @param Exec $exec The shell command execution class |
|
| 80 | 80 | */ |
| 81 | 81 | public function __construct(OriginInterface $origin, Exec $exec) |
| 82 | 82 | { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | /** |
| 132 | 132 | * Runs a shell command, logs, and handles the result. |
| 133 | 133 | * |
| 134 | - * @param AdamBrett\ShellWrapper\CommandInterface $cmd The text of the command to be run |
|
| 134 | + * @param CommandInterface $cmd The text of the command to be run |
|
| 135 | 135 | * |
| 136 | 136 | * @return bool True if the command was successful, false on error |
| 137 | 137 | */ |
@@ -2,16 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Morphatic\AutoDeploy\Controllers; |
| 4 | 4 | |
| 5 | -use Log; |
|
| 6 | -use Mail; |
|
| 7 | -use Monolog\Logger; |
|
| 8 | -use Illuminate\Http\Request; |
|
| 9 | -use Illuminate\Routing\Controller; |
|
| 10 | 5 | use AdamBrett\ShellWrapper\Command\Builder as Command; |
| 11 | 6 | use AdamBrett\ShellWrapper\Command\CommandInterface; |
| 12 | 7 | use AdamBrett\ShellWrapper\Runners\Exec; |
| 8 | +use Illuminate\Routing\Controller; |
|
| 9 | +use Log; |
|
| 10 | +use Mail; |
|
| 13 | 11 | use Monolog\Formatter\HtmlFormatter; |
| 14 | 12 | use Monolog\Handler\SwiftMailerHandler; |
| 13 | +use Monolog\Logger; |
|
| 15 | 14 | use Morphatic\AutoDeploy\Origins\OriginInterface; |
| 16 | 15 | |
| 17 | 16 | class DeployController extends Controller |
@@ -119,7 +119,7 @@ |
||
| 119 | 119 | 'Timestamp' => date('r'), |
| 120 | 120 | 'output' => '', |
| 121 | 121 | ]; |
| 122 | - $whitelist = ['backupDatabase','pull','copyEnv','composer','npm','migrate','seed','deploy']; |
|
| 122 | + $whitelist = ['backupDatabase', 'pull', 'copyEnv', 'composer', 'npm', 'migrate', 'seed', 'deploy']; |
|
| 123 | 123 | foreach ($steps as $step) { |
| 124 | 124 | if (in_array($step, $whitelist) && !$this->{$step}()) { |
| 125 | 125 | $this->log->error('Deploy failed.', $this->result); |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | * |
| 32 | 32 | * Follows the procedure described here: https://developer.github.com/webhooks/securing/ |
| 33 | 33 | * |
| 34 | - * @return bool Returns true if the request is authentic. False otherwise. |
|
| 34 | + * @return null|boolean Returns true if the request is authentic. False otherwise. |
|
| 35 | 35 | */ |
| 36 | 36 | public function isAuthentic() |
| 37 | 37 | { |
@@ -33,9 +33,9 @@ |
||
| 33 | 33 | $url = parse_url(config('app.url'), PHP_URL_HOST); |
| 34 | 34 | $ssl = config('auto-deploy.require-ssl') ? 'https' : 'http'; |
| 35 | 35 | $msg = "Here is the information you'll need to set up your webhooks:\n\n". |
| 36 | - " Payload URL: <comment>$ssl://$url/%s</comment>\n". |
|
| 37 | - " Secret Key: <comment>%s</comment>\n\n". |
|
| 38 | - "You can display this information again by running `php artisan deploy:info`\n"; |
|
| 36 | + " Payload URL: <comment>$ssl://$url/%s</comment>\n". |
|
| 37 | + " Secret Key: <comment>%s</comment>\n\n". |
|
| 38 | + "You can display this information again by running `php artisan deploy:info`\n"; |
|
| 39 | 39 | $conf = 'Are you sure you want to overwrite the existing keys?'; |
| 40 | 40 | $show = $this->option('show'); |
| 41 | 41 | $over = $this->option('force'); |