WIP Upgrade to PHP 7

.gitignore

@@ -0,0 +1,3 @@
+/vendor/
+/composer.lock
+/.phpunit.result.cache

.travis.yml

@@ -1,8 +1,10 @@
 language: php
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - 7.2
+  - 7.3
+  - 7.4
 
-script: phpunit
+install:
+  - composer install
+
+script: vendor/bin/simple-phpunit

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Groupe Express Roularta
+Copyright (c) 2020 Jérôme Tamarelle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -16,12 +16,26 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.2.0",
+        "ext-dom": "*",
+        "ext-xsl": "*",
+        "ext-libxml": "*"
     },
     "suggest": {
         "symfony/css-selector": "Provides facilities is you prefers CSS to Xpath"
     },
     "autoload": {
         "psr-0": { "Welldom": "src/" }
+    },
+    "autoload-dev": {
+        "psr-0": { "Welldom\\Tests": "tests/" }
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^5.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

phpunit.xml.dist

@@ -7,8 +7,7 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     >
 
     <testsuites>

src/Welldom/Attr.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/Comment.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/Document.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -84,7 +84,7 @@ static public function create($source, $encoding = null, $version = null)
      * Factory.
      * Create a document from a DOMNode.
      *
-     * @param \Welldom\DOMNode $node
+     * @param \Welldom\NodeInterface $node
      * @param bool $deep When false, $node subtree is not imported.
      * @return \Welldom\Document
      */
@@ -345,7 +345,7 @@ public function createElement($name, $value = null, $namespaceUri = null) {
      */
     public function createNode($expression, $value = null, array $attributes = null)
     {
-        $current = ('/' === $expression{0}) ? $this : $this->documentElement;
+        $current = ('/' === $expression[0]) ? $this : $this->documentElement;
         $xpaths = explode('/', str_replace('//', '', $expression));
 
         $i = 0;
@@ -459,7 +459,7 @@ public function getNodeValue($expression, $default = false)
      *
      * @param string $expression
      * @param string $value
-     * @return \Welldom\Node
+     * @return \Welldom\NodeInterface
      */
     public function setNodeValue($expression, $value = null)
     {
@@ -530,7 +530,7 @@ public function getNodeInnerXml($expression, $default = false)
      * @param string $expression
      * @param string $xml
      * @param boolean $append
-     * @return \Welldom\Node
+     * @return \Welldom\NodeInterface
      */
     public function setNodeInnerXml($expression, $xml, $append = false)
     {

src/Welldom/DocumentFragment.php

@@ -3,16 +3,14 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Welldom;
 
-use Welldom\Exception\XmlLoadingException;
-
 /**
  * DOM Document Fragment extension.
  *

src/Welldom/Element.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -284,7 +284,7 @@ public function toArray($renderRoot = false)
                 $mValue = $childNode->getValue();
             }
 
-            $sKey = $childNode->nodeName{0} == '#' ? 0 : $childNode->nodeName;
+            $sKey = $childNode->nodeName[0] == '#' ? 0 : $childNode->nodeName;
 
             // this will give us a clue as to what the result structure should be
             // how many of these child nodes do we have?

src/Welldom/Exception/InvalidXpathException.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/NodeInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/NodeList.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/Text.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/XmlErrorHandler.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/XmlSerializer.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Welldom/Xpath.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -74,7 +74,7 @@ public function query($expression, \DOMNode $contextnode = null, $registerNodeNS
      * @param string $expression Xpath expression
      * @param \DOMNode $contextnode
      * @param bool $registerNodeNS
-     * @return \Welldom\Node The node found or FALSE if the number of results is not 1
+     * @return \Welldom\NodeInterface|false The node found or FALSE if the number of results is not 1
      * @throws \Welldom\Exception\InvalidXpathException
      */
     public function queryOne($expression, \DOMNode $contextnode = null, $registerNodeNS = true)

src/Welldom/XsltProcessor.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -64,7 +64,7 @@ public function transformToXml(\DOMNode $node, array $parameters = array())
     {
         $this->preTransform($parameters);
         $xml = $this->processor->transformToXml($node);
-        $this->postTransform($parameters);
+        $this->postTransform();
 
         if (false === $xml) {
             return false;
@@ -166,7 +166,7 @@ public function removeParameter(array $name)
     /**
      * Removes a list of parameters.
      *
-     * @param type $names List of names
+     * @param string[] $names List of names
      * @return \Welldom\XsltProcessor
      */
     public function removeParameters(array $names)

src/Welldom/XsltProcessorCollection.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

tests/Welldom/Tests/DocumentFragmentTest.php

@@ -3,33 +3,37 @@
 /*
  * This file is part of the Welldom package.
  *
- * (c) Groupe Express Roularta
+ * (c) Jérôme Tamarelle
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace Welldom\Tests;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers \Welldom\DocumentFragment
  */
 class DocumentFragmentTest extends TestCase
 {
+    use TestHelpers;
+
     public function testAppendXmlError()
     {
         $doc = $this->createDocument('<foo />');
         $fragment = $doc->createDocumentFragment();
 
         $errors = $fragment->getLastErrors();
-        $this->assertInternalType('array', $errors);
+        $this->assertIsArray($errors);
         $this->assertCount(0, $errors);
 
         $success = $fragment->appendXML('<invalid att="v><test></invalid>');
         $this->assertSame(false, $success);
 
         $errors = $fragment->getLastErrors();
-        $this->assertInternalType('array', $errors);
+        $this->assertIsArray($errors);
         $this->assertCount(5, $errors);
     }