From ffaa4a4cab20f2108430d14c1fdeb04061f77567 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 19 Oct 2016 13:24:08 -0400
Subject: [PATCH] Re-namespace tests

---
 build/header_comment.txt                      |  3 +-
 build/update_header_comments.php              | 46 +++++++++++--------
 composer.json                                 |  7 ++-
 src/StringWrapper.php                         |  2 +-
 tests/BaseModelTest.php                       |  2 +-
 tests/Cache/CacheManagerTest.php              |  3 +-
 tests/Cache/Driver/NullDriverTest.php         |  3 +-
 tests/Cache/Driver/RedisDriver2Test.php       |  3 +-
 tests/Cache/Driver/RedisDriverTest.php        |  3 +-
 tests/Cache/Driver/SQLDriverTest.php          |  3 +-
 tests/ConfigTest.php                          |  2 +-
 tests/Di/ContainerAwareTest.php               |  7 ++-
 tests/Di/ContainerTest.php                    |  6 +--
 tests/EnumTest.php                            |  3 +-
 tests/Exception/DoubleRenderExceptionTest.php |  3 +-
 tests/FriendTest.php                          |  5 +-
 tests/Ion_TestCase.php                        | 10 ++--
 tests/JsonTest.php                            |  5 +-
 tests/Model/BaseDBModelTest.php               |  3 +-
 tests/TestSessionHandler.php                  | 32 +++++++------
 tests/Transformer/AbstractTransformerTest.php |  7 ++-
 tests/Type/ArrayTypeTest.php                  |  6 ++-
 tests/View/HtmlViewTest.php                   |  6 ++-
 tests/View/HttpViewTest.php                   |  6 ++-
 tests/View/JsonViewTest.php                   |  7 +--
 tests/mocks.php                               |  6 +--
 26 files changed, 110 insertions(+), 79 deletions(-)

diff --git a/build/header_comment.txt b/build/header_comment.txt
index 4257195..485e85a 100644
--- a/build/header_comment.txt
+++ b/build/header_comment.txt
@@ -11,4 +11,5 @@
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
  * @version     1.0.0
  * @link        https://git.timshomepage.net/timw4mail/ion
- */
\ No newline at end of file
+ */
+
diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index 3ae05d1..055357f 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -25,28 +25,30 @@ if ( ! function_exists('glob_recursive'))
 
 function get_text_to_replace($tokens)
 {
-	if ($tokens[0][0] !== T_OPEN_TAG)
+	$output = '';
+
+	// Tokens have the follow structure if arrays:
+	// [0] => token type constant
+	// [1] => raw sytax parsed to that token
+	// [2] => line number
+	foreach($tokens as $token)
 	{
-		return NULL;
+		// Since we only care about opening docblocks,
+		// bail out when we get to the namespace token
+		if (is_array($token) && $token[0] === T_NAMESPACE)
+		{
+			break;
+		}
+
+		if (is_array($token))
+		{
+			$token = $token[1];
+		}
+
+		$output .= $token;
 	}
 
-	// If there is already a docblock, as the second token after the
-	// open tag, get the contents of that token to replace
-	if ($tokens[1][0] === T_DOC_COMMENT)
-	{
-		return "<?php\n" . $tokens[1][1];
-	}
-	// If there is a declare strict types,
-	else if ($tokens[1][0] === T_DECLARE && $tokens[9][0] === T_DOC_COMMENT)
-	{
-		// '<?php' and 'declare(strict_types=1);' makes for 8 tokens
-		// replace it all
-		return "<?php\ndeclare(strict_types=1);\n" . $tokens[9][1];
-	}
-	else if ($tokens[1][0] !== T_DOC_COMMENT)
-	{
-		return "<?php";
-	}
+	return $output;
 }
 
 function get_tokens($source)
