Switch to PHPUnit 7 syntax.

Crell · Nov 20, 2018 · 7cbc712 · 7cbc712
1 parent 860ec55
commit 7cbc712
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 24 deletions.
diff --git 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
@@ -22,7 +22,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage" />
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()
     {