use correct sf version

Author: digibeuk

Tests/Command/DumpEmoticonsCommandTest.php

@@ -2,30 +2,32 @@
 
 namespace FM\BbcodeBundle\Tests\Command;
 
+use FM\BbcodeBundle\Command\DumpEmoticonsCommand;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
-use FM\BbcodeBundle\Command\DumpEmoticonsCommand;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @author Alexandre Quercia <alquerci@email.com>
  */
 class DumpEmoticonsCommandTest extends TestCase
 {
+    private $emoticonFolder;
+
+    private $emoticonPath;
+
     private $rootDir;
+
     private $webDir;
-    private $emoticonPath;
-    private $emoticonFolder;
 
     public function setUp(): void
     {
-        $this->rootDir = __DIR__.'/..';
-        $this->webDir  = sys_get_temp_dir().'/symfonyFMBbcodeweb';
+        $this->rootDir = __DIR__ . '/..';
+        $this->webDir = sys_get_temp_dir() . '/symfonyFMBbcodeweb';
         if (!file_exists($this->webDir)) {
             mkdir($this->webDir);
         }
-        $this->emoticonPath   = '/emoticons';
-        $this->emoticonFolder = $this->rootDir.'/../vendor/mjohnson/decoda/emoticons';
+        $this->emoticonPath = '/emoticons';
+        $this->emoticonFolder = $this->rootDir . '/../vendor/mjohnson/decoda/emoticons';
     }
 
     public function tearDown(): void
@@ -36,9 +38,23 @@ public function tearDown(): void
         $this->removeDirectory($this->webDir);
     }
 
+    public function testExecute(): void
+    {
+        $command = new DumpEmoticonsCommand($this->webDir, $this->emoticonPath, $this->emoticonFolder);
+
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+
+        $this->assertFileExists($this->webDir . $this->emoticonPath);
+        $this->assertEquals('Emoticons dumped succesfully' . PHP_EOL, $tester->getDisplay());
+    }
+
     protected function removeDirectory($directory): void
     {
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($directory),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
         foreach ($iterator as $path) {
             if (preg_match('#[/\\\\]\.\.?$#', $path->__toString())) {
                 continue;
@@ -51,42 +67,4 @@ protected function removeDirectory($directory): void
         }
         @rmdir($directory);
     }
-
-    public function testExecute(): void
-    {
-        $webDir         = $this->webDir;
-        $emoticonPath   = $this->emoticonPath;
-        $rootDir        = $this->rootDir;
-        $emoticonFolder = $this->emoticonFolder;
-
-        $container = $this->createMock(ContainerInterface::class);
-        $container
-            ->expects($this->any())
-            ->method('getParameter')
-            ->withAnyParameters()
-            ->will($this->returnCallback(function ($v) use ($webDir, $emoticonPath, $rootDir, $emoticonFolder) {
-                switch ($v) {
-                    case 'fm_bbcode.public_path':
-                        return $webDir;
-                    case 'fm_bbcode.emoticon.path':
-                        return $emoticonPath;
-                    case 'fm_bbcode.emoticon.folder':
-                        return $emoticonFolder;
-                    case 'kernel.root_dir':
-                        return $rootDir;
-                    default:
-                        throw new \RuntimeException(sprintf('Unknown parameter "%s".', $v));
-                }
-            }))
-        ;
-
-        $command = new DumpEmoticonsCommand();
-        $command->setContainer($container);
-
-        $tester = new CommandTester($command);
-        $tester->execute(array());
-
-        $this->assertFileExists($this->webDir.$this->emoticonPath);
-        $this->assertEquals('Emoticons dumped succesfully'.PHP_EOL, $tester->getDisplay());
-    }
 }

composer.json

@@ -20,8 +20,8 @@
         "symfony/config": "^4.4|^5.3",
         "symfony/console": "^4.4|^5.3",
         "symfony/dependency-injection": "^4.4|^5.3",
-        "symfony/framework-bundle": "~3.2|~4.0",
-        "symfony/http-foundation": "~3.2|~4.0",
+        "symfony/framework-bundle": "^4.4|^5.3",
+        "symfony/http-foundation": "^4.4|^5.3",
         "symfony/http-kernel": "^4.4|^5.3",
         "symfony/process": "^4.4|^5.3",
         "symfony/templating": "^4.4|^5.3",

src/Command/DumpEmoticonsCommand.php

@@ -2,7 +2,7 @@
 
 namespace FM\BbcodeBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -12,19 +12,38 @@
  * @copyright 2013 Al Ganiev
  * @license   http://www.opensource.org/licenses/mit-license.php MIT License
  */
-class DumpEmoticonsCommand extends ContainerAwareCommand
+class DumpEmoticonsCommand extends Command
 {
+    /** @var string */
+    private $emoticonFolder;
+
+    /** @var string */
+    private $emoticonPath;
+
+    /** @var string */
+    private $publicPath;
+
+    public function __construct(string $publicPath, string $emoticonPath, string $emoticonFolder)
+    {
+        $this->publicPath = $publicPath;
+        $this->emoticonPath = $emoticonPath;
+        $this->emoticonFolder = $emoticonFolder;
+
+        parent::__construct();
+    }
+
     /**
      * @see Command
      */
     protected function configure()
     {
-        $this
-            ->setName('bbcode:dump')
+        $this->setName('bbcode:dump')
             ->setDescription('Dumps the emoticons to their configured folder')
             ->addOption('emoticons-folder', null, InputOption::VALUE_OPTIONAL);
     }
 
+
+
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
@@ -35,17 +54,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $webFolder = sprintf(
             '%s%s',
-            $this->getContainer()
-                ->getParameter('fm_bbcode.public_path'),
-            $this->getContainer()
-                ->getParameter('fm_bbcode.emoticon.path')
+            $this->publicPath,
+            $this->emoticonPath
         );
         @mkdir($webFolder);
 
         $emoticonsFolder = $input->getOption('emoticons-folder');
         if (!$emoticonsFolder) {
-            $emoticonsFolder = $this->getContainer()
-                ->getParameter('fm_bbcode.emoticon.folder');
+            $emoticonsFolder = $this->emoticonFolder;
         }
 
         if (!file_exists($emoticonsFolder) && !is_dir($emoticonsFolder)) {

src/Resources/config/bbcode.xml

@@ -30,6 +30,11 @@
                 <argument key="default_locale">%kernel.default_locale%</argument>
             </argument>
         </service>
+        <service id="FM\BbcodeBundle\Command\DumpEmoticonsCommand">
+            <argument type="string" id="publicPath">%fm_bbcode.public_path%</argument>
+            <argument type="string" id="emoticonPath">%fm_bbcode.emoticon.path%</argument>
+            <argument type="string" id="emoticonFolder">%fm_bbcode.emoticon.folder%%</argument>
+        </service>
     </services>
 
 </container>