@@ -59,6 +61,12 @@ function replace_files(array $files, $template)
 	foreach ($files as $file)
 	{
 		$source = file_get_contents($file);
+
+		if (stripos($source, 'namespace') === FALSE)
+		{
+			continue;
+		}
+
 		$tokens = get_tokens($source);
 		$text_to_replace = get_text_to_replace($tokens);
 
diff --git a/composer.json b/composer.json
index 3285a6c..944393c 100644
--- a/composer.json
+++ b/composer.json
@@ -34,14 +34,13 @@
 		"humbug/humbug": "~1.0@dev",
 		"consolidation/robo": "~1.0@RC",
 		"henrikbjorn/lurker": "^1.1.0",
-		"nikic/php-parser": "3.0.*@alpha",
+		"nikic/php-parser": "3.0.*@beta",
 		"monolog/monolog": "1.*",
 		"predis/predis": "1.1.*",
-		"squizlabs/php_codesniffer": "^3.0.0@alpha"
+		"squizlabs/php_codesniffer": "^3.0.0@RC"
 	},
 	"suggest": {
 		"monolog/monolog": "Provides implementation of psr/log",
-	  	"predis/predis": "Required for redis cache driver",
-		"zendframework/zend-diactoros": "Provides implementation of psr/http-message"
+		"predis/predis": "Required for redis cache driver"
 	}
 }
