Start of PHP 7 updates

build/header_comment.txt

@@ -3,7 +3,7 @@
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

build/update_header_comments.php

@@ -1,7 +1,9 @@
 <?php
+declare(strict_types=1);
 
-$ion_file_patterns = [
+$file_patterns = [
-	'src/*.php'
+	'src/*.php',
+	'tests/**/*.php',
 ];
 
 if ( ! function_exists('glob_recursive'))
@@ -34,6 +36,13 @@ function get_text_to_replace($tokens)
 	{
 		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";
@@ -54,17 +63,17 @@ function replace_files(array $files, $template)
 		$text_to_replace = get_text_to_replace($tokens);
 
 		$header = file_get_contents(__DIR__ . $template);
-		$new_text = "<?php\n{$header}";
+		$new_text = "<?php declare(strict_types=1);\n{$header}";
 
 		$new_source = str_replace($text_to_replace, $new_text, $source);
 		file_put_contents($file, $new_source);
 	}
 }
 
-foreach ($ion_file_patterns as $glob)
+foreach ($file_patterns as $glob)
 {
 	$files = glob_recursive($glob);
-	replace_files($files, '/ion_header_comment.txt');
+	replace_files($files, '/header_comment.txt');
 }
 
 echo "Successfully updated headers \n";

src/ArrayWrapper.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/CacheInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/CacheManager.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/Driver/DriverInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/Driver/DriverTrait.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/Driver/NullDriver.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/Driver/RedisDriver.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Cache/Driver/SQLDriver.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Config.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/ConfigInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/Container.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/ContainerAware.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/ContainerAwareInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/ContainerInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/Exception/ContainerException.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Di/Exception/NotFoundException.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Enum.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Exception/ConfigException.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Exception/DoubleRenderException.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Friend.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Json.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/JsonException.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Model.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Model/DB.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/StaticInstance.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/StringWrapper.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Transformer/AbstractTransformer.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Transformer/TransformerInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Type/ArrayType.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/Type/StringType.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/View.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/View/HtmlView.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/View/HttpView.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/View/JsonView.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

src/ViewInterface.php

@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Ion
  *
  * Building blocks for web development
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>

tests/Cache/CacheManagerTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache;
 

tests/Cache/Driver/CacheDriverBase.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache\Driver;
 

tests/Cache/Driver/NullDriverTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache\Driver;
 

tests/Cache/Driver/RedisDriver2Test.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache\Driver;
 

tests/Cache/Driver/RedisDriverTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache\Driver;
 

tests/Cache/Driver/SQLDriverTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Cache\Driver;
 

tests/Di/ContainerAwareTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Di;
 

tests/Di/ContainerTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Di;
 

tests/Exception/DoubleRenderExceptionTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Exception;
 

tests/Model/BaseDBModelTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Model;
 

tests/Transformer/AbstractTransformerTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Transformer;
 

tests/Type/ArrayTypeTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\Type;
 

tests/View/HtmlViewTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\View;
 

tests/View/HttpViewTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\View;
 

tests/View/JsonViewTest.php

@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     1.0.0
+ * @link        https://git.timshomepage.net/timw4mail/ion
+ */
 
 namespace Aviat\Ion\Tests\View;