[Discovery One] Upgrade to Symfony 4 and PHPUnit 7

This commit is contained in:
Andrés Montañez
2018-03-29 20:19:35 -03:00
parent 23dae99c1a
commit 05d9cf0b80
30 changed files with 51 additions and 47 deletions
@@ -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
{
@@ -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
{
@@ -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
{
@@ -15,7 +15,7 @@ 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
{
@@ -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
{
@@ -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
{
@@ -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
{
@@ -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
{
+1 -1
View File
@@ -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
{
+1 -1
View File
@@ -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
{
+1 -1
View File
@@ -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
{
+8 -2
View File
@@ -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()
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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
{
@@ -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
{
@@ -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
{
+1 -1
View File
@@ -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
{
@@ -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
{
@@ -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
{
@@ -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
{
@@ -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
{
@@ -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
{
@@ -5,8 +5,9 @@ namespace Mage\tests\Task\BuiltIn\Symfony;
use Mage\Task\BuiltIn\Symfony\AsseticDumpTask;
use Mage\Tests\Runtime\RuntimeMockup;
use PHPUnit\Framework\TestCase;
class AsseticDumpTaskTest extends \PHPUnit_Framework_TestCase
class AsseticDumpTaskTest extends TestCase
{
/**
* @var RuntimeMockup
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
{