From 7cbc71239d2fd3aa9388b28ff7fe3fe76cc99b90 Mon Sep 17 00:00:00 2001 From: Larry Garfield Date: Mon, 19 Nov 2018 18:18:00 -0600 Subject: [PATCH] Switch to PHPUnit 7 syntax. --- composer.json | 4 ++-- phpunit.xml.dist | 2 +- tests/AttributeBagTest.php | 3 ++- tests/Head/BaseElementTest.php | 3 ++- tests/Head/HeadElementTest.php | 3 ++- tests/Head/KeywordsMetaElementTest.php | 3 ++- tests/Head/LinkElementTest.php | 3 ++- tests/Head/MetaCharsetElementTest.php | 3 ++- tests/Head/MetaElementTest.php | 3 ++- tests/Head/MetaRefreshElementTest.php | 3 ++- tests/Head/ScriptElementTest.php | 3 ++- tests/Head/StyleElementTest.php | 3 ++- tests/Head/StyleLinkElementTest.php | 3 ++- tests/HeadElementTest.php | 3 ++- tests/HtmlFragmentTest.php | 3 ++- tests/HtmlPageTest.php | 6 +++++- tests/Link/LinkTest.php | 3 ++- .../MetadataTransferer/AggregateMetadataTransfererTest.php | 3 ++- tests/MetadataTransferer/HeadElementTransfererTest.php | 3 ++- tests/MetadataTransferer/ScriptTransfererTest.php | 3 ++- tests/MetadataTransferer/StatusCodeTransfererTest.php | 3 ++- tests/MetadataTransferer/StyleTransfererTest.php | 3 ++- tests/StatusCodeContainerTraitTest.php | 3 ++- 23 files changed, 48 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 238e715..8fed176 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,10 @@ "require": { "php" : ">=7.1.0", "psr/link": "^1.0", - "fig/link-util": "^1.0" + "fig/link-util": "^1.0", + "phpunit/phpunit": "^7.4" }, "require-dev": { - "phpunit/phpunit" : "4.*", "codeclimate/php-test-reporter": "dev-master" }, "autoload": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7976608..a34826d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -22,7 +22,7 @@ - + diff --git a/tests/AttributeBagTest.php b/tests/AttributeBagTest.php index 2a1351f..e248bd6 100644 --- a/tests/AttributeBagTest.php +++ b/tests/AttributeBagTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test; use Crell\HtmlModel\AttributeBag; +use PHPUnit\Framework\TestCase; -class AttributeBagTest extends \PHPUnit_Framework_TestCase +class AttributeBagTest extends TestCase { /** * Confirms that setting values from the constructor works. diff --git a/tests/Head/BaseElementTest.php b/tests/Head/BaseElementTest.php index e7f44dd..89f9f05 100644 --- a/tests/Head/BaseElementTest.php +++ b/tests/Head/BaseElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\BaseElement; +use PHPUnit\Framework\TestCase; -class BaseElementTest extends \PHPUnit_Framework_TestCase +class BaseElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/HeadElementTest.php b/tests/Head/HeadElementTest.php index 6f945cb..07fb2ae 100644 --- a/tests/Head/HeadElementTest.php +++ b/tests/Head/HeadElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\HeadElement; +use PHPUnit\Framework\TestCase; -class HeadElementTest extends \PHPUnit_Framework_TestCase +class HeadElementTest extends TestCase { public function testAttributes() { diff --git a/tests/Head/KeywordsMetaElementTest.php b/tests/Head/KeywordsMetaElementTest.php index 2ddad32..ea67532 100644 --- a/tests/Head/KeywordsMetaElementTest.php +++ b/tests/Head/KeywordsMetaElementTest.php @@ -4,8 +4,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\KeywordsMetaElement; +use PHPUnit\Framework\TestCase; -class KeywordsMetaElementTest extends \PHPUnit_Framework_TestCase +class KeywordsMetaElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/LinkElementTest.php b/tests/Head/LinkElementTest.php index 102c379..884e361 100644 --- a/tests/Head/LinkElementTest.php +++ b/tests/Head/LinkElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\LinkElement; +use PHPUnit\Framework\TestCase; -class LinkElementTest extends \PHPUnit_Framework_TestCase +class LinkElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/MetaCharsetElementTest.php b/tests/Head/MetaCharsetElementTest.php index aa88ed3..9591d62 100644 --- a/tests/Head/MetaCharsetElementTest.php +++ b/tests/Head/MetaCharsetElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\MetaCharsetElement; +use PHPUnit\Framework\TestCase; -class MetaCharsetElementTest extends \PHPUnit_Framework_TestCase +class MetaCharsetElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/MetaElementTest.php b/tests/Head/MetaElementTest.php index 33889b3..0369614 100644 --- a/tests/Head/MetaElementTest.php +++ b/tests/Head/MetaElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\MetaElement; +use PHPUnit\Framework\TestCase; -class MetaElementTest extends \PHPUnit_Framework_TestCase +class MetaElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/MetaRefreshElementTest.php b/tests/Head/MetaRefreshElementTest.php index af1b6b0..e6c8d1a 100644 --- a/tests/Head/MetaRefreshElementTest.php +++ b/tests/Head/MetaRefreshElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\MetaRefreshElement; +use PHPUnit\Framework\TestCase; -class MetaRefreshElementTest extends \PHPUnit_Framework_TestCase +class MetaRefreshElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/ScriptElementTest.php b/tests/Head/ScriptElementTest.php index e3a888d..809e5a4 100644 --- a/tests/Head/ScriptElementTest.php +++ b/tests/Head/ScriptElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\ScriptElement; +use PHPUnit\Framework\TestCase; -class ScriptElementTest extends \PHPUnit_Framework_TestCase +class ScriptElementTest extends TestCase { public function testConstrutor() { diff --git a/tests/Head/StyleElementTest.php b/tests/Head/StyleElementTest.php index 524441e..2c03f49 100644 --- a/tests/Head/StyleElementTest.php +++ b/tests/Head/StyleElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\StyleElement; +use PHPUnit\Framework\TestCase; -class StyleElementTest extends \PHPUnit_Framework_TestCase +class StyleElementTest extends TestCase { public function testConstructor() { diff --git a/tests/Head/StyleLinkElementTest.php b/tests/Head/StyleLinkElementTest.php index e3f0491..fb81181 100644 --- a/tests/Head/StyleLinkElementTest.php +++ b/tests/Head/StyleLinkElementTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Head; use Crell\HtmlModel\Head\StyleLinkElement; +use PHPUnit\Framework\TestCase; -class StyleLinkElementTest extends \PHPUnit_Framework_TestCase +class StyleLinkElementTest extends TestCase { public function testConstructor() { diff --git a/tests/HeadElementTest.php b/tests/HeadElementTest.php index 3e7f51a..c37907d 100644 --- a/tests/HeadElementTest.php +++ b/tests/HeadElementTest.php @@ -4,8 +4,9 @@ use Crell\HtmlModel\Head\LinkElement; use Crell\HtmlModel\Head\StyleElement; +use PHPUnit\Framework\TestCase; -class HeadElementTest extends \PHPUnit_Framework_TestCase +class HeadElementTest extends TestCase { /** * Test that true does in fact equal true diff --git a/tests/HtmlFragmentTest.php b/tests/HtmlFragmentTest.php index 7857608..7dfb904 100644 --- a/tests/HtmlFragmentTest.php +++ b/tests/HtmlFragmentTest.php @@ -7,8 +7,9 @@ use Crell\HtmlModel\Head\MetaRefreshElement; use Crell\HtmlModel\Head\StyleLinkElement; use Crell\HtmlModel\HtmlFragment; +use PHPUnit\Framework\TestCase; -class HtmlFragmentTest extends \PHPUnit_Framework_TestCase +class HtmlFragmentTest extends TestCase { public function testLinks() { diff --git a/tests/HtmlPageTest.php b/tests/HtmlPageTest.php index 0b2620c..a195641 100644 --- a/tests/HtmlPageTest.php +++ b/tests/HtmlPageTest.php @@ -9,8 +9,9 @@ use Crell\HtmlModel\Head\StyleElement; use Crell\HtmlModel\Head\StyleLinkElement; use Crell\HtmlModel\HtmlPage; +use PHPUnit\Framework\TestCase; -class HtmlPageTest extends \PHPUnit_Framework_TestCase +class HtmlPageTest extends TestCase { public function testConstructorContent() { @@ -61,6 +62,9 @@ public function testTitle() $this->assertEquals('Test page', $html->getTitle()); } + /** + * @doesNotPerformAssertions + */ public function testAddingEverything() { $html = new HtmlPage(); diff --git a/tests/Link/LinkTest.php b/tests/Link/LinkTest.php index 30fa09f..46130a1 100644 --- a/tests/Link/LinkTest.php +++ b/tests/Link/LinkTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test\Link; use Fig\Link\Link; +use PHPUnit\Framework\TestCase; -class LinkTest extends \PHPUnit_Framework_TestCase +class LinkTest extends TestCase { public function testConstructor() { diff --git a/tests/MetadataTransferer/AggregateMetadataTransfererTest.php b/tests/MetadataTransferer/AggregateMetadataTransfererTest.php index ec50d1f..680093e 100644 --- a/tests/MetadataTransferer/AggregateMetadataTransfererTest.php +++ b/tests/MetadataTransferer/AggregateMetadataTransfererTest.php @@ -20,9 +20,10 @@ use Crell\HtmlModel\ScriptContainerInterface; use Crell\HtmlModel\StatusCodeContainerInterface; use Crell\HtmlModel\StyleContainerInterface; +use PHPUnit\Framework\TestCase; use Prophecy\Argument; -class AggregateMetadataTransfererTest extends \PHPUnit_Framework_TestCase +class AggregateMetadataTransfererTest extends TestCase { public function testAggregateHandoff() { diff --git a/tests/MetadataTransferer/HeadElementTransfererTest.php b/tests/MetadataTransferer/HeadElementTransfererTest.php index 922cb85..a907fa7 100644 --- a/tests/MetadataTransferer/HeadElementTransfererTest.php +++ b/tests/MetadataTransferer/HeadElementTransfererTest.php @@ -6,8 +6,9 @@ use Crell\HtmlModel\Head\MetaRefreshElement; use Crell\HtmlModel\HtmlFragment; use Crell\HtmlModel\MetadataTransfer\HeadElementTransferer; +use PHPUnit\Framework\TestCase; -class HeadElementTransfererTest extends \PHPUnit_Framework_TestCase +class HeadElementTransfererTest extends TestCase { public function testTransferStyles() { diff --git a/tests/MetadataTransferer/ScriptTransfererTest.php b/tests/MetadataTransferer/ScriptTransfererTest.php index b32dd4e..85b319d 100644 --- a/tests/MetadataTransferer/ScriptTransfererTest.php +++ b/tests/MetadataTransferer/ScriptTransfererTest.php @@ -5,8 +5,9 @@ use Crell\HtmlModel\HtmlFragment; use Crell\HtmlModel\Head\ScriptElement; use Crell\HtmlModel\MetadataTransfer\ScriptTransferer; +use PHPUnit\Framework\TestCase; -class ScriptTransfererTest extends \PHPUnit_Framework_TestCase +class ScriptTransfererTest extends TestCase { public function testTransferScripts() { diff --git a/tests/MetadataTransferer/StatusCodeTransfererTest.php b/tests/MetadataTransferer/StatusCodeTransfererTest.php index 6a05ea7..ed18723 100644 --- a/tests/MetadataTransferer/StatusCodeTransfererTest.php +++ b/tests/MetadataTransferer/StatusCodeTransfererTest.php @@ -4,8 +4,9 @@ use Crell\HtmlModel\HtmlPage; use Crell\HtmlModel\MetadataTransfer\StatusCodeTransferer; +use PHPUnit\Framework\TestCase; -class StatusCodeTransfererTest extends \PHPUnit_Framework_TestCase +class StatusCodeTransfererTest extends TestCase { public function testTransferStyles() { diff --git a/tests/MetadataTransferer/StyleTransfererTest.php b/tests/MetadataTransferer/StyleTransfererTest.php index 50229ef..cc2a9a7 100644 --- a/tests/MetadataTransferer/StyleTransfererTest.php +++ b/tests/MetadataTransferer/StyleTransfererTest.php @@ -6,8 +6,9 @@ use Crell\HtmlModel\Head\StyleLinkElement; use Crell\HtmlModel\HtmlFragment; use Crell\HtmlModel\MetadataTransfer\StyleTransferer; +use PHPUnit\Framework\TestCase; -class StyleTransfererTest extends \PHPUnit_Framework_TestCase +class StyleTransfererTest extends TestCase { public function testTransferStyles() { diff --git a/tests/StatusCodeContainerTraitTest.php b/tests/StatusCodeContainerTraitTest.php index 9da9c36..e48a376 100644 --- a/tests/StatusCodeContainerTraitTest.php +++ b/tests/StatusCodeContainerTraitTest.php @@ -3,8 +3,9 @@ namespace Crell\HtmlModel\Test; use Crell\HtmlModel\StatusCodeContainerTrait; +use PHPUnit\Framework\TestCase; -class StatusCodeContainerTraitTest extends \PHPUnit_Framework_TestCase +class StatusCodeContainerTraitTest extends TestCase { public function testStatusCode() {