test against PHP 7.2 in travis CI

.travis.yml

@@ -6,6 +6,7 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
 matrix:
     include:

composer.json

@@ -21,8 +21,8 @@
         "psr/cache": "~1.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "mockery/mockery": "~0.9.9",
+        "phpunit/phpunit": "^5.7|^6",
+        "mockery/mockery": "^1",
         "symfony/phpunit-bridge": "^2|^3"
     },
     "conflict": {

tests/AssetTest.php

@@ -3,27 +3,26 @@
 namespace Markup\Contentful\Tests;
 
 use Markup\Contentful\Asset;
+use Markup\Contentful\AssetFile;
+use Markup\Contentful\AssetInterface;
 use Markup\Contentful\ImageApiOptions;
+use Markup\Contentful\MetadataInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class AssetTest extends \PHPUnit_Framework_TestCase
+class AssetTest extends MockeryTestCase
 {
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsAsset()
     {
-        $refl = new \ReflectionClass('Markup\Contentful\Asset');
-        $this->assertTrue($refl->implementsInterface('Markup\Contentful\AssetInterface'));
+        $refl = new \ReflectionClass(Asset::class);
+        $this->assertTrue($refl->implementsInterface(AssetInterface::class));
     }
 
     public function testCreateAssetWithNoFile()
     {
         $title = 'No File';
         $description = 'This asset has no file, and so will be in draft';
-        $metadata = m::mock('Markup\Contentful\MetadataInterface');
+        $metadata = m::mock(MetadataInterface::class);
         $asset = new Asset($title, $description, null, $metadata);
         $this->assertEquals($title, $asset->getTitle());
         $this->assertEquals($description, $asset->getDescription());
@@ -36,12 +35,12 @@ public function testCreateAssetWithNoFile()
 
     public function testGetUrlUsingImageApiOptionsArray()
     {
-        $assetFile = m::mock('Markup\Contentful\AssetFile');
+        $assetFile = m::mock(AssetFile::class);
         $baseUrl = 'http://domain.com/image';
         $assetFile
             ->shouldReceive('getUrl')
             ->andReturn($baseUrl);
-        $asset = new Asset('', '', $assetFile, m::mock('Markup\Contentful\MetadataInterface'));
+        $asset = new Asset('', '', $assetFile, m::mock(MetadataInterface::class));
         $apiOptions = [
             'width' => 300,
             'height' => 400,
@@ -53,12 +52,12 @@ public function testGetUrlUsingImageApiOptionsArray()
 
     public function testGetUrlUsingImageApiOptionsObject()
     {
-        $assetFile = m::mock('Markup\Contentful\AssetFile');
+        $assetFile = m::mock(AssetFile::class);
         $baseUrl = 'http://domain.com/image';
         $assetFile
             ->shouldReceive('getUrl')
             ->andReturn($baseUrl);
-        $asset = new Asset('', '', $assetFile, m::mock('Markup\Contentful\MetadataInterface'));
+        $asset = new Asset('', '', $assetFile, m::mock(MetadataInterface::class));
         $apiOptions = new ImageApiOptions();
         $apiOptions->setProgressive(true);
         $apiOptions->setWidth(300);

tests/ContentTypeTest.php

@@ -3,25 +3,23 @@
 namespace Markup\Contentful\Tests;
 
 use Markup\Contentful\ContentType;
+use Markup\Contentful\ContentTypeField;
+use Markup\Contentful\ContentTypeInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ContentTypeTest extends \PHPUnit_Framework_TestCase
+class ContentTypeTest extends MockeryTestCase
 {
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsContentType()
     {
-        $refl = new \ReflectionClass('Markup\Contentful\ContentType');
-        $this->assertTrue($refl->implementsInterface('Markup\Contentful\ContentTypeInterface'));
+        $refl = new \ReflectionClass(ContentType::class);
+        $this->assertTrue($refl->implementsInterface(ContentTypeInterface::class));
     }
 
     public function testGetDisplayFieldWhenDefined()
     {
-        $field1 = m::mock('Markup\Contentful\ContentTypeField');
-        $field2 = m::mock('Markup\Contentful\ContentTypeField');
+        $field1 = m::mock(ContentTypeField::class);
+        $field2 = m::mock(ContentTypeField::class);
         $id1 = 'id1';
         $id2 = 'id2';
         $field1

tests/Decorator/CompositeAssetDecoratorTest.php

@@ -6,19 +6,20 @@
 use Markup\Contentful\Decorator\AssetDecoratorInterface;
 use Markup\Contentful\Decorator\CompositeAssetDecorator;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class CompositeAssetDecoratorTest extends \PHPUnit_Framework_TestCase
+class CompositeAssetDecoratorTest extends MockeryTestCase
 {
+    /**
+     * @var CompositeAssetDecorator
+     */
+    private $composite;
+
     protected function setUp()
     {
         $this->composite = new CompositeAssetDecorator();
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsDecorator()
     {
         $this->assertInstanceOf(AssetDecoratorInterface::class, $this->composite);

tests/Decorator/DecoratedAssetTest.php

@@ -4,20 +4,16 @@
 
 use Markup\Contentful\AssetInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class DecoratedAssetTest extends \PHPUnit_Framework_TestCase
+class DecoratedAssetTest extends MockeryTestCase
 {
     protected function setUp()
     {
         $this->asset = m::mock(AssetInterface::class);
         $this->decorated = new ConcreteDecoratedAsset($this->asset);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testGetUrlPassesApiOptions()
     {
         $options = ['width' => 100, 'height' => 100];

tests/Decorator/NullAssetDecoratorTest.php

@@ -5,8 +5,9 @@
 use Markup\Contentful\AssetInterface;
 use Markup\Contentful\Decorator\AssetDecoratorInterface;
 use Markup\Contentful\Decorator\NullAssetDecorator;
+use PHPUnit\Framework\TestCase;
 
-class NullAssetDecoratorTest extends \PHPUnit_Framework_TestCase
+class NullAssetDecoratorTest extends TestCase
 {
     protected function setUp()
     {

tests/DynamicEntryTest.php

@@ -2,35 +2,36 @@
 
 namespace Markup\Contentful\Tests;
 
+use Markup\Contentful\ContentType;
+use Markup\Contentful\ContentTypeField;
 use Markup\Contentful\DynamicEntry;
+use Markup\Contentful\Entry;
+use Markup\Contentful\EntryInterface;
+use Markup\Contentful\Location;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class DynamicEntryTest extends \PHPUnit_Framework_TestCase
+class DynamicEntryTest extends MockeryTestCase
 {
     protected function setUp()
     {
-        $this->entry = m::mock('Markup\Contentful\Entry');
-        $this->contentType = m::mock('Markup\Contentful\ContentType')->shouldIgnoreMissing();
+        $this->entry = m::mock(Entry::class);
+        $this->contentType = m::mock(ContentType::class)->shouldIgnoreMissing();
         $this->entry
             ->shouldReceive('getContentType')
             ->andReturn($this->contentType);
         $this->dynamicEntry = new DynamicEntry($this->entry, $this->contentType);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsEntry()
     {
-        $this->assertInstanceOf('Markup\Contentful\EntryInterface', $this->dynamicEntry);
+        $this->assertInstanceOf(EntryInterface::class, $this->dynamicEntry);
     }
 
     public function testCoercesToDate()
     {
         $key = 'date';
-        $contentTypeField = m::mock('Markup\Contentful\ContentTypeField');
+        $contentTypeField = m::mock(ContentTypeField::class);
         $contentTypeField
             ->shouldReceive('getType')
             ->andReturn('Date');
@@ -50,7 +51,7 @@ public function testCoercesToDate()
     public function testGetLocation()
     {
         $key = 'location';
-        $contentTypeField = m::mock('Markup\Contentful\ContentTypeField');
+        $contentTypeField = m::mock(ContentTypeField::class);
         $contentTypeField
             ->shouldReceive('getType')
             ->andReturn('Location');
@@ -63,7 +64,7 @@ public function testGetLocation()
             ->with($key)
             ->andReturn('23,42');
         $location = $this->dynamicEntry->getField($key);
-        $this->assertInstanceOf('Markup\Contentful\Location', $location);
+        $this->assertInstanceOf(Location::class, $location);
         $this->assertEquals(42, $location->getLongitude());
     }
 
@@ -82,7 +83,7 @@ public function testExistenceCheckChecksAgainstContentType()
     {
         $contentTypeFieldIds = ['yes', 'ja'];
         $contentTypeFields = array_map(function ($id) {
-            $field = m::mock('Markup\Contentful\ContentTypeField');
+            $field = m::mock(ContentTypeField::class);
             $field
                 ->shouldReceive('getId')
                 ->andReturn($id);

tests/EntryTest.php

@@ -12,8 +12,9 @@
 use Markup\Contentful\Link;
 use Markup\Contentful\MetadataInterface;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class EntryTest extends \PHPUnit_Framework_TestCase
+class EntryTest extends TestCase
 {
     /**
      * @var array

tests/Filter/ContentTypeFilterProviderTest.php

@@ -7,20 +7,16 @@
 use Markup\Contentful\Filter\ContentTypeFilter;
 use Markup\Contentful\Filter\ContentTypeFilterProvider;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ContentTypeFilterProviderTest extends \PHPUnit_Framework_TestCase
+class ContentTypeFilterProviderTest extends MockeryTestCase
 {
     protected function setUp()
     {
         $this->contentful = m::mock(Contentful::class);
         $this->provider = new ContentTypeFilterProvider($this->contentful);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testCreateForExistingContentType()
     {
         $contentType = m::mock(ContentTypeInterface::class);

tests/Filter/ContentTypeFilterTest.php

@@ -4,8 +4,9 @@
 
 use Markup\Contentful\Filter\ContentTypeFilter;
 use Markup\Contentful\FilterInterface;
+use PHPUnit\Framework\TestCase;
 
-class ContentTypeFilterTest extends \PHPUnit_Framework_TestCase
+class ContentTypeFilterTest extends TestCase
 {
     protected function setUp()
     {

tests/Filter/EqualFilterTest.php

@@ -7,8 +7,9 @@
 use Markup\Contentful\FilterInterface;
 use Markup\Contentful\PropertyInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class EqualFilterTest extends \PHPUnit_Framework_TestCase
+class EqualFilterTest extends MockeryTestCase
 {
     /**
      * @var PropertyInterface|m\MockInterface
@@ -32,11 +33,6 @@ protected function setUp()
         $this->filter = new EqualFilter($this->property, $this->value);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsFilter()
     {
         $this->assertInstanceOf(FilterInterface::class, $this->filter);

tests/Filter/ExcludeFilterTest.php

@@ -7,8 +7,9 @@
 use Markup\Contentful\FilterInterface;
 use Markup\Contentful\PropertyInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ExcludeFilterTest extends \PHPUnit_Framework_TestCase
+class ExcludeFilterTest extends MockeryTestCase
 {
     /**
      * @var PropertyInterface|m\MockInterface
@@ -32,11 +33,6 @@ protected function setUp()
         $this->filter = new ExcludeFilter($this->property, $this->values);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsFilter()
     {
         $this->assertInstanceOf(FilterInterface::class, $this->filter);

tests/Filter/ExistsFilterTest.php

@@ -6,8 +6,9 @@
 use Markup\Contentful\FilterInterface;
 use Markup\Contentful\PropertyInterface;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ExistsFilterTest extends \PHPUnit_Framework_TestCase
+class ExistsFilterTest extends MockeryTestCase
 {
     /**
      * @var PropertyInterface|m\MockInterface
@@ -35,11 +36,6 @@ protected function setUp()
         $this->filter = new ExistsFilter($this->property, $this->value);
     }
 
-    protected function tearDown()
-    {
-        m::close();
-    }
-
     public function testIsFilter()
     {
         $this->assertInstanceOf(FilterInterface::class, $this->filter);