Update version and copyright

popphp · Feb 12, 2021 · ef5b7cc · ef5b7cc
1 parent 7693529
commit ef5b7cc
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 75 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,2 @@
 tests/ export-ignore
 phpunit.xml export-ignore
-.travis.yml export-ignore
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -0,0 +1,37 @@
+name: phpunit
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    #- name: Validate composer.json and composer.lock
+    #  run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    - name: Run test suite
+      run: composer run-script test
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -1,6 +1,6 @@
 BSD 3 Clause License
 
-Copyright (c) 2009-2020, NOLA Interactive, LLC.
+Copyright (c) 2009-2021, NOLA Interactive, LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 pop-dom
 =======
 
-[![Build Status](https://travis-ci.org/popphp/pop-dom.svg?branch=master)](https://travis-ci.org/popphp/pop-dom)
+[![Build Status](https://github.com/popphp/pop-dom/workflows/phpunit/badge.svg)](https://github.com/popphp/pop-dom/actions)
 [![Coverage Status](http://cc.popphp.org/coverage.php?comp=pop-dom)](http://cc.popphp.org/pop-dom/)
 
 OVERVIEW

diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0"
+        "php": ">=7.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0.0"
+        "phpunit/phpunit": "^9.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -35,9 +35,12 @@
             "Pop\\Dom\\Test\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.2.x-dev"
+            "dev-master": "3.3.x-dev"
         }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Pop Dom Component PHPUnit Test">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="/tmp/pop-dom-cc" lowUpperBound="35"
-             highLowerBound="70"/>
-        <log type="coverage-text" showUncoveredFiles="true"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <html outputDirectory="/tmp/pop-dom-cc" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Pop Dom Component PHPUnit Test">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>
diff --git a/src/AbstractNode.php b/src/AbstractNode.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popphp-framework
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
  */
 
@@ -19,9 +19,9 @@
  * @category   Pop
  * @package    Pop\Dom
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
- * @version    3.2.7
+ * @version    3.3.0
  */
 abstract class AbstractNode
 {

diff --git a/src/Child.php b/src/Child.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popphp-framework
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
  */
 
@@ -19,9 +19,9 @@
  * @category   Pop
  * @package    Pop\Dom
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
- * @version    3.2.7
+ * @version    3.3.0
  */
 class Child extends AbstractNode
 {

diff --git a/src/Document.php b/src/Document.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popphp-framework
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
  */
 
@@ -19,9 +19,9 @@
  * @category   Pop
  * @package    Pop\Dom
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
- * @version    3.2.7
+ * @version    3.3.0
  */
 class Document extends AbstractNode
 {

diff --git a/src/DomIterator.php b/src/DomIterator.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popphp-framework
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
  */
 
@@ -19,9 +19,9 @@
  * @category   Pop
  * @package    Pop\Dom
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
- * @version    3.2.7
+ * @version    3.3.0
  */
 class DomIterator implements \RecursiveIterator
 {

diff --git a/src/Exception.php b/src/Exception.php
@@ -4,7 +4,7 @@
  *
  * @link       https://github.com/popphp/popphp-framework
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
  */
 
@@ -19,8 +19,8 @@
  * @category   Pop
  * @package    Pop\Dom
  * @author     Nick Sagona, III <[email protected]>
- * @copyright  Copyright (c) 2009-2020 NOLA Interactive, LLC. (http://www.nolainteractive.com)
+ * @copyright  Copyright (c) 2009-2021 NOLA Interactive, LLC. (http://www.nolainteractive.com)
  * @license    http://www.popphp.org/license     New BSD License
- * @version    3.2.7
+ * @version    3.3.0
  */
 class Exception extends \Exception {}
diff --git a/tests/ChildTest.php b/tests/ChildTest.php
@@ -104,8 +104,8 @@ public function testRender()
             'style' => 'display: block;'
         ]);
         $child->addChild(new Child('p', 'Paragraph'));
-        $this->assertContains('<h1 id="header" style="display: block;">', (string)$child);
-        $this->assertContains('<p>Paragraph</p>', (string)$child);
+        $this->assertStringContainsString('<h1 id="header" style="display: block;">', (string)$child);
+        $this->assertStringContainsString('<p>Paragraph</p>', (string)$child);
     }
 
     public function testRenderChildrenFirst()
@@ -118,8 +118,8 @@ public function testRenderChildrenFirst()
             'style' => 'display: block;'
         ]);
         $child->addChild(new Child('p', 'Paragraph'));
-        $this->assertContains('<h1 id="header" style="display: block;">', (string)$child);
-        $this->assertContains('<p>Paragraph</p>', (string)$child);
+        $this->assertStringContainsString('<h1 id="header" style="display: block;">', (string)$child);
+        $this->assertStringContainsString('<p>Paragraph</p>', (string)$child);
     }
 
     public function testRenderNoNodeValue()
@@ -164,8 +164,8 @@ public function testGetNodeContent()
 
         $body = $parent->getChild(1);
         $content = $body->getNodeContent();
-        $this->assertContains('<strong>more</strong>', $content);
-        $this->assertNotContains('<body', $content);
+        $this->assertStringContainsString('<strong>more</strong>', $content);
+        $this->assertStringNotContainsString('<body', $content);
     }
 
     public function testGetTextContent()
@@ -204,8 +204,8 @@ public function testGetTextContent()
 
         $body = $parent->getChild(1);
         $content = $body->getTextContent();
-        $this->assertContains('more', $content);
-        $this->assertNotContains('<h1>', $content);
+        $this->assertStringContainsString('more', $content);
+        $this->assertStringNotContainsString('<h1>', $content);
     }
 
     public function testNodeWhiteSpace()
@@ -234,8 +234,8 @@ public function testCData()
 
         $content = $child->render();
         $this->assertTrue($child->isCData());
-        $this->assertContains('<![CDATA[', $content);
-        $this->assertContains(']]>', $content);
+        $this->assertStringContainsString('<![CDATA[', $content);
+        $this->assertStringContainsString(']]>', $content);
     }
 
     /**
@@ -247,7 +247,7 @@ public function testOutput()
         ob_start();
         echo $child;
         $result = ob_get_clean();
-        $this->assertContains('<h1>Header</h1>', $result);
+        $this->assertStringContainsString('<h1>Header</h1>', $result);
     }
 
 }
diff --git a/tests/DocumentTest.php b/tests/DocumentTest.php
@@ -15,18 +15,18 @@ public function testConstructor()
         $this->assertInstanceOf('Pop\Dom\Document', $doc);
         $this->assertEquals('    ', $doc->getIndent());
         $this->assertEquals(1, count($doc->getChildren()));
-        $this->assertContains('<!DOCTYPE html>', $doc->getDoctype());
+        $this->assertStringContainsString('<!DOCTYPE html>', $doc->getDoctype());
     }
 
     public function testSetDoctype()
     {
         $doc = new Document();
         $doc->setDoctype(Document::ATOM);
-        $this->assertContains('<?xml version=', $doc->getDoctype());
+        $this->assertStringContainsString('<?xml version=', $doc->getDoctype());
         $doc->setDoctype(Document::RSS);
-        $this->assertContains('<?xml version=', $doc->getDoctype());
+        $this->assertStringContainsString('<?xml version=', $doc->getDoctype());
         $doc->setDoctype(Document::XML);
-        $this->assertContains('<?xml version=', $doc->getDoctype());
+        $this->assertStringContainsString('<?xml version=', $doc->getDoctype());
     }
 
     public function testSetDoctypeException()
@@ -79,7 +79,7 @@ public function testRender()
             new Child('title', 'Hello World'),
             new Child('h1', 'Header')
         ]);
-        $this->assertContains('<h1>Header</h1>', (string)$doc);
+        $this->assertStringContainsString('<h1>Header</h1>', (string)$doc);
     }
 
     /**
@@ -94,7 +94,7 @@ public function testOutput()
         echo $doc;
         $result = ob_get_clean();
 
-        $this->assertContains('<h1>Header</h1>', $result);
+        $this->assertStringContainsString('<h1>Header</h1>', $result);
     }
 
 }
diff --git a/tests/ParseTest.php b/tests/ParseTest.php
@@ -26,19 +26,19 @@ public function testParseString()
         $doc = new Document(Document::HTML);
         $doc->addChild(Child::parseString($html));
         $render = (string)$doc;
-        $this->assertContains('<title>Hello World Title</title>', $render);
-        $this->assertContains('class="top-header"', $render);
-        $this->assertContains('<p class="special-p">', $render);
+        $this->assertStringContainsString('<title>Hello World Title</title>', $render);
+        $this->assertStringContainsString('class="top-header"', $render);
+        $this->assertStringContainsString('<p class="special-p">', $render);
     }
 
     public function testParseFile()
     {
         $doc = new Document(Document::HTML);
         $doc->addChild(Child::parseFile(__DIR__ . '/tmp/test.html'));
         $render = (string)$doc;
-        $this->assertContains('<title>Hello World Title</title>', $render);
-        $this->assertContains('class="top-header"', $render);
-        $this->assertContains('<p class="special-p">', $render);
+        $this->assertStringContainsString('<title>Hello World Title</title>', $render);
+        $this->assertStringContainsString('class="top-header"', $render);
+        $this->assertStringContainsString('<p class="special-p">', $render);
     }
 
     public function testParseFileException()
@@ -59,8 +59,8 @@ public function testParsePartial()
         $doc = new Document(Document::HTML);
         $doc->addChildren(Child::parseString($html));
         $render = (string)$doc;
-        $this->assertContains('class="top-header"', $render);
-        $this->assertContains('<p class="special-p">', $render);
+        $this->assertStringContainsString('class="top-header"', $render);
+        $this->assertStringContainsString('<p class="special-p">', $render);
     }
 
 }