Make sure fresh dependencies are installed on CI runs

.gitignore

@@ -30,3 +30,4 @@ build/humbuglog.txt
 phpdoc/
 tests/test_data/json_write.json
 tests/test_data/sessions/
+.phpunit.result.cache

.gitlab-ci.yml

@@ -1,31 +0,0 @@
-test:7:
-    before_script:
-      - sh build/docker_install.sh > /dev/null
-      - apk add --no-cache php7-phpdbg
-      - curl -sS https://getcomposer.org/installer | php
-      - php composer.phar install --ignore-platform-reqs
-    image: php:7-alpine
-    script:
-      - phpdbg -qrr -- vendor/bin/phpunit -c build --coverage-text --colors=never
-
-test:7.1:
-    stage: test
-    before_script:
-      - sh build/docker_install.sh > /dev/null
-      - apk add --no-cache php7-phpdbg
-      - curl -sS https://getcomposer.org/installer | php
-      - php composer.phar install --ignore-platform-reqs
-    image: php:7.1-alpine
-    script:
-      - phpdbg -qrr -- ./vendor/bin/phpunit -c build --coverage-text --colors=never
-
-test:7.2:
-    stage: test
-    before_script:
-      - sh build/docker_install.sh > /dev/null
-      - apk add --no-cache php7-phpdbg
-      - curl -sS https://getcomposer.org/installer | php
-      - php composer.phar install --ignore-platform-reqs
-    image: php:7.2-alpine
-    script:
-      - phpdbg -qrr -- ./vendor/bin/phpunit -c build --coverage-text --colors=never

.travis.yml

@@ -4,10 +4,9 @@ install:
   - composer install
 
 php:
-  - 7
-  - 7.1
   - 7.2
-  - hhvm
+  - 7.3
+  - 7.4
   - nightly
 
 script:
@@ -15,7 +14,7 @@ script:
   - vendor/bin/phpunit -c build
 
 services:
-  - redis
+  - redis-server
 
 matrix:
   allow_failures:

Jenkinsfile

@@ -0,0 +1,50 @@
+pipeline {
+	agent none
+	stages {
+		stage('PHP 7.2') {
+			agent {
+				docker {
+				    image 'php:7.2-alpine'
+				    args '-u root --privileged'
+				}
+			}
+			steps {
+				sh 'apk add --no-cache php7-phpdbg'
+				sh 'curl -sS https://getcomposer.org/installer | php'
+				sh 'rm -f composer.lock'
+				sh 'php composer.phar install --ignore-platform-reqs'
+				sh 'php composer.phar run-script coverage -- --coverage-text --colors=never'
+			}
+		}
+		stage('PHP 7.3') {
+			agent {
+				docker {
+					image 'php:7.3-alpine'
+					args '-u root --privileged'
+				}
+			}
+			steps {
+				sh 'apk add --no-cache php7-phpdbg'
+				sh 'curl -sS https://getcomposer.org/installer | php'
+				sh 'rm -f composer.lock'
+				sh 'php composer.phar install --ignore-platform-reqs'
+				sh 'php composer.phar run-script coverage -- --coverage-text --colors=never'
+			}
+		}
+		stage('PHP 7.4') {
+			agent {
+				docker {
+					image 'php:7.4-alpine'
+					args '-u root --privileged'
+				}
+			}
+			steps {
+				sh 'apk add --no-cache php7-phpdbg'
+				sh 'curl -sS https://getcomposer.org/installer | php'
+				sh 'rm -f composer.lock'
+				sh 'php composer.phar install --ignore-platform-reqs'
+				sh 'php composer.phar run-script coverage -- --coverage-text --colors=never'
+			}
+		}
+	}
+}

README.md

@@ -1,7 +1,6 @@
 # Ion
 
