Fix tests

Author: Kai Eichinger

composer.json

@@ -35,6 +35,7 @@
         "twig/twig": "^3.3.8"
     },
     "require-dev": {
+        "dms/phpunit-arraysubset-asserts": "^0.4.0",
         "symfony/phpunit-bridge": "^5.4.3"
     },
     "conflict": {

tests/File/FileLoaderTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Becklyn\AssetsBundle\File;
 
 use Becklyn\AssetsBundle\Asset\Asset;
+use Becklyn\AssetsBundle\Exception\AssetsException;
 use Becklyn\AssetsBundle\File\FileLoader;
 use Becklyn\AssetsBundle\File\FileTypeRegistry;
 use Becklyn\AssetsBundle\File\Type\FileType;
@@ -78,11 +79,11 @@ public function dataProviderInvalid ()
      * @dataProvider dataProviderInvalid
      *
      * @param Asset $asset
-     *
-     * @expectedException \Becklyn\AssetsBundle\Exception\AssetsException
      */
     public function testInvalid (Asset $asset) : void
     {
+        $this->expectException(AssetsException::class);
+
         $this->loader->loadFile($asset, FileLoader::MODE_UNTOUCHED);
     }
 

tests/Html/AssetHtmlGeneratorTest.php

@@ -122,7 +122,8 @@ function (Asset $asset)
             );
 
         $html = $generator->linkAssets(["@a/first.js", "@b/second.js"]);
-        self::assertContains(\sprintf('integrity="%s-hash', Asset::HASH_ALGORITHM), $html);
+
+        self::assertStringContainsString(\sprintf('integrity="%s-hash', Asset::HASH_ALGORITHM), $html);
     }
 
 
@@ -144,7 +145,7 @@ function (Asset $asset)
             );
 
         $html = $generator->linkAssets(["@a/first.css", "@b/second.css"]);
-        self::assertContains(\sprintf('integrity="%s-hash', Asset::HASH_ALGORITHM), $html);
+        self::assertStringContainsString(\sprintf('integrity="%s-hash', Asset::HASH_ALGORITHM), $html);
     }
 
 

tests/Storage/AssetStorageTest.php

@@ -89,7 +89,7 @@ public function testGenerate () : void
         $expectedOutputFilePath = "test/css/app2.zu+_RiyZqaqqHgSHa3Xv.css";
         $outputPath = "{$this->outDir}/assets/other/{$expectedOutputFilePath}";
 
-        self::assertFileNotExists($outputPath);
+        self::assertFileDoesNotExist($outputPath);
         $asset = $this->storage->import(new Asset("other", "test/css/app2.css"));
         self::assertFileExists($outputPath);
 
@@ -111,7 +111,7 @@ public function testGenerateWithoutHash () : void
         $expectedOutputFilePath = "test/js/test.js";
         $outputPath = "{$this->outDir}/assets/bundles/{$expectedOutputFilePath}";
 
-        self::assertFileNotExists($outputPath);
+        self::assertFileDoesNotExist($outputPath);
         $asset = $this->storage->import(new Asset("bundles", "test/js/test.js"));
         self::assertFileExists($outputPath);
 
@@ -144,6 +144,6 @@ public function testClear () : void
         self::assertFileExists("{$assetsDir}/test/a");
         self::assertDirectoryExists($assetsDir);
         $this->storage->removeAllStoredFiles();
-        self::assertDirectoryNotExists($assetsDir);
+        self::assertDirectoryDoesNotExist($assetsDir);
     }
 }

tests/Twig/AssetsTwigExtensionTest.php

@@ -7,9 +7,12 @@
 use Becklyn\AssetsBundle\Twig\AssetsTwigExtension;
 use PHPUnit\Framework\TestCase;
 use Twig\TwigFunction;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 
 class AssetsTwigExtensionTest extends TestCase
 {
+    use ArraySubsetAsserts;
+
     /**
      * Assert that the exposed twig functions don't change.
      */
@@ -25,14 +28,11 @@ public function testMethodNames () : void
 
         $extension = new AssetsTwigExtension($htmlReferences, $helper);
         $functions = \array_map(
-            function (TwigFunction $f)
-            {
-                return $f->getName();
-            },
+            static fn (TwigFunction $f) => $f->getName(),
             $extension->getFunctions()
         );
 
-        self::assertArraySubset([
+        $this->assertArraySubset([
             "asset",
             "asset_inline",
             "assets_link",

tests/Url/AssetUrlTest.php

@@ -183,11 +183,11 @@ public function testMissingFileInProdWithLogger () : void
      * Missing file in dev:.
      *
      * Throw exception
-     *
-     * @expectedException \Becklyn\AssetsBundle\Exception\AssetsException
      */
     public function testMissingFileInDev () : void
     {
+        $this->expectException(AssetsException::class);
+
         /**
          * @var AssetUrl $assetUrl
          * @var \PHPUnit_Framework_MockObject_MockObject $router