Move phpstan

.gitignore

@@ -0,0 +1 @@
+phpstan.neon

Convertor/ConvertorListing.php

@@ -7,15 +7,26 @@ class ConvertorListing
     /**
      * @var ConvertorInterface[]
      */
-    private $convertors;
+    private $convertors = [];
 
     /**
      * ConvertorListing constructor.
      * @param ConvertorInterface[] $convertors
      */
     public function __construct(array $convertors = [])
     {
-        $this->convertors = $convertors;
+        foreach ($convertors as $convertor) {
+            $this->addConvertor($convertor);
+        }
+    }
+
+    /**
+     * @param ConvertorInterface $convertor
+     * @return void
+     */
+    public function addConvertor(ConvertorInterface $convertor)
+    {
+        $this->convertors[] = $convertor;
     }
 
     /**

Test/Integration/Util/UrlConvertorTest.php

@@ -2,7 +2,9 @@
 
 namespace Yireo\NextGenImages\Test\Integration\Util;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\File\NotFoundException;
 use Yireo\IntegrationTestHelper\Test\Integration\AbstractTestCase;
 use Yireo\NextGenImages\Util\UrlConvertor;
@@ -13,6 +15,7 @@ public function testGetUrlFromFilename()
     {
         $directoryList = $this->objectManager->get(DirectoryList::class);
         $root = $directoryList->getRoot();
+
         $urlConvertor = $this->objectManager->create(UrlConvertor::class);
 
         $filename = $urlConvertor->getFilenameFromUrl('/static/foobar.jpg');
@@ -22,6 +25,9 @@ public function testGetUrlFromFilename()
         $this->assertSame($root . '/pub/static/foobar.jpg', $filename);
     }
 
+    /**
+     * @return void
+     */
     public function testGetFilenameFromUrl()
     {
         $directoryList = $this->objectManager->get(DirectoryList::class);
@@ -30,7 +36,7 @@ public function testGetFilenameFromUrl()
         $urlConvertor = $this->objectManager->create(UrlConvertor::class);
         $filename = $urlConvertor->getUrlFromFilename($root . '/pub/static/foobar.jpg');
 
-        $expectedUrl = 'http://localhost/index.php/static/foobar.jpg';
+        $expectedUrl = 'http://localhost/static/foobar.jpg';
 
         $this->assertSame($expectedUrl, $filename);
     }

Test/Unit/Convertor/ConvertorListingTest.php

@@ -3,6 +3,7 @@
 namespace Yireo\NextGenImages\Test\Unit\Convertor;
 
 use PHPUnit\Framework\TestCase;
+use TypeError;
 use Yireo\NextGenImages\Convertor\ConvertorInterface;
 use Yireo\NextGenImages\Convertor\ConvertorListing;
 
@@ -22,4 +23,12 @@ public function testGetConvertorsWithOneConvertor()
 
         $this->assertEquals(1, count($convertorListing->getConvertors()));
     }
+
+    public function testWithInvalidConvertorShouldFail()
+    {
+        $this->expectException(TypeError::class);
+        new ConvertorListing([
+            'this-should-not-work'
+        ]);
+    }
 }

Util/UrlConvertor.php

@@ -130,7 +130,7 @@ public function getFilenameFromUrl(string $url): string
      */
     private function getBaseUrl(): string
     {
-        return str_replace('/index.php/', '', $this->urlModel->getBaseUrl());
+        return str_replace('/index.php/', '/', $this->urlModel->getBaseUrl());
     }
 
     /**