PHPUnit forward compatibility layer

composer.json

@@ -26,7 +26,7 @@
         "mrclay/minify": "<2.3",
         "natxet/cssmin": "3.0.4",
         "patchwork/jsqueeze": "~1.0|~2.0",
-        "phpunit/phpunit": "~4.8 || ^5.6",
+        "phpunit/phpunit": "^4.8.35 || ^5.7",
         "psr/log": "~1.0",
         "ptachoire/cssembed": "~1.0",
         "symfony/phpunit-bridge": "~2.7|~3.0",

tests/Assetic/Test/Asset/AssetCacheTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Asset;
 
 use Assetic\Asset\AssetCache;
+use PHPUnit\Framework\TestCase;
 
-class AssetCacheTest extends \PHPUnit_Framework_TestCase
+class AssetCacheTest extends TestCase
 {
     private $inner;
     private $cache;

tests/Assetic/Test/Asset/AssetCollectionTest.php

@@ -15,8 +15,9 @@
 use Assetic\Asset\FileAsset;
 use Assetic\Asset\AssetCollection;
 use Assetic\Filter\CallablesFilter;
+use PHPUnit\Framework\TestCase;
 
-class AssetCollectionTest extends \PHPUnit_Framework_TestCase
+class AssetCollectionTest extends TestCase
 {
     public function testInterface()
     {
@@ -309,7 +310,7 @@ public function testRemoveRecursiveLeaf()
 
     public function testRemoveInvalidLeaf()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         $coll = new AssetCollection();
         $coll->removeLeaf(new StringAsset('asdf'));
@@ -337,7 +338,7 @@ public function testReplaceRecursiveLeaf()
 
     public function testReplaceInvalidLeaf()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         $coll = new AssetCollection();
         $coll->replaceLeaf(new StringAsset('foo'), new StringAsset('bar'));

tests/Assetic/Test/Asset/AssetReferenceTest.php

@@ -13,8 +13,9 @@
 
 use Assetic\Asset\AssetReference;
 use Assetic\Asset\StringAsset;
+use PHPUnit\Framework\TestCase;
 
-class AssetReferenceTest extends \PHPUnit_Framework_TestCase
+class AssetReferenceTest extends TestCase
 {
     private $am;
     private $ref;

tests/Assetic/Test/Asset/FileAssetTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Asset;
 
 use Assetic\Asset\FileAsset;
+use PHPUnit\Framework\TestCase;
 
-class FileAssetTest extends \PHPUnit_Framework_TestCase
+class FileAssetTest extends TestCase
 {
     public function testInterface()
     {
@@ -40,7 +41,9 @@ public function testGetLastModifiedTypeFileNotFound()
     {
         $asset = new FileAsset(__DIR__."/foo/bar/baz.css");
 
-        $this->setExpectedException("RuntimeException", "The source file");
+        $this->expectException("RuntimeException");
+        $this->expectExceptionMessage("The source file");
+
         $asset->getLastModified();
     }
 
@@ -67,7 +70,7 @@ public function testPathGuessing()
 
     public function testInvalidBase()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         $asset = new FileAsset(__FILE__, array(), __DIR__.'/foo');
     }

tests/Assetic/Test/Asset/GlobAssetTest.php

@@ -13,8 +13,9 @@
 
 use Assetic\Asset\GlobAsset;
 use Assetic\Util\VarUtils;
+use PHPUnit\Framework\TestCase;
 
-class GlobAssetTest extends \PHPUnit_Framework_TestCase
+class GlobAssetTest extends TestCase
 {
     public function testInterface()
     {

tests/Assetic/Test/Asset/HttpAssetTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Asset;
 
 use Assetic\Asset\HttpAsset;
+use PHPUnit\Framework\TestCase;
 
-class HttpAssetTest extends \PHPUnit_Framework_TestCase
+class HttpAssetTest extends TestCase
 {
     const JQUERY = 'http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js';
 
@@ -38,14 +39,14 @@ public function testProtocolRelativeUrl()
 
     public function testMalformedUrl()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         new HttpAsset(__FILE__);
     }
 
     public function testInvalidUrl()
     {
-        $this->setExpectedException('RuntimeException');
+        $this->expectException('RuntimeException');
 
         $asset = new HttpAsset('http://invalid.com/foobar');
         $asset->load();

tests/Assetic/Test/Asset/StringAssetTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Asset;
 
 use Assetic\Asset\StringAsset;
+use PHPUnit\Framework\TestCase;
 
-class StringAssetTest extends \PHPUnit_Framework_TestCase
+class StringAssetTest extends TestCase
 {
     public function testInterface()
     {

tests/Assetic/Test/AssetManagerTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test;
 
 use Assetic\AssetManager;
+use PHPUnit\Framework\TestCase;
 
-class AssetManagerTest extends \PHPUnit_Framework_TestCase
+class AssetManagerTest extends TestCase
 {
     /** @var AssetManager */
     private $am;
@@ -32,7 +33,7 @@ public function testGetAsset()
 
     public function testGetInvalidAsset()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
         $this->am->get('foo');
     }
 
@@ -47,7 +48,7 @@ public function testHas()
 
     public function testInvalidName()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         $this->am->set('@foo', $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock());
     }

tests/Assetic/Test/AssetWriterTest.php

@@ -13,8 +13,9 @@
 
 use Assetic\Asset\FileAsset;
 use Assetic\AssetWriter;
+use PHPUnit\Framework\TestCase;
 
-class AssetWriterTest extends \PHPUnit_Framework_TestCase
+class AssetWriterTest extends TestCase
 {
     private $dir;
     /** @var AssetWriter */

tests/Assetic/Test/Cache/ApcCacheTest.php

@@ -12,11 +12,12 @@
 namespace Assetic\Test\Cache;
 
 use Assetic\Cache\ApcCache;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group integration
  */
-class ApcCacheTest extends \PHPUnit_Framework_TestCase
+class ApcCacheTest extends TestCase
 {
     protected function setUp()
     {

tests/Assetic/Test/Cache/ArrayCacheTest.php

@@ -12,11 +12,12 @@
 namespace Assetic\Test\Cache;
 
 use Assetic\Cache\ArrayCache;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group integration
  */
-class ArrayCacheTest extends \PHPUnit_Framework_TestCase
+class ArrayCacheTest extends TestCase
 {
     public function testCache()
     {

tests/Assetic/Test/Cache/ConfigCacheTest.php

@@ -49,13 +49,13 @@ public function testTimestamp()
 
     public function testInvalidValue()
     {
-        $this->setExpectedException('RuntimeException');
+        $this->expectException('RuntimeException');
         $this->cache->get('_invalid');
     }
 
     public function testInvalidTimestamp()
     {
-        $this->setExpectedException('RuntimeException');
+        $this->expectException('RuntimeException');
         $this->cache->getTimestamp('_invalid');
     }
 

tests/Assetic/Test/Cache/ExpiringCacheTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Cache;
 
 use Assetic\Cache\ExpiringCache;
+use PHPUnit\Framework\TestCase;
 
-class ExpiringCacheTest extends \PHPUnit_Framework_TestCase
+class ExpiringCacheTest extends TestCase
 {
     private $inner;
     private $lifetime;

tests/Assetic/Test/Cache/FilesystemCacheTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Cache;
 
 use Assetic\Cache\FilesystemCache;
+use PHPUnit\Framework\TestCase;
 
-class FilesystemCacheTest extends \PHPUnit_Framework_TestCase
+class FilesystemCacheTest extends TestCase
 {
     public function testWithExistingDir()
     {

tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php

@@ -15,8 +15,9 @@
 use Assetic\Extension\Twig\AsseticExtension;
 use Assetic\Asset\AssetCollection;
 use Assetic\Asset\FileAsset;
+use PHPUnit\Framework\TestCase;
 
-class AsseticExtensionTest extends \PHPUnit_Framework_TestCase
+class AsseticExtensionTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Assetic\AssetManager

tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php

@@ -14,8 +14,9 @@
 use Assetic\Factory\AssetFactory;
 use Assetic\Extension\Twig\AsseticExtension;
 use Assetic\Extension\Twig\TwigFormulaLoader;
+use PHPUnit\Framework\TestCase;
 
-class TwigFormulaLoaderTest extends \PHPUnit_Framework_TestCase
+class TwigFormulaLoaderTest extends TestCase
 {
     private $am;
     private $fm;

tests/Assetic/Test/Extension/Twig/TwigResourceTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Extension\Twig;
 
 use Assetic\Extension\Twig\TwigResource;
+use PHPUnit\Framework\TestCase;
 
-class TwigResourceTest extends \PHPUnit_Framework_TestCase
+class TwigResourceTest extends TestCase
 {
     protected function setUp()
     {

tests/Assetic/Test/Factory/AssetFactoryTest.php

@@ -13,8 +13,9 @@
 
 use Assetic\Asset\AssetCollection;
 use Assetic\Factory\AssetFactory;
+use PHPUnit\Framework\TestCase;
 
-class AssetFactoryTest extends \PHPUnit_Framework_TestCase
+class AssetFactoryTest extends TestCase
 {
     private $am;
     private $fm;
@@ -39,7 +40,8 @@ protected function tearDown()
 
     public function testNoAssetManagerReference()
     {
-        $this->setExpectedException('LogicException', 'There is no asset manager.');
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('There is no asset manager.');
 
         $factory = new AssetFactory('.');
         $factory->createAsset(array('@foo'));
@@ -53,7 +55,9 @@ public function testNoAssetManagerNotReference()
 
     public function testNoFilterManager()
     {
-        $this->setExpectedException('LogicException', 'There is no filter manager.');
+        $this->expectException('LogicException');
+        $this->expectExceptionMessage('There is no filter manager.');
+
 
         $factory = new AssetFactory('.');
         $factory->createAsset(array('foo'), array('foo'));
@@ -141,7 +145,7 @@ public function testFilter()
 
     public function testInvalidFilter()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $this->expectException('InvalidArgumentException');
 
         $this->fm->expects($this->once())
             ->method('get')

tests/Assetic/Test/Factory/LazyAssetManagerTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Factory;
 
 use Assetic\Factory\LazyAssetManager;
+use PHPUnit\Framework\TestCase;
 
-class LazyAssetManagerTest extends \PHPUnit_Framework_TestCase
+class LazyAssetManagerTest extends TestCase
 {
     private $factory;
     private $am;

tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Factory\Loader;
 
 use Assetic\Factory\Loader\CachedFormulaLoader;
+use PHPUnit\Framework\TestCase;
 
-class CachedFormulaLoaderTest extends \PHPUnit_Framework_TestCase
+class CachedFormulaLoaderTest extends TestCase
 {
     protected $loader;
     protected $configCache;

tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php

@@ -14,8 +14,9 @@
 use Assetic\Factory\AssetFactory;
 use Assetic\Factory\Loader\FunctionCallsFormulaLoader;
 use Assetic\Factory\Resource\FileResource;
+use PHPUnit\Framework\TestCase;
 
-class FunctionCallsFormulaLoaderTest extends \PHPUnit_Framework_TestCase
+class FunctionCallsFormulaLoaderTest extends TestCase
 {
     /**
      * @dataProvider getJavascriptInputs

tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php

@@ -13,8 +13,9 @@
 
 use Assetic\Factory\Resource\CoalescingDirectoryResource;
 use Assetic\Factory\Resource\DirectoryResource;
+use PHPUnit\Framework\TestCase;
 
-class CoalescingDirectoryResourceTest extends \PHPUnit_Framework_TestCase
+class CoalescingDirectoryResourceTest extends TestCase
 {
     /**
      * @test

tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Factory\Resource;
 
 use Assetic\Factory\Resource\DirectoryResource;
+use PHPUnit\Framework\TestCase;
 
-class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
+class DirectoryResourceTest extends TestCase
 {
     public function testIsFresh()
     {

tests/Assetic/Test/Factory/Resource/FileResourceTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Factory\Resource;
 
 use Assetic\Factory\Resource\FileResource;
+use PHPUnit\Framework\TestCase;
 
-class FileResourceTest extends \PHPUnit_Framework_TestCase
+class FileResourceTest extends TestCase
 {
     public function testIsFresh()
     {

tests/Assetic/Test/Factory/Worker/CacheBustingWorkerTest.php

@@ -12,8 +12,9 @@
 namespace Assetic\Test\Factory\Worker;
 
 use Assetic\Factory\Worker\CacheBustingWorker;
+use PHPUnit\Framework\TestCase;
 
-class CacheBustingWorkerTest extends \PHPUnit_Framework_TestCase
+class CacheBustingWorkerTest extends TestCase
 {
     private $worker;