Cleaned up tests

paquettg · paquettg · commit dbbfe74d5e23 · 2019-07-10T19:29:46.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - New `removeSmartyScripts` configuration setting. Defaults to true.
+- Added `declare(strict_types=1)` to all source files.
 
 ### Changed
 - Started using a changelog.
 - Fixed bug that caused an infinite loop when no content found in tags.
+- Moved the Mock object to the tests directory, where it belongs.
diff --git a/src/PHPHtmlParser/Content.php b/src/PHPHtmlParser/Content.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 /**
diff --git a/src/PHPHtmlParser/Curl.php b/src/PHPHtmlParser/Curl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 use PHPHtmlParser\Exceptions\CurlException;
diff --git a/src/PHPHtmlParser/CurlInterface.php b/src/PHPHtmlParser/CurlInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 /**
diff --git a/src/PHPHtmlParser/Dom.php b/src/PHPHtmlParser/Dom.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 use PHPHtmlParser\Dom\AbstractNode;
diff --git a/src/PHPHtmlParser/Dom/AbstractNode.php b/src/PHPHtmlParser/Dom/AbstractNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use PHPHtmlParser\Exceptions\CircularException;
diff --git a/src/PHPHtmlParser/Dom/ArrayNode.php b/src/PHPHtmlParser/Dom/ArrayNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use Countable;
diff --git a/src/PHPHtmlParser/Dom/Collection.php b/src/PHPHtmlParser/Dom/Collection.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use ArrayAccess;
diff --git a/src/PHPHtmlParser/Dom/HtmlNode.php b/src/PHPHtmlParser/Dom/HtmlNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use PHPHtmlParser\Exceptions\UnknownChildTypeException;
diff --git a/src/PHPHtmlParser/Dom/InnerNode.php b/src/PHPHtmlParser/Dom/InnerNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
diff --git a/src/PHPHtmlParser/Dom/LeafNode.php b/src/PHPHtmlParser/Dom/LeafNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 
@@ -10,4 +10,4 @@
 abstract class LeafNode extends AbstractNode
 {
 
-}
+}
diff --git a/src/PHPHtmlParser/Dom/Tag.php b/src/PHPHtmlParser/Dom/Tag.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 use PHPHtmlParser\Dom;
diff --git a/src/PHPHtmlParser/Dom/TextNode.php b/src/PHPHtmlParser/Dom/TextNode.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Dom;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/ChildNotFoundException.php b/src/PHPHtmlParser/Exceptions/ChildNotFoundException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/CircularException.php b/src/PHPHtmlParser/Exceptions/CircularException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/CurlException.php b/src/PHPHtmlParser/Exceptions/CurlException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/EmptyCollectionException.php b/src/PHPHtmlParser/Exceptions/EmptyCollectionException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/NotLoadedException.php b/src/PHPHtmlParser/Exceptions/NotLoadedException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/ParentNotFoundException.php b/src/PHPHtmlParser/Exceptions/ParentNotFoundException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/StrictException.php b/src/PHPHtmlParser/Exceptions/StrictException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Exceptions/UnknownChildTypeException.php b/src/PHPHtmlParser/Exceptions/UnknownChildTypeException.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Exceptions;
 
 /**
diff --git a/src/PHPHtmlParser/Finder.php b/src/PHPHtmlParser/Finder.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PHPHtmlParser;
 
diff --git a/src/PHPHtmlParser/Options.php b/src/PHPHtmlParser/Options.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 /**
diff --git a/src/PHPHtmlParser/Selector/Parser.php b/src/PHPHtmlParser/Selector/Parser.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Selector;
 
 /**
diff --git a/src/PHPHtmlParser/Selector/ParserInterface.php b/src/PHPHtmlParser/Selector/ParserInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Selector;
 
 interface ParserInterface
diff --git a/src/PHPHtmlParser/Selector/Selector.php b/src/PHPHtmlParser/Selector/Selector.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser\Selector;
 
 use PHPHtmlParser\Dom\AbstractNode;
diff --git a/src/PHPHtmlParser/StaticDom.php b/src/PHPHtmlParser/StaticDom.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
 use PHPHtmlParser\Exceptions\NotLoadedException;
diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Selector\Selector;
diff --git a/tests/ContentTest.php b/tests/ContentTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Content;
diff --git a/tests/DomTest.php b/tests/DomTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
@@ -158,21 +157,21 @@ public function testLoadUpperCase()
     public function testLoadWithFile()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFile()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-user font', 0)->text);
     }
 
     public function testLoadFromFileFind()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/small.html');
+        $dom->loadFromFile('tests/data/files/small.html');
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 
@@ -187,30 +186,30 @@ public function testLoadFileWhitespace()
 	{
 		$dom = new Dom;
 		$dom->setOptions(['cleanupInput' => false]);
-		$dom->loadFromFile('tests/files/whitespace.html');
+		$dom->loadFromFile('tests/data/files/whitespace.html');
 		$this->assertEquals(1, count($dom->find('.class')));
 		$this->assertEquals("<span><span class=\"class\"></span></span>", (string)$dom);
 	}
 
     public function testLoadFileBig()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(10, count($dom->find('.content-border')));
     }
 
     public function testLoadFileBigTwice()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $post = $dom->find('.post-row', 0);
         $this->assertEquals(' <p>Журчанье воды<br /> Черно-белые тени<br /> Вновь на фонтане</p> ', $post->find('.post-message', 0)->innerHtml);
     }
 
     public function testLoadFileBigTwicePreserveOption()
     {
         $dom = new Dom;
-        $dom->loadFromFile('tests/files/big.html', ['preserveLineBreaks' => true]);
+        $dom->loadFromFile('tests/data/files/big.html', ['preserveLineBreaks' => true]);
         $post = $dom->find('.post-row', 0);
         $this->assertEquals(
             "<p>Журчанье воды<br />\nЧерно-белые тени<br />\nВновь на фонтане</p>",
@@ -224,7 +223,7 @@ public function testLoadFromUrl()
         $curl->shouldReceive('get')
              ->once()
              ->with('http://google.com')
-             ->andReturn(file_get_contents('tests/files/small.html'));
+             ->andReturn(file_get_contents('tests/data/files/small.html'));
         
         $dom = new Dom;
         $dom->loadFromUrl('http://google.com', [], $curl);
diff --git a/tests/Node/ChildrenTest.php b/tests/Node/ChildrenTest.php
@@ -1,5 +1,5 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
+require_once('tests/data/MockNode.php');
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom\MockNode as Node;
diff --git a/tests/Node/HtmlTest.php b/tests/Node/HtmlTest.php
@@ -1,5 +1,5 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
+require_once('tests/data/MockNode.php');
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
diff --git a/tests/Node/ParentTest.php b/tests/Node/ParentTest.php
@@ -1,5 +1,5 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
+require_once('tests/data/MockNode.php');
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom\MockNode as Node;
diff --git a/tests/Node/TagTest.php b/tests/Node/TagTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom\Tag;
diff --git a/tests/Node/TextTest.php b/tests/Node/TextTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
diff --git a/tests/Options/CleanupTest.php b/tests/Options/CleanupTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
@@ -12,7 +11,7 @@ public function testCleanupInputTrue()
         $dom->setOptions([
             'cleanupInput' => true,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, count($dom->find('style')));
         $this->assertEquals(0, count($dom->find('script')));
     }
@@ -23,7 +22,7 @@ public function testCleanupInputFalse()
         $dom->setOptions([
             'cleanupInput' => false,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(1, count($dom->find('style')));
         $this->assertEquals(22, count($dom->find('script')));
     }
@@ -34,7 +33,7 @@ public function testRemoveStylesTrue()
         $dom->setOptions([
             'removeStyles' => true,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, count($dom->find('style')));
     }
 
@@ -44,7 +43,7 @@ public function testRemoveStylesFalse()
         $dom->setOptions([
             'removeStyles' => false,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(1, count($dom->find('style')));
         $this->assertEquals('text/css',
             $dom->find('style')->getAttribute('type'));
@@ -56,7 +55,7 @@ public function testRemoveScriptsTrue()
         $dom->setOptions([
             'removeScripts' => true,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(0, count($dom->find('script')));
     }
 
@@ -66,7 +65,7 @@ public function testRemoveScriptsFalse()
         $dom->setOptions([
             'removeScripts' => false,
         ]);
-        $dom->loadFromFile('tests/files/big.html');
+        $dom->loadFromFile('tests/data/files/big.html');
         $this->assertEquals(22, count($dom->find('script')));
         $this->assertEquals('text/javascript',
             $dom->find('script')->getAttribute('type'));
diff --git a/tests/Options/PreserveLineBreaks.php b/tests/Options/PreserveLineBreaks.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
diff --git a/tests/Options/StrictTest.php b/tests/Options/StrictTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
diff --git a/tests/Options/WhitespaceTextNodeTest.php b/tests/Options/WhitespaceTextNodeTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Dom;
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Options;
diff --git a/tests/Selector/SelectorTest.php b/tests/Selector/SelectorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPHtmlParser\Selector\Selector;
diff --git a/tests/StaticDomTest.php b/tests/StaticDomTest.php
diff --git a/tests/data/MockNode.php b/tests/data/MockNode.php
diff --git a/tests/data/files/big.html b/tests/data/files/big.html
diff --git a/tests/data/files/small.html b/tests/data/files/small.html
diff --git a/tests/data/files/whitespace.html b/tests/data/files/whitespace.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php`
	`1`	`+<?php declare(strict_types=1);`
`2`	`2`	`namespace PHPHtmlParser;`
`3`	`3`
`4`	`4`	`/**`