diff --git a/.travis.yml b/.travis.yml index 8bda367..c40af59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 matrix: include: diff --git a/composer.json b/composer.json index cc5d57e..44f0bce 100644 --- a/composer.json +++ b/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": { diff --git a/tests/AssetTest.php b/tests/AssetTest.php index e225a05..5ef71ed 100644 --- a/tests/AssetTest.php +++ b/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); diff --git a/tests/ContentTypeTest.php b/tests/ContentTypeTest.php index 7087151..59a7396 100644 --- a/tests/ContentTypeTest.php +++ b/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 diff --git a/tests/Decorator/CompositeAssetDecoratorTest.php b/tests/Decorator/CompositeAssetDecoratorTest.php index 148a16c..0f8ff1f 100644 --- a/tests/Decorator/CompositeAssetDecoratorTest.php +++ b/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); diff --git a/tests/Decorator/DecoratedAssetTest.php b/tests/Decorator/DecoratedAssetTest.php index 533e981..bf9a742 100644 --- a/tests/Decorator/DecoratedAssetTest.php +++ b/tests/Decorator/DecoratedAssetTest.php @@ -4,8 +4,9 @@ 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() { @@ -13,11 +14,6 @@ protected function setUp() $this->decorated = new ConcreteDecoratedAsset($this->asset); } - protected function tearDown() - { - m::close(); - } - public function testGetUrlPassesApiOptions() { $options = ['width' => 100, 'height' => 100]; diff --git a/tests/Decorator/NullAssetDecoratorTest.php b/tests/Decorator/NullAssetDecoratorTest.php index d9aa721..11f50aa 100644 --- a/tests/Decorator/NullAssetDecoratorTest.php +++ b/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() { diff --git a/tests/DynamicEntryTest.php b/tests/DynamicEntryTest.php index f186e7d..bf58b0c 100644 --- a/tests/DynamicEntryTest.php +++ b/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); diff --git a/tests/EntryTest.php b/tests/EntryTest.php index 47872a2..a02515a 100644 --- a/tests/EntryTest.php +++ b/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 diff --git a/tests/Filter/ContentTypeFilterProviderTest.php b/tests/Filter/ContentTypeFilterProviderTest.php index 4c08a86..7e5f460 100644 --- a/tests/Filter/ContentTypeFilterProviderTest.php +++ b/tests/Filter/ContentTypeFilterProviderTest.php @@ -7,8 +7,9 @@ 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() { @@ -16,11 +17,6 @@ protected function setUp() $this->provider = new ContentTypeFilterProvider($this->contentful); } - protected function tearDown() - { - m::close(); - } - public function testCreateForExistingContentType() { $contentType = m::mock(ContentTypeInterface::class); diff --git a/tests/Filter/ContentTypeFilterTest.php b/tests/Filter/ContentTypeFilterTest.php index b7aac69..2113613 100644 --- a/tests/Filter/ContentTypeFilterTest.php +++ b/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() { diff --git a/tests/Filter/EqualFilterTest.php b/tests/Filter/EqualFilterTest.php index 700c281..155dafc 100644 --- a/tests/Filter/EqualFilterTest.php +++ b/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); diff --git a/tests/Filter/ExcludeFilterTest.php b/tests/Filter/ExcludeFilterTest.php index 71834cb..1b0a850 100644 --- a/tests/Filter/ExcludeFilterTest.php +++ b/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); diff --git a/tests/Filter/ExistsFilterTest.php b/tests/Filter/ExistsFilterTest.php index 9d0a630..8115fcb 100644 --- a/tests/Filter/ExistsFilterTest.php +++ b/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); diff --git a/tests/Filter/IncludeFilterTest.php b/tests/Filter/IncludeFilterTest.php index b0ab4d6..5d795e8 100644 --- a/tests/Filter/IncludeFilterTest.php +++ b/tests/Filter/IncludeFilterTest.php @@ -3,30 +3,29 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\IncludeFilter; +use Markup\Contentful\Filter\PropertyFilter; +use Markup\Contentful\FilterInterface; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class IncludeFilterTest extends \PHPUnit_Framework_TestCase +class IncludeFilterTest extends MockeryTestCase { protected function setUp() { - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->values = ['foo', 'bar']; $this->filter = new IncludeFilter($this->property, $this->values); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testIsPropertyFilter() { - $this->assertInstanceOf('Markup\Contentful\Filter\PropertyFilter', $this->filter); + $this->assertInstanceOf(PropertyFilter::class, $this->filter); } public function testGetKey() diff --git a/tests/Filter/LessThanFilterTest.php b/tests/Filter/LessThanFilterTest.php index 69b1ad6..a38fee7 100644 --- a/tests/Filter/LessThanFilterTest.php +++ b/tests/Filter/LessThanFilterTest.php @@ -3,30 +3,29 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\LessThanFilter; +use Markup\Contentful\Filter\PropertyFilter; +use Markup\Contentful\FilterInterface; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class LessThanFilterTest extends \PHPUnit_Framework_TestCase +class LessThanFilterTest extends MockeryTestCase { protected function setUp() { - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->value = 3; $this->filter = new LessThanFilter($this->property, $this->value); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testIsPropertyFilter() { - $this->assertInstanceOf('Markup\Contentful\Filter\PropertyFilter', $this->filter); + $this->assertInstanceOf(PropertyFilter::class, $this->filter); } public function testGetDateTimeValue() diff --git a/tests/Filter/LessThanOrEqualFilterTest.php b/tests/Filter/LessThanOrEqualFilterTest.php index c377b7e..50b9649 100644 --- a/tests/Filter/LessThanOrEqualFilterTest.php +++ b/tests/Filter/LessThanOrEqualFilterTest.php @@ -3,25 +3,23 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\LessThanOrEqualFilter; +use Markup\Contentful\FilterInterface; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class LessThanOrEqualFilterTest extends \PHPUnit_Framework_TestCase +class LessThanOrEqualFilterTest extends MockeryTestCase { protected function setUp() { - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->value = 3; $this->filter = new LessThanOrEqualFilter($this->property, $this->value); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testGetName() diff --git a/tests/Filter/LocaleFilterTest.php b/tests/Filter/LocaleFilterTest.php index c79ae44..4eea086 100644 --- a/tests/Filter/LocaleFilterTest.php +++ b/tests/Filter/LocaleFilterTest.php @@ -3,9 +3,22 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\LocaleFilter; +use Markup\Contentful\Filter\PropertyFilter; +use Markup\Contentful\FilterInterface; +use PHPUnit\Framework\TestCase; -class LocaleFilterTest extends \PHPUnit_Framework_TestCase +class LocaleFilterTest extends TestCase { + /** + * @var string + */ + private $localeString; + + /** + * @var LocaleFilter + */ + private $filter; + protected function setUp() { $this->localeString = 'de_DE'; @@ -14,12 +27,12 @@ protected function setUp() public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testIsPropertyFilter() { - $this->assertInstanceOf('Markup\Contentful\Filter\PropertyFilter', $this->filter); + $this->assertInstanceOf(PropertyFilter::class, $this->filter); } public function testGetKey() diff --git a/tests/Filter/MimeTypeGroupFilterTest.php b/tests/Filter/MimeTypeGroupFilterTest.php index a9573a4..c9e5ba0 100644 --- a/tests/Filter/MimeTypeGroupFilterTest.php +++ b/tests/Filter/MimeTypeGroupFilterTest.php @@ -5,9 +5,20 @@ use Markup\Contentful\Filter\MimeTypeGroupFilter; use Markup\Contentful\Filter\PropertyFilter; use Markup\Contentful\FilterInterface; +use PHPUnit\Framework\TestCase; -class MimeTypeGroupFilterTest extends \PHPUnit_Framework_TestCase +class MimeTypeGroupFilterTest extends TestCase { + /** + * @var string + */ + private $mimeTypeGroup; + + /** + * @var MimeTypeGroupFilter + */ + private $filter; + protected function setUp() { $this->mimeTypeGroup = 'plaintext'; diff --git a/tests/Filter/NearFilterTest.php b/tests/Filter/NearFilterTest.php index f4d658d..05834a5 100644 --- a/tests/Filter/NearFilterTest.php +++ b/tests/Filter/NearFilterTest.php @@ -3,26 +3,24 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\NearFilter; +use Markup\Contentful\FilterInterface; use Markup\Contentful\Location; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class NearFilterTest extends \PHPUnit_Framework_TestCase +class NearFilterTest extends MockeryTestCase { protected function setUp() { - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->location = new Location(10, 20); $this->filter = new NearFilter($this->property, $this->location); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testGetKey() diff --git a/tests/Filter/NotEqualFilterTest.php b/tests/Filter/NotEqualFilterTest.php index 6ed82aa..a5d3971 100644 --- a/tests/Filter/NotEqualFilterTest.php +++ b/tests/Filter/NotEqualFilterTest.php @@ -7,8 +7,9 @@ use Markup\Contentful\FilterInterface; use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class NotEqualFilterTest extends \PHPUnit_Framework_TestCase +class NotEqualFilterTest extends MockeryTestCase { protected function setUp() { @@ -17,11 +18,6 @@ protected function setUp() $this->filter = new NotEqualFilter($this->property, $this->value); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { $this->assertInstanceOf(FilterInterface::class, $this->filter); diff --git a/tests/Filter/SearchFilterTest.php b/tests/Filter/SearchFilterTest.php index b3f46ec..2d2236e 100644 --- a/tests/Filter/SearchFilterTest.php +++ b/tests/Filter/SearchFilterTest.php @@ -3,25 +3,23 @@ namespace Markup\Contentful\Tests\Filter; use Markup\Contentful\Filter\SearchFilter; +use Markup\Contentful\FilterInterface; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class SearchFilterTest extends \PHPUnit_Framework_TestCase +class SearchFilterTest extends MockeryTestCase { protected function setUp() { $this->query = 'look_for_me'; - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->filter = new SearchFilter($this->query, $this->property); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { - $this->assertInstanceOf('Markup\Contentful\FilterInterface', $this->filter); + $this->assertInstanceOf(FilterInterface::class, $this->filter); } public function testGetKeyForQueryWithProperty() diff --git a/tests/Filter/WithinCircleFilterTest.php b/tests/Filter/WithinCircleFilterTest.php index a15fcc3..22ec0c8 100644 --- a/tests/Filter/WithinCircleFilterTest.php +++ b/tests/Filter/WithinCircleFilterTest.php @@ -7,8 +7,9 @@ use Markup\Contentful\Location; use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class WithinCircleFilterTest extends \PHPUnit_Framework_TestCase +class WithinCircleFilterTest extends MockeryTestCase { protected function setUp() { @@ -18,11 +19,6 @@ protected function setUp() $this->filter = new WithinCircleFilter($this->property, $this->center, $this->radiusInKm); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { $this->assertInstanceOf(FilterInterface::class, $this->filter); diff --git a/tests/Filter/WithinRectangleFilterTest.php b/tests/Filter/WithinRectangleFilterTest.php index 4993bb6..56c9acc 100644 --- a/tests/Filter/WithinRectangleFilterTest.php +++ b/tests/Filter/WithinRectangleFilterTest.php @@ -7,12 +7,33 @@ use Markup\Contentful\Location; use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; /** * A filter for narrowing to locations within a bounding rectangle. */ -class WithinRectangleFilterTest extends \PHPUnit_Framework_TestCase +class WithinRectangleFilterTest extends MockeryTestCase { + /** + * @var PropertyInterface|m\MockInterface + */ + private $property; + + /** + * @var Location + */ + private $bottomLeftLocation; + + /** + * @var Location + */ + private $topRightLocation; + + /** + * @var WithinRectangleFilter + */ + private $filter; + protected function setUp() { $this->property = m::mock(PropertyInterface::class); @@ -21,11 +42,6 @@ protected function setUp() $this->filter = new WithinRectangleFilter($this->property, $this->bottomLeftLocation, $this->topRightLocation); } - protected function tearDown() - { - m::close(); - } - public function testIsFilter() { $this->assertInstanceOf(FilterInterface::class, $this->filter); diff --git a/tests/ImageApiOptionsTest.php b/tests/ImageApiOptionsTest.php index 5b114b6..8312f0b 100644 --- a/tests/ImageApiOptionsTest.php +++ b/tests/ImageApiOptionsTest.php @@ -3,8 +3,9 @@ namespace Markup\Contentful\Tests; use Markup\Contentful\ImageApiOptions; +use PHPUnit\Framework\TestCase; -class ImageApiOptionsTest extends \PHPUnit_Framework_TestCase +class ImageApiOptionsTest extends TestCase { public function testWithAllOptions() { @@ -20,7 +21,7 @@ public function testWithAllOptions() 'background_color' => 'AAAAAA', ]; $options = ImageApiOptions::createFromHumanOptions($optionsArr); - $this->assertInstanceOf('Markup\Contentful\ImageApiOptions', $options); + $this->assertInstanceOf(ImageApiOptions::class, $options); $expected = [ 'bg' => 'rgb:aaaaaa', 'f' => 'faces', diff --git a/tests/LinkTest.php b/tests/LinkTest.php index c40ea6c..ef5bbcd 100644 --- a/tests/LinkTest.php +++ b/tests/LinkTest.php @@ -3,15 +3,12 @@ namespace Markup\Contentful\Tests; use Markup\Contentful\Link; +use Markup\Contentful\MetadataInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class LinkTest extends \PHPUnit_Framework_TestCase +class LinkTest extends MockeryTestCase { - protected function tearDown() - { - m::close(); - } - public function testGetSpaceName() { $name = 'space_name'; @@ -21,6 +18,6 @@ public function testGetSpaceName() private function getMockMetadata() { - return m::mock('Markup\Contentful\MetadataInterface'); + return m::mock(MetadataInterface::class); } } diff --git a/tests/Log/LogTest.php b/tests/Log/LogTest.php index 1a7ff25..49c452c 100644 --- a/tests/Log/LogTest.php +++ b/tests/Log/LogTest.php @@ -6,8 +6,9 @@ use Markup\Contentful\Log\Log; use Markup\Contentful\Log\LogInterface; use Mockery as m; +use PHPUnit\Framework\TestCase; -class LogTest extends \PHPUnit_Framework_TestCase +class LogTest extends TestCase { public function testLog() { diff --git a/tests/Log/StandardLoggerTest.php b/tests/Log/StandardLoggerTest.php index 10883e9..85128fc 100644 --- a/tests/Log/StandardLoggerTest.php +++ b/tests/Log/StandardLoggerTest.php @@ -7,9 +7,15 @@ use Markup\Contentful\Log\LogInterface; use Markup\Contentful\Log\StandardLogger; use Markup\Contentful\Log\TimerInterface; +use PHPUnit\Framework\TestCase; -class StandardLoggerTest extends \PHPUnit_Framework_TestCase +class StandardLoggerTest extends TestCase { + /** + * @var StandardLogger + */ + private $logger; + protected function setUp() { $this->logger = new StandardLogger(); diff --git a/tests/Log/StandardTimerTest.php b/tests/Log/StandardTimerTest.php index bf60936..89d60b9 100644 --- a/tests/Log/StandardTimerTest.php +++ b/tests/Log/StandardTimerTest.php @@ -4,8 +4,9 @@ use Markup\Contentful\Log\StandardTimer; use Markup\Contentful\Log\TimerInterface; +use PHPUnit\Framework\TestCase; -class StandardTimerTest extends \PHPUnit_Framework_TestCase +class StandardTimerTest extends TestCase { protected function setUp() { diff --git a/tests/Parameter/LimitTest.php b/tests/Parameter/LimitTest.php index 380731c..86737bd 100644 --- a/tests/Parameter/LimitTest.php +++ b/tests/Parameter/LimitTest.php @@ -3,8 +3,10 @@ namespace Markup\Contentful\Tests\Parameter; use Markup\Contentful\Parameter\Limit; +use Markup\Contentful\ParameterInterface; +use PHPUnit\Framework\TestCase; -class LimitTest extends \PHPUnit_Framework_TestCase +class LimitTest extends TestCase { protected function setUp() { @@ -14,7 +16,7 @@ protected function setUp() public function testIsParameter() { - $this->assertInstanceOf('Markup\Contentful\ParameterInterface', $this->limit); + $this->assertInstanceOf(ParameterInterface::class, $this->limit); } public function testGetKey() diff --git a/tests/Parameter/OrderByTest.php b/tests/Parameter/OrderByTest.php index 31b2bbf..b8bbfdf 100644 --- a/tests/Parameter/OrderByTest.php +++ b/tests/Parameter/OrderByTest.php @@ -3,24 +3,22 @@ namespace Markup\Contentful\Tests\Parameter; use Markup\Contentful\Parameter\OrderBy; +use Markup\Contentful\ParameterInterface; +use Markup\Contentful\PropertyInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class OrderByTest extends \PHPUnit_Framework_TestCase +class OrderByTest extends MockeryTestCase { protected function setUp() { - $this->property = m::mock('Markup\Contentful\PropertyInterface'); + $this->property = m::mock(PropertyInterface::class); $this->orderBy = new OrderBy($this->property); } - protected function tearDown() - { - m::close(); - } - public function testIsParameter() { - $this->assertInstanceOf('Markup\Contentful\ParameterInterface', $this->orderBy); + $this->assertInstanceOf(ParameterInterface::class, $this->orderBy); } public function testGetKey() diff --git a/tests/Parameter/SkipTest.php b/tests/Parameter/SkipTest.php index f05124a..b5d5778 100644 --- a/tests/Parameter/SkipTest.php +++ b/tests/Parameter/SkipTest.php @@ -3,8 +3,10 @@ namespace Markup\Contentful\Tests\Parameter; use Markup\Contentful\Parameter\Skip; +use Markup\Contentful\ParameterInterface; +use PHPUnit\Framework\TestCase; -class SkipTest extends \PHPUnit_Framework_TestCase +class SkipTest extends TestCase { protected function setUp() { @@ -14,7 +16,7 @@ protected function setUp() public function testIsParameter() { - $this->assertInstanceOf('Markup\Contentful\ParameterInterface', $this->skip); + $this->assertInstanceOf(ParameterInterface::class, $this->skip); } public function testGetKey() diff --git a/tests/Property/FieldPropertyTest.php b/tests/Property/FieldPropertyTest.php index 82df0f5..a1920ce 100644 --- a/tests/Property/FieldPropertyTest.php +++ b/tests/Property/FieldPropertyTest.php @@ -3,9 +3,21 @@ namespace Markup\Contentful\Tests\Property; use Markup\Contentful\Property\FieldProperty; +use Markup\Contentful\PropertyInterface; +use PHPUnit\Framework\TestCase; -class FieldPropertyTest extends \PHPUnit_Framework_TestCase +class FieldPropertyTest extends TestCase { + /** + * @var string + */ + private $propertyName; + + /** + * @var FieldProperty + */ + private $property; + protected function setUp() { $this->propertyName = 'likes'; @@ -14,7 +26,7 @@ protected function setUp() public function testIsProperty() { - $this->assertInstanceOf('Markup\Contentful\PropertyInterface', $this->property); + $this->assertInstanceOf(PropertyInterface::class, $this->property); } public function testGetKey() diff --git a/tests/Property/LocaleTest.php b/tests/Property/LocaleTest.php index 80de9ea..8b3153e 100644 --- a/tests/Property/LocaleTest.php +++ b/tests/Property/LocaleTest.php @@ -3,8 +3,10 @@ namespace Markup\Contentful\Tests\Property; use Markup\Contentful\Property\Locale; +use Markup\Contentful\PropertyInterface; +use PHPUnit\Framework\TestCase; -class LocaleTest extends \PHPUnit_Framework_TestCase +class LocaleTest extends TestCase { protected function setUp() { @@ -13,7 +15,7 @@ protected function setUp() public function testIsProperty() { - $this->assertInstanceOf('Markup\Contentful\PropertyInterface', $this->localeProp); + $this->assertInstanceOf(PropertyInterface::class, $this->localeProp); } public function testGetKey() diff --git a/tests/Property/MimeTypeGroupTest.php b/tests/Property/MimeTypeGroupTest.php index 0f47745..d6017c7 100644 --- a/tests/Property/MimeTypeGroupTest.php +++ b/tests/Property/MimeTypeGroupTest.php @@ -3,9 +3,16 @@ namespace Markup\Contentful\Tests\Property; use Markup\Contentful\Property\MimeTypeGroup; +use Markup\Contentful\PropertyInterface; +use PHPUnit\Framework\TestCase; -class MimeTypeGroupTest extends \PHPUnit_Framework_TestCase +class MimeTypeGroupTest extends TestCase { + /** + * @var MimeTypeGroup + */ + private $mimeTypeProp; + protected function setUp() { $this->mimeTypeProp = new MimeTypeGroup(); @@ -13,7 +20,7 @@ protected function setUp() public function testIsProperty() { - $this->assertInstanceOf('Markup\Contentful\PropertyInterface', $this->mimeTypeProp); + $this->assertInstanceOf(PropertyInterface::class, $this->mimeTypeProp); } public function testGetKey() diff --git a/tests/Property/SystemPropertyTest.php b/tests/Property/SystemPropertyTest.php index 7fc4c07..b1a4043 100644 --- a/tests/Property/SystemPropertyTest.php +++ b/tests/Property/SystemPropertyTest.php @@ -3,9 +3,21 @@ namespace Markup\Contentful\Tests\Property; use Markup\Contentful\Property\SystemProperty; +use Markup\Contentful\PropertyInterface; +use PHPUnit\Framework\TestCase; -class SystemPropertyTest extends \PHPUnit_Framework_TestCase +class SystemPropertyTest extends TestCase { + /** + * @var string + */ + private $propertyName; + + /** + * @var SystemProperty + */ + private $property; + protected function setUp() { $this->propertyName = 'id'; @@ -14,7 +26,7 @@ protected function setUp() public function testIsProperty() { - $this->assertInstanceOf('Markup\Contentful\PropertyInterface', $this->property); + $this->assertInstanceOf(PropertyInterface::class, $this->property); } public function testGetKey() diff --git a/tests/ResourceArrayTest.php b/tests/ResourceArrayTest.php index c037667..7721f4d 100644 --- a/tests/ResourceArrayTest.php +++ b/tests/ResourceArrayTest.php @@ -6,14 +6,10 @@ use Markup\Contentful\ResourceArray; use Markup\Contentful\ResourceArrayInterface; use Mockery as m; +use Mockery\Adapter\Phpunit\MockeryTestCase; -class ResourceArrayTest extends \PHPUnit_Framework_TestCase +class ResourceArrayTest extends MockeryTestCase { - protected function tearDown() - { - m::close(); - } - public function testIsResourceArray() { $this->assertInstanceOf(ResourceArrayInterface::class, new ResourceArray([], 0, 0, 1)); diff --git a/tests/ResourceBuilderTest.php b/tests/ResourceBuilderTest.php index 288ec70..654c9a5 100644 --- a/tests/ResourceBuilderTest.php +++ b/tests/ResourceBuilderTest.php @@ -11,8 +11,9 @@ use Markup\Contentful\ResourceArray; use Markup\Contentful\ResourceBuilder; use Markup\Contentful\SpaceInterface; +use PHPUnit\Framework\TestCase; -class ResourceBuilderTest extends \PHPUnit_Framework_TestCase +class ResourceBuilderTest extends TestCase { /** * @var ResourceBuilder diff --git a/tests/ResourceEnvelopeTest.php b/tests/ResourceEnvelopeTest.php index 76757d1..e5eba21 100644 --- a/tests/ResourceEnvelopeTest.php +++ b/tests/ResourceEnvelopeTest.php @@ -8,8 +8,9 @@ use Markup\Contentful\ResourceArray; use Markup\Contentful\ResourceEnvelope; use Mockery as m; +use PHPUnit\Framework\TestCase; -class ResourceEnvelopeTest extends \PHPUnit_Framework_TestCase +class ResourceEnvelopeTest extends TestCase { /** * @var ResourceEnvelope diff --git a/tests/WebhookTest.php b/tests/WebhookTest.php index 12e0186..772ec6e 100644 --- a/tests/WebhookTest.php +++ b/tests/WebhookTest.php @@ -2,15 +2,18 @@ namespace Markup\Contentful\Tests; +use Markup\Contentful\MetadataInterface; use Markup\Contentful\Webhook; +use Markup\Contentful\WebhookInterface; use Mockery as m; +use PHPUnit\Framework\TestCase; -class WebhookTest extends \PHPUnit_Framework_TestCase +class WebhookTest extends TestCase { protected function setUp() { $this->url = 'http://domain.com/hook'; - $this->metadata = m::mock('Markup\Contentful\MetadataInterface'); + $this->metadata = m::mock(MetadataInterface::class); $this->hook = new Webhook($this->url, $this->metadata); } @@ -21,7 +24,7 @@ protected function tearDown() public function testIsWebhook() { - $this->assertInstanceOf('Markup\Contentful\WebhookInterface', $this->hook); + $this->assertInstanceOf(WebhookInterface::class, $this->hook); } public function testGetId()