Merge pull request #4 from MyOnlineStore/TD-207

TD-207 upgrade to SF 4.4|5.3

Author: Frank Verhoeven

.coveralls.yml

@@ -2,43 +2,59 @@
 
 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()
+    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()
+    public function tearDown(): void
     {
         if (!is_dir($this->webDir)) {
             return;
         }
         $this->removeDirectory($this->webDir);
     }
 
-    protected function removeDirectory($directory)
+    public function testExecute(): void
     {
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
+        $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
+        );
         foreach ($iterator as $path) {
             if (preg_match('#[/\\\\]\.\.?$#', $path->__toString())) {
                 continue;
@@ -51,42 +67,4 @@ protected function removeDirectory($directory)
         }
         @rmdir($directory);
     }
-
-    public function testExecute()
-    {
-        $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());
-    }
 }

.scrutinizer.yml

@@ -17,7 +17,7 @@ class DecodaManagerTest extends TestCase
      */
     protected $object;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $container = $this->createMock(ContainerInterface::class);
         $kernel    = $this->createMock(KernelInterface::class);
@@ -32,22 +32,22 @@ protected function setUp()
         $this->object = new DecodaManager($container, $locator, $options);
     }
 
-    public function testHas()
+    public function testHas(): void
     {
         $this->assertTrue($this->object->has(DecodaManager::DECODA_DEFAULT));
         $this->assertTrue($this->object->has('foo'));
         $this->assertFalse($this->object->has('bar'));
     }
 
-    public function testSetFilter()
+    public function testSetFilter(): void
     {
         $filter = $this->createMock(Filter::class);
         $this->object->setFilter('foo', $filter);
         $this->assertTrue($this->object->hasFilter('foo'));
         $this->assertSame($filter, $this->object->getFilter('foo'));
     }
 
-    public function testSetHook()
+    public function testSetHook(): void
     {
         $hook = $this->createMock(Hook::class);
         $this->object->setHook('foo', $hook);

.styleci.yml

@@ -7,7 +7,7 @@
 
 class DecodaTest extends TestCase
 {
-    public function testSetLocale()
+    public function testSetLocale(): void
     {
         $result = new Decoda();
         $result->setDefaultLocale('en');
@@ -23,7 +23,7 @@ public function testSetLocale()
     /**
      * @dataProvider getMessage
      */
-    public function testMessage($defaultLocale, $locale, $value, $expect)
+    public function testMessage($defaultLocale, $locale, $value, $expect): void
     {
         if ($expect instanceof \Exception) {
             $this->expectException(get_class($expect));
@@ -58,7 +58,7 @@ public function testMessage($defaultLocale, $locale, $value, $expect)
         $this->assertEquals($expect, $result->message($value));
     }
 
-    public function getMessage()
+    public function getMessage(): array
     {
         return array(
             array(null, 'en', 'foo', 'foo-en'),

.travis.yml

@@ -11,7 +11,7 @@
 
 class EmoticonHookTest extends TestCase
 {
-    public function testGetMatcher()
+    public function testGetMatcher(): void
     {
         $expectEmoticon = new Emoticon();
         $expectEmoticon->setSmiley(':foo:');