Fix tests

BerliozFramework · Jul 7, 2021 · 1e38ecc · 1e38ecc
1 parent 9a0eba1
commit 1e38ecc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/App/CliApp.php b/src/App/CliApp.php
@@ -15,12 +15,9 @@
 namespace Berlioz\Cli\Core\App;
 
 use Berlioz\Cli\Core\Command\CommandHandler;
-use Berlioz\Cli\Core\Container\ServiceProvider;
 use Berlioz\Cli\Core\Exception\CliException;
-use Berlioz\Config\Adapter\JsonAdapter;
-use Berlioz\Config\Config;
-use Berlioz\Config\Exception\ConfigException;
 use Berlioz\Core\App\AbstractApp;
+use Berlioz\Core\Core;
 use Berlioz\ServiceContainer\Inflector\Inflector;
 
 /**

diff --git a/tests/Command/AbstractCommandTest.php b/tests/Command/AbstractCommandTest.php
@@ -37,14 +37,16 @@ public function testGetHelp()
     public function testRun()
     {
         $declaration = new CommandDeclaration('foo', FakeCommand::class, []);
-        $command = new FakeCommand(new CliApp(new Core(new FakeDefaultDirectories(), cache: false)));
+        $command = new FakeCommand();
+        $command->setApp(new CliApp(new Core(new FakeDefaultDirectories(), cache: false)));
 
         $this->assertSame(0, $command->run(new Environment(new Console(), $declaration)));
     }
 
     public function testGet()
     {
-        $command = new FakeCommand($app = new CliApp(new Core(new FakeDefaultDirectories(), cache: false)));
+        $command = new FakeCommand();
+        $command->setApp($app = new CliApp(new Core(new FakeDefaultDirectories(), cache: false)));
         $reflectionClass = new ReflectionClass(AbstractCommand::class);
         $reflectionMethod = $reflectionClass->getMethod('get');
         $reflectionMethod->setAccessible(true);

diff --git a/tests/Command/Berlioz/CacheClearCommandTest.php b/tests/Command/Berlioz/CacheClearCommandTest.php
@@ -37,7 +37,8 @@ public function testClearCache()
     {
         $app = new CliApp(new Core(new FakeDefaultDirectories(), cache: false));
         $app->getCore()->getCache()->set('foo', 'bar');
-        $command = new CacheClearCommand($app);
+        $command = new CacheClearCommand();
+        $command->setApp($app);
 
         $this->assertEquals('bar', $app->getCore()->getCache()->get('foo'));
         $this->assertTrue($command->clearCache());
@@ -48,7 +49,8 @@ public function testRun()
     {
         $app = new CliApp(new Core(new FakeDefaultDirectories(), cache: false));
         $app->getCore()->getCache()->set('foo', 'bar');
-        $command = new CacheClearCommand($app);
+        $command = new CacheClearCommand();
+        $command->setApp($app);
         $console = new Console();
         $console->output->defaultTo('buffer');
 

diff --git a/tests/Command/Berlioz/ConfigCommandTest.php b/tests/Command/Berlioz/ConfigCommandTest.php
@@ -20,7 +20,6 @@
 use Berlioz\Cli\Core\Console\Environment;
 use Berlioz\Cli\Core\Tests\FakeDefaultDirectories;
 use Berlioz\Core\Core;
-use GetOpt\GetOpt;
 use PHPUnit\Framework\TestCase;
 
 class ConfigCommandTest extends TestCase
@@ -38,12 +37,13 @@ public function testGetHelp()
     public function testRun()
     {
         $app = new CliApp(new Core(new FakeDefaultDirectories(), cache: false));
-        $command = new ConfigCommand($app);
+        $command = new ConfigCommand();
+        $command->setApp($app);
         $console = new Console();
         $console->output->defaultTo('buffer');
         $console->getArgumentsManager()->add('filter', []);
 
-        $result =$command->run(
+        $result = $command->run(
             new Environment(
                 $console,
                 new CommandDeclaration('berlioz:config', ConfigCommand::class, [new Argument('filter')])