-[![build status](https://git.timshomepage.net/aviat/ion/badges/master/build.svg)](https://git.timshomepage.net/aviat/ion/commits/master)
+[![Build Status](https://travis-ci.org/timw4mail/ion.svg?branch=master)](https://travis-ci.org/timw4mail/ion)
-[![coverage report](https://git.timshomepage.net/aviat/ion/badges/master/coverage.svg)](https://git.timshomepage.net/aviat/ion/commits/master)
+[![Build Status](https://jenkins.timshomepage.net/buildStatus/icon?job=Gitea%20-%20aviat/ion/master)](https://jenkins.timshomepage.net/job/Gitea%20-%20aviat/ion/master)
-
 
 Ion is a set of helpful PHP libraries for general web development

build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php

@@ -93,12 +93,12 @@ class InlineCommentSniff implements Sniff
     private function _checkCommentStyle(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['content']{0} === '#') {
+        if ($tokens[$stackPtr]['content'][0] === '#') {
             $error  = 'Perl-style comments are not allowed; use "// Comment" or DocBlock comments instead';
             $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
             return FALSE;
         } else if (substr($tokens[$stackPtr]['content'], 0, 2) === '/*'
-            || $tokens[$stackPtr]['content']{0} === '*'
+            || $tokens[$stackPtr]['content'][0] === '*'
         ) {
             $error  = 'Multi lines comments are not allowed; use "// Comment" DocBlock comments instead';
             $phpcsFile->addError($error, $stackPtr, 'WrongStyle');

build/docker_install.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# We need to install dependencies only for Docker
-[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0
-
-set -xe
-
-# Install git (the php image doesn't have it) which is required by composer
-echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories
-apk add --no-cache \
-	curl \
-	git

build/header_comment.txt

@@ -3,13 +3,13 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 

build/phpunit.xml

@@ -20,7 +20,7 @@
 		<!-- <log type="coverage-clover" target="logs/clover.xml"/>
 		<log type="coverage-crap4j" target="logs/crap4j.xml"/> -->
 		<log type="coverage-xml" target="logs/coverage" />
-		<log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
+		<log type="junit" target="logs/junit.xml" />
 	</logging>
 	<php>
 		<server name="HTTP_USER_AGENT" value="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393" />

composer.json

@@ -1,52 +1,55 @@
 {
-	"name": "aviat/ion",
+  "name": "aviat/ion",
-	"description": "Basic PHP Framework",
+  "description": "Basic PHP Framework",
-	"license":"MIT",
+  "license": "MIT",
-	"autoload": {
+  "autoload": {
-		"files": [
+	"files": [
-			"src/functions.php"
+	  "src/functions.php"
-		],
+	],
-		"psr-4": {
+	"psr-4": {
-			"Aviat\\Ion\\": "src/"
+	  "Aviat\\Ion\\": "src/"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Aviat\\Ion\\Tests\\": "tests/",
-			"CodeIgniter\\": "build/CodeIgniter/"
-		}
-	},
-	"require": {
-		"aviat/query": "^2.5",
-		"aura/html": "2.*",
-		"container-interop/container-interop": "1.*",
-		"danielstjules/stringy": "^3.0.0",
-		"psr/http-message": "~1.0",
-		"psr/log": "~1.0",
-		"zendframework/zend-diactoros": "^1.4.0"
-	},
-	"require-dev": {
-	  	"aura/session": "^2.1.0",
-		"consolidation/robo": "^1.1.0",
-		"monolog/monolog": "1.*",
-		"pdepend/pdepend": "^2.2",
-		"phploc/phploc": "^4.0",
-		"phpmd/phpmd": "^2.4",
-		"phpstan/phpstan": "^0.9.1",
-		"phpunit/phpunit": "^6.0",
-		"robmorgan/phinx": "^0.9.2",
-		"sebastian/phpcpd": "^3.0",
-		"squizlabs/php_codesniffer": "^3.0.0",
-		"theseer/phpdox": "^0.11.0"
-	},
-	"scripts": {
-		"coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build",
-		"build": "robo build",
-		"docs": "cd build && ../vendor/bin/phpdox && cd ..",
-		"phpstan": "phpstan analyse -l 7 -c phpstan.neon src tests",
-		"test": "phpunit"
-	},
-	"suggest": {
-		"monolog/monolog": "Provides implementation of psr/log"
 	}
+  },
+  "autoload-dev": {
+	"psr-4": {
+	  "Aviat\\Ion\\Tests\\": "tests/",
+	  "CodeIgniter\\": "build/CodeIgniter/"
+	}
+  },
+  "require": {
+	"aura/html": "^2.5.0",
+	"aviat/query": "^2.5.1",
+	"danielstjules/stringy": "^3.1.0",
+	"ext-dom": "*",
+	"ext-json": "*",
+	"php": "^7.2",
+	"psr/http-message": "~1.0",
+	"psr/log": "~1.0",
+	"zendframework/zend-diactoros": "^2.0.0",
+	"zendframework/zend-httphandlerrunner": "^1.0"
+  },
+  "require-dev": {
+	"aura/session": "^2.1.0",
+	"consolidation/robo": "^2.0.0",
+	"monolog/monolog": "^2.0.1",
+	"pdepend/pdepend": "^2.2",
+	"phploc/phploc": "^5.0",
+	"phpmd/phpmd": "^2.4",
+	"phpstan/phpstan": "^0.12.0",
+	"phpunit/phpunit": "^8.4.3",
+	"roave/security-advisories": "dev-master",
+	"sebastian/phpcpd": "^4.1.0",
+	"squizlabs/php_codesniffer": "^3.0.0",
+	"theseer/phpdox": "^0.12.0"
+  },
+  "scripts": {
+	"coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build",
+	"build": "robo build",
+	"docs": "cd build && ../vendor/bin/phpdox && cd ..",
+	"phpstan": "phpstan analyse -l 7 -c phpstan.neon src tests",
+	"test": "phpunit -c phpunit.dist.xml"
+  },
+  "suggest": {
+	"monolog/monolog": "Provides implementation of psr/log"
+  }
 }

phpunit.dist.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit 
+<phpunit
-    colors="true"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    stopOnFailure="false"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
-    bootstrap="tests/bootstrap.php"
+	colors="true"
-    beStrictAboutTestsThatDoNotTestAnything="true">
+	stopOnFailure="false"
-    <filter>
+	bootstrap="tests/bootstrap.php"
-        <whitelist>
+	beStrictAboutTestsThatDoNotTestAnything="true">
-            <directory suffix=".php">src</directory>
+	<filter>
-        </whitelist>
+		<whitelist>
-    </filter>
+			<directory suffix=".php">src</directory>
-    <testsuites>
+		</whitelist>
-        <testsuite name="Ion">
+	</filter>
-            <directory>tests</directory>
+	<testsuites>
-        </testsuite>
+		<testsuite name="Ion">
-    </testsuites>
+			<directory>tests</directory>
+		</testsuite>
+	</testsuites>
 </phpunit>

src/ArrayWrapper.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/Config.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -44,14 +44,25 @@ class Config implements ConfigInterface {
 		$this->map = $this->arr($configArray);
 	}
 
+	/**
+	 * Does the config item exist?
+	 *
+	 * @param string|int|array $key
+	 * @return bool
+	 */
+	public function has($key): bool
+	{
+		return $this->map->hasKey($key);
+	}
+
 	/**
 	 * Get a config value
 	 *
-	 * @param array|string $key
+	 * @param array|string|null $key
 	 * @return mixed
 	 * @throws ConfigException
 	 */
-	public function get($key)
+	public function get($key = NULL)
 	{
 		if (\is_array($key))
 		{

src/ConfigInterface.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -20,13 +20,21 @@ namespace Aviat\Ion;
  * Standard interface for retrieving/setting configuration values
  */
 interface ConfigInterface {
+	/**
+	 * Does the config item exist?
+	 *
+	 * @param string|int|array $key
+	 * @return bool
+	 */
+	public function has($key): bool;
+
 	/**
 	 * Get a config value
 	 *
-	 * @param array|string $key
+	 * @param array|string|null $key
 	 * @return mixed
 	 */
-	public function get($key);
+	public function get($key = NULL);
 
 	/**
 	 * Set a config value
@@ -36,7 +44,7 @@ interface ConfigInterface {
 	 * @throws \InvalidArgumentException
 	 * @return ConfigInterface
 	 */
-	public function set($key, $value): ConfigInterface;
+	public function set($key, $value): self;
 
 	/**
 	 * Remove a config value

src/Di/Container.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di;
@@ -211,8 +211,8 @@ class Container implements ContainerInterface {
 	 */
 	private function applyContainer($obj)
 	{
-		$trait_name = __NAMESPACE__ . '\\ContainerAware';
+		$trait_name = ContainerAware::class;
-		$interface_name = __NAMESPACE__ . '\\ContainerAwareInterface';
+		$interface_name = ContainerAwareInterface::class;
 
 		$uses_trait = \in_array($trait_name, class_uses($obj), TRUE);
 		$implements_interface = \in_array($interface_name, class_implements($obj), TRUE);

src/Di/ContainerAware.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di;

src/Di/ContainerAwareInterface.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di;

src/Di/ContainerInterface.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di;
@@ -75,6 +75,7 @@ interface ContainerInterface {
 
 	/**
 	 * Determine whether a logger channel is registered
+	 *
 	 * @param  string $id The logger channel
 	 * @return boolean
 	 */

src/Di/Exception/ContainerException.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di\Exception;

src/Di/Exception/NotFoundException.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Di\Exception;

src/Enum.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -27,6 +27,7 @@ abstract class Enum {
 	 * Return the list of constant values for the Enum
 	 *
 	 * @return array
+	 * @throws \ReflectionException
 	 */
 	public static function getConstList(): array
 	{
@@ -47,6 +48,7 @@ abstract class Enum {
 	 *
 	 * @param  mixed $key
 	 * @return boolean
+	 * @throws \ReflectionException
 	 */
 	public static function isValid($key): bool
 	{

src/Exception/ConfigException.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Exception;

src/Exception/DoubleRenderException.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Exception;

src/Friend.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -35,7 +35,7 @@ class Friend {
 
 	/**
 	 * Reflection class of the object
-	 * @var \ReflectionClass
+	 * @var ReflectionClass
 	 */
 	private $_reflect_;
 
@@ -44,6 +44,7 @@ class Friend {
 	 *
 	 * @param mixed $obj
 	 * @throws InvalidArgumentException
+	 * @throws \ReflectionException
 	 */
 	public function __construct($obj)
 	{
@@ -115,6 +116,7 @@ class Friend {
 	 * @param  array  $args
 	 * @return mixed
 	 * @throws BadMethodCallException
+	 * @throws \ReflectionException
 	 */
 	public function __call(string $method, array $args)
 	{

src/Json.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/JsonException.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/Model.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/Model/DB.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Model;

src/StringWrapper.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/Transformer/AbstractTransformer.php

@@ -4,22 +4,24 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Transformer;
 
 use Aviat\Ion\StringWrapper;
 
+use BadMethodCallException;
+
 /**
- * Base class for data trasformation
+ * Base class for data transformation
  */
 abstract class AbstractTransformer implements TransformerInterface {
 
@@ -36,13 +38,32 @@ abstract class AbstractTransformer implements TransformerInterface {
 	/**
 	 * Transform a set of structures
 	 *
-	 * @param  array|object $collection
+	 * @param  iterable $collection
 	 * @return array
 	 */
-	public function transformCollection($collection): array
+	public function transformCollection(iterable $collection): array
 	{
 		$list = (array)$collection;
 		return array_map([$this, 'transform'], $list);
 	}
+
+	/**
+	 * Untransform a set of structures
+	 *
+	 * Requires an 'untransform' method in the extending class
+	 *
+	 * @param iterable $collection
+	 * @return array
+	 */
+	public function untransformCollection(iterable $collection): array
+	{
+		if ( ! method_exists($this, 'untransform'))
+		{
+			throw new BadMethodCallException('untransform() method does not exist.');
+		}
+
+		$list = (array)$collection;
+		return array_map([$this, 'untransform'], $list);
+	}
 }
 // End of AbstractTransformer.php

src/Transformer/TransformerInterface.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Transformer;

src/Type/ArrayType.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Type;
@@ -114,11 +114,28 @@ class ArrayType {
 	/**
 	 * Does the passed key exist in the current array?
 	 *
-	 * @param int|string $key
+	 * @param int|string|array $key
 	 * @return bool
 	 */
 	public function hasKey($key): bool
 	{
+		if (\is_array($key))
+		{
+			$pos =& $this->arr;
+
+			foreach($key as $level)
+			{
+				if ( ! array_key_exists($level, $pos))
+				{
+					return FALSE;
+				}
+
+				$pos =& $pos[$level];
+			}
+
+			return TRUE;
+		}
+
 		return array_key_exists($key, $this->arr);
 	}
 

src/Type/StringType.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Type;
@@ -33,8 +33,8 @@ class StringType extends Stringy {
 	 */
 	public function fuzzyCaseMatch(string $strToMatch): bool
 	{
-		$firstStr = self::create($this->str)->dasherize()->__toString();
+		$firstStr = (string)self::create($this->str)->dasherize();
-		$secondStr = self::create($strToMatch)->dasherize()->__toString();
+		$secondStr = (string)self::create($strToMatch)->dasherize();
 
 		return $firstStr === $secondStr;
 	}

src/View.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -50,6 +50,8 @@ abstract class View
 	 * Constructor
 	 *
 	 * @param ContainerInterface $container
+	 * @throws Di\Exception\ContainerException
+	 * @throws Di\Exception\NotFoundException
 	 */
 	public function __construct(ContainerInterface $container)
 	{
@@ -135,7 +137,7 @@ abstract class View
 	 */
 	public function getOutput(): string
 	{
-		return $this->response->getBody()->__toString();
+		return (string)$this->response->getBody();
 	}
 }
 // End of View.php

src/View/HtmlView.php

@@ -4,19 +4,22 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.2.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\View;
 
+use Aura\Html\HelperLocator;
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Di\Exception\ContainerException;
+use Aviat\Ion\Di\Exception\NotFoundException;
 
 /**
  * View class for outputting HTML
@@ -26,7 +29,7 @@ class HtmlView extends HttpView {
 	/**
 	 * HTML generator/escaper helper
 	 *
-	 * @var \Aura\Html\HelperLocator
+	 * @var HelperLocator
 	 */
 	protected $helper;
 
@@ -41,6 +44,8 @@ class HtmlView extends HttpView {
 	 * Create the Html View
 	 *
 	 * @param ContainerInterface $container
+	 * @throws ContainerException
+	 * @throws NotFoundException
 	 */
 	public function __construct(ContainerInterface $container)
 	{
@@ -64,8 +69,7 @@ class HtmlView extends HttpView {
 		ob_start();
 		extract($data, \EXTR_OVERWRITE);
 		include_once $path;
-		$buffer = ob_get_contents();
+		$buffer = ob_get_clean();
-		ob_end_clean();
 
 
 		// Very basic html minify, that won't affect content between html tags

src/View/HttpView.php

@@ -4,19 +4,20 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\View;
 
-use Zend\Diactoros\Response\SapiEmitter;
+use Zend\Diactoros\Response;
+use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
 
 use Aviat\Ion\Exception\DoubleRenderException;
 use Aviat\Ion\View as BaseView;
@@ -38,24 +39,13 @@ class HttpView extends BaseView {
 	 *
 	 * @param string $url
 	 * @param int    $code
+	 * @param array $headers
 	 * @throws \InvalidArgumentException
 	 * @return void
 	 */
-	public function redirect(string $url, int $code): void
+	public function redirect(string $url, int $code = 302, array $headers = []): void
 	{
-		ob_start();
+		$this->response = new Response\RedirectResponse($url, $code, $headers);
-		$this->setStatusCode($code);
-		$message = $this->response->getReasonPhrase();
-		$this->response = $this->response->withHeader('Location', $url);
-
-		if (PHP_SAPI !== 'cli')
-		{
-			header("HTTP/1.1 ${code} ${message}");
-			header("Location: {$url}");
-		}
-
-		$this->hasRendered = TRUE;
-		ob_end_clean();
 	}
 
 	/**

src/View/JsonView.php

@@ -4,19 +4,20 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\View;
 
 use Aviat\Ion\Json;
+use Aviat\Ion\JsonException;
 use Aviat\Ion\ViewInterface;
 
 /**
@@ -37,7 +38,7 @@ class JsonView extends HttpView {
 	 * @param mixed $string
 	 * @throws \InvalidArgumentException
 	 * @throws \RuntimeException
-	 * @throws \Aviat\Ion\JsonException
+	 * @throws JsonException
 	 * @return ViewInterface
 	 */
 	public function setOutput($string): ViewInterface

src/ViewInterface.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;

src/XML.php

@@ -0,0 +1,279 @@
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7.2
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2019 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     3.0.0
+ * @link        https://git.timshomepage.net/aviat/ion
+ */
+
+namespace Aviat\Ion;
+
+use DOMDocument, DOMNode, DOMNodeList, InvalidArgumentException;
+
+/**
+ * XML <=> PHP Array codec
+ */
+final class XML {
+
+	/**
+	 * XML representation of the data
+	 *
+	 * @var string
+	 */
+	private $xml;
+
+	/**
+	 * PHP array version of the data
+	 *
+	 * @var array
+	 */
+	private $data;
+
+	/**
+	 * XML constructor
+	 *
+	 * @param string $xml
+	 * @param array $data
+	 */
+	public function __construct(string $xml = '', array $data = [])
+	{
+		$this->setXML($xml)->setData($data);
+	}
+
+	/**
+	 * Serialize the data to an xml string
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return static::toXML($this->getData());
+	}
+
+	/**
+	 * Get the data parsed from the XML
+	 *
+	 * @return array
+	 */
+	public function getData(): array
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Set the data to create xml from
+	 *
+	 * @param array $data
+	 * @return self
+	 */
+	public function setData(array $data): self
+	{
+		$this->data = $data;
+		return $this;
+	}
+
+	/**
+	 * Get the xml created from the data
+	 *
+	 * @return string
+	 */
+	public function getXML(): string
+	{
+		return $this->xml;
+	}
+
+	/**
+	 * Set the xml to parse the data from
+	 *
+	 * @param string $xml
+	 * @return self
+	 */
+	public function setXML(string $xml): self
+	{
+		$this->xml = $xml;
+		return $this;
+	}
+
+	/**
+	 * Parse an xml document string to a php array
+	 *
+	 * @param string $xml
+	 * @return array
+	 */
+	public static function toArray(string $xml): array
+	{
+		$data = [];
+
+		$xml = static::stripXMLWhitespace($xml);
+
+		$dom = new DOMDocument();
+		$hasLoaded = @$dom->loadXML($xml);
+
+		if ( ! $hasLoaded)
+		{
+			throw new InvalidArgumentException('Failed to load XML');
+		}
+
+		$root = $dom->documentElement;
+
+		$data[$root->tagName] = [];
+
+		if ($root->hasChildNodes())
+		{
+			static::childNodesToArray($data[$root->tagName], $root->childNodes);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Transform the array into XML
+	 *
+	 * @param array $data
+	 * @return string
+	 */
+	public static function toXML(array $data): string
+	{
+		$dom = new DOMDocument();
+		$dom->encoding = 'UTF-8';
+
+		static::arrayPropertiesToXmlNodes($dom, $dom, $data);
+
+		return $dom->saveXML();
+	}
+
+	/**
+	 * Parse the xml document string to a php array
+	 *
+	 * @return array
+	 */
+	public function parse(): array
+	{
+		$xml = $this->getXML();
+		$data = static::toArray($xml);
+		return $this->setData($data)->getData();
+	}
+
+	/**
+	 * Transform the array into XML
+	 *
+	 * @return string
+	 */
+	public function createXML(): string
+	{
+		return static::toXML($this->getData());
+	}
+
+	/**
+	 * Strip whitespace from raw xml to remove irrelevant text nodes
+	 *
+	 * @param string $xml
+	 * @return string
+	 */
+	private static function stripXMLWhitespace(string $xml): string
+	{
+		// Get rid of unimportant text nodes by removing
+		// whitespace characters from between xml tags,
+		// except for the xml declaration tag, Which looks
+		// something like:
+		/* <?xml version="1.0" encoding="UTF-8"?> */
+		return preg_replace('/([^?])>\s+</', '$1><', $xml);
+	}
+
+	/**
+	 * Recursively create array structure based on xml structure
+	 *
+	 * @param array $root A reference to the current array location
+	 * @param DOMNodeList $nodeList The current NodeList object
+	 * @return void
+	 */
+	private static function childNodesToArray(array &$root, DOMNodelist $nodeList): void
+	{
+		$length = $nodeList->length;
+		for ($i = 0; $i < $length; $i++)
+		{
+			$el = $nodeList->item($i);
+			$current =& $root[$el->nodeName];
+
+			// It's a top level element!
+			if (( ! $el->hasChildNodes()) || ($el->childNodes->item(0) instanceof \DomText))
+			{
+				$current = $el->textContent;
+				continue;
+			}
+
+			// An empty value at the current root
+			if ($current === NULL)
+			{
+				$current = [];
+				static::childNodesToArray($current, $el->childNodes);
+				continue;
+			}
+
+			$keys = array_keys($current);
+
+			// Wrap the array in a containing array
+			// if there are only string keys
+			if ( ! is_numeric($keys[0]))
+			{
+				// But if there is only one key, don't wrap it in
+				// an array, just recurse to parse the child nodes
+				if (count($current) === 1)
+				{
+					static::childNodesToArray($current, $el->childNodes);
+					continue;
+				}
+				$current = [$current];
+			}
+
+			$current[] = [];
+			$index = count($current) - 1;
+
+			static::childNodesToArray($current[$index], $el->childNodes);
+		}
+	}
+
+	/**
+	 * Recursively create xml nodes from array properties
+	 *
+	 * @param DOMDocument $dom The current DOM object
+	 * @param DOMNode $parent The parent element to append children to
+	 * @param array $data The data for the current node
+	 * @return void
+	 */
+	private static function arrayPropertiesToXmlNodes(DOMDocument $dom, DOMNode $parent, array $data): void
+	{
+		foreach ($data as $key => $props)
+		{
+			// 'Flatten' the array as you create the xml
+			if (is_numeric($key))
+			{
+				foreach ($props as $k => $p)
+				{
+					break;
+				}
+			}
+
+			$node = $dom->createElement($key);
+
+			if (\is_array($props))
+			{
+				static::arrayPropertiesToXmlNodes($dom, $node, $props);
+			} else
+			{
+				$tNode = $dom->createTextNode((string)$props);
+				$node->appendChild($tNode);
+			}
+
+			$parent->appendChild($node);
+		}
+	}
+}

src/functions.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion;
@@ -20,7 +20,7 @@ namespace Aviat\Ion;
  * Joins paths together. Variadic to take an
  * arbitrary number of arguments
  *
- * @param string[] ...$args
+ * @param string ...$args
  * @return string
  */
 function _dir(string ...$args): string

tests/BaseModelTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;

tests/ConfigTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
@@ -20,16 +20,32 @@ use Aviat\Ion\Config;
 
 class ConfigTest extends Ion_TestCase {
 
-	public function setUp()
+	protected $config;
+
+	public function setUp(): void
 	{
 		$this->config = new Config([
 			'foo' => 'bar',
 			'asset_path' => '/assets',
-			'bar' => 'baz'
+			'bar' => 'baz',
+			'a' => [
+				'b' => [
+					'c' => TRUE,
+				],
+			],
 		]);
 	}
 
-	public function testConfigGet()
+	public function testConfigHas(): void
+	{
+		$this->assertTrue($this->config->has('foo'));
+		$this->assertTrue($this->config->has(['a', 'b', 'c']));
+
+		$this->assertFalse($this->config->has('baz'));
+		$this->assertFalse($this->config->has(['c', 'b', 'a']));
+	}
+
+	public function testConfigGet(): void
 	{
 		$this->assertEquals('bar', $this->config->get('foo'));
 		$this->assertEquals('baz', $this->config->get('bar'));
@@ -37,27 +53,26 @@ class ConfigTest extends Ion_TestCase {
 		$this->assertNull($this->config->get(['apple', 'sauce', 'is']));
 	}
 
-	public function testConfigSet()
+	public function testConfigSet(): void
 	{
 		$ret = $this->config->set('foo', 'foobar');
-		$this->assertInstanceOf('Aviat\Ion\Config', $ret);
+		$this->assertInstanceOf(Config::class, $ret);
 		$this->assertEquals('foobar', $this->config->get('foo'));
 
 		$this->config->set(['apple', 'sauce', 'is'], 'great');
 		$apple = $this->config->get('apple');
-		$this->assertEquals('great', $apple['sauce']['is'], "Config value not set correctly");
+		$this->assertEquals('great', $apple['sauce']['is'], 'Config value not set correctly');
 
 		$this->assertEquals('great', $this->config->get(['apple', 'sauce', 'is']), "Array argument get for config failed.");
-
 	}
 
-	public function testConfigBadSet()
+	public function testConfigBadSet(): void
 	{
 		$this->expectException('InvalidArgumentException');
 		$this->config->set(NULL, FALSE);
 	}
 
-	public function dataConfigDelete()
+	public function dataConfigDelete(): array
 	{
 		return [
 			'top level delete' => [
@@ -117,7 +132,7 @@ class ConfigTest extends Ion_TestCase {
 	/**
 	 * @dataProvider dataConfigDelete
 	 */
-	public function testConfigDelete($key, $assertKeys)
+	public function testConfigDelete($key, array $assertKeys): void
 	{
 		$config = new Config([]);
 		$config->set(['apple', 'sauce', 'is'], 'great');
@@ -129,7 +144,7 @@ class ConfigTest extends Ion_TestCase {
 		}
 	}
 
-	public function testGetNonExistentConfigItem()
+	public function testGetNonExistentConfigItem(): void
 	{
 		$this->assertNull($this->config->get('foobar'));
 	}

tests/Di/ContainerAwareTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Di;
@@ -33,13 +33,13 @@ class ContainerAwareTest extends Ion_TestCase {
 
 	protected $aware;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		$this->container = new Container();
 		$this->aware = new Aware($this->container);
 	}
 
-	public function testContainerAwareTrait()
+	public function testContainerAwareTrait(): void
 	{
 		// The container was set in setup
 		// check that the get method returns the same

tests/Di/ContainerTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Di;
@@ -21,6 +21,8 @@ use Aviat\Ion\Di\Exception\ContainerException;
 use Aviat\Ion\Tests\Ion_TestCase;
 use Monolog\Logger;
 use Monolog\Handler\{TestHandler, NullHandler};
+use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Di\Exception\NotFoundException;
 
 class FooTest {
 
@@ -37,27 +39,27 @@ class FooTest2 {
 
 class ContainerTest extends Ion_TestCase {
 
-	public function setUp()
+	public function setUp(): void
 	{
 		$this->container = new Container();
 	}
 
-	public function dataGetWithException()
+	public function dataGetWithException(): array
 	{
 		return [
 			'Bad index type: number' => [
 				'id' => 42,
-				'exception' => 'Aviat\Ion\Di\Exception\ContainerException',
+				'exception' => ContainerException::class,
 				'message' => 'Id must be a string'
 			],
 			'Bad index type: array' => [
 				'id' => [],
-				'exception' => 'Aviat\Ion\Di\Exception\ContainerException',
+				'exception' => ContainerException::class,
 				'message' => 'Id must be a string'
 			],
 			'Non-existent id' => [
 				'id' => 'foo',
-				'exception' => 'Aviat\Ion\Di\Exception\NotFoundException',
+				'exception' => NotFoundException::class,
 				'message' => "Item 'foo' does not exist in container."
 			]
 		];
@@ -66,7 +68,7 @@ class ContainerTest extends Ion_TestCase {
 	/**
 	 * @dataProvider dataGetWithException
 	 */
-	public function testGetWithException($id, $exception, $message)
+	public function testGetWithException($id, $exception, $message): void
 	{
 		try
 		{
@@ -82,24 +84,24 @@ class ContainerTest extends Ion_TestCase {
 	/**
 	 * @dataProvider dataGetWithException
 	 */
-	public function testGetNewWithException($id, $exception, $message)
+	public function testGetNewWithException($id, $exception, $message): void
 	{
 		$this->expectException($exception);
 		$this->expectExceptionMessage($message);
 		$this->container->getNew($id);
 	}
 
-	public function dataSetInstanceWithException()
+	public function dataSetInstanceWithException(): array
 	{
 		return [
 			'Non-existent id' => [
 				'id' => 'foo',
-				'exception' => 'Aviat\Ion\Di\Exception\NotFoundException',
+				'exception' => NotFoundException::class,
 				'message' => "Factory 'foo' does not exist in container. Set that first.",
 			],
 			'Non-existent id 2' => [
 				'id' => 'foobarbaz',
-				'exception' => 'Aviat\Ion\Di\Exception\NotFoundException',
+				'exception' => NotFoundException::class,
 				'message' => "Factory 'foobarbaz' does not exist in container. Set that first.",
 			],
 		];
@@ -108,7 +110,7 @@ class ContainerTest extends Ion_TestCase {
 	/**
 	 * @dataProvider dataSetInstanceWithException
 	 */
-	public function testSetInstanceWithException($id, $exception, $message)
+	public function testSetInstanceWithException($id, $exception, $message): void
 	{
 		try
 		{
@@ -121,21 +123,21 @@ class ContainerTest extends Ion_TestCase {
 		}
 	}
 
-	public function testGetNew()
+	public function testGetNew(): void
 	{
-		$this->container->set('footest', function($item) {
+		$this->container->set('footest', static function($item) {
 			return new FooTest($item);
 		});
 
 		// Check that the item is the container, if called without arguments
 		$footest1 = $this->container->getNew('footest');
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $footest1->item);
+		$this->assertInstanceOf(ContainerInterface::class, $footest1->item);
 
 		$footest2 = $this->container->getNew('footest', ['Test String']);
 		$this->assertEquals('Test String', $footest2->item);
 	}
 
-	public function testSetContainerInInstance()
+	public function testSetContainerInInstance(): void
 	{
 		$this->container->set('footest2', function() {
 			return new FooTest2();
@@ -145,36 +147,36 @@ class ContainerTest extends Ion_TestCase {
 		$this->assertEquals($this->container, $footest2->getContainer());
 	}
 
-	public function testGetNewReturnCallable()
+	public function testGetNewReturnCallable(): void
 	{
-		$this->container->set('footest', function($item) {
+		$this->container->set('footest', static function($item) {
-			return function() use ($item) {
+			return static function() use ($item) {
 				return $item;
 			};
 		});
 
 		// Check that the item is the container, if called without arguments
 		$footest1 = $this->container->getNew('footest');
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $footest1());
+		$this->assertInstanceOf(ContainerInterface::class, $footest1());
 
 		$footest2 = $this->container->getNew('footest', ['Test String']);
 		$this->assertEquals('Test String', $footest2());
 	}
 
-	public function testGetSet()
+	public function testGetSet(): void
 	{
-		$container = $this->container->set('foo', function() {
+		$container = $this->container->set('foo', static function() {
-			return function() {};
+			return static function() {};
 		});
 
 		$this->assertInstanceOf(Container::class, $container);
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
+		$this->assertInstanceOf(ContainerInterface::class, $container);
 
 		// The factory returns a callable
 		$this->assertTrue(is_callable($container->get('foo')));
 	}
 
-	public function testLoggerMethods()
+	public function testLoggerMethods(): void
 	{
 		// Does the container have the default logger?
 		$this->assertFalse($this->container->hasLogger());
@@ -189,8 +191,8 @@ class ContainerTest extends Ion_TestCase {
 		$container = $this->container->setLogger($logger1);
 		$container2 = $this->container->setLogger($logger2, 'test');
 
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
+		$this->assertInstanceOf(ContainerInterface::class, $container);
-		$this->assertInstanceOf('Aviat\Ion\Di\Container', $container2);
+		$this->assertInstanceOf(Container::class, $container2);
 
 		$this->assertEquals($logger1, $this->container->getLogger('default'));
 		$this->assertEquals($logger2, $this->container->getLogger('test'));

tests/EnumTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
@@ -26,8 +26,7 @@ class EnumTest extends Ion_TestCase {
 		'FOOBAR' => 'baz'
 	];
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 		$this->enum = new TestEnum();
 	}

tests/Exception/DoubleRenderExceptionTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Exception;

tests/FriendTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
@@ -21,8 +21,7 @@ use Aviat\Ion\Tests\FriendTestClass;
 
 class FriendTest extends Ion_TestCase {
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 		$obj = new FriendTestClass();
 		$this->friend = new Friend($obj);

tests/Ion_TestCase.php

@@ -4,25 +4,22 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
 
 use function Aviat\Ion\_dir;
 
-use Aura\Web\WebFactory;
-use Aviat\Ion\Json;
 use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Response as HttpResponse;
 
 define('ROOT_DIR', realpath(__DIR__ . '/../') . '/');
 define('SRC_DIR', ROOT_DIR . 'src/');
@@ -34,10 +31,10 @@ define('TEST_VIEW_DIR', __DIR__ . '/test_views');
  */
 class Ion_TestCase extends TestCase {
 	// Test directory constants
-	const ROOT_DIR = ROOT_DIR;
+	public const ROOT_DIR = ROOT_DIR;
-	const SRC_DIR = SRC_DIR;
+	public const SRC_DIR = SRC_DIR;
-	const TEST_DATA_DIR = TEST_DATA_DIR;
+	public const TEST_DATA_DIR = TEST_DATA_DIR;
-	const TEST_VIEW_DIR = TEST_VIEW_DIR;
+	public const TEST_VIEW_DIR = TEST_VIEW_DIR;
 
 	protected $container;
 	protected static $staticContainer;
@@ -51,7 +48,7 @@ class Ion_TestCase extends TestCase {
 		self::$session_handler = $session_handler;
 	}*/
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
@@ -100,7 +97,7 @@ class Ion_TestCase extends TestCase {
 		// Set up DI container
 		$di = require('di.php');
 		$container = $di($config_array);
-		$container->set('session-handler', function() {
+		$container->set('session-handler', static function() {
 			// Use mock session handler
 			$session_handler = new TestSessionHandler();
 			session_set_save_handler($session_handler, TRUE);
@@ -116,7 +113,7 @@ class Ion_TestCase extends TestCase {
 	 * @param array $supers
 	 * @return void
 	 */
-	public function setSuperGlobals(array $supers = [])
+	public function setSuperGlobals(array $supers = []): void
 	{
 		$default = [
 			'_SERVER' => $_SERVER,
@@ -127,7 +124,7 @@ class Ion_TestCase extends TestCase {
 		];
 
 		$request = call_user_func_array(
-			['Zend\Diactoros\ServerRequestFactory', 'fromGlobals'],
+			[ServerRequestFactory::class, 'fromGlobals'],
 			array_merge($default, $supers)
 		);
 		$this->container->setInstance('request', $request);

tests/JsonTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;

tests/Model/BaseDBModelTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Model;

tests/StringWrapperTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
@@ -24,8 +24,7 @@ class StringWrapperTest extends TestCase {
 
 	protected $wrapper;
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		$this->wrapper = new class {
 			use StringWrapper;
 		};

tests/TestSessionHandler.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;

tests/Transformer/AbstractTransformerTest.php

@@ -4,29 +4,30 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Transformer;
 
 use Aviat\Ion\Tests\Ion_TestCase;
-use Aviat\Ion\Tests\TestTransformer;
+use Aviat\Ion\Tests\{TestTransformer, TestTransformerUntransform};
 
 class AbstractTransformerTest extends Ion_TestCase {
 
 	protected $transformer;
+	protected $untransformer;
 
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		$this->transformer = new TestTransformer();
+		$this->untransformer = new TestTransformerUntransform();
 	}
 
 	public function dataTransformCollection()
@@ -87,6 +88,36 @@ class AbstractTransformerTest extends Ion_TestCase {
 		];
 	}
 
+	public function dataUnTransformCollection()
+	{
+		return [
+			'object' => [
+				'original' => [
+					(object)['Comedy', 'Romance', 'School', 'Harem'],
+					(object)['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
+					(object)['Comedy', 'Sci-Fi']
+				],
+				'expected' => [
+					['Comedy', 'Romance', 'School', 'Harem'],
+					['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
+					['Comedy', 'Sci-Fi']
+				]
+			],
+			'array' => [
+				'original' => [
+					['Comedy', 'Romance', 'School', 'Harem'],
+					['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
+					['Comedy', 'Sci-Fi']
+				],
+				'expected' => [
+					['Comedy', 'Romance', 'School', 'Harem'],
+					['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
+					['Comedy', 'Sci-Fi']
+				]
+			]
+		];
+	}
+
 	public function testTransform()
 	{
 		$data = $this->dataTransformCollection();
@@ -105,4 +136,22 @@ class AbstractTransformerTest extends Ion_TestCase {
 		$actual = $this->transformer->transformCollection($original);
 		$this->assertEquals($expected, $actual);
 	}
+
+	/**
+	 * @dataProvider dataUnTransformCollection
+	 */
+	public function testUntransformCollection($original, $expected)
+	{
+		$actual = $this->untransformer->untransformCollection($original);
+		$this->assertEquals($expected, $actual);
+	}
+
+	/**
+	 * @dataProvider dataUnTransformCollection
+	 */
+	public function testUntransformCollectionWithException($original, $expected)
+	{
+		$this->expectException(\BadMethodCallException::class);
+		$this->transformer->untransformCollection($original);
+	}
 }

tests/Type/ArrayTypeTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Type;
@@ -22,8 +22,7 @@ use Aviat\Ion\Tests\Ion_TestCase;
 class ArrayTypeTest extends Ion_TestCase {
 	use ArrayWrapper;
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 	}
 
@@ -169,6 +168,29 @@ class ArrayTypeTest extends Ion_TestCase {
 		$this->assertFalse($obj->hasKey('b'));
 	}
 
+	public function testHasKeyArray()
+	{
+		$obj = $this->arr([
+			'foo' => [
+				'bar' => [
+					'baz' => [
+						'foobar' => NULL,
+						'one' => 1,
+					],
+				],
+			],
+		]);
+
+		$this->assertTrue($obj->hasKey(['foo']));
+		$this->assertTrue($obj->hasKey(['foo', 'bar']));
+		$this->assertTrue($obj->hasKey(['foo', 'bar', 'baz']));
+		$this->assertTrue($obj->hasKey(['foo', 'bar', 'baz', 'one']));
+		$this->assertTrue($obj->hasKey(['foo', 'bar', 'baz', 'foobar']));
+
+		$this->assertFalse($obj->hasKey(['foo', 'baz']));
+		$this->assertFalse($obj->hasKey(['bar', 'baz']));
+	}
+
 	public function testHas()
 	{
 		$obj = $this->arr([1, 2, 6, 8, 11]);

tests/Type/StringTypeTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\Type;

tests/View/HtmlViewTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\View;
@@ -24,8 +24,7 @@ class HtmlViewTest extends HttpViewTest {
 
 	protected $template_path;
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 		$this->view = new TestHtmlView($this->container);
 	}

tests/View/HttpViewTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\View;
@@ -26,8 +26,7 @@ class HttpViewTest extends Ion_TestCase {
 	protected $view;
 	protected $friend;
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 		$this->view = new TestHttpView($this->container);
 		$this->friend = new Friend($this->view);

tests/View/JsonViewTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests\View;
@@ -21,8 +21,7 @@ use Aviat\Ion\Tests\TestJsonView;
 
 class JsonViewTest extends HttpViewTest {
 
-	public function setUp()
+	public function setUp(): void	{
-	{
 		parent::setUp();
 
 		$this->view = new TestJsonView($this->container);

tests/XMLTest.php

@@ -0,0 +1,88 @@
+<?php declare(strict_types=1);
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * PHP version 7.2
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2019 Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     3.0.0
+ * @link        https://git.timshomepage.net/aviat/ion
+ */
+
+namespace Aviat\Ion\Tests;
+
+use Aviat\Ion\XML;
+use PHPUnit\Framework\TestCase;
+
+class XMLTest extends TestCase {
+
+	protected $xml;
+	protected $expectedXml;
+	protected $object;
+	protected $array;
+
+	public function setUp(): void	{
+		$this->xml = file_get_contents(__DIR__ . '/test_data/XML/xmlTestFile.xml');
+		$this->expectedXml = file_get_contents(__DIR__ . '/test_data/XML/minifiedXmlTestFile.xml');
+
+		$this->array = [
+			'entry' => [
+				'foo' => [
+					'bar' => [
+						'baz' => 42
+					]
+				],
+				'episode' => '11',
+				'status' => 'watching',
+				'score' => '7',
+				'storage_type' => '1',
+				'storage_value' => '2.5',
+				'times_rewatched' => '1',
+				'rewatch_value' => '3',
+				'date_start' => '01152015',
+				'date_finish' => '10232016',
+				'priority' => '2',
+				'enable_discussion' => '0',
+				'enable_rewatching' => '1',
+				'comments' => 'Should you say something?',
+				'tags' => 'test tag, 2nd tag'
+			]
+		];
+
+		$this->object = new XML();
+	}
+
+	public function testToArray()
+	{
+		$this->assertEquals($this->array, XML::toArray($this->xml));
+	}
+
+	public function testParse()
+	{
+		$this->object->setXML($this->xml);
+		$this->assertEquals($this->array, $this->object->parse());
+	}
+
+	public function testToXML()
+	{
+		$this->assertEquals($this->expectedXml, XML::toXML($this->array));
+	}
+
+	public function testCreateXML()
+	{
+		$this->object->setData($this->array);
+		$this->assertEquals($this->expectedXml, $this->object->createXML());
+	}
+
+	public function testToString()
+	{
+		$this->object->setData($this->array);
+		$this->assertEquals($this->expectedXml, $this->object->__toString());
+		$this->assertEquals($this->expectedXml, (string)$this->object);
+	}
+}

tests/bootstrap.php

@@ -21,8 +21,8 @@ require 'Ion_TestCase.php';
 // Ini Settings
 // -----------------------------------------------------------------------------
 ini_set('session.use_cookies', 0);
-ini_set("session.use_only_cookies",0);
+ini_set('session.use_only_cookies',0);
-ini_set("session.use_trans_sid",1);
+ini_set('session.use_trans_sid',1);
 // Start session here to surpress error about headers not sent
 session_start();
 

tests/di.php

@@ -11,16 +11,16 @@ use Aviat\Ion\Di\Container;
 // -----------------------------------------------------------------------------
 // Setup DI container
 // -----------------------------------------------------------------------------
-return function(array $config_array = []) {
+return static function(array $config_array = []) {
 	$container = new Container();
 
-	$container->set('config', function() {
+	$container->set('config', static function() {
 		return new Config([]);
 	});
 
 	$container->setInstance('config', new Config($config_array));
 
-	$container->set('request', function() {
+	$container->set('request', static function() {
 		return ServerRequestFactory::fromGlobals(
 			$_SERVER,
 			$_GET,
@@ -30,17 +30,17 @@ return function(array $config_array = []) {
 		);
 	});
 
-	$container->set('response', function() {
+	$container->set('response', static function() {
 		return new Response();
 	});
 
 	// Create session Object
-	$container->set('session', function() {
+	$container->set('session', static function() {
 		return (new SessionFactory())->newInstance($_COOKIE);
 	});
 
 	// Create Html helper Object
-	$container->set('html-helper', function() {
+	$container->set('html-helper', static function() {
 		return (new HelperLocatorFactory)->newInstance();
 	});
 

tests/functionsTest.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;

tests/mocks.php

@@ -4,14 +4,14 @@
  *
  * Building blocks for web development
  *
- * PHP version 7.1
+ * PHP version 7.2
  *
  * @package     Ion
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2018 Timothy J. Warren
+ * @copyright   2015 - 2019 Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     2.3.0
+ * @version     3.0.0
- * @link        https://git.timshomepage.net/timw4mail/ion
+ * @link        https://git.timshomepage.net/aviat/ion
  */
 
 namespace Aviat\Ion\Tests;
@@ -81,6 +81,13 @@ class TestTransformer extends AbstractTransformer {
 	}
 }
 
+class TestTransformerUntransform extends TestTransformer {
+	public function untransform($item)
+	{
+		return (array)$item;
+	}
+}
+
 trait MockViewOutputTrait {
 	/*protected function output() {
 		$reflect = new ReflectionClass($this);

tests/test_data/XML/minifiedXmlTestFile.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry><foo><bar><baz>42</baz></bar></foo><episode>11</episode><status>watching</status><score>7</score><storage_type>1</storage_type><storage_value>2.5</storage_value><times_rewatched>1</times_rewatched><rewatch_value>3</rewatch_value><date_start>01152015</date_start><date_finish>10232016</date_finish><priority>2</priority><enable_discussion>0</enable_discussion><enable_rewatching>1</enable_rewatching><comments>Should you say something?</comments><tags>test tag, 2nd tag</tags></entry>

tests/test_data/XML/xmlTestFile.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry>
+	<foo>
+		<bar>
+			<baz>42</baz>
+		</bar>
+	</foo>
+	<episode>11</episode>
+	<status>watching</status>
+	<score>7</score>
+	<storage_type>1</storage_type>
+	<storage_value>2.5</storage_value>
+	<times_rewatched>1</times_rewatched>
+	<rewatch_value>3</rewatch_value>
+	<date_start>01152015</date_start>
+	<date_finish>10232016</date_finish>
+	<priority>2</priority>
+	<enable_discussion>0</enable_discussion>
+	<enable_rewatching>1</enable_rewatching>
+	<comments>Should you say something?</comments>
+	<tags>test tag, 2nd tag</tags>
+</entry>