Undo previous name change

Develop

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /build
 composer.lock
+.mage.yml

.travis.yml

@@ -1,9 +1,13 @@
 language: php
 php:
-  - '5.5'
+  - '7.2'
-  - '5.6'
+  - '7.3'
-  - '7.0'
+  - '7.4'
-  - '7.1'
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - php: 7.1
 
 install:
   - composer install

CHANGELOG.md

@@ -1,26 +1,9 @@
-CHANGELOG for 3.X
+CHANGELOG for 4.X
 =================
 
-* 3.2.0 (2017-04-14)
+* 4.0.0 (2018-04-02)
- * Allow to pre-register Custom Tasks
+ * v4 series release
- * [PR#365] New option "from" to define deployment start point
+ * Refactored for Symfony 4 and PHP 7.1
- * Allow to define excludes in the global scope.
+ * Symfony Pool Clear task added
- * Improve code quality, remove duplications on Symfony Tasks.
+ * Symfony Pool Prune task added
- * Improve code quality, remove duplications on Composer Tasks.
+ * Symfony Assetic task removed
- * [PR#364] Allow to define custom timeout to Composer:Install
-
-* 3.1.0 (2017-02-25)
- * Add new Exec task to execute arbitrary shell commands
- * Add new Composer task, to update phar (composer/self-update)
- * [#344] Allow to flag Filesystem tasks
- * [PR#346] Add new File System task, to change file's modes (fs/chmod)
- * [BUGFIX] [PR#342] Ignore empty exclude lines
- * [PR#330] Allow Composer task options to be overwritten at environment level
- * [PR#330] Add new method Runtime::getMergedOption to merge ConfigOption and EnvOption
- * [Documentation] [PR#333] Improve example config file
-
-* 3.0.1 (2017-01-10)
- * [BUGFIX] [#350] [#353] Fix escape issue when commands are sent through SSH
-
-* 3.0.0 (2017-01-31)
- * v3 series release

README.md

@@ -1,4 +1,4 @@
-# Magallanes #
+# Magallanes
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/ed0de53a-a12e-459b-9464-34def5907b56/mini.png)](https://insight.sensiolabs.com/projects/ed0de53a-a12e-459b-9464-34def5907b56)
 [![Build Status](https://img.shields.io/travis/andres-montanez/Magallanes/master.svg)](https://travis-ci.org/andres-montanez/Magallanes)
 [![Coverage Status](https://img.shields.io/coveralls/andres-montanez/Magallanes/master.svg)](https://coveralls.io/github/andres-montanez/Magallanes?branch=master)
@@ -8,15 +8,15 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/andres-montanez/magallanes.svg)](https://packagist.org/packages/andres-montanez/magallanes)
 [![License](https://img.shields.io/packagist/l/andres-montanez/magallanes.svg)](https://packagist.org/packages/andres-montanez/magallanes)
 
-### What's Magallanes? ###
+### What's Magallanes?
-**Magallanes** is a deployment tool for made with PHP for PHP applications; it's quite simple to use and manage. For more information and documentation please visit http://magephp.com
+**Magallanes** is a deployment tool for made with PHP for PHP applications; it's quite simple to use and manage. For more information and documentation please visit https://magephp.com
 
-### Installing ###
+### Installing
 Simply add the following dependency to your project’s composer.json file:
 
 ```json
     "require": {
-        "andres-montanez/magallanes": "^3.0"
+        "andres-montanez/magallanes": "^4.0"
     }
 ```
 Finally you can use **Magallanes** from the vendor's bin:
@@ -25,8 +25,5 @@ Finally you can use **Magallanes** from the vendor's bin:
 $ vendor/bin/mage version
 ```
 
-### What happend to version 2? ###
+### Codename Discovery One
-There is no version 2. I've skipped it and jumpped stright from v1 to v3. This new version of **Magallanes** is quite radical and different from it's successor. The whole application has been rewritten using **_Symfony3 Components_**, so naming it v3 makes a lot of sense.
+Each new mayor version of **Magallanes** will have a codename (like Ubuntu), version 3 was _Nostromo_, and in the current version it is **_Discovery One_**, in homage to the spaceship from the ground breaking film *2001: A Space Odyssey (1968)*.
-
-### Codename Nostromo ###
-Each new mayor version of **Magallanes** will have a codename (like Ubuntu), and in the current version it is **_Nostromo_**, like the spaceship from the movie *Alien (1979)*.

composer.json

@@ -1,7 +1,7 @@
 {
-  "name": "andres-montanez/magallanes",
+  "name": "hauke68/magallanes",
   "description": "The Deployment Tool for PHP Applications",
-  "homepage": "http://magephp.com",
+  "homepage": "https://magephp.com",
   "license": "MIT",
   "type": "library",
   "keywords": ["deployment"],
@@ -9,21 +9,25 @@
     {
       "name": "Andrés Montañez",
       "email": "andresmontanez@gmail.com"
+    },
+    {
+      "name": "Hauke Zühl",
+      "email": "hzuehl@web.de"
     }
   ],
   "require": {
-    "php": ">=5.5.9",
+    "php": "^7.2.5",
-    "monolog/monolog": "^1.0",
+    "monolog/monolog": "~1.11||^2.0",
-    "symfony/console": "^3.0",
+    "symfony/console": "^5.0",
-    "symfony/filesystem": "^3.0",
+    "symfony/filesystem": "^5.0",
-    "symfony/event-dispatcher": "^3.0",
+    "symfony/event-dispatcher": "^5.0",
-    "symfony/finder": "^3.0",
+    "symfony/finder": "^5.0",
-    "symfony/yaml": "^3.0",
+    "symfony/yaml": "^5.0",
-    "symfony/process": "^3.0"
+    "symfony/process": "^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8.*",
+    "phpunit/phpunit": "^7.0",
-    "satooshi/php-coveralls": "~1.0"
+    "satooshi/php-coveralls": "^2.0"
   },
   "autoload": {
     "psr-4": {
@@ -38,8 +42,8 @@
   "bin": ["bin/mage"],
   "extra": {
     "branch-alias": {
-      "dev-master": "3.0.x-dev",
+      "dev-master": "4.0.x-dev",
-      "dev-nostromo": "3.x-dev"
+      "dev-discovery-one": "4.x-dev"
     }
   }
 }

docs/dockers/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '2'
+services:
+    php5:
+        container_name: mage-php5
+        build: ./php5
+        volumes:
+            - ../../:/home/magephp
+
+    php7.0:
+        container_name: mage-php7.0
+        build: ./php7.0
+        volumes:
+            - ../../:/home/magephp
+
+    php7.1:
+        container_name: mage-php7.1
+        build: ./php7.1
+        volumes:
+            - ../../:/home/magephp

docs/dockers/php5/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:14.04
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y vim curl git unzip
+RUN apt-get install -y php5-cli php5-curl
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
+
+WORKDIR /home/magephp

docs/dockers/php7.0/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y vim curl git unzip
+RUN apt-get install -y php7.0-cli php-zip php7.0-curl php7.0-xml
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
+
+WORKDIR /home/magephp

docs/dockers/php7.1/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:17.10
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y vim curl git unzip
+RUN apt-get install -y php7.1-cli php-zip php7.1-curl php7.1-xml php7.1-mbstring
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
+
+WORKDIR /home/magephp

src/Command/BuiltIn/DeployCommand.php

@@ -143,6 +143,9 @@ class DeployCommand extends AbstractCommand
     protected function runOnHosts(OutputInterface $output, $tasks)
     {
         $hosts = $this->runtime->getEnvOption('hosts');
+        if (!is_array($hosts) && !$hosts instanceof \Countable) {
+            $hosts = [];
+        }
         if (count($hosts) == 0) {
             $output->writeln(sprintf('    No hosts defined, skipping %s tasks', $this->getStageName()));
             $output->writeln('');
@@ -175,8 +178,8 @@ class DeployCommand extends AbstractCommand
             return true;
         }
 
-        if ($this->runtime->getWorkingHost() !== null) {
+        if ($this->runtime->getHostName() !== null) {
-            $output->writeln(sprintf('    Starting <fg=black;options=bold>%s</> tasks on host <fg=black;options=bold>%s</>:', $this->getStageName(), $this->runtime->getWorkingHost()));
+            $output->writeln(sprintf('    Starting <fg=black;options=bold>%s</> tasks on host <fg=black;options=bold>%s</>:', $this->getStageName(), $this->runtime->getHostName()));
         } else {
             $output->writeln(sprintf('    Starting <fg=black;options=bold>%s</> tasks:', $this->getStageName()));
         }

src/Command/BuiltIn/Releases/ListCommand.php

@@ -74,6 +74,9 @@ class ListCommand extends AbstractCommand
             $output->writeln('');
 
             $hosts = $this->runtime->getEnvOption('hosts');
+            if (!is_array($hosts) && !$hosts instanceof \Countable) {
+                $hosts = [];
+            }
             if (count($hosts) == 0) {
                 $output->writeln('No hosts defined');
                 $output->writeln('');

src/Mage.php

@@ -17,6 +17,6 @@ namespace Mage;
  */
 class Mage
 {
-    const VERSION = '3.2';
+    const VERSION = '4.0.0';
-    const CODENAME = 'Nostromo';
+    const CODENAME = 'Discovery One';
 }

src/MageApplication.php

@@ -17,7 +17,7 @@ use Symfony\Component\Finder\SplFileInfo;
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Yaml\Parser;
@@ -46,12 +46,12 @@ class MageApplication extends Application
         $dispatcher = new EventDispatcher();
         $this->setDispatcher($dispatcher);
 
-        $dispatcher->addListener(ConsoleEvents::EXCEPTION, function (ConsoleExceptionEvent $event) {
+        $dispatcher->addListener(ConsoleEvents::ERROR, function (ConsoleErrorEvent $event) {
             $output = $event->getOutput();
             $command = $event->getCommand();
             $output->writeln(sprintf('Oops, exception thrown while running command <info>%s</info>', $command->getName()));
             $exitCode = $event->getExitCode();
-            $event->setException(new \LogicException('Caught exception', $exitCode, $event->getException()));
+            $event->setError(new \LogicException('Caught exception', $exitCode, $event->getError()));
         });
 
         $this->runtime = $this->instantiateRuntime();
@@ -84,6 +84,9 @@ class MageApplication extends Application
 
                 $logger = new Logger('magephp');
                 $logger->pushHandler(new StreamHandler($logfile));
+
+            } elseif (array_key_exists('log_dir', $config['magephp']) && !is_dir($config['magephp']['log_dir'])) {
+                throw new RuntimeException(sprintf('The configured log_dir "%s" does not exists or is not a directory.', $config['magephp']['log_dir']));
             }
 
             $this->runtime->setConfiguration($config['magephp']);

src/Runtime/Runtime.php

@@ -405,7 +405,7 @@ class Runtime
     {
         $this->log($cmd, LogLevel::INFO);
 
-        $process = new Process($cmd);
+        $process = Process::fromShellCommandline($cmd);
         $process->setTimeout($timeout);
         $process->run();
 
@@ -429,7 +429,7 @@ class Runtime
     {
         $user = $this->getEnvOption('user', $this->getCurrentUser());
         $sudo = $this->getEnvOption('sudo', false);
-        $host = $this->getWorkingHost();
+        $host = $this->getHostName();
         $sshConfig = $this->getSSHConfig();
 
         $cmdDelegate = $cmd;
@@ -457,7 +457,11 @@ class Runtime
      */
     public function getSSHConfig()
     {
-        $sshConfig = $this->getEnvOption('ssh', ['port' => '22', 'flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
+        $sshConfig = $this->getEnvOption('ssh', ['port' => 22, 'flags' => '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no']);
+
+        if ($this->getHostPort() !== null) {
+            $sshConfig['port'] = $this->getHostPort();
+        }
 
         if (!array_key_exists('port', $sshConfig)) {
             $sshConfig['port'] = '22';
@@ -470,6 +474,32 @@ class Runtime
         return $sshConfig;
     }
 
+    /**
+     * Get the current Host Port or default ssh port
+     *
+     * @return integer
+     */
+    public function getHostPort()
+    {
+        $info = explode(':', $this->getWorkingHost());
+        return isset($info[1]) ? $info[1] : null;
+    }
+
+    /**
+     * Get the current Host Name
+     *
+     * @return string
+     */
+    public function getHostName()
+    {
+        if (strpos($this->getWorkingHost(), ':') === false) {
+            return $this->getWorkingHost();
+        }
+
+        $info = explode(':', $this->getWorkingHost());
+        return $info[0];
+    }
+
     /**
      * Gets a Temporal File name
      *

src/Task/BuiltIn/Deploy/ReleaseTask.php

@@ -44,7 +44,7 @@ class ReleaseTask extends AbstractTask implements ExecuteOnRollbackInterface
         $cmdLinkRelease = sprintf('cd %s && ln -snf releases/%s current', $hostPath, $releaseId);
 
         /** @var Process $process */
-        $process = $this->runtime->runRemoteCommand($cmdLinkRelease, false);
+        $process = $this->runtime->runRemoteCommand($cmdLinkRelease, false, null);
         return $process->isSuccessful();
     }
 }

src/Task/BuiltIn/Deploy/RsyncTask.php

@@ -36,7 +36,7 @@ class RsyncTask extends AbstractTask
         $flags = $this->runtime->getEnvOption('rsync', '-avz');
         $sshConfig = $this->runtime->getSSHConfig();
         $user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
-        $host = $this->runtime->getWorkingHost();
+        $host = $this->runtime->getHostName();
         $hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
         $targetDir = rtrim($hostPath, '/');
 
@@ -49,7 +49,7 @@ class RsyncTask extends AbstractTask
         $cmdRsync = sprintf('rsync -e "ssh -p %d %s" %s %s %s %s@%s:%s', $sshConfig['port'], $sshConfig['flags'], $flags, $excludes, $from, $user, $host, $targetDir);
 
         /** @var Process $process */
-        $process = $this->runtime->runLocalCommand($cmdRsync, 600);
+        $process = $this->runtime->runLocalCommand($cmdRsync, null);
         return $process->isSuccessful();
     }
 

src/Task/BuiltIn/Deploy/Tar/CopyTask.php

@@ -38,11 +38,12 @@ class CopyTask extends AbstractTask
         }
 
         $user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
-        $host = $this->runtime->getWorkingHost();
+        $host = $this->runtime->getHostName();
         $sshConfig = $sshConfig = $this->runtime->getSSHConfig();
         $hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
         $currentReleaseId = $this->runtime->getReleaseId();
 
+        $tarPath = $this->runtime->getEnvOption('tar_extract_path', 'tar');
         $flags = $this->runtime->getEnvOption('tar_extract', 'xfzop');
         $targetDir = sprintf('%s/releases/%s', $hostPath, $currentReleaseId);
 
@@ -54,7 +55,7 @@ class CopyTask extends AbstractTask
         /** @var Process $process */
         $process = $this->runtime->runLocalCommand($cmdCopy, 300);
         if ($process->isSuccessful()) {
-            $cmdUnTar = sprintf('cd %s && tar %s %s', $targetDir, $flags, $tarRemote);
+            $cmdUnTar = sprintf('cd %s && %s %s %s', $targetDir, $tarPath, $flags, $tarRemote);
             $process = $this->runtime->runRemoteCommand($cmdUnTar, false, 600);
             if ($process->isSuccessful()) {
                 $cmdDelete = sprintf('rm %s/%s', $targetDir, $tarRemote);

src/Task/BuiltIn/Deploy/Tar/PrepareTask.php

@@ -41,9 +41,10 @@ class PrepareTask extends AbstractTask
         $this->runtime->setVar('tar_local', $tarLocal);
 
         $excludes = $this->getExcludes();
+        $tarPath = $this->runtime->getEnvOption('tar_create_path', 'tar');
         $flags = $this->runtime->getEnvOption('tar_create', 'cfzp');
         $from = $this->runtime->getEnvOption('from', './');
-        $cmdTar = sprintf('tar %s %s %s %s', $flags, $tarLocal, $excludes, $from);
+        $cmdTar = sprintf('%s %s %s %s %s', $tarPath, $flags, $tarLocal, $excludes, $from);
 
         /** @var Process $process */
         $process = $this->runtime->runLocalCommand($cmdTar, 300);

src/Task/BuiltIn/FS/AbstractFileTask.php

@@ -61,8 +61,8 @@ abstract class AbstractFileTask extends AbstractTask
             '%environment%' => $this->runtime->getEnvironment(),
         ];
 
-        if ($this->runtime->getWorkingHost() !== null) {
+        if ($this->runtime->getHostName() !== null) {
-            $mapping['%host%'] = $this->runtime->getWorkingHost();
+            $mapping['%host%'] = $this->runtime->getHostName();
         }
 
         if ($this->runtime->getReleaseId() !== null) {

src/Task/BuiltIn/Symfony/CachePoolClearTask.php

@@ -10,30 +10,35 @@
 
 namespace Mage\Task\BuiltIn\Symfony;
 
+use Mage\Task\Exception\ErrorException;
 use Symfony\Component\Process\Process;
-use Mage\Task\AbstractTask;
 
 /**
- * Symfony Task - Dump Assetics
+ * Symfony Task - Cache Pool Clear
  *
  * @author Andrés Montañez <andresmontanez@gmail.com>
  */
-class AsseticDumpTask extends AbstractTask
+class CachePoolClearTask extends AbstractSymfonyTask
 {
     public function getName()
     {
-        return 'symfony/assetic-dump';
+        return 'symfony/cache-pool-clear';
     }
 
     public function getDescription()
     {
-        return '[Symfony] Assetic Dump';
+        return '[Symfony] Cache Pool Clear';
     }
 
     public function execute()
     {
         $options = $this->getOptions();
-        $command = sprintf('%s assetic:dump --env=%s %s', $options['console'], $options['env'], $options['flags']);
+
+        if (!$options['pools']) {
+            throw new ErrorException('Parameter "pools" is not defined');
+        }
+
+        $command = $options['console'] . ' cache:pool:clear ' . $options['pools'] . ' --env=' . $options['env'] . ' ' . $options['flags'];
 
         /** @var Process $process */
         $process = $this->runtime->runCommand(trim($command));
@@ -41,14 +46,8 @@ class AsseticDumpTask extends AbstractTask
         return $process->isSuccessful();
     }
 
-    protected function getOptions()
+    protected function getSymfonyOptions()
     {
-        $options = array_merge(
+        return ['pools' => null];
-            ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getMergedOption('symfony'),
-            $this->options
-        );
-
-        return $options;
     }
 }

src/Task/BuiltIn/Symfony/CachePoolPruneTask.php

@@ -0,0 +1,42 @@
+<?php
+/*
+ * This file is part of the Magallanes package.
+ *
+ * (c) Andrés Montañez <andres@andresmontanez.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Mage\Task\BuiltIn\Symfony;
+
+use Symfony\Component\Process\Process;
+
+/**
+ * Symfony Task - Cache Pool Prune
+ *
+ * @author Andrés Montañez <andresmontanez@gmail.com>
+ */
+class CachePoolPruneTask extends AbstractSymfonyTask
+{
+    public function getName()
+    {
+        return 'symfony/cache-pool-prune';
+    }
+
+    public function getDescription()
+    {
+        return '[Symfony] Cache Pool Prune';
+    }
+
+    public function execute()
+    {
+        $options = $this->getOptions();
+        $command = $options['console'] . ' cache:pool:prune --env=' . $options['env'] . ' ' . $options['flags'];
+
+        /** @var Process $process */
+        $process = $this->runtime->runCommand(trim($command));
+
+        return $process->isSuccessful();
+    }
+}

tests/Command/BuiltIn/Config/DumpCommandTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\Config\DumpCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DumpCommandTest extends TestCase
 {

tests/Command/BuiltIn/Config/EnvironmentsCommandTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\Config\EnvironmentsCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class EnvironmentsCommandTest extends TestCase
 {

tests/Command/BuiltIn/DeployCommandMiscTasksTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\DeployCommand;
 use Mage\Tests\MageApplicationMockup;
 use Mage\Command\AbstractCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DeployCommandMiscTasksTest extends TestCase
 {
@@ -35,8 +35,10 @@ class DeployCommandMiscTasksTest extends TestCase
             0 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
             1 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=testenv"',
             2 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=testenv --symlink --relative"',
-            3 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=testenv"',
+            3 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=testenv"',
-            4 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=prod"',
+            4 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=prod"',
+            5 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:clear main --env=testenv"',
+            6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:clear main --env=prod"',
         );
 
         // Check total of Executed Commands

tests/Command/BuiltIn/DeployCommandMiscTest.php

@@ -11,10 +11,11 @@
 namespace Mage\Tests\Command\BuiltIn;
 
 use Mage\Command\BuiltIn\DeployCommand;
+use Mage\Runtime\Exception\RuntimeException;
 use Mage\Tests\MageApplicationMockup;
 use Mage\Command\AbstractCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DeployCommandMiscTest extends TestCase
 {
@@ -36,6 +37,24 @@ class DeployCommandMiscTest extends TestCase
         $this->assertEquals(0, $tester->getStatusCode());
     }
 
+    public function testInvalidLog()
+    {
+        $application = new MageApplicationMockup(__DIR__ . '/../../Resources/invalid-log.yml');
+
+        /** @var AbstractCommand $command */
+        $command = $application->find('deploy');
+        $this->assertTrue($command instanceof DeployCommand);
+
+        try {
+            $tester = new CommandTester($command);
+            $tester->execute(['command' => $command->getName(), 'environment' => 'test']);
+        } catch (RuntimeException $exception) {
+            $this->assertEquals('The configured log_dir "/no-temp" does not exists or is not a directory.', $exception->getMessage());
+        } catch (\Exception $exception) {
+            $this->assertFalse(true, sprintf('Exception "%s" catched, message: "%s"', get_class($exception), $exception->getMessage()));
+        }
+    }
+
     public function testDeploymentWithSudo()
     {
         $application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-sudo.yml');
@@ -59,7 +78,7 @@ class DeployCommandMiscTest extends TestCase
             6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:clear --env=dev"',
             7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:warmup --env=dev"',
             8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console assets:install web --env=dev --symlink --relative"',
-            9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console assetic:dump --env=dev"',
+            9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:pool:prune --env=dev"',
             10 => 'git checkout master',
         );
 
@@ -96,7 +115,7 @@ class DeployCommandMiscTest extends TestCase
             5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
             6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
             7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
-            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"',
+            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"',
             9 => 'git checkout master',
         );
 
@@ -240,7 +259,7 @@ class DeployCommandMiscTest extends TestCase
             4 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
             5 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
             6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
-            7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"',
+            7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"',
             8 => 'git branch | grep "*"',
         );
 

tests/Command/BuiltIn/DeployCommandWithReleasesTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\DeployCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DeployCommandWithReleasesTest extends TestCase
 {
@@ -46,7 +46,7 @@ class DeployCommandWithReleasesTest extends TestCase
             9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
             10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"',
             11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"',
-            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"',
+            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"',
             13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
             14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
             15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"',
@@ -68,6 +68,56 @@ class DeployCommandWithReleasesTest extends TestCase
         $this->assertEquals(0, $tester->getStatusCode());
     }
 
+    public function testDeploymentWithReleasesWithPortCommands()
+    {
+        $application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-with-port.yml');
+
+        $application->getRuntime()->setReleaseId('20170101015120');
+
+        /** @var AbstractCommand $command */
+        $command = $application->find('deploy');
+        $this->assertTrue($command instanceof DeployCommand);
+
+        $tester = new CommandTester($command);
+        $tester->execute(['command' => $command->getName(), 'environment' => 'test']);
+
+        $ranCommands = $application->getRuntime()->getRanCommands();
+
+        $testCase = array(
+            0 => 'git branch | grep "*"',
+            1 => 'git checkout test',
+            2 => 'git pull',
+            3 => 'composer install --optimize-autoloader',
+            4 => 'composer dump-autoload --optimize',
+            5 => 'tar cfzp /tmp/mageXYZ --exclude=".git" --exclude="./var/cache/*" --exclude="./var/log/*" --exclude="./web/app_dev.php" ./',
+            6 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "mkdir -p /var/www/test/releases/1234567890"',
+            7 => 'scp -P 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/mageXYZ tester@testhost:/var/www/test/releases/1234567890/mageXYZ',
+            8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && tar xfzop mageXYZ"',
+            9 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
+            10 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=prod"',
+            11 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=prod --symlink --relative"',
+            12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=prod"',
+            13 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
+            14 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
+            15 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"',
+            16 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015111"',
+            17 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015112"',
+            18 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015113"',
+            19 => 'rm /tmp/mageXYZ',
+            20 => 'git checkout master',
+        );
+
+        // Check total of Executed Commands
+        $this->assertEquals(count($testCase), count($ranCommands));
+
+        // Check Generated Commands
+        foreach ($testCase as $index => $command) {
+            $this->assertEquals($command, $ranCommands[$index]);
+        }
+
+        $this->assertEquals(0, $tester->getStatusCode());
+    }
+
     public function testDeploymentWithReleasesWithFromCommands()
     {
         $application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-with-from.yml');
@@ -96,7 +146,7 @@ class DeployCommandWithReleasesTest extends TestCase
             9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
             10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"',
             11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"',
-            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"',
+            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"',
             13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
             14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
             15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"',
@@ -306,7 +356,7 @@ class DeployCommandWithReleasesTest extends TestCase
             9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
             10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"',
             11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"',
-            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"',
+            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"',
             13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
             14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
             15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"',
@@ -359,7 +409,7 @@ class DeployCommandWithReleasesTest extends TestCase
             9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
             10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"',
             11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"',
-            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"',
+            12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"',
             13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
             14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
         );

tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\DeployCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class DeployCommandWithoutReleasesTest extends TestCase
 {
@@ -40,7 +40,44 @@ class DeployCommandWithoutReleasesTest extends TestCase
             5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
             6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
             7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
-            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"',
+            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"',
+            9 => 'git checkout master',
+        );
+
+        // Check total of Executed Commands
+        $this->assertEquals(count($testCase), count($ranCommands));
+
+        // Check Generated Commands
+        foreach ($testCase as $index => $command) {
+            $this->assertEquals($command, $ranCommands[$index]);
+        }
+
+        $this->assertEquals(0, $tester->getStatusCode());
+    }
+
+    public function testDeploymentWithoutReleasesWithPortCommands()
+    {
+        $application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-without-releases-with-port.yml');
+
+        /** @var AbstractCommand $command */
+        $command = $application->find('deploy');
+        $this->assertTrue($command instanceof DeployCommand);
+
+        $tester = new CommandTester($command);
+        $tester->execute(['command' => $command->getName(), 'environment' => 'test']);
+
+        $ranCommands = $application->getRuntime()->getRanCommands();
+
+        $testCase = array(
+            0 => 'git branch | grep "*"',
+            1 => 'git checkout test',
+            2 => 'git pull',
+            3 => 'composer install --optimize-autoloader',
+            4 => 'composer dump-autoload --optimize',
+            5 => 'rsync -e "ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
+            6 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
+            7 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
+            8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"',
             9 => 'git checkout master',
         );
 
@@ -77,7 +114,7 @@ class DeployCommandWithoutReleasesTest extends TestCase
             5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./dist tester@testhost:/var/www/test',
             6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
             7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
-            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"',
+            8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"',
             9 => 'git checkout master',
         );
 

tests/Command/BuiltIn/Releases/ListCommandTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\Releases\ListCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ListCommandTest extends TestCase
 {

tests/Command/BuiltIn/Releases/RollbackCommandTest.php

@@ -14,7 +14,7 @@ use Mage\Command\BuiltIn\Releases\RollbackCommand;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class RollbackCommandTest extends TestCase
 {

tests/Command/BuiltIn/VersionCommandTest.php

@@ -15,7 +15,7 @@ use Mage\Command\BuiltIn\VersionCommand;
 use Mage\Tests\MageApplicationMockup;
 use Mage\Mage;
 use Symfony\Component\Console\Tester\CommandTester;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class VersionCommandTest extends TestCase
 {

tests/Deploy/StrategyTest.php

@@ -15,7 +15,7 @@ use Mage\Deploy\Strategy\RsyncStrategy;
 use Mage\Runtime\Exception\RuntimeException;
 use Mage\Runtime\Runtime;
 use Exception;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class StrategyTest extends TestCase
 {

tests/MageApplicationTest.php

@@ -14,7 +14,7 @@ use Mage\MageApplication;
 use Mage\Runtime\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Exception;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class MageApplicationTest extends TestCase
 {

tests/Resources/basic.yml

@@ -21,7 +21,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/invalid-log.yml

@@ -0,0 +1,27 @@
+magephp:
+    log_dir: /no-temp
+    environments:
+        production:
+            user: app
+            branch: master
+            host_path: /var/www/myapp
+            releases: 4
+            exclude:
+                - ./var/cache/*
+                - ./var/log/*
+                - ./web/app_dev.php
+            hosts:
+                - webserver1
+                - webserver2
+                - webserver3
+            pre-deploy:
+                - git/update
+                - composer/install
+                - composer/dump-autoload
+            on-deploy:
+                - symfony/cache-warmup: { env: 'dev' }
+                - symfony/assets-install: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
+            on-release:
+            post-release:
+            post-deploy:

tests/Resources/no-hosts.yml

@@ -17,7 +17,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/symfony-envconf.yml

@@ -14,5 +14,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup
                 - symfony/assets-install
-                - symfony/assetic-dump
+                - symfony/cache-pool-prune
-                - symfony/assetic-dump: { env: 'prod' }
+                - symfony/cache-pool-prune: { env: 'prod' }
+                - symfony/cache-pool-clear: { pools: 'main' }
+                - symfony/cache-pool-clear: { env: 'prod', pools: 'main' }

tests/Resources/testhost-skipping.yml

@@ -18,7 +18,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/testhost-sudo.yml

@@ -20,7 +20,7 @@ magephp:
                 - symfony/cache-clear: { env: 'dev' }
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/testhost-with-from.yml

@@ -22,7 +22,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/testhost-with-port.yml

@@ -0,0 +1,27 @@
+magephp:
+    log_dir: /tmp
+    environments:
+        test:
+            user: tester
+            branch: test
+            host_path: /var/www/test
+            releases: 4
+            exclude:
+                - ./var/cache/*
+                - ./var/log/*
+                - ./web/app_dev.php
+                -
+                -
+            hosts:
+                - testhost:202
+            pre-deploy:
+                - git/update
+                - composer/install
+                - composer/dump-autoload
+            on-deploy:
+                - symfony/cache-warmup: { env: 'prod' }
+                - symfony/assets-install: { env: 'prod' }
+                - symfony/cache-pool-prune: { env: 'prod' }
+            on-release:
+            post-release:
+            post-deploy:

tests/Resources/testhost-without-releases-with-from.yml

@@ -19,7 +19,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/testhost-without-releases-with-port.yml

@@ -0,0 +1,24 @@
+magephp:
+    log_dir: /tmp
+    environments:
+        test:
+            user: tester
+            branch: test
+            host_path: /var/www/test
+            exclude:
+                - ./var/cache/*
+                - ./var/log/*
+                - ./web/app_dev.php
+            hosts:
+                - testhost:202
+            pre-deploy:
+                - git/update
+                - composer/install
+                - composer/dump-autoload
+            on-deploy:
+                - symfony/cache-warmup: { env: 'dev' }
+                - symfony/assets-install: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
+            on-release:
+            post-release:
+            post-deploy:

tests/Resources/testhost-without-releases.yml

@@ -18,7 +18,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Resources/testhost.yml

@@ -21,7 +21,7 @@ magephp:
             on-deploy:
                 - symfony/cache-warmup: { env: 'dev' }
                 - symfony/assets-install: { env: 'dev' }
-                - symfony/assetic-dump: { env: 'dev' }
+                - symfony/cache-pool-prune: { env: 'dev' }
             on-release:
             post-release:
             post-deploy:

tests/Runtime/ProcessMockup.php

@@ -19,7 +19,7 @@ class ProcessMockup extends Process
     protected $timeout;
     protected $success = true;
 
-    public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
+    public function __construct($commandline, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
     {
         $this->commandline = $commandline;
     }
@@ -29,7 +29,7 @@ class ProcessMockup extends Process
         $this->timeout = $timeout;
     }
 
-    public function run($callback = null)
+    public function run(callable $callback = null, array $env = array()): int
     {
         if (in_array($this->commandline, $this->forceFail)) {
             $this->success = false;
@@ -50,6 +50,12 @@ class ProcessMockup extends Process
         if ($this->commandline == 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@hostdemo2 "ls -1 /var/www/test/releases"') {
             $this->success = false;
         }
+
+        if (!$this->success) {
+            return 10;
+        }
+
+        return 0;
     }
 
     public function isSuccessful()
@@ -99,6 +105,14 @@ class ProcessMockup extends Process
             return '/var/www/test/releases/20170101015117';
         }
 
+        if ($this->commandline == 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"') {
+            return implode(PHP_EOL, ['20170101015110', '20170101015111', '20170101015112', '20170101015113', '20170101015114', '20170101015115', '20170101015116', '20170101015117']);
+        }
+
+        if ($this->commandline == 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "readlink -f /var/www/test/current"') {
+            return '/var/www/test/releases/20170101015117';
+        }
+
         if ($this->commandline == 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@host1 "ls -1 /var/www/test/releases"') {
             return implode(PHP_EOL, ['20170101015110', '20170101015111', '20170101015112', '20170101015113', '20170101015114', '20170101015115', '20170101015116', '20170101015117']);
         }

tests/Runtime/RuntimeMockup.php

@@ -16,6 +16,7 @@ use Symfony\Component\Process\Process;
 class RuntimeMockup extends Runtime
 {
     protected $ranCommands = [];
+    protected $ranCommandTimeouts = [];
     protected $forceFail = [];
 
     public function getRanCommands()
@@ -23,6 +24,11 @@ class RuntimeMockup extends Runtime
         return $this->ranCommands;
     }
 
+    public function getRanCommandTimeoutFor($cmd)
+    {
+        return isset($this->ranCommandTimeouts[$cmd]) ? $this->ranCommandTimeouts[$cmd] : null;
+    }
+
     /**
      * Generate the Release ID
      *
@@ -44,6 +50,7 @@ class RuntimeMockup extends Runtime
     public function runLocalCommand($cmd, $timeout = 120)
     {
         $this->ranCommands[] = $cmd;
+        $this->ranCommandTimeouts[$cmd] = $timeout;
 
         $process = new ProcessMockup($cmd);
         $process->forceFail = $this->forceFail;

tests/Runtime/RuntimeTest.php

@@ -15,7 +15,7 @@ use Mage\Runtime\Runtime;
 use Exception;
 use Monolog\Logger;
 use Monolog\Handler\TestHandler;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 use Symfony\Component\Process\Process;
 use DateTime;
@@ -119,6 +119,20 @@ class RuntimeTest extends TestCase
         $this->assertEquals('-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no', $sshConfig['flags']);
     }
 
+    public function testSSHConfigPortDefinedInHostNotation()
+    {
+        $runtime = new Runtime();
+        $runtime->setWorkingHost('223.12.24.64:1056');
+        $sshConfig = $runtime->getSSHConfig();
+
+        $this->assertEquals('1056', $sshConfig['port']);
+
+        $runtime->setWorkingHost('223.12.24.64');
+        $sshConfig = $runtime->getSSHConfig();
+
+        $this->assertEquals('22', $sshConfig['port']);
+    }
+
     public function testSSHConfigEmptyOptions()
     {
         $runtime = new Runtime();

tests/Task/AbstractTaskTest.php

@@ -12,7 +12,7 @@ namespace Mage\Tests\Task;
 
 use Mage\Task\Exception\ErrorException;
 use Exception;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class AbstractTaskTest extends TestCase
 {

tests/Task/BuiltIn/Composer/BasicComposerTaskTest.php

@@ -3,7 +3,7 @@
 namespace Mage\Tests\Task\BuiltIn\Composer;
 
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class BasicComposerTaskTest extends TestCase
 {

tests/Task/BuiltIn/Composer/SelfUpdateTaskTest.php

@@ -6,7 +6,7 @@ use Mage\Tests\Runtime\RuntimeMockup;
 use Mage\Task\BuiltIn\Composer\SelfUpdateTask;
 use Mage\Task\Exception\SkipException;
 use Exception;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class SelfUpdateTaskTest extends TestCase
 {

tests/Task/BuiltIn/ExecTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\ExecTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ExecTest extends TestCase
 {

tests/Task/BuiltIn/FileSystem/ChangeModeTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\FS\ChangeModeTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ChangeModeTest extends TestCase
 {

tests/Task/BuiltIn/FileSystem/CopyTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\FS\CopyTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class CopyTaskTest extends TestCase
 {

tests/Task/BuiltIn/FileSystem/LinkTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\FS\LinkTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class LinkTaskTest extends TestCase
 {

tests/Task/BuiltIn/FileSystem/MoveTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\FS\MoveTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class MoveTaskTest extends TestCase
 {

tests/Task/BuiltIn/FileSystem/RemoveTaskTest.php

@@ -14,7 +14,7 @@ use Mage\Task\Exception\ErrorException;
 use Mage\Task\BuiltIn\FS\RemoveTask;
 use Exception;
 use Mage\Tests\Runtime\RuntimeMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class RemoveTaskTest extends TestCase
 {

tests/Task/BuiltIn/Symfony/CachePoolClearTaskTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Mage\tests\Task\BuiltIn\Symfony;
+
+
+use Mage\Task\BuiltIn\Symfony\CachePoolClearTask;
+use PHPUnit\Framework\TestCase;
+use Mage\Tests\Runtime\RuntimeMockup;
+use Mage\Task\Exception\ErrorException;
+
+class CachePoolClearTaskTest extends TestCase
+{
+    /**
+     * @var RuntimeMockup
+     */
+    private $runtime;
+
+    public function setUp()
+    {
+        $this->runtime = new RuntimeMockup();
+        $this->runtime->setConfiguration(['environments' => ['test' => []]]);
+        $this->runtime->setEnvironment('test');
+    }
+
+    public function testAsseticDumpTask()
+    {
+        $task = new CachePoolClearTask();
+        $task->setOptions(['env' => 'test']);
+        $task->setRuntime($this->runtime);
+        $this->assertEquals('[Symfony] Cache Pool Clear', $task->getDescription());
+
+        try {
+            $task->execute();
+        } catch (ErrorException $exception) {
+            $this->assertEquals('Parameter "pools" is not defined', $exception->getMessage());
+        }
+    }
+}

tests/Task/TaskFactoryTest.php

@@ -17,7 +17,7 @@ use Mage\Runtime\Runtime;
 use Mage\Runtime\Exception\RuntimeException;
 use Exception;
 use Mage\Tests\MageApplicationMockup;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class TaskFactoryTest extends TestCase

tests/UtilsTest.php

@@ -13,7 +13,7 @@ namespace Mage\Tests;
 use Mage\Utils;
 use Mage\Runtime\Runtime;
 use DateTime;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class UtilsTest extends TestCase
 {