diff --git a/src/StringWrapper.php b/src/StringWrapper.php
index 38e0887..daa4868 100644
--- a/src/StringWrapper.php
+++ b/src/StringWrapper.php
@@ -29,7 +29,7 @@ trait StringWrapper {
 	 * @param string $str
 	 * @return StringType
 	 */
-	public function string($str)
+	public function string($str): StringType
 	{
 		return StringType::create($str);
 	}
diff --git a/tests/BaseModelTest.php b/tests/BaseModelTest.php
index 9006d3d..37d5e6b 100644
--- a/tests/BaseModelTest.php
+++ b/tests/BaseModelTest.php
@@ -4,7 +4,7 @@ namespace Aviat\Ion\Tests;
 
 use Aviat\Ion\Model as BaseModel;
 
-class BaseModelTest extends \Ion_TestCase {
+class BaseModelTest extends Ion_TestCase {
 
 	public function testBaseModelSanity()
 	{
diff --git a/tests/Cache/CacheManagerTest.php b/tests/Cache/CacheManagerTest.php
index 94ab34c..ca6415c 100644
--- a/tests/Cache/CacheManagerTest.php
+++ b/tests/Cache/CacheManagerTest.php
@@ -18,8 +18,9 @@ namespace Aviat\Ion\Tests\Cache;
 
 use Aviat\Ion\Friend;
 use Aviat\Ion\Cache\CacheManager;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class CacheManagerTest extends \Ion_TestCase {
+class CacheManagerTest extends Ion_TestCase {
 
 	protected $cachedTime;
 
diff --git a/tests/Cache/Driver/NullDriverTest.php b/tests/Cache/Driver/NullDriverTest.php
index af8ef8d..4bac011 100644
--- a/tests/Cache/Driver/NullDriverTest.php
+++ b/tests/Cache/Driver/NullDriverTest.php
@@ -17,8 +17,9 @@
 namespace Aviat\Ion\Tests\Cache\Driver;
 
 use Aviat\Ion\Cache\Driver\NullDriver;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class CacheNullDriverTest extends \Ion_TestCase {
+class CacheNullDriverTest extends Ion_TestCase {
 	use CacheDriverBase;
 
 	protected $driver;
diff --git a/tests/Cache/Driver/RedisDriver2Test.php b/tests/Cache/Driver/RedisDriver2Test.php
index 6ac26eb..6446d0b 100644
--- a/tests/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Cache/Driver/RedisDriver2Test.php
@@ -18,8 +18,9 @@ namespace Aviat\Ion\Tests\Cache\Driver;
 
 use Aviat\Ion\Config;
 use Aviat\Ion\Cache\Driver\RedisDriver;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class CacheRedisDriverTestTwo extends \Ion_TestCase {
+class CacheRedisDriverTestTwo extends Ion_TestCase {
 	use CacheDriverBase;
 
 	protected $driver;
diff --git a/tests/Cache/Driver/RedisDriverTest.php b/tests/Cache/Driver/RedisDriverTest.php
index 87bc20f..66087f7 100644
--- a/tests/Cache/Driver/RedisDriverTest.php
+++ b/tests/Cache/Driver/RedisDriverTest.php
@@ -17,8 +17,9 @@
 namespace Aviat\Ion\Tests\Cache\Driver;
 
 use Aviat\Ion\Cache\Driver\RedisDriver;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class CacheRedisDriverTest extends \Ion_TestCase {
+class CacheRedisDriverTest extends Ion_TestCase {
 	use CacheDriverBase;
 
 	protected $driver;
diff --git a/tests/Cache/Driver/SQLDriverTest.php b/tests/Cache/Driver/SQLDriverTest.php
index 228fe1b..308fd09 100644
--- a/tests/Cache/Driver/SQLDriverTest.php
+++ b/tests/Cache/Driver/SQLDriverTest.php
@@ -19,8 +19,9 @@ namespace Aviat\Ion\Tests\Cache\Driver;
 use Aviat\Ion\Config;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Cache\Driver\SQLDriver;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class CacheSQLDriverTest extends \Ion_TestCase {
+class CacheSQLDriverTest extends Ion_TestCase {
 	use CacheDriverBase;
 
 	protected $driver;
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 8570a3a..2a32775 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -4,7 +4,7 @@ namespace Aviat\Ion\Tests;
 
 use Aviat\Ion\Config;
 
-class ConfigTest extends \Ion_TestCase {
+class ConfigTest extends Ion_TestCase {
 
 	public function setUp()
 	{
diff --git a/tests/Di/ContainerAwareTest.php b/tests/Di/ContainerAwareTest.php
index 4647a68..59572e3 100644
--- a/tests/Di/ContainerAwareTest.php
+++ b/tests/Di/ContainerAwareTest.php
@@ -16,10 +16,9 @@
 
 namespace Aviat\Ion\Tests\Di;
 
-use Aviat\Ion\Di\Container;
-use Aviat\Ion\Di\ContainerAware;
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Di\{Container, ContainerAware, ContainerInterface};
 use Aviat\Ion\Di\Exception\ContainerException;
+use Aviat\Ion\Tests\Ion_TestCase;
 
 class Aware {
 	use ContainerAware;
@@ -31,7 +30,7 @@ class Aware {
 }
 
 
-class ContainerAwareTest extends \Ion_TestCase {
+class ContainerAwareTest extends Ion_TestCase {
 
 	public function setUp()
 	{
diff --git a/tests/Di/ContainerTest.php b/tests/Di/ContainerTest.php
index 37647cd..7649aa7 100644
--- a/tests/Di/ContainerTest.php
+++ b/tests/Di/ContainerTest.php
@@ -18,9 +18,9 @@ namespace Aviat\Ion\Tests\Di;
 
 use Aviat\Ion\Di\Container;
 use Aviat\Ion\Di\Exception\ContainerException;
+use Aviat\Ion\Tests\Ion_TestCase;
 use Monolog\Logger;
-use Monolog\Handler\TestHandler;
-use Monolog\Handler\NullHandler;
+use Monolog\Handler\{TestHandler, NullHandler};
 
 class FooTest {
 
@@ -35,7 +35,7 @@ class FooTest2 {
 	use \Aviat\Ion\Di\ContainerAware;
 }
 
-class ContainerTest extends \Ion_TestCase {
+class ContainerTest extends Ion_TestCase {
 
 
 	public function setUp()
diff --git a/tests/EnumTest.php b/tests/EnumTest.php
index cdfad7d..1b36f29 100644
--- a/tests/EnumTest.php
+++ b/tests/EnumTest.php
@@ -3,9 +3,8 @@
 namespace Aviat\Ion\Tests;
 
 use Aviat\Ion\Enum;
-use TestEnum;
 
-class EnumTest extends \Ion_TestCase {
+class EnumTest extends Ion_TestCase {
 
 	protected $expectedConstList = [
 		'FOO' => 'bar',
diff --git a/tests/Exception/DoubleRenderExceptionTest.php b/tests/Exception/DoubleRenderExceptionTest.php
index a75caa0..b9ebbbd 100644
--- a/tests/Exception/DoubleRenderExceptionTest.php
+++ b/tests/Exception/DoubleRenderExceptionTest.php
@@ -17,8 +17,9 @@
 namespace Aviat\Ion\Tests\Exception;
 
 use Aviat\Ion\Exception\DoubleRenderException;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class DoubleRenderExceptionTest extends \Ion_TestCase {
+class DoubleRenderExceptionTest extends Ion_TestCase {
 
 	public function testDefaultMessage()
 	{
diff --git a/tests/FriendTest.php b/tests/FriendTest.php
index 916c23a..719b4c8 100644
--- a/tests/FriendTest.php
+++ b/tests/FriendTest.php
@@ -3,13 +3,14 @@
 namespace Aviat\Ion\Tests;
 
 use Aviat\Ion\Friend;
+use Aviat\Ion\Tests\FriendTestClass;
 
-class FriendTest extends \Ion_TestCase {
+class FriendTest extends Ion_TestCase {
 
 	public function setUp()
 	{
 		parent::setUp();
-		$obj = new \FriendTestClass();
+		$obj = new FriendTestClass();
 		$this->friend = new Friend($obj);
 	}
 
diff --git a/tests/Ion_TestCase.php b/tests/Ion_TestCase.php
index 875dcff..a75e661 100644
--- a/tests/Ion_TestCase.php
+++ b/tests/Ion_TestCase.php
@@ -1,15 +1,17 @@
 <?php
 
+namespace Aviat\Ion\Tests;
+
 use Aura\Web\WebFactory;
+use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response as HttpResponse;
 
-use Aviat\Ion\Json;
-
 define('ROOT_DIR', realpath(__DIR__ . '/../') . '/');
 define('SRC_DIR', ROOT_DIR . 'src/');
 define('TEST_DATA_DIR', __DIR__ . '/test_data');
@@ -18,7 +20,7 @@ define('TEST_VIEW_DIR', __DIR__ . '/test_views');
 /**
  * Base class for TestCases
  */
-class Ion_TestCase extends PHPUnit_Framework_TestCase {
+class Ion_TestCase extends TestCase {
 	// Test directory constants
 	const ROOT_DIR = ROOT_DIR;
 	const SRC_DIR = SRC_DIR;
@@ -102,7 +104,7 @@ class Ion_TestCase extends PHPUnit_Framework_TestCase {
 	 * @param array $supers
 	 * @return void
 	 */
-	public function setSuperGlobals($supers = [])
+	public function setSuperGlobals(array $supers = [])
 	{
 		$default = [
 			'_SERVER' => $_SERVER,
diff --git a/tests/JsonTest.php b/tests/JsonTest.php
index 16a0b66..727fa5a 100644
--- a/tests/JsonTest.php
+++ b/tests/JsonTest.php
@@ -2,10 +2,9 @@
 
 namespace Aviat\Ion\Tests;
 
-use Aviat\Ion\Json;
-use Aviat\Ion\JsonException;
+use Aviat\Ion\{Json, JsonException};
 
-class JsonTest extends \Ion_TestCase {
+class JsonTest extends Ion_TestCase {
 
 	public function testEncode()
 	{
diff --git a/tests/Model/BaseDBModelTest.php b/tests/Model/BaseDBModelTest.php
index 51fd96a..1a69438 100644
--- a/tests/Model/BaseDBModelTest.php
+++ b/tests/Model/BaseDBModelTest.php
@@ -17,8 +17,9 @@
 namespace Aviat\Ion\Tests\Model;
 
 use Aviat\Ion\Model\DB as BaseDBModel;
+use Aviat\Ion\Tests\Ion_TestCase;
 
-class BaseDBModelTest extends \Ion_TestCase {
+class BaseDBModelTest extends Ion_TestCase {
 
 	public function testBaseDBModelSanity()
 	{
diff --git a/tests/TestSessionHandler.php b/tests/TestSessionHandler.php
index 16537a4..e360dc7 100644
--- a/tests/TestSessionHandler.php
+++ b/tests/TestSessionHandler.php
@@ -1,16 +1,20 @@
 <?php
 
+namespace Aviat\Ion\Tests;
+
+use SessionHandlerInterface;
+
 class TestSessionHandler implements SessionHandlerInterface {
-	
+
 	public $data = [];
 	public $save_path = './test_data/sessions';
-	
-	public function close() 
+
+	public function close()
 	{
 		return TRUE;
 	}
-	
-	public function destroy($id) 
+
+	public function destroy($id)
 	{
 		$file = "$this->save_path/$id";
 		if (file_exists($file))
@@ -20,13 +24,13 @@ class TestSessionHandler implements SessionHandlerInterface {
 		$this->data[$id] = [];
 		return TRUE;
 	}
-	
+
 	public function gc($maxLifetime)
 	{
 		return TRUE;
 	}
-	
-	public function open($save_path, $name) 
+
+	public function open($save_path, $name)
 	{
 		/*if ( ! array_key_exists($save_path, $this->data))
 		{
@@ -35,19 +39,19 @@ class TestSessionHandler implements SessionHandlerInterface {
 		}*/
 		return TRUE;
 	}
-	
-	public function read($id) 
+
+	public function read($id)
 	{
 		return json_decode(@file_get_contents("$this->save_path/$id"), TRUE);
 	}
-	
-	public function write($id, $data) 
+
+	public function write($id, $data)
 	{
 		$file = "$this->save_path/$id";
 		file_put_contents($file, json_encode($data));
-		
+
 		return TRUE;
 	}
-	
+
 }
 // End of TestSessionHandler.php
\ No newline at end of file
diff --git a/tests/Transformer/AbstractTransformerTest.php b/tests/Transformer/AbstractTransformerTest.php
index 5f1905e..9988c44 100644
--- a/tests/Transformer/AbstractTransformerTest.php
+++ b/tests/Transformer/AbstractTransformerTest.php
@@ -16,14 +16,17 @@
 
 namespace Aviat\Ion\Tests\Transformer;
 
-class AbstractTransformerTest extends \Ion_TestCase {
+use Aviat\Ion\Tests\Ion_TestCase;
+use Aviat\Ion\Tests\TestTransformer;
+
+class AbstractTransformerTest extends Ion_TestCase {
 
 	protected $transformer;
 
 
 	public function setUp()
 	{
-		$this->transformer = new \TestTransformer();
+		$this->transformer = new TestTransformer();
 	}
 
 	public function dataTransformCollection()
diff --git a/tests/Type/ArrayTypeTest.php b/tests/Type/ArrayTypeTest.php
index 5b3dc90..4acad36 100644
--- a/tests/Type/ArrayTypeTest.php
+++ b/tests/Type/ArrayTypeTest.php
@@ -16,9 +16,11 @@
 
 namespace Aviat\Ion\Tests\Type;
 
-class ArrayTypeTest extends \Ion_TestCase {
-	use \Aviat\Ion\ArrayWrapper;
+use Aviat\Ion\ArrayWrapper;
+use Aviat\Ion\Tests\Ion_TestCase;
 
+class ArrayTypeTest extends Ion_TestCase {
+	use ArrayWrapper;
 
 	public function setUp()
 	{
diff --git a/tests/View/HtmlViewTest.php b/tests/View/HtmlViewTest.php
index 59c1422..5e355dd 100644
--- a/tests/View/HtmlViewTest.php
+++ b/tests/View/HtmlViewTest.php
@@ -16,6 +16,10 @@
 
 namespace Aviat\Ion\Tests\View;
 
+use Aviat\Ion\Tests\TestHtmlView;
+
+use function _dir;
+
 class HtmlViewTest extends HttpViewTest {
 
 	protected $template_path;
@@ -23,7 +27,7 @@ class HtmlViewTest extends HttpViewTest {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->view = new \TestHtmlView($this->container);
+		$this->view = new TestHtmlView($this->container);
 	}
 
 	public function testRenderTemplate()
diff --git a/tests/View/HttpViewTest.php b/tests/View/HttpViewTest.php
index afe82cd..d6f6d0a 100644
--- a/tests/View/HttpViewTest.php
+++ b/tests/View/HttpViewTest.php
@@ -18,8 +18,10 @@ namespace Aviat\Ion\Tests\View;
 
 use Aviat\Ion\Friend;
 use Aviat\Ion\Exception\DoubleRenderException;
+use Aviat\Ion\Tests\Ion_TestCase;
+use Aviat\Ion\Tests\TestHttpView;
 
-class HttpViewTest extends \Ion_TestCase {
+class HttpViewTest extends Ion_TestCase {
 
 	protected $view;
 	protected $friend;
@@ -27,7 +29,7 @@ class HttpViewTest extends \Ion_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->view = new \TestHttpView($this->container);
+		$this->view = new TestHttpView($this->container);
 		$this->friend = new Friend($this->view);
 	}
 
diff --git a/tests/View/JsonViewTest.php b/tests/View/JsonViewTest.php
index 05716fc..5a9874c 100644
--- a/tests/View/JsonViewTest.php
+++ b/tests/View/JsonViewTest.php
@@ -17,6 +17,7 @@
 namespace Aviat\Ion\Tests\View;
 
 use Aviat\Ion\Friend;
+use Aviat\Ion\Tests\TestJsonView;
 
 class JsonViewTest extends HttpViewTest {
 
@@ -24,14 +25,14 @@ class JsonViewTest extends HttpViewTest {
 	{
 		parent::setUp();
 
-		$this->view = new \TestJsonView($this->container);
+		$this->view = new TestJsonView($this->container);
 		$this->friend = new Friend($this->view);
 	}
 
 	public function testSetOutputJSON()
 	{
 		// Extend view class to remove destructor which does output
-		$view = new \TestJsonView($this->container);
+		$view = new TestJsonView($this->container);
 
 		// Json encode non-string
 		$content = ['foo' => 'bar'];
@@ -43,7 +44,7 @@ class JsonViewTest extends HttpViewTest {
 	public function testSetOutput()
 	{
 		// Directly set string
-		$view = new \TestJsonView($this->container);
+		$view = new TestJsonView($this->container);
 		$content = '{}';
 		$expected = '{}';
 		$view->setOutput($content);
diff --git a/tests/mocks.php b/tests/mocks.php
index b83fcf5..5ba55aa 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -3,14 +3,14 @@
  * All the mock classes that extend the classes they are used to test
  */
 
+namespace Aviat\Ion\Tests;
+
 use Aviat\Ion\Enum;
 use Aviat\Ion\Exception\DoubleRenderException;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Transformer\AbstractTransformer;
 use Aviat\Ion\View;
-use Aviat\Ion\View\HtmlView;
-use Aviat\Ion\View\HttpView;
-use Aviat\Ion\View\JsonView;
+use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
 
 // -----------------------------------------------------------------------------
 // Mock the default error handler