From 9fc3d60835427490fa160a847faadf6ca4b74182 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 09:47:34 -0400
Subject: [PATCH 01/65] First attempt at setting up gitlab ci

---
 .gitlab-ci.yml          | 21 +++++++++++++++++++++
 build/docker_install.sh | 22 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 build/docker_install.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..b74a5032
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+before_script:
+    # Install dependencies
+    - bash build/docker_install.sh > /dev/null
+
+services:
+    - redis:latest
+
+test:5.5:
+    image: php:5.5
+    script:
+      - phpunit -c build
+
+test:5.6:
+    image: php:5.6
+    script:
+      - phpunit -c build
+
+test:7:
+    image: php:7
+    script:
+      - phpunit -c build
\ No newline at end of file
diff --git a/build/docker_install.sh b/build/docker_install.sh
new file mode 100644
index 00000000..f2c8e053
--- /dev/null
+++ b/build/docker_install.sh
@@ -0,0 +1,22 @@
+#!/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
+# And for some reason apt-utils is not installed
+apt-get update -yqq
+apt-get install apt-utils
+apt-get install git sqlite3 -yqq
+
+# Install phpunit, the tool that we will use for testing
+curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
+chmod +x /usr/local/bin/phpunit
+
+# Install mysql driver
+# Here you can install any other extension that you need
+docker-php-ext-install pdo_sqlite
+pecl install redis
+docker-php-ext-enable redis
\ No newline at end of file

From 3f7711dd204f03dc7dc53a355aec3833611aced1 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 09:55:06 -0400
Subject: [PATCH 02/65] Gitlab CI take two

---
 .gitlab-ci.yml          | 10 ++++++++++
 build/docker_install.sh |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b74a5032..718b39a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,16 @@
 before_script:
     # Install dependencies
     - bash build/docker_install.sh > /dev/null
+    # Install composer dependencies
+    - curl -sS https://getcomposer.org/installer | php
+    - php composer.phar install
+
+# Composer stores all downloaded packages in the vendor/ directory.
+# Do not use the following if the vendor/ directory is commited to
+# your git repository.
+cache:
+  paths:
+  - vendor/
 
 services:
     - redis:latest
diff --git a/build/docker_install.sh b/build/docker_install.sh
index f2c8e053..784e6a34 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -6,9 +6,7 @@
 set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
-# And for some reason apt-utils is not installed
 apt-get update -yqq
-apt-get install apt-utils
 apt-get install git sqlite3 -yqq
 
 # Install phpunit, the tool that we will use for testing

From 8ba6e83032ce0316ce10e3cdd80d47b58604849b Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 09:58:23 -0400
Subject: [PATCH 03/65] Make sure docker sh script doesn't have CRLF line
 endings

---
 .gitlab-ci.yml          | 60 ++++++++++++++++++++---------------------
 build/docker_install.sh | 38 +++++++++++++-------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 718b39a5..373e92c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,31 @@
-before_script:
-    # Install dependencies
-    - bash build/docker_install.sh > /dev/null
-    # Install composer dependencies
-    - curl -sS https://getcomposer.org/installer | php
-    - php composer.phar install
-
-# Composer stores all downloaded packages in the vendor/ directory.
-# Do not use the following if the vendor/ directory is commited to
-# your git repository.
-cache:
-  paths:
-  - vendor/
-
-services:
-    - redis:latest
-
-test:5.5:
-    image: php:5.5
-    script:
-      - phpunit -c build
-
-test:5.6:
-    image: php:5.6
-    script:
-      - phpunit -c build
-
-test:7:
-    image: php:7
-    script:
+before_script:
+    # Install dependencies
+    - bash build/docker_install.sh > /dev/null
+    # Install composer dependencies
+    - curl -sS https://getcomposer.org/installer | php
+    - php composer.phar install
+
+# Composer stores all downloaded packages in the vendor/ directory.
+# Do not use the following if the vendor/ directory is commited to
+# your git repository.
+cache:
+  paths:
+  - vendor/
+
+services:
+    - redis:latest
+
+test:5.5:
+    image: php:5.5
+    script:
+      - phpunit -c build
+
+test:5.6:
+    image: php:5.6
+    script:
+      - phpunit -c build
+
+test:7:
+    image: php:7
+    script:
       - phpunit -c build
\ No newline at end of file
diff --git a/build/docker_install.sh b/build/docker_install.sh
index 784e6a34..16465a8d 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -1,20 +1,20 @@
-#!/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
-apt-get update -yqq
-apt-get install git sqlite3 -yqq
-
-# Install phpunit, the tool that we will use for testing
-curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-chmod +x /usr/local/bin/phpunit
-
-# Install mysql driver
-# Here you can install any other extension that you need
-docker-php-ext-install pdo_sqlite
-pecl install redis
+#!/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
+apt-get update -yqq
+apt-get install git sqlite3 -yqq
+
+# Install phpunit, the tool that we will use for testing
+curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
+chmod +x /usr/local/bin/phpunit
+
+# Install mysql driver
+# Here you can install any other extension that you need
+docker-php-ext-install pdo_sqlite
+pecl install redis
 docker-php-ext-enable redis
\ No newline at end of file

From 229387a972b16b07f311dc30ae6f35d5071975b2 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 10:07:50 -0400
Subject: [PATCH 04/65] Gitlab CI take 3

---
 build/docker_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 16465a8d..64a5c64e 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -7,7 +7,7 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git sqlite3 -yqq
+apt-get install git libsqlite3-dev -yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar

From 691387b7c9e29838498617e1d35dd1862a0141d0 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 10:16:21 -0400
Subject: [PATCH 05/65] Attempt tests without redis for now

---
 build/docker_install.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 64a5c64e..68babfdc 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -7,14 +7,8 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git libsqlite3-dev -yqq
+apt-get install git -yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-chmod +x /usr/local/bin/phpunit
-
-# Install mysql driver
-# Here you can install any other extension that you need
-docker-php-ext-install pdo_sqlite
-pecl install redis
-docker-php-ext-enable redis
\ No newline at end of file
+chmod +x /usr/local/bin/phpunit
\ No newline at end of file

From 1f804919687853f5006a432cf18a85a2990bf98a Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 12:47:51 -0400
Subject: [PATCH 06/65] Another attempt at getting gitlab ci to run

---
 .gitlab-ci.yml          | 5 -----
 build/docker_install.sh | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 373e92c3..78229a40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,11 +15,6 @@ cache:
 services:
     - redis:latest
 
-test:5.5:
-    image: php:5.5
-    script:
-      - phpunit -c build
-
 test:5.6:
     image: php:5.6
     script:
diff --git a/build/docker_install.sh b/build/docker_install.sh
index 68babfdc..d2e3ead8 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -7,7 +7,7 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git -yqq
+apt-get install git unzip -yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar

From c0c90eb56522fb40d743d873d1cf8b5bb0116fb7 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 12:59:34 -0400
Subject: [PATCH 07/65] Make tests skip redis integration if the extension is
 not installed

---
 tests/Ion/Cache/Driver/RedisDriver2Test.php | 35 ++++++++++++++-------
 tests/Ion/Cache/Driver/RedisDriverTest.php  | 17 ++++++++--
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index 4f2ecead..b6b6ecaa 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -15,22 +15,33 @@ class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 
-		// Setup config with port and password
-		$container = new Container();
-		$container->set('config', new Config([
-			'redis' => [
-				'host' => 'localhost',
-				'port' => 6379,
-				'password' => '',
-				'database' => 13,
-			]
-		]));
-		$this->driver = new RedisDriver($container);
+		if ( ! class_exists('Redis'))
+		{
+			$this->markTestSkipped('Redis extension not installed');
+		}
+		else
+		{
+			// Setup config with port and password
+			$container = new Container();
+			$container->set('config', new Config([
+				'redis' => [
+					'host' => 'localhost',
+					'port' => 6379,
+					'password' => '',
+					'database' => 13,
+				]
+			]));
+			$this->driver = new RedisDriver($container);
+		}
 	}
 
 	public function tearDown()
 	{
 		parent::tearDown();
-		$this->driver->__destruct();
+
+		if ( ! is_null($this->driver))
+		{
+			$this->driver->__destruct();
+		}
 	}
 }
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/RedisDriverTest.php b/tests/Ion/Cache/Driver/RedisDriverTest.php
index 171a3324..9200dc61 100644
--- a/tests/Ion/Cache/Driver/RedisDriverTest.php
+++ b/tests/Ion/Cache/Driver/RedisDriverTest.php
@@ -12,12 +12,25 @@ class CacheRedisDriverTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->driver = new RedisDriver($this->container);
+
+		if ( ! class_exists('Redis'))
+		{
+			$this->markTestSkipped('Redis extension not installed');
+		}
+		else
+		{
+			$this->driver = new RedisDriver($this->container);
+		}
 	}
 
 	public function tearDown()
 	{
 		parent::tearDown();
-		$this->driver->__destruct();
+
+		if ( ! is_null($this->driver))
+		{
+			$this->driver->__destruct();
+		}
+
 	}
 }
\ No newline at end of file

From 23fa88bb334cd9208fcf45c1e0090f79d0eff366 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 18 Jul 2016 13:06:37 -0400
Subject: [PATCH 08/65] Set default timezone to prevent stupid test errors

---
 tests/bootstrap.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b988e8c1..9df960d1 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -6,6 +6,14 @@
 use Aviat\Ion\Json;
 use Aviat\AnimeClient\AnimeClient;
 
+// Work around the silly timezone error
+$timezone = ini_get('date.timezone');
+if ($timezone === '' || $timezone === FALSE)
+{
+	ini_set('date.timezone', 'GMT');
+}
+
+
 // -----------------------------------------------------------------------------
 // Global functions
 // -----------------------------------------------------------------------------

From d54d180090b45629950b4b532444bbf7c2f9d034 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 19 Jul 2016 10:17:53 -0400
Subject: [PATCH 09/65] Fix failing test by installing gd in gitlab ci test

---
 build/docker_install.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index d2e3ead8..e2bdfa21 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -7,8 +7,15 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git unzip -yqq
+apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 sendmail -yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-chmod +x /usr/local/bin/phpunit
\ No newline at end of file
+chmod +x /usr/local/bin/phpunit
+
+# Install gd
+docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
+docker-php-ext-install gd
+docker-php-ext-install mcrypt
+docker-php-ext-install mbstring
+docker-php-ext-install zip
\ No newline at end of file

From b61f0b5e6cbef067ad77109a6c3da66abcc07357 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 19 Jul 2016 10:25:54 -0400
Subject: [PATCH 10/65] Attempt 2 to install gd in gitlab ci tests

---
 build/docker_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index e2bdfa21..add8adbe 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -7,7 +7,7 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 sendmail -yqq
+apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 libfreetype6-dev libjpeg-dev libmcrypt-dev libpng12-dev zlib1g-dev -yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar

From 0632ebba6645434e697579618ec6db82d174ac4e Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 19 Jul 2016 10:45:16 -0400
Subject: [PATCH 11/65] Remove redundant mbstring extesion from build setup

---
 build/docker_install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index add8adbe..14aabcd5 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -17,5 +17,4 @@ chmod +x /usr/local/bin/phpunit
 docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
 docker-php-ext-install gd
 docker-php-ext-install mcrypt
-docker-php-ext-install mbstring
 docker-php-ext-install zip
\ No newline at end of file

From 4772c6df95721fc05abff620a3a84c3a74fced80 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 22 Jul 2016 17:22:00 -0400
Subject: [PATCH 12/65] Update Redis cache driver to use PHP-only library,
 removing the dependence on an extension:

---
 app/config/redis.toml.example               |  1 +
 composer.json                               |  1 +
 src/Aviat/Ion/Cache/Driver/RedisDriver.php  | 36 ++++++++-------------
 tests/Ion/Cache/Driver/CacheDriverBase.php  |  2 ++
 tests/Ion/Cache/Driver/RedisDriver2Test.php | 29 +++++++----------
 tests/Ion/Cache/Driver/RedisDriverTest.php  |  9 +-----
 6 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/app/config/redis.toml.example b/app/config/redis.toml.example
index c45ea3c1..a3f7b996 100644
--- a/app/config/redis.toml.example
+++ b/app/config/redis.toml.example
@@ -3,6 +3,7 @@
 ################################################################################
 
 # Host or socket to connect to
+# Socket must be prefixed with 'unix:'
 host = "127.0.0.1"
 
 # Connection port
diff --git a/composer.json b/composer.json
index 018dcfe7..bf012bc2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
 		"filp/whoops": "2.0.*",
 		"guzzlehttp/guzzle": "6.*",
 		"monolog/monolog": "1.*",
+		"predis/predis": "1.1.*",
 		"psr/http-message": "~1.0",
 		"psr/log": "~1.0",
 		"robmorgan/phinx": "0.4.*",
diff --git a/src/Aviat/Ion/Cache/Driver/RedisDriver.php b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
index 3fedc6e0..db265e13 100644
--- a/src/Aviat/Ion/Cache/Driver/RedisDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
@@ -13,8 +13,11 @@
 namespace Aviat\Ion\Cache\Driver;
 
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Cache\CacheDriverInterface;
 
-class RedisDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
+use Predis\Client;
+
+class RedisDriver implements CacheDriverInterface {
 	
 	/**
 	 * The redis extension class instance
@@ -29,34 +32,21 @@ class RedisDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
 	{
 		$config = $container->get('config');
 		$redisConfig = $config->get('redis');
-		
-		$this->redis = new \Redis();
-		
-		(array_key_exists('port', $redisConfig))
-			? $this->redis->pconnect($redisConfig['host'], $redisConfig['port'])
-			: $this->redis->pconnect($redisConfig['host']);
-		
-		// If there is a password, authorize
-		if (array_key_exists('password', $redisConfig))
+
+		if (array_key_exists('password', $redisConfig) && $redisConfig['password'] === '')
 		{
-			$this->redis->auth($redisConfig['password']);
+			unset($redisConfig['password']);
 		}
 		
-		// If there is a database selected, connect to the specified database
-		if (array_key_exists('database', $redisConfig))
-		{
-			$this->redis->select($redisConfig['database']);
-		}
-		
-		$this->redis->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
+		$this->redis = new Client($redisConfig);
 	}
-	
+
 	/**
-	 * Destructor to disconnect from redis
+	 * Disconnect from redis
 	 */
 	public function __destruct()
 	{
-		$this->redis->close();
+		$this->redis = null;
 	}
 	
 	/**
@@ -67,7 +57,7 @@ class RedisDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
 	 */
 	public function get($key)
 	{
-		return $this->redis->get($key);
+		return unserialize($this->redis->get($key));
 	}
 	
 	/**
@@ -79,7 +69,7 @@ class RedisDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
 	 */
 	public function set($key, $value)
 	{
-		$this->redis->set($key, $value);
+		$this->redis->set($key, serialize($value));
 		return $this;
 	}
 	
diff --git a/tests/Ion/Cache/Driver/CacheDriverBase.php b/tests/Ion/Cache/Driver/CacheDriverBase.php
index e0ba7a94..d1e333aa 100644
--- a/tests/Ion/Cache/Driver/CacheDriverBase.php
+++ b/tests/Ion/Cache/Driver/CacheDriverBase.php
@@ -18,7 +18,9 @@ trait CacheDriverBase {
 	public function testDriverGetSet()
 	{
 		$this->driver->set('foo', $this->foo);
+		$this->driver->set('bar', 'baz');
 		$this->assertEquals($this->driver->get('foo'), $this->foo);
+		$this->assertEquals($this->driver->get('bar'), 'baz');
 	}
 	
 	public function testInvalidate()
diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index b6b6ecaa..8bcbb0b9 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -15,24 +15,17 @@ class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 
-		if ( ! class_exists('Redis'))
-		{
-			$this->markTestSkipped('Redis extension not installed');
-		}
-		else
-		{
-			// Setup config with port and password
-			$container = new Container();
-			$container->set('config', new Config([
-				'redis' => [
-					'host' => 'localhost',
-					'port' => 6379,
-					'password' => '',
-					'database' => 13,
-				]
-			]));
-			$this->driver = new RedisDriver($container);
-		}
+		// Setup config with port and password
+		$container = new Container();
+		$container->set('config', new Config([
+			'redis' => [
+				'host' => 'localhost',
+				'port' => 6379,
+				'password' => '',
+				'database' => 13,
+			]
+		]));
+		$this->driver = new RedisDriver($container);
 	}
 
 	public function tearDown()
diff --git a/tests/Ion/Cache/Driver/RedisDriverTest.php b/tests/Ion/Cache/Driver/RedisDriverTest.php
index 9200dc61..3ae45a9a 100644
--- a/tests/Ion/Cache/Driver/RedisDriverTest.php
+++ b/tests/Ion/Cache/Driver/RedisDriverTest.php
@@ -13,14 +13,7 @@ class CacheRedisDriverTest extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 
-		if ( ! class_exists('Redis'))
-		{
-			$this->markTestSkipped('Redis extension not installed');
-		}
-		else
-		{
-			$this->driver = new RedisDriver($this->container);
-		}
+		$this->driver = new RedisDriver($this->container);
 	}
 
 	public function tearDown()

From 5a69da4466b600d1b2c3a39d0df858674aecfc22 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 22 Jul 2016 17:48:13 -0400
Subject: [PATCH 13/65] Update Redis tests to work with gitlab ci

---
 src/Aviat/Ion/Cache/Driver/SQLDriver.php    | 3 ++-
 tests/Ion/Cache/Driver/RedisDriver2Test.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
index c8a51dd2..dc1c47ef 100644
--- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
@@ -13,12 +13,13 @@
 namespace Aviat\Ion\Cache\Driver;
 
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Cache\CacheDriverInterface;
 use Aviat\AnimeClient\Model\DB;
 
 /**
  * Driver for caching via a traditional SQL database
  */
-class SQLDriver extends DB implements \Aviat\Ion\Cache\CacheDriverInterface  {
+class SQLDriver extends DB implements CacheDriverInterface  {
 
 	/**
 	 * The query builder object
diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index 8bcbb0b9..35317251 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -19,7 +19,7 @@ class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
 		$container = new Container();
 		$container->set('config', new Config([
 			'redis' => [
-				'host' => 'localhost',
+				'host' => (array_key_exists('REDIS_HOST', $_ENV)) ? $_ENV['REDIS_HOST'] : 'localhost',
 				'port' => 6379,
 				'password' => '',
 				'database' => 13,

From fec9de0e3db233f1a5367451a1d01c651b7640e9 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 25 Jul 2016 11:58:43 -0400
Subject: [PATCH 14/65] Add redis config file for gitlab ci tests

---
 build/docker_install.sh |  7 +++++++
 tests/redis.toml        | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tests/redis.toml

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 14aabcd5..88223f44 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -3,6 +3,9 @@
 # We need to install dependencies only for Docker
 [[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0
 
+# Where am I?
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
@@ -13,6 +16,10 @@ apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 lib
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
 chmod +x /usr/local/bin/phpunit
 
+# Move redis test config file into place
+mv "$DIR/test/redis.toml" "$DIR/app/config/redis.toml"
+
+
 # Install gd
 docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
 docker-php-ext-install gd
diff --git a/tests/redis.toml b/tests/redis.toml
new file mode 100644
index 00000000..ea731750
--- /dev/null
+++ b/tests/redis.toml
@@ -0,0 +1,15 @@
+################################################################################
+#                         Redis Cache Configuration                            #
+################################################################################
+
+# Host or socket to connect to
+host = "redis"
+
+# Connection port
+#port = 6379
+
+# Connection password
+#password = ""
+
+# Database number
+database = 13
\ No newline at end of file

From 1d2936df92b2717a650bb57cf8544e5c8e2a2a0e Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 25 Jul 2016 12:04:56 -0400
Subject: [PATCH 15/65] Fix typo in test path

---
 build/docker_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 88223f44..42ac246f 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -17,7 +17,7 @@ curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
 chmod +x /usr/local/bin/phpunit
 
 # Move redis test config file into place
-mv "$DIR/test/redis.toml" "$DIR/app/config/redis.toml"
+mv "$DIR/tests/redis.toml" "$DIR/app/config/redis.toml"
 
 
 # Install gd

From ac76994a7005085e10c6d62b2d4613194b0cc577 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 25 Jul 2016 12:18:51 -0400
Subject: [PATCH 16/65] Attempt moving config file in a different way

---
 .gitlab-ci.yml          | 2 ++
 build/docker_install.sh | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78229a40..c64b9fb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ before_script:
     # Install composer dependencies
     - curl -sS https://getcomposer.org/installer | php
     - php composer.phar install
+    # Move redis test config file into place
+    - mv "./tests/redis.toml" "./app/config/redis.toml"
 
 # Composer stores all downloaded packages in the vendor/ directory.
 # Do not use the following if the vendor/ directory is commited to
diff --git a/build/docker_install.sh b/build/docker_install.sh
index 42ac246f..7dca9c3f 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -16,10 +16,6 @@ apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 lib
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
 chmod +x /usr/local/bin/phpunit
 
-# Move redis test config file into place
-mv "$DIR/tests/redis.toml" "$DIR/app/config/redis.toml"
-
-
 # Install gd
 docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
 docker-php-ext-install gd

From 756b5b51364102e65f9a4ad2411755c8cccf1b93 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 25 Jul 2016 12:29:42 -0400
Subject: [PATCH 17/65] Update the correct file to change config for gitlab ci

---
 .gitlab-ci.yml                 |  2 --
 tests/AnimeClient_TestCase.php |  2 +-
 tests/redis.toml               | 15 ---------------
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 tests/redis.toml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c64b9fb2..78229a40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,6 @@ before_script:
     # Install composer dependencies
     - curl -sS https://getcomposer.org/installer | php
     - php composer.phar install
-    # Move redis test config file into place
-    - mv "./tests/redis.toml" "./app/config/redis.toml"
 
 # Composer stores all downloaded packages in the vendor/ directory.
 # Do not use the following if the vendor/ directory is commited to
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index f4a296dc..9a9a6a50 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -73,7 +73,7 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 				]
 			],
 			'redis' => [
-				'host' => 'localhost',
+				'host' => 'redis',
 				'database' => 13
 			]
 		];
diff --git a/tests/redis.toml b/tests/redis.toml
deleted file mode 100644
index ea731750..00000000
--- a/tests/redis.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#                         Redis Cache Configuration                            #
-################################################################################
-
-# Host or socket to connect to
-host = "redis"
-
-# Connection port
-#port = 6379
-
-# Connection password
-#password = ""
-
-# Database number
-database = 13
\ No newline at end of file

From 1b93adefa30db91e7053a2a217ad948f8666b3ee Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 27 Jul 2016 13:18:52 -0400
Subject: [PATCH 18/65] Refactor out some Interdependency between Ion and
 AnimeClient namespaces

---
 app/bootstrap.php                             |   8 +-
 app/views/header.php                          |   4 +-
 src/Aviat/AnimeClient/AnimeClient.php         |  66 +---
 .../AnimeClient/Auth/HummingbirdAuth.php      |   2 -
 src/Aviat/AnimeClient/Command/BaseCommand.php |   4 +-
 src/Aviat/AnimeClient/Config.php              |   4 +-
 src/Aviat/AnimeClient/Dispatcher.php          |   1 -
 src/Aviat/AnimeClient/Model/API.php           |  18 +-
 src/Aviat/AnimeClient/Model/Anime.php         |   3 +-
 src/Aviat/AnimeClient/Model/Collection.php    |   2 +-
 src/Aviat/AnimeClient/Model/DB.php            |  12 +-
 src/Aviat/AnimeClient/Model/Manga.php         |   4 +-
 src/Aviat/AnimeClient/{Model.php => Util.php} | 335 ++++++++++--------
 src/Aviat/Ion/Cache/CacheManager.php          |  15 +-
 src/Aviat/Ion/Cache/Driver/NullDriver.php     |  11 +-
 src/Aviat/Ion/Cache/Driver/RedisDriver.php    |  14 +-
 src/Aviat/Ion/Cache/Driver/SQLDriver.php      |  12 +-
 src/Aviat/Ion/ConfigInterface.php             |  41 +++
 src/Aviat/Ion/Model.php                       |  21 ++
 src/Aviat/Ion/Model/DB.php                    |  51 +++
 tests/AnimeClient/AnimeClientTest.php         |  73 ----
 tests/AnimeClient/Model/MangaModelTest.php    |   1 +
 tests/AnimeClient/UtilTest.php                |  78 ++++
 tests/{AnimeClient => Ion}/BaseModelTest.php  |   4 +-
 tests/Ion/Cache/CacheManagerTest.php          |   2 +-
 tests/Ion/Cache/Driver/NullDriverTest.php     |   2 +-
 tests/Ion/Cache/Driver/RedisDriver2Test.php   |   7 +-
 tests/Ion/Cache/Driver/RedisDriverTest.php    |   2 +-
 tests/Ion/Cache/Driver/SQLDriverTest.php      |   2 +-
 tests/mocks.php                               |  12 +-
 30 files changed, 473 insertions(+), 338 deletions(-)
 rename src/Aviat/AnimeClient/{Model.php => Util.php} (62%)
 create mode 100644 src/Aviat/Ion/ConfigInterface.php
 create mode 100644 src/Aviat/Ion/Model.php
 create mode 100644 src/Aviat/Ion/Model/DB.php
 create mode 100644 tests/AnimeClient/UtilTest.php
 rename tests/{AnimeClient => Ion}/BaseModelTest.php (62%)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index c3304640..6b3701ab 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -41,7 +41,7 @@ return function(array $config_array = []) {
 	$container->set('config', $config);
 
 	// Create Cache Object
-	$container->set('cache', new CacheManager($container));
+	$container->set('cache', new CacheManager($config));
 
 	// Create Aura Router Object
 	$container->set('aura-router', new RouterContainer);
@@ -71,9 +71,9 @@ return function(array $config_array = []) {
 	$container->set('session', $session);
 
 	// Miscellaneous helper methods
-	$anime_client = new AnimeClient();
-	$anime_client->setContainer($container);
-	$container->set('anime-client', $anime_client);
+	$util = new Util($container);
+	$container->set('anime-client', $util);
+	$container->set('util', $util);
 
 	// Models
 	$container->set('api-model', new Model\API($container));
diff --git a/app/views/header.php b/app/views/header.php
index 306f5bf9..5ec53689 100644
--- a/app/views/header.php
+++ b/app/views/header.php
@@ -50,8 +50,8 @@
 			<?= $helper->menu($menu_name) ?>
 			<br />
 			<ul>
-				<li class="<?= AnimeClient::is_not_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
-				<li class="<?= AnimeClient::is_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
+				<li class="<?= Util::is_not_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
+				<li class="<?= Util::is_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
 			</ul>
 			<?php endif ?>
 		</nav>
diff --git a/src/Aviat/AnimeClient/AnimeClient.php b/src/Aviat/AnimeClient/AnimeClient.php
index 435afc86..f737124d 100644
--- a/src/Aviat/AnimeClient/AnimeClient.php
+++ b/src/Aviat/AnimeClient/AnimeClient.php
@@ -18,12 +18,11 @@ use Yosymfony\Toml\Toml;
 define('SRC_DIR', realpath(__DIR__ . '/../../'));
 
 /**
- * Odds and Ends class
+ * Application constants
  */
 class AnimeClient {
 
-	use \Aviat\Ion\Di\ContainerAware;
-
+	const HUMMINGBIRD_AUTH_URL = 'https://hummingbird.me/api/v1/users/authenticate';
 	const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
 	const DEFAULT_CONTROLLER_NAMESPACE = 'Aviat\AnimeClient\Controller';
 	const DEFAULT_CONTROLLER = 'Aviat\AnimeClient\Controller\Anime';
@@ -32,67 +31,6 @@ class AnimeClient {
 	const ERROR_MESSAGE_METHOD = 'error_page';
 	const SRC_DIR = SRC_DIR;
 
-	private static $form_pages = [
-		'edit',
-		'add',
-		'update',
-		'update_form',
-		'login',
-		'logout',
-		'details'
-	];
-
-	/**
-	 * HTML selection helper function
-	 *
-	 * @param string $a - First item to compare
-	 * @param string $b - Second item to compare
-	 * @return string
-	 */
-	public static function is_selected($a, $b)
-	{
-		return ($a === $b) ? 'selected' : '';
-	}
-
-	/**
-	 * Inverse of selected helper function
-	 *
-	 * @param string $a - First item to compare
-	 * @param string $b - Second item to compare
-	 * @return string
-	 */
-	public static function is_not_selected($a, $b)
-	{
-		return ($a !== $b) ? 'selected' : '';
-	}
-
-	/**
-	 * Determine whether to show the sub-menu
-	 *
-	 * @return bool
-	 */
-	public function is_view_page()
-	{
-		$url = $this->container->get('request')
-			->getUri();
-		$page_segments = explode("/", $url);
-
-		$intersect = array_intersect($page_segments, self::$form_pages);
-
-		return empty($intersect);
-	}
-
-	/**
-	 * Determine whether the page is a page with a form, and
-	 * not suitable for redirection
-	 *
-	 * @return boolean
-	 */
-	public function is_form_page()
-	{
-		return ! $this->is_view_page();
-	}
-
 	/**
 	 * Load configuration options from .toml files
 	 *
diff --git a/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php b/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
index c6fa6d02..ac9625cf 100644
--- a/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
+++ b/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
@@ -15,7 +15,6 @@ namespace Aviat\AnimeClient\Auth;
 
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\AnimeClient;
-use Aviat\AnimeClient\Model\API;
 
 /**
  * Hummingbird API Authentication
@@ -102,6 +101,5 @@ class HummingbirdAuth {
 	{
 		return $this->segment->get('auth_token', FALSE);
 	}
-
 }
 // End of HummingbirdAuth.php
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Command/BaseCommand.php b/src/Aviat/AnimeClient/Command/BaseCommand.php
index 980ccc22..2f4b9b48 100644
--- a/src/Aviat/AnimeClient/Command/BaseCommand.php
+++ b/src/Aviat/AnimeClient/Command/BaseCommand.php
@@ -51,7 +51,7 @@ class BaseCommand extends Command {
 	 */
 	protected function setupContainer()
 	{
-		$CONF_DIR = __DIR__ . '/../../../../app/config/';
+		$CONF_DIR = realpath(__DIR__ . '/../../../../app/config/');
 		require_once $CONF_DIR . '/base_config.php'; // $base_config
 
 		$config = AnimeClient::load_toml($CONF_DIR);
@@ -65,7 +65,7 @@ class BaseCommand extends Command {
 			$container->set('config', $config);
 
 			// Create Cache Object
-			$container->set('cache', new CacheManager($container));
+			$container->set('cache', new CacheManager($config));
 
 			// Create session Object
 			$session = (new SessionFactory())->newInstance($_COOKIE);
diff --git a/src/Aviat/AnimeClient/Config.php b/src/Aviat/AnimeClient/Config.php
index e994b42d..3cbf9195 100644
--- a/src/Aviat/AnimeClient/Config.php
+++ b/src/Aviat/AnimeClient/Config.php
@@ -13,12 +13,14 @@
 
 namespace Aviat\AnimeClient;
 
+use Aviat\Ion\ConfigInterface;
+
 use InvalidArgumentException;
 
 /**
  * Wrapper for configuration values
  */
-class Config {
+class Config implements ConfigInterface {
 
 	use \Aviat\Ion\ArrayWrapper;
 
diff --git a/src/Aviat/AnimeClient/Dispatcher.php b/src/Aviat/AnimeClient/Dispatcher.php
index d1517e38..1d57e3c9 100644
--- a/src/Aviat/AnimeClient/Dispatcher.php
+++ b/src/Aviat/AnimeClient/Dispatcher.php
@@ -17,7 +17,6 @@ use Aura\Web\Response;
 
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Friend;
-use Aviat\AnimeClient\AnimeClient;
 
 
 /**
diff --git a/src/Aviat/AnimeClient/Model/API.php b/src/Aviat/AnimeClient/Model/API.php
index 1fa6511a..feec4985 100644
--- a/src/Aviat/AnimeClient/Model/API.php
+++ b/src/Aviat/AnimeClient/Model/API.php
@@ -19,7 +19,8 @@ use GuzzleHttp\Psr7\ResponseInterface;
 use GuzzleHttp\Exception\ClientException;
 
 use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Model as BaseModel;
+use Aviat\Ion\Model;
+use Aviat\AnimeClient\AnimeClient;
 
 /**
  * Base model for api interaction
@@ -32,7 +33,15 @@ use Aviat\AnimeClient\Model as BaseModel;
  * @method ResponseInterface post(string $uri, array $options);
  * @method ResponseInterface put(string $uri, array $options);
  */
-class API extends BaseModel {
+class API extends Model {
+
+	use \Aviat\Ion\Di\ContainerAware;
+
+	/**
+	 * Config manager
+	 * @var ConfigInterface
+	 */
+	protected $config;
 
 	/**
 	 * Base url for making api requests
@@ -65,7 +74,8 @@ class API extends BaseModel {
 	 */
 	public function __construct(ContainerInterface $container)
 	{
-		parent::__construct($container);
+		$this->container = $container;
+		$this->config = $container->get('config');
 		$this->cache = $container->get('cache');
 		$this->init();
 	}
@@ -171,7 +181,7 @@ class API extends BaseModel {
 	 */
 	public function authenticate($username, $password)
 	{
-		$response = $this->post('https://hummingbird.me/api/v1/users/authenticate', [
+		$response = $this->post(AnimeClient::HUMMINGBIRD_AUTH_URL, [
 			'form_params' => [
 				'username' => $username,
 				'password' => $password
diff --git a/src/Aviat/AnimeClient/Model/Anime.php b/src/Aviat/AnimeClient/Model/Anime.php
index 8d13c208..449b2648 100644
--- a/src/Aviat/AnimeClient/Model/Anime.php
+++ b/src/Aviat/AnimeClient/Model/Anime.php
@@ -226,9 +226,10 @@ class Anime extends API {
 		$response = $this->get("users/{$username}/library", $config);
 		$output = $this->transform($status, $response);
 
+		$util = $this->container->get('util');
 		foreach ($output as &$row)
 		{
-			$row['anime']['image'] = $this->get_cached_image($row['anime']['image'], $row['anime']['slug'], 'anime');
+			$row['anime']['image'] = $util->get_cached_image($row['anime']['image'], $row['anime']['slug'], 'anime');
 		}
 
 		return $output;
diff --git a/src/Aviat/AnimeClient/Model/Collection.php b/src/Aviat/AnimeClient/Model/Collection.php
index 22e19378..0bec057b 100644
--- a/src/Aviat/AnimeClient/Model/Collection.php
+++ b/src/Aviat/AnimeClient/Model/Collection.php
@@ -36,7 +36,7 @@ class Collection extends DB {
 	 * Create a new collection object
 	 *
 	 * @param ContainerInterface $container
-	 * @return boolean
+	 * @return void
 	 */
 	public function __construct(ContainerInterface $container)
 	{
diff --git a/src/Aviat/AnimeClient/Model/DB.php b/src/Aviat/AnimeClient/Model/DB.php
index 82167e54..8ad0e9f0 100644
--- a/src/Aviat/AnimeClient/Model/DB.php
+++ b/src/Aviat/AnimeClient/Model/DB.php
@@ -13,12 +13,14 @@
 namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Model as BaseModel;
+use Aviat\Ion\Model;
 
 /**
  * Base model for database interaction
  */
-class DB extends BaseModel {
+class DB extends Model {
+	use \Aviat\Ion\Di\ContainerAware;
+
 	/**
 	 * The query builder object
 	 * @var object $db
@@ -38,8 +40,8 @@ class DB extends BaseModel {
 	 */
 	public function __construct(ContainerInterface $container)
 	{
-		parent::__construct($container);
-		$this->db_config = (array)$this->config->get('database');
+		$this->db_config = $container->get('config')->get('database');
+		$this->setContainer($container);
 	}
 }
-// End of BaseDBModel.php
\ No newline at end of file
+// End of DB.php
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Model/Manga.php b/src/Aviat/AnimeClient/Model/Manga.php
index 6a6e3c94..999578af 100644
--- a/src/Aviat/AnimeClient/Model/Manga.php
+++ b/src/Aviat/AnimeClient/Model/Manga.php
@@ -252,9 +252,11 @@ class Manga extends API {
 			self::COMPLETED => [],
 		];
 
+		$util = $this->container->get('util');
+
 		foreach ($data as &$entry)
 		{
-			$entry['manga']['image'] = $this->get_cached_image(
+			$entry['manga']['image'] = $util->get_cached_image(
 				$entry['manga']['image'],
 				$entry['manga']['slug'],
 				'manga'
diff --git a/src/Aviat/AnimeClient/Model.php b/src/Aviat/AnimeClient/Util.php
similarity index 62%
rename from src/Aviat/AnimeClient/Model.php
rename to src/Aviat/AnimeClient/Util.php
index ba4861fa..cfabaca3 100644
--- a/src/Aviat/AnimeClient/Model.php
+++ b/src/Aviat/AnimeClient/Util.php
@@ -1,140 +1,195 @@
-<?php
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
- */
-namespace Aviat\AnimeClient;
-
-use abeautifulsite\SimpleImage;
-use Aviat\Ion\Di\ContainerInterface;
-
-/**
- * Common base for all Models
- */
-class Model {
-
-	use \Aviat\Ion\StringWrapper;
-
-	/**
-	 * The global configuration object
-	 * @var Config
-	 */
-	protected $config;
-
-	/**
-	 * The container object
-	 * @var ContainerInterface
-	 */
-	protected $container;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		$this->container = $container;
-		$this->config = $container->get('config');
-	}
-
-	/**
-	 * Get the path of the cached version of the image. Create the cached image
-	 * if the file does not already exist
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $api_path - The original image url
-	 * @param string $series_slug - The part of the url with the series name, becomes the image name
-	 * @param string $type - Anime or Manga, controls cache path
-	 * @return string - the frontend path for the cached image
-	 * @throws DomainException
-	 */
-	public function get_cached_image($api_path, $series_slug, $type = "anime")
-	{
-		$path_parts = explode('?', basename($api_path));
-		$path = current($path_parts);
-		$ext_parts = explode('.', $path);
-		$ext = end($ext_parts);
-
-		// Workaround for some broken file extensions
-		if ($ext == "jjpg")
-		{
-			$ext = "jpg";
-		}
-
-		// Failsafe for weird urls
-		if (strlen($ext) > 3)
-		{
-			return $api_path;
-		}
-
-		$img_cache_path = $this->config->get('img_cache_path');
-		$cached_image = "{$series_slug}.{$ext}";
-		$cached_path = "{$img_cache_path}/{$type}/{$cached_image}";
-
-		// Cache the file if it doesn't already exist
-		if ( ! file_exists($cached_path))
-		{
-			if (function_exists('curl_init'))
-			{
-				$ch = curl_init($api_path);
-				$fp = fopen($cached_path, 'wb');
-				curl_setopt_array($ch, [
-					CURLOPT_FILE => $fp,
-					CURLOPT_HEADER => 0
-				]);
-				curl_exec($ch);
-				curl_close($ch);
-				fclose($fp);
-			}
-			else if (ini_get('allow_url_fopen'))
-			{
-				copy($api_path, $cached_path);
-			}
-			else
-			{
-				throw new DomainException("Couldn't cache images because they couldn't be downloaded.");
-			}
-
-			// Resize the image
-			if ($type == 'anime')
-			{
-				$resize_width = 220;
-				$resize_height = 319;
-				$this->_resize($cached_path, $resize_width, $resize_height);
-			}
-		}
-
-		return "/public/images/{$type}/{$cached_image}";
-	}
-
-	/**
-	 * Resize an image
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $path
-	 * @param string $width
-	 * @param string $height
-	 */
-	private function _resize($path, $width, $height)
-	{
-		try
-		{
-			$img = new SimpleImage($path);
-			$img->resize($width, $height)->save();
-		}
-		catch (Exception $e)
-		{
-			// Catch image errors, since they don't otherwise affect
-			// functionality
-		}
-	}
-}
-// End of BaseModel.php
\ No newline at end of file
+<?php
+/**
+ * Hummingbird Anime Client
+ *
+ * An API client for Hummingbird to manage anime and manga watch lists
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     MIT
+ */
+namespace Aviat\AnimeClient;
+
+use abeautifulsite\SimpleImage;
+use Aviat\Ion\ConfigInterface;
+use Aviat\Ion\Di\ContainerInterface;
+
+/**
+ * Utility method class
+ */
+class Util {
+
+	use \Aviat\Ion\Di\ContainerAware;
+
+	private static $form_pages = [
+		'edit',
+		'add',
+		'update',
+		'update_form',
+		'login',
+		'logout',
+		'details'
+	];
+
+	/**
+	 * The config manager
+	 * @var ConfigInterface
+	 */
+	private $config;
+
+	/**
+	 * Set up the Util class
+	 *
+	 * @param ContainerInterface $container
+	 */
+	public function __construct(ContainerInterface $container)
+	{
+		$this->setContainer($container);
+		$this->config = $container->get('config');
+	}
+
+	/**
+	 * HTML selection helper function
+	 *
+	 * @param string $a - First item to compare
+	 * @param string $b - Second item to compare
+	 * @return string
+	 */
+	public static function is_selected($a, $b)
+	{
+		return ($a === $b) ? 'selected' : '';
+	}
+
+	/**
+	 * Inverse of selected helper function
+	 *
+	 * @param string $a - First item to compare
+	 * @param string $b - Second item to compare
+	 * @return string
+	 */
+	public static function is_not_selected($a, $b)
+	{
+		return ($a !== $b) ? 'selected' : '';
+	}
+
+	/**
+	 * Determine whether to show the sub-menu
+	 *
+	 * @return bool
+	 */
+	public function is_view_page()
+	{
+		$url = $this->container->get('request')
+			->getUri();
+		$page_segments = explode("/", $url);
+
+		$intersect = array_intersect($page_segments, self::$form_pages);
+
+		return empty($intersect);
+	}
+
+	/**
+	 * Determine whether the page is a page with a form, and
+	 * not suitable for redirection
+	 *
+	 * @return boolean
+	 */
+	public function is_form_page()
+	{
+		return ! $this->is_view_page();
+	}
+
+	/**
+	 * Get the path of the cached version of the image. Create the cached image
+	 * if the file does not already exist
+	 *
+	 * @codeCoverageIgnore
+	 * @param string $api_path - The original image url
+	 * @param string $series_slug - The part of the url with the series name, becomes the image name
+	 * @param string $type - Anime or Manga, controls cache path
+	 * @return string - the frontend path for the cached image
+	 * @throws DomainException
+	 */
+	public function get_cached_image($api_path, $series_slug, $type = "anime")
+	{
+		$path_parts = explode('?', basename($api_path));
+		$path = current($path_parts);
+		$ext_parts = explode('.', $path);
+		$ext = end($ext_parts);
+
+		// Workaround for some broken file extensions
+		if ($ext == "jjpg")
+		{
+			$ext = "jpg";
+		}
+
+		// Failsafe for weird urls
+		if (strlen($ext) > 3)
+		{
+			return $api_path;
+		}
+
+		$img_cache_path = $this->config->get('img_cache_path');
+		$cached_image = "{$series_slug}.{$ext}";
+		$cached_path = "{$img_cache_path}/{$type}/{$cached_image}";
+
+		// Cache the file if it doesn't already exist
+		if ( ! file_exists($cached_path))
+		{
+			if (function_exists('curl_init'))
+			{
+				$ch = curl_init($api_path);
+				$fp = fopen($cached_path, 'wb');
+				curl_setopt_array($ch, [
+					CURLOPT_FILE => $fp,
+					CURLOPT_HEADER => 0
+				]);
+				curl_exec($ch);
+				curl_close($ch);
+				fclose($fp);
+			}
+			else if (ini_get('allow_url_fopen'))
+			{
+				copy($api_path, $cached_path);
+			}
+			else
+			{
+				throw new \DomainException("Couldn't cache images because they couldn't be downloaded.");
+			}
+
+			// Resize the image
+			if ($type == 'anime')
+			{
+				$resize_width = 220;
+				$resize_height = 319;
+				$this->_resize($cached_path, $resize_width, $resize_height);
+			}
+		}
+
+		return "/public/images/{$type}/{$cached_image}";
+	}
+
+	/**
+	 * Resize an image
+	 *
+	 * @codeCoverageIgnore
+	 * @param string $path
+	 * @param string $width
+	 * @param string $height
+	 */
+	private function _resize($path, $width, $height)
+	{
+		try
+		{
+			$img = new SimpleImage($path);
+			$img->resize($width, $height)->save();
+		}
+		catch (Exception $e)
+		{
+			// Catch image errors, since they don't otherwise affect
+			// functionality
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/CacheManager.php b/src/Aviat/Ion/Cache/CacheManager.php
index b5e32cb4..34fc4887 100644
--- a/src/Aviat/Ion/Cache/CacheManager.php
+++ b/src/Aviat/Ion/Cache/CacheManager.php
@@ -12,7 +12,7 @@
 
 namespace Aviat\Ion\Cache;
 
-use \Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\ConfigInterface;
 
 /**
  * Class proxying cached and fresh values from the selected cache driver
@@ -25,11 +25,12 @@ class CacheManager implements CacheInterface {
 	protected $driver;
 
 	/**
-	 * Retreive the appropriate driver from the container
+	 * Retrieve the appropriate driver from the container
+	 *
+	 * @param ConfigInterface $config The configuration management class
 	 */
-	public function __construct(ContainerInterface $container)
+	public function __construct(ConfigInterface $config)
 	{
-		$config = $container->get('config');
 		$driverConf = $config->get('cache_driver');
 
 		if (empty($driverConf))
@@ -38,13 +39,13 @@ class CacheManager implements CacheInterface {
 		}
 
 		$driverClass = __NAMESPACE__ . "\\Driver\\{$driverConf}";
-		$driver = new $driverClass($container);
+		$driver = new $driverClass($config);
 
 		$this->driver = $driver;
 	}
 
 	/**
-	 * Retreive a cached value if it exists, otherwise, get the value
+	 * Retrieve a cached value if it exists, otherwise, get the value
 	 * from the passed arguments
 	 *
 	 * @param object $object - object to retrieve fresh value from
@@ -68,7 +69,7 @@ class CacheManager implements CacheInterface {
 	}
 
 	/**
-	 * Retreive a fresh value from the method, and update the cache
+	 * Retrieve a fresh value from the method, and update the cache
 	 * @param object $object - object to retrieve fresh value from
 	 * @param string $method - method name to call
 	 * @param [array] $args - the arguments to pass to the retrieval method
diff --git a/src/Aviat/Ion/Cache/Driver/NullDriver.php b/src/Aviat/Ion/Cache/Driver/NullDriver.php
index b7d0bb9c..aca42a2c 100644
--- a/src/Aviat/Ion/Cache/Driver/NullDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/NullDriver.php
@@ -12,12 +12,13 @@
 
 namespace Aviat\Ion\Cache\Driver;
 
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\ConfigInterface;
+use Aviat\Ion\Cache\CacheDriverInterface;
 
 /**
  * The Driver for no real cache
  */
-class NullDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
+class NullDriver implements CacheDriverInterface {
 
 	/**
 	 * 'Cache' for Null data store
@@ -25,9 +26,11 @@ class NullDriver implements \Aviat\Ion\Cache\CacheDriverInterface {
 	protected $data;
 
 	/**
-	 * Create the Redis cache driver
+	 * Create the Null cache driver
+	 *
+	 * @param ConfigInterface $config The configuration management class
 	 */
-	public function __construct(ContainerInterface $container)
+	public function __construct(ConfigInterface $config)
 	{
 		$this->data = [];
 	}
diff --git a/src/Aviat/Ion/Cache/Driver/RedisDriver.php b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
index db265e13..b0b436d6 100644
--- a/src/Aviat/Ion/Cache/Driver/RedisDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
@@ -12,7 +12,7 @@
 
 namespace Aviat\Ion\Cache\Driver;
 
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\ConfigInterface;
 use Aviat\Ion\Cache\CacheDriverInterface;
 
 use Predis\Client;
@@ -20,17 +20,19 @@ use Predis\Client;
 class RedisDriver implements CacheDriverInterface {
 	
 	/**
-	 * The redis extension class instance
-	 * @var Redis
+	 * THe Predis library instance
+	 *
+	 * @var Client
 	 */
 	protected $redis;
 	
 	/**
 	 * Create the Redis cache driver
+	 *
+	 * @param ConfigInterface $config The configuration management class
 	 */
-	public function __construct(ContainerInterface $container)
+	public function __construct(ConfigInterface $config)
 	{
-		$config = $container->get('config');
 		$redisConfig = $config->get('redis');
 
 		if (array_key_exists('password', $redisConfig) && $redisConfig['password'] === '')
@@ -50,7 +52,7 @@ class RedisDriver implements CacheDriverInterface {
 	}
 	
 	/**
-	 * Retreive a value from the cache backend
+	 * Retrieve a value from the cache backend
 	 *
 	 * @param string $key
 	 * @return mixed
diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
index dc1c47ef..483494e4 100644
--- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
@@ -12,9 +12,9 @@
 
 namespace Aviat\Ion\Cache\Driver;
 
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\ConfigInterface;
 use Aviat\Ion\Cache\CacheDriverInterface;
-use Aviat\AnimeClient\Model\DB;
+use Aviat\Ion\Model\DB;
 
 /**
  * Driver for caching via a traditional SQL database
@@ -29,15 +29,17 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 
 	/**
 	 * Create the driver object
+	 *
+	 * @param ConfigInterface $config
 	 */
-	public function __construct(ContainerInterface $container)
+	public function __construct(ConfigInterface $config)
 	{
-		parent::__construct($container);
+		parent::__construct($config);
 		$this->db = \Query($this->db_config['collection']);
 	}
 
 	/**
-	 * Retreive a value from the cache backend
+	 * Retrieve a value from the cache backend
 	 *
 	 * @param string $key
 	 * @return mixed
diff --git a/src/Aviat/Ion/ConfigInterface.php b/src/Aviat/Ion/ConfigInterface.php
new file mode 100644
index 00000000..9c644bae
--- /dev/null
+++ b/src/Aviat/Ion/ConfigInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @license     MIT
+ */
+
+namespace Aviat\Ion;
+
+interface ConfigInterface {
+	/**
+	 * Get a config value
+	 *
+	 * @param array|string $key
+	 * @return mixed
+	 */
+	public function get($key);
+
+	/**
+	 * Set a config value
+	 *
+	 * @param integer|string|array $key
+	 * @param mixed $value
+	 * @throws \InvalidArgumentException
+	 * @return ConfigInterface
+	 */
+	public function set($key, $value);
+
+	/**
+	 * Remove a config value
+	 *
+	 * @param  string|array $key
+	 * @return void
+	 */
+	public function delete($key);
+}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Model.php b/src/Aviat/Ion/Model.php
new file mode 100644
index 00000000..ac723592
--- /dev/null
+++ b/src/Aviat/Ion/Model.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @license     MIT
+ */
+
+namespace Aviat\Ion;
+
+/**
+ * Common base for all Models
+ */
+class Model {
+	use StringWrapper;
+}
+// End of Model.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Model/DB.php b/src/Aviat/Ion/Model/DB.php
new file mode 100644
index 00000000..3043c33a
--- /dev/null
+++ b/src/Aviat/Ion/Model/DB.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * @package     Ion
+ * @author      Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @license     MIT
+ */
+
+namespace Aviat\Ion\Model;
+
+use Aviat\Ion\ConfigInterface;
+use Aviat\Ion\Model as BaseModel;
+
+/**
+ * Base model for database interaction
+ */
+class DB extends BaseModel {
+	/**
+	 * The query builder object
+	 * @var object $db
+	 */
+	protected $db;
+
+	/**
+	 * The config manager
+	 * @var ConfigInterface
+	 */
+	protected $config;
+
+	/**
+	 * The database connection information array
+	 * @var array $db_config
+	 */
+	protected $db_config;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ConfigInterface $config
+	 */
+	public function __construct(ConfigInterface $config)
+	{
+		$this->config = $config;
+		$this->db_config = (array)$config->get('database');
+	}
+}
+// End of DB.php
\ No newline at end of file
diff --git a/tests/AnimeClient/AnimeClientTest.php b/tests/AnimeClient/AnimeClientTest.php
index ee649c85..75a89554 100644
--- a/tests/AnimeClient/AnimeClientTest.php
+++ b/tests/AnimeClient/AnimeClientTest.php
@@ -5,13 +5,6 @@ use Aviat\AnimeClient\AnimeClient;
 
 class AnimeClientTest extends AnimeClient_TestCase {
 
-	public function setUp()
-	{
-		parent::setUp();
-		$this->anime_client = new AnimeClient();
-		$this->anime_client->setContainer($this->container);
-	}
-
 	/**
 	 * Basic sanity test for _dir function
 	 */
@@ -19,70 +12,4 @@ class AnimeClientTest extends AnimeClient_TestCase {
 	{
 		$this->assertEquals('foo' . DIRECTORY_SEPARATOR . 'bar', \_dir('foo', 'bar'));
 	}
-
-	public function testIsSelected()
-	{
-		// Failure to match
-		$this->assertEquals('', AnimeClient::is_selected('foo', 'bar'));
-
-		// Matches
-		$this->assertEquals('selected', AnimeClient::is_selected('foo', 'foo'));
-	}
-
-	public function testIsNotSelected()
-	{
-		// Failure to match
-		$this->assertEquals('selected', AnimeClient::is_not_selected('foo', 'bar'));
-
-		// Matches
-		$this->assertEquals('', AnimeClient::is_not_selected('foo', 'foo'));
-	}
-
-	public function dataIsViewPage()
-	{
-		return [
-			[
-				'uri' => '/anime/update',
-				'expected' => FALSE
-			],
-			[
-				'uri' => '/anime/watching',
-				'expected' => TRUE
-			],
-			[
-				'uri' => '/manga/reading',
-				'expected' => TRUE
-			],
-			[
-				'uri' => '/manga/update',
-				'expected' => FALSE
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataIsViewPage
-	 */
-	public function testIsViewPage($uri, $expected)
-	{
-		$this->setSuperGlobals([
-			'_SERVER' => [
-				'REQUEST_URI' => $uri
-			]
-		]);
-		$this->assertEquals($expected, $this->anime_client->is_view_page());
-	}
-
-	/**
-	 * @dataProvider dataIsViewPage
-	 */
-	public function testIsFormPage($uri, $expected)
-	{
-		$this->setSuperGlobals([
-			'_SERVER' => [
-				'REQUEST_URI' => $uri
-			]
-		]);
-		$this->assertEquals(!$expected, $this->anime_client->is_form_page());
-	}
 }
diff --git a/tests/AnimeClient/Model/MangaModelTest.php b/tests/AnimeClient/Model/MangaModelTest.php
index d8cd4b21..bc97fca7 100644
--- a/tests/AnimeClient/Model/MangaModelTest.php
+++ b/tests/AnimeClient/Model/MangaModelTest.php
@@ -12,6 +12,7 @@ class MangaModelTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
+		$this->container->set('util', new MockUtil($this->container));
 		$this->model = new Friend(new TestMangaModel($this->container));
 		$this->mockDir = __DIR__ . '/../../test_data/manga_list';
 	}
diff --git a/tests/AnimeClient/UtilTest.php b/tests/AnimeClient/UtilTest.php
new file mode 100644
index 00000000..67492ce5
--- /dev/null
+++ b/tests/AnimeClient/UtilTest.php
@@ -0,0 +1,78 @@
+<?php
+
+use Aviat\AnimeClient\Util;
+
+class UtilTest extends AnimeClient_TestCase {
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->util = new Util($this->container);
+	}
+
+	public function testIsSelected()
+	{
+		// Failure to match
+		$this->assertEquals('', Util::is_selected('foo', 'bar'));
+
+		// Matches
+		$this->assertEquals('selected', Util::is_selected('foo', 'foo'));
+	}
+
+	public function testIsNotSelected()
+	{
+		// Failure to match
+		$this->assertEquals('selected', Util::is_not_selected('foo', 'bar'));
+
+		// Matches
+		$this->assertEquals('', Util::is_not_selected('foo', 'foo'));
+	}
+
+	public function dataIsViewPage()
+	{
+		return [
+			[
+				'uri' => '/anime/update',
+				'expected' => FALSE
+			],
+			[
+				'uri' => '/anime/watching',
+				'expected' => TRUE
+			],
+			[
+				'uri' => '/manga/reading',
+				'expected' => TRUE
+			],
+			[
+				'uri' => '/manga/update',
+				'expected' => FALSE
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsViewPage
+	 */
+	public function testIsViewPage($uri, $expected)
+	{
+		$this->setSuperGlobals([
+			'_SERVER' => [
+				'REQUEST_URI' => $uri
+			]
+		]);
+		$this->assertEquals($expected, $this->util->is_view_page());
+	}
+
+	/**
+	 * @dataProvider dataIsViewPage
+	 */
+	public function testIsFormPage($uri, $expected)
+	{
+		$this->setSuperGlobals([
+			'_SERVER' => [
+				'REQUEST_URI' => $uri
+			]
+		]);
+		$this->assertEquals(!$expected, $this->util->is_form_page());
+	}
+}
diff --git a/tests/AnimeClient/BaseModelTest.php b/tests/Ion/BaseModelTest.php
similarity index 62%
rename from tests/AnimeClient/BaseModelTest.php
rename to tests/Ion/BaseModelTest.php
index 01ff61b6..edc2a2f4 100644
--- a/tests/AnimeClient/BaseModelTest.php
+++ b/tests/Ion/BaseModelTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use Aviat\AnimeClient\Model as BaseModel;
+use Aviat\Ion\Model as BaseModel;
 
 class BaseModelTest extends AnimeClient_TestCase {
 
 	public function testBaseModelSanity()
 	{
-		$baseModel = new BaseModel($this->container);
+		$baseModel = new BaseModel();
 		$this->assertTrue(is_object($baseModel));
 	}
 }
\ No newline at end of file
diff --git a/tests/Ion/Cache/CacheManagerTest.php b/tests/Ion/Cache/CacheManagerTest.php
index bad7a202..7d88dcc1 100644
--- a/tests/Ion/Cache/CacheManagerTest.php
+++ b/tests/Ion/Cache/CacheManagerTest.php
@@ -15,7 +15,7 @@ class CacheManagerText extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->cache = new CacheManager($this->container);
+		$this->cache = new CacheManager($this->container->get('config'), $this->container);
 		$this->friend = new Friend($this->cache);
 	}
 
diff --git a/tests/Ion/Cache/Driver/NullDriverTest.php b/tests/Ion/Cache/Driver/NullDriverTest.php
index 6771fdea..df6606d4 100644
--- a/tests/Ion/Cache/Driver/NullDriverTest.php
+++ b/tests/Ion/Cache/Driver/NullDriverTest.php
@@ -12,6 +12,6 @@ class CacheNullDriverTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->driver = new NullDriver($this->container);
+		$this->driver = new NullDriver($this->container->get('config'));
 	}
 }
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index 35317251..4962c35a 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -16,16 +16,15 @@ class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
 		parent::setUp();
 
 		// Setup config with port and password
-		$container = new Container();
-		$container->set('config', new Config([
+		$config =  new Config([
 			'redis' => [
 				'host' => (array_key_exists('REDIS_HOST', $_ENV)) ? $_ENV['REDIS_HOST'] : 'localhost',
 				'port' => 6379,
 				'password' => '',
 				'database' => 13,
 			]
-		]));
-		$this->driver = new RedisDriver($container);
+		]);
+		$this->driver = new RedisDriver($config);
 	}
 
 	public function tearDown()
diff --git a/tests/Ion/Cache/Driver/RedisDriverTest.php b/tests/Ion/Cache/Driver/RedisDriverTest.php
index 3ae45a9a..ed1209f5 100644
--- a/tests/Ion/Cache/Driver/RedisDriverTest.php
+++ b/tests/Ion/Cache/Driver/RedisDriverTest.php
@@ -13,7 +13,7 @@ class CacheRedisDriverTest extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 
-		$this->driver = new RedisDriver($this->container);
+		$this->driver = new RedisDriver($this->container->get('config'));
 	}
 
 	public function tearDown()
diff --git a/tests/Ion/Cache/Driver/SQLDriverTest.php b/tests/Ion/Cache/Driver/SQLDriverTest.php
index d23d9ec1..4cd98659 100644
--- a/tests/Ion/Cache/Driver/SQLDriverTest.php
+++ b/tests/Ion/Cache/Driver/SQLDriverTest.php
@@ -13,7 +13,7 @@ class CacheSQLDriverTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->driver = new SQLDriver($this->container);
+		$this->driver = new SQLDriver($this->container->get('config'));
 		$friend = new Friend($this->driver);
 		$friend->db->query('CREATE TABLE IF NOT EXISTS "cache" ("key" TEXT NULL, "value" TEXT NULL, PRIMARY KEY ("key"))');
 	}
diff --git a/tests/mocks.php b/tests/mocks.php
index 6b48a815..d4884bbe 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -99,6 +99,13 @@ trait MockViewOutputTrait {
 	}
 }
 
+class MockUtil {
+	public function get_cached_image($api_path, $series_slug, $type = "anime")
+	{
+		return "/public/images/{$type}/{$series_slug}.jpg";
+	}
+}
+
 class TestView extends View {
 	public function send() {}
 	protected function output()
@@ -157,11 +164,6 @@ class TestAnimeModel extends AnimeModel {
 class TestMangaModel extends MangaModel {
 	use MockInjectionTrait;
 
-	public function get_cached_image($api_path, $series_slug, $type = "anime")
-	{
-		return "/public/images/{$type}/{$series_slug}.jpg";
-	}
-
 	protected function _check_cache($response)
 	{
 		$file = __DIR__ . '/test_data/manga_list/manga-transformed.json';

From 2a3a64f0ebe68baa79aa5621590a5336df0309f2 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 27 Jul 2016 13:35:30 -0400
Subject: [PATCH 19/65] Fix travis ci tests

---
 tests/AnimeClient_TestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 9a9a6a50..04852dc8 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -73,7 +73,7 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 				]
 			],
 			'redis' => [
-				'host' => 'redis',
+				'host' => (array_key_exists('REDIS_HOST', $_ENV)) ? $_ENV['REDIS_HOST'] : 'localhost',
 				'database' => 13
 			]
 		];

From 3d66fa9c11f90a220aa8bb57957c628b555af974 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 27 Jul 2016 14:32:37 -0400
Subject: [PATCH 20/65] Finish moving get_cached_image method to Util class

---
 app/views/header.php                          | 45 +------------------
 app/views/main-menu.php                       | 44 ++++++++++++++++++
 src/Aviat/AnimeClient/Command/CacheImages.php | 10 ++---
 src/Aviat/AnimeClient/Controller.php          |  7 ++-
 .../AnimeClient/Model/AnimeCollection.php     |  8 +++-
 5 files changed, 59 insertions(+), 55 deletions(-)
 create mode 100644 app/views/main-menu.php

diff --git a/app/views/header.php b/app/views/header.php
index 5ec53689..d5dd4835 100644
--- a/app/views/header.php
+++ b/app/views/header.php
@@ -1,4 +1,3 @@
-<?php namespace Aviat\AnimeClient ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -12,49 +11,7 @@
 </head>
 <body class="<?= $escape->attr($url_type) ?> list">
 	<header>
-		<h1 class="flex flex-align-end flex-wrap">
-			<span class="flex-no-wrap grow-1">
-				<?php if(strpos($route_path, 'collection') === FALSE): ?>
-					<a href="<?= $escape->attr($urlGenerator->default_url($url_type)) ?>">
-						<?= $config->get('whose_list') ?>'s <?= ucfirst($url_type) ?> List
-					</a>
-					<?php if($config->get("show_{$url_type}_collection")): ?>
-						[<a href="<?= $urlGenerator->url('collection/view') ?>"><?= ucfirst($url_type) ?> Collection</a>]
-					<?php endif ?>
-					[<a href="<?= $urlGenerator->default_url($other_type) ?>"><?= ucfirst($other_type) ?> List</a>]
-				<?php else: ?>
-					<a href="<?= $urlGenerator->url('collection/view') ?>">
-						<?= $config->get('whose_list') ?>'s <?= ucfirst($url_type) ?> Collection
-					</a>
-					[<a href="<?= $urlGenerator->default_url('anime') ?>">Anime List</a>]
-					[<a href="<?= $urlGenerator->default_url('manga') ?>">Manga List</a>]
-				<?php endif ?>
-			</span>
-			<?php if ($auth->is_authenticated()): ?>
-			<span class="flex-no-wrap">&nbsp;</span>
-			<span class="flex-no-wrap small-font">
-				<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
-			</span>
-			<span class="flex-no-wrap">&nbsp;</span>
-			<?php endif ?>
-			<span class="flex-no-wrap small-font">
-				<?php if ($auth->is_authenticated()): ?>
-				<a class="bracketed" href="<?= $url->generate('logout') ?>">Logout</a>
-				<?php else: ?>
-				[<a href="<?= $url->generate('login'); ?>"><?= $config->get('whose_list') ?>'s Login</a>]
-				<?php endif ?>
-			</span>
-		</h1>
-		<nav>
-			<?php if ($container->get('anime-client')->is_view_page()): ?>
-			<?= $helper->menu($menu_name) ?>
-			<br />
-			<ul>
-				<li class="<?= Util::is_not_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
-				<li class="<?= Util::is_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
-			</ul>
-			<?php endif ?>
-		</nav>
+		<?php include 'main-menu.php' ?>
 		<?php if(isset($message) && is_array($message)):
 	 		extract($message);
 	 		include 'message.php';
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
new file mode 100644
index 00000000..8a852a30
--- /dev/null
+++ b/app/views/main-menu.php
@@ -0,0 +1,44 @@
+<?php namespace Aviat\AnimeClient ?>
+<h1 class="flex flex-align-end flex-wrap">
+	<span class="flex-no-wrap grow-1">
+		<?php if(strpos($route_path, 'collection') === FALSE): ?>
+			<a href="<?= $escape->attr($urlGenerator->default_url($url_type)) ?>">
+				<?= $config->get('whose_list') ?>'s <?= ucfirst($url_type) ?> List
+			</a>
+			<?php if($config->get("show_{$url_type}_collection")): ?>
+				[<a href="<?= $urlGenerator->url('collection/view') ?>"><?= ucfirst($url_type) ?> Collection</a>]
+			<?php endif ?>
+			[<a href="<?= $urlGenerator->default_url($other_type) ?>"><?= ucfirst($other_type) ?> List</a>]
+		<?php else: ?>
+			<a href="<?= $urlGenerator->url('collection/view') ?>">
+				<?= $config->get('whose_list') ?>'s <?= ucfirst($url_type) ?> Collection
+			</a>
+			[<a href="<?= $urlGenerator->default_url('anime') ?>">Anime List</a>]
+			[<a href="<?= $urlGenerator->default_url('manga') ?>">Manga List</a>]
+		<?php endif ?>
+	</span>
+	<?php if ($auth->is_authenticated()): ?>
+		<span class="flex-no-wrap">&nbsp;</span>
+		<span class="flex-no-wrap small-font">
+				<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
+			</span>
+		<span class="flex-no-wrap">&nbsp;</span>
+	<?php endif ?>
+	<span class="flex-no-wrap small-font">
+		<?php if ($auth->is_authenticated()): ?>
+			<a class="bracketed" href="<?= $url->generate('logout') ?>">Logout</a>
+		<?php else: ?>
+			[<a href="<?= $url->generate('login'); ?>"><?= $config->get('whose_list') ?>'s Login</a>]
+		<?php endif ?>
+	</span>
+</h1>
+<nav>
+	<?php if ($container->get('util')->is_view_page()): ?>
+		<?= $helper->menu($menu_name) ?>
+		<br />
+		<ul>
+			<li class="<?= Util::is_not_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
+			<li class="<?= Util::is_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
+		</ul>
+	<?php endif ?>
+</nav>
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Command/CacheImages.php b/src/Aviat/AnimeClient/Command/CacheImages.php
index 599ef928..34e68843 100644
--- a/src/Aviat/AnimeClient/Command/CacheImages.php
+++ b/src/Aviat/AnimeClient/Command/CacheImages.php
@@ -13,7 +13,7 @@
 
 namespace Aviat\AnimeClient\Command;
 
-use Aviat\AnimeClient\Model;
+use Aviat\AnimeClient\Util;
 /**
  * Generates thumbnail image cache so that cover images load faster
  */
@@ -21,7 +21,7 @@ class CacheImages extends BaseCommand {
 
 	protected $mangaModel;
 	protected $animeModel;
-	protected $model;
+	protected $util;
 
 	/*
 	 * Convert manga images
@@ -37,7 +37,7 @@ class CacheImages extends BaseCommand {
 		$current = 0;
 		foreach($manga_list as $item)
 		{
-			$this->model->get_cached_image($item['poster_image'], $item['id'], 'manga');
+			$this->util->get_cached_image($item['poster_image'], $item['id'], 'manga');
 			$current++;
 
 			echo "Cached {$current} of {$total} manga images. \n";
@@ -57,7 +57,7 @@ class CacheImages extends BaseCommand {
 		$current = 0;
 		foreach($raw_list as $item)
 		{
-			$this->model->get_cached_image($item['anime']['cover_image'], $item['anime']['slug'], 'anime');
+			$this->util->get_cached_image($item['anime']['cover_image'], $item['anime']['slug'], 'anime');
 			$current++;
 
 			echo "Cached {$current} of {$total} anime images. \n";
@@ -75,7 +75,7 @@ class CacheImages extends BaseCommand {
 	public function execute(array $args, array $options = array())
 	{
 		$this->setContainer($this->setupContainer());
-		$this->model = new Model($this->container);
+		$this->util = new Util($this->container);
 		$this->animeModel = $this->container->get('anime-model');
 		$this->mangaModel = $this->container->get('manga-model');
 
diff --git a/src/Aviat/AnimeClient/Controller.php b/src/Aviat/AnimeClient/Controller.php
index 88f262eb..f558ee5b 100644
--- a/src/Aviat/AnimeClient/Controller.php
+++ b/src/Aviat/AnimeClient/Controller.php
@@ -21,7 +21,6 @@ use Aviat\Ion\View\JsonView;
  * Controller base, defines output methods
  *
  * @property Response object $response
- * @property Config object $config
  */
 class Controller {
 
@@ -35,7 +34,7 @@ class Controller {
 
 	/**
 	 * The global configuration object
-	 * @var object $config
+	 * @var Aviat\Ion\ConfigInterface $config
 	 */
 	protected $config;
 
@@ -148,7 +147,7 @@ class Controller {
 			return;
 		}
 
-		$anime_client = $this->container->get('anime-client');
+		$util = $this->container->get('util');
 		$double_form_page = $server_params['HTTP_REFERER'] == $this->request->getUri();
 
 		// Don't attempt to set the redirect url if
@@ -161,7 +160,7 @@ class Controller {
 
 		if (is_null($url))
 		{
-			$url = ($anime_client->is_view_page())
+			$url = ($util->is_view_page())
 				? $this->request->url->get()
 				: $server_params['HTTP_REFERER'];
 		}
diff --git a/src/Aviat/AnimeClient/Model/AnimeCollection.php b/src/Aviat/AnimeClient/Model/AnimeCollection.php
index 7b426344..2f54be93 100644
--- a/src/Aviat/AnimeClient/Model/AnimeCollection.php
+++ b/src/Aviat/AnimeClient/Model/AnimeCollection.php
@@ -129,6 +129,8 @@ class AnimeCollection extends Collection {
 	{
 		$anime = (object)$this->anime_model->get_anime($data['id']);
 
+		$util = $this->container->get('util');
+
 		$this->db->set([
 			'hummingbird_id' => $data['id'],
 			'slug' => $anime->slug,
@@ -137,7 +139,7 @@ class AnimeCollection extends Collection {
 			'show_type' => $anime->show_type,
 			'age_rating' => $anime->age_rating,
 			'cover_image' => basename(
-				$this->get_cached_image($anime->cover_image, $anime->slug, 'anime')
+				$util->get_cached_image($anime->cover_image, $anime->slug, 'anime')
 			),
 			'episode_count' => $anime->episode_count,
 			'episode_length' => $anime->episode_length,
@@ -222,6 +224,8 @@ class AnimeCollection extends Collection {
 
 		foreach ($anime as $item)
 		{
+			$util = $this->container->get('util');
+
 			$this->db->set([
 				'hummingbird_id' => $item->id,
 				'slug' => $item->slug,
@@ -230,7 +234,7 @@ class AnimeCollection extends Collection {
 				'show_type' => $item->show_type,
 				'age_rating' => $item->age_rating,
 				'cover_image' => basename(
-					$this->get_cached_image($item->cover_image, $item->slug, 'anime')
+					$util->get_cached_image($item->cover_image, $item->slug, 'anime')
 				),
 				'episode_count' => $item->episode_count,
 				'episode_length' => $item->episode_length

From ba6ada32f921dae2de66f8b035cbf3a8ff763708 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 28 Jul 2016 10:44:13 -0400
Subject: [PATCH 21/65] Move cache class to IOn namespace, use safer json for
 serialization in cache drivers

---
 app/bootstrap.php                             |  1 +
 app/config/database.toml.example              | 12 ++++++++++-
 src/Aviat/AnimeClient/Command/BaseCommand.php |  5 ++++-
 src/Aviat/Ion/Cache/Driver/RedisDriver.php    |  4 ++--
 src/Aviat/Ion/Cache/Driver/SQLDriver.php      | 14 ++++++++++---
 src/Aviat/{AnimeClient => Ion}/Config.php     | 15 +++++++-------
 src/Aviat/Ion/Exception/ConfigException.php   | 20 +++++++++++++++++++
 tests/AnimeClient/DispatcherTest.php          |  2 +-
 tests/AnimeClient/MenuGeneratorTest.php       |  7 +------
 .../Model/AnimeCollectionModelTest.php        |  3 ++-
 .../{CoreTest.php => RequirementsTest.php}    | 20 +++++++++++++------
 tests/AnimeClient/UrlGeneratorTest.php        |  3 +--
 tests/AnimeClient_TestCase.php                | 11 +++++++++-
 tests/Ion/Cache/Driver/RedisDriver2Test.php   |  3 +--
 tests/{AnimeClient => Ion}/ConfigTest.php     |  2 +-
 15 files changed, 88 insertions(+), 34 deletions(-)
 rename src/Aviat/{AnimeClient => Ion}/Config.php (83%)
 create mode 100644 src/Aviat/Ion/Exception/ConfigException.php
 rename tests/AnimeClient/{CoreTest.php => RequirementsTest.php} (63%)
 rename tests/{AnimeClient => Ion}/ConfigTest.php (98%)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 6b3701ab..38c96305 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -13,6 +13,7 @@ use Monolog\Handler\RotatingFileHandler;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response;
 
+use Aviat\Ion\Config;
 use Aviat\Ion\Di\Container;
 use Aviat\Ion\Cache\CacheManager;
 use Aviat\AnimeClient\Auth\HummingbirdAuth;
diff --git a/app/config/database.toml.example b/app/config/database.toml.example
index d6d8656d..18b1ecc9 100644
--- a/app/config/database.toml.example
+++ b/app/config/database.toml.example
@@ -10,4 +10,14 @@ pass = ""
 port = ""
 name = "default"
 database = ""
-file = "/../../anime_collection.sqlite"
\ No newline at end of file
+file = "anime_collection.sqlite"
+
+[cache]
+type = "sqlite"
+host = ""
+user = ""
+pass = ""
+port = ""
+name = "default"
+database = ""
+file = "anime_collection.sqlite"
\ No newline at end of file
diff --git a/src/Aviat/AnimeClient/Command/BaseCommand.php b/src/Aviat/AnimeClient/Command/BaseCommand.php
index 2f4b9b48..bd50731f 100644
--- a/src/Aviat/AnimeClient/Command/BaseCommand.php
+++ b/src/Aviat/AnimeClient/Command/BaseCommand.php
@@ -17,12 +17,14 @@ use Aura\Session\SessionFactory;
 use ConsoleKit\Command;
 use ConsoleKit\Widgets\Box;
 
+use Aviat\Ion\Config;
 use Aviat\Ion\Di\Container;
 use Aviat\Ion\Cache\CacheManager;
-use Aviat\AnimeClient\Config;
+
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\Auth\HummingbirdAuth;
 use Aviat\AnimeClient\Model;
+use Aviat\AnimeClient\Util;
 
 /**
  * Base class for console command setup
@@ -77,6 +79,7 @@ class BaseCommand extends Command {
 			$container->set('manga-model', new Model\Manga($container));
 
 			$container->set('auth', new HummingbirdAuth($container));
+			$container->set('util', new Util($container));
 
 			return $container;
 		};
diff --git a/src/Aviat/Ion/Cache/Driver/RedisDriver.php b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
index b0b436d6..85e140d5 100644
--- a/src/Aviat/Ion/Cache/Driver/RedisDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
@@ -59,7 +59,7 @@ class RedisDriver implements CacheDriverInterface {
 	 */
 	public function get($key)
 	{
-		return unserialize($this->redis->get($key));
+		return json_decode($this->redis->get($key));
 	}
 	
 	/**
@@ -71,7 +71,7 @@ class RedisDriver implements CacheDriverInterface {
 	 */
 	public function set($key, $value)
 	{
-		$this->redis->set($key, serialize($value));
+		$this->redis->set($key, json_encode($value));
 		return $this;
 	}
 	
diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
index 483494e4..f3bbc64d 100644
--- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
@@ -14,6 +14,7 @@ namespace Aviat\Ion\Cache\Driver;
 
 use Aviat\Ion\ConfigInterface;
 use Aviat\Ion\Cache\CacheDriverInterface;
+use Aviat\Ion\Exception\ConfigException;
 use Aviat\Ion\Model\DB;
 
 /**
@@ -31,11 +32,18 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 	 * Create the driver object
 	 *
 	 * @param ConfigInterface $config
+	 * @throws ConfigException
 	 */
 	public function __construct(ConfigInterface $config)
 	{
 		parent::__construct($config);
-		$this->db = \Query($this->db_config['collection']);
+
+		if ( ! array_key_exists('cache', $this->db_config))
+		{
+			throw new ConfigException("Missing '[cache]' section in database config.");
+		}
+
+		$this->db = \Query($this->db_config['cache']);
 	}
 
 	/**
@@ -54,7 +62,7 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 		$row = $query->fetch(\PDO::FETCH_ASSOC);
 		if ( ! empty($row))
 		{
-			return unserialize($row['value']);
+			return json_decode($row['value']);
 		}
 		
 		return NULL;
@@ -71,7 +79,7 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 	{
 		$this->db->set([
 			'key' => $key,
-			'value' => serialize($value),
+			'value' => json_encode($value),
 		]);
 		
 		$this->db->insert('cache');
diff --git a/src/Aviat/AnimeClient/Config.php b/src/Aviat/Ion/Config.php
similarity index 83%
rename from src/Aviat/AnimeClient/Config.php
rename to src/Aviat/Ion/Config.php
index 3cbf9195..c0dea9f0 100644
--- a/src/Aviat/AnimeClient/Config.php
+++ b/src/Aviat/Ion/Config.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * Hummingbird Anime Client
+ * Ion
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * Building blocks for web development
  *
- * @package     HummingbirdAnimeClient
+ * @package     Ion
  * @author      Timothy J. Warren
  * @copyright   Copyright (c) 2015 - 2016
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  * @license     MIT
  */
 
-namespace Aviat\AnimeClient;
+namespace Aviat\Ion;
 
-use Aviat\Ion\ConfigInterface;
+
+use Aviat\Ion\Exception\ConfigException;
 
 use InvalidArgumentException;
 
@@ -22,7 +22,7 @@ use InvalidArgumentException;
  */
 class Config implements ConfigInterface {
 
-	use \Aviat\Ion\ArrayWrapper;
+	use ArrayWrapper;
 
 	/**
 	 * Config object
@@ -46,6 +46,7 @@ class Config implements ConfigInterface {
 	 *
 	 * @param array|string $key
 	 * @return mixed
+	 * @throws ConfigException
 	 */
 	public function get($key)
 	{
diff --git a/src/Aviat/Ion/Exception/ConfigException.php b/src/Aviat/Ion/Exception/ConfigException.php
new file mode 100644
index 00000000..ea1d21c3
--- /dev/null
+++ b/src/Aviat/Ion/Exception/ConfigException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * @package	 Ion
+ * @author	  Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @license	 MIT
+ */
+
+namespace Aviat\Ion\Exception;
+
+/**
+ * Exception for bad configuration
+ */
+class ConfigException extends \InvalidArgumentException {
+
+}
\ No newline at end of file
diff --git a/tests/AnimeClient/DispatcherTest.php b/tests/AnimeClient/DispatcherTest.php
index b577d120..4c87a4ce 100644
--- a/tests/AnimeClient/DispatcherTest.php
+++ b/tests/AnimeClient/DispatcherTest.php
@@ -6,9 +6,9 @@ use Monolog\Handler\TestHandler;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response;
 
+use Aviat\Ion\Config;
 use Aviat\Ion\Di\Container;
 use Aviat\AnimeClient\Dispatcher;
-use Aviat\AnimeClient\Config;
 use Aviat\AnimeClient\UrlGenerator;
 
 
diff --git a/tests/AnimeClient/MenuGeneratorTest.php b/tests/AnimeClient/MenuGeneratorTest.php
index 768a557e..2bb1b265 100644
--- a/tests/AnimeClient/MenuGeneratorTest.php
+++ b/tests/AnimeClient/MenuGeneratorTest.php
@@ -1,11 +1,6 @@
 <?php
-
-use Aura\Html\HelperLocatorFactory;
-
 use Aviat\Ion\Friend;
-use Aviat\Ion\Di\Container;
-use Aviat\AnimeClient\Helper;
-use Aviat\AnimeClient\Config;
+
 use Aviat\AnimeClient\MenuGenerator;
 
 class MenuGeneratorTest extends AnimeClient_TestCase {
diff --git a/tests/AnimeClient/Model/AnimeCollectionModelTest.php b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
index c23da485..1004b75d 100644
--- a/tests/AnimeClient/Model/AnimeCollectionModelTest.php
+++ b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
@@ -1,7 +1,8 @@
 <?php
 
+use Aviat\Ion\Config;
 use Aviat\Ion\Friend;
-use Aviat\AnimeClient\Config;
+
 use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
 class AnimeCollectionModelTest extends AnimeClient_TestCase {
diff --git a/tests/AnimeClient/CoreTest.php b/tests/AnimeClient/RequirementsTest.php
similarity index 63%
rename from tests/AnimeClient/CoreTest.php
rename to tests/AnimeClient/RequirementsTest.php
index 44976283..7c8c3bce 100644
--- a/tests/AnimeClient/CoreTest.php
+++ b/tests/AnimeClient/RequirementsTest.php
@@ -1,22 +1,30 @@
 <?php
 
-class CoreTest extends AnimeClient_TestCase {
+class RequirementsTest extends AnimeClient_TestCase {
 
 	public function testPHPVersion()
 	{
 		$this->assertTrue(version_compare(PHP_VERSION, "5.4", "ge"));
 	}
 
-	public function testRequirements()
+	public function testHasGd()
 	{
-		// Check required extensions
 		$this->assertTrue(extension_loaded('gd'));
-		$this->assertTrue(extension_loaded('mcrypt'));
+	}
 
-		// Check for pdo_sqlite
+	public function testHasMcrypt()
+	{
+		$this->assertTrue(extension_loaded('mcrypt'));
+	}
+
+	public function testHasPDO()
+	{
 		$this->assertTrue(class_exists('PDO'));
+	}
+
+	public function testHasPDOSqlite()
+	{
 		$drivers = PDO::getAvailableDrivers();
 		$this->assertTrue(in_array('sqlite', $drivers));
 	}
-
 }
\ No newline at end of file
diff --git a/tests/AnimeClient/UrlGeneratorTest.php b/tests/AnimeClient/UrlGeneratorTest.php
index 3635dedb..aea2e044 100644
--- a/tests/AnimeClient/UrlGeneratorTest.php
+++ b/tests/AnimeClient/UrlGeneratorTest.php
@@ -1,7 +1,6 @@
 <?php
 
-use Aviat\Ion\Di\Container;
-use Aviat\AnimeClient\Config;
+use Aviat\Ion\Config;
 use Aviat\AnimeClient\UrlGenerator;
 
 class UrlGeneratorTest extends AnimeClient_TestCase {
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 04852dc8..d778f14b 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -9,7 +9,6 @@ use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response as HttpResponse;
 
 use Aviat\AnimeClient\AnimeClient;
-use Aviat\AnimeClient\Config;
 
 define('ROOT_DIR', __DIR__ . '/../');
 define('TEST_DATA_DIR', __DIR__ . '/test_data');
@@ -62,6 +61,16 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 					'name' => 'default',
 					'database'   => '',
 					'file' => ':memory:',
+				],
+				'cache' => [
+					'type' => 'sqlite',
+					'host' => '',
+					'user' => '',
+					'pass' => '',
+					'port' => '',
+					'name' => 'default',
+					'database'   => '',
+					'file' => ':memory:',
 				]
 			],
 			'routes' => [
diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
index 4962c35a..62f5482d 100644
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ b/tests/Ion/Cache/Driver/RedisDriver2Test.php
@@ -2,8 +2,7 @@
 
 require_once('CacheDriverBase.php');
 
-use Aviat\AnimeClient\Config;
-use Aviat\Ion\Di\Container;
+use Aviat\Ion\Config;
 use Aviat\Ion\Cache\Driver\RedisDriver;
 
 class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
diff --git a/tests/AnimeClient/ConfigTest.php b/tests/Ion/ConfigTest.php
similarity index 98%
rename from tests/AnimeClient/ConfigTest.php
rename to tests/Ion/ConfigTest.php
index b3134843..3cd84de2 100644
--- a/tests/AnimeClient/ConfigTest.php
+++ b/tests/Ion/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Aviat\AnimeClient\Config;
+use Aviat\Ion\Config;
 
 class ConfigTest extends AnimeClient_TestCase {
 

From 7f1bcc841a82ea1c137582f79cb9d66eda5ea27b Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 1 Aug 2016 13:02:26 -0400
Subject: [PATCH 22/65] Refactor cache to remove dependency on container

---
 build.xml                                     |  3 +-
 src/Aviat/AnimeClient/Model/API.php           |  2 +
 src/Aviat/AnimeClient/Model/Collection.php    |  4 +-
 src/Aviat/AnimeClient/Model/Manga.php         |  2 +-
 src/Aviat/Ion/Cache/CacheInterface.php        |  4 +-
 src/Aviat/Ion/Cache/CacheManager.php          |  3 +-
 .../DriverInterface.php}                      | 10 +--
 src/Aviat/Ion/Cache/Driver/DriverTrait.php    | 62 +++++++++++++++++++
 src/Aviat/Ion/Cache/Driver/NullDriver.php     | 22 ++-----
 src/Aviat/Ion/Cache/Driver/RedisDriver.php    | 43 +++++++++----
 src/Aviat/Ion/Cache/Driver/SQLDriver.php      | 25 +++++---
 src/Aviat/Ion/Json.php                        | 10 ++-
 .../Model/AnimeCollectionModelTest.php        |  2 +-
 tests/AnimeClient_TestCase.php                | 31 ++++++++++
 .../Model/BaseDBModelTest.php                 |  4 +-
 tests/bootstrap.php                           |  3 -
 tests/mocks.php                               |  1 -
 17 files changed, 171 insertions(+), 60 deletions(-)
 rename src/Aviat/Ion/Cache/{CacheDriverInterface.php => Driver/DriverInterface.php} (80%)
 create mode 100644 src/Aviat/Ion/Cache/Driver/DriverTrait.php
 rename tests/{AnimeClient => Ion}/Model/BaseDBModelTest.php (59%)

diff --git a/build.xml b/build.xml
index b8554ad5..35dbaf72 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="full-build" name="animeclient" basedir=".">
+	<autoloader autoloaderpath="${project.basedir}/vendor/autoload.php" />
 	<!-- By default, we assume all tools to be on the $PATH -->
 	<property name="pdepend" value="pdepend" />
 	<property name="phpcpd" value="phpcpd" />
@@ -10,7 +11,7 @@
 	<property name="sonar" value="sonar-runner" />
 
 	<target name="full-build"
-		depends="prepare,static-analysis,phpunit,phpdox,sonar"
+		depends="prepare,static-analysis,phpunit,phpdox"
 		description="Performs static analysis, runs the tests, and generates project documentation"
 	/>
 	<target name="quick-build"
diff --git a/src/Aviat/AnimeClient/Model/API.php b/src/Aviat/AnimeClient/Model/API.php
index feec4985..ddd9f819 100644
--- a/src/Aviat/AnimeClient/Model/API.php
+++ b/src/Aviat/AnimeClient/Model/API.php
@@ -19,6 +19,8 @@ use GuzzleHttp\Psr7\ResponseInterface;
 use GuzzleHttp\Exception\ClientException;
 
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Cache\CacheInterface;
+
 use Aviat\Ion\Model;
 use Aviat\AnimeClient\AnimeClient;
 
diff --git a/src/Aviat/AnimeClient/Model/Collection.php b/src/Aviat/AnimeClient/Model/Collection.php
index 0bec057b..6e611603 100644
--- a/src/Aviat/AnimeClient/Model/Collection.php
+++ b/src/Aviat/AnimeClient/Model/Collection.php
@@ -14,6 +14,7 @@
 namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Model\DB;
 
 /**
  * Base model for anime and manga collections
@@ -36,11 +37,10 @@ class Collection extends DB {
 	 * Create a new collection object
 	 *
 	 * @param ContainerInterface $container
-	 * @return void
 	 */
 	public function __construct(ContainerInterface $container)
 	{
-		parent::__construct($container);
+		parent::__construct($container->get('config'));
 
 		try
 		{
diff --git a/src/Aviat/AnimeClient/Model/Manga.php b/src/Aviat/AnimeClient/Model/Manga.php
index 999578af..8cb51f26 100644
--- a/src/Aviat/AnimeClient/Model/Manga.php
+++ b/src/Aviat/AnimeClient/Model/Manga.php
@@ -162,7 +162,7 @@ class Manga extends API {
 			$logger->warning("Non 200 response for search api call");
 			$logger->warning($response->getBody());
 
-			throw new RuntimeException($response->getEffectiveUrl());
+			throw new \RuntimeException($response->getEffectiveUrl());
 		}
 
 		return Json::decode($response->getBody(), TRUE);
diff --git a/src/Aviat/Ion/Cache/CacheInterface.php b/src/Aviat/Ion/Cache/CacheInterface.php
index 94957384..4a4413bf 100644
--- a/src/Aviat/Ion/Cache/CacheInterface.php
+++ b/src/Aviat/Ion/Cache/CacheInterface.php
@@ -18,7 +18,7 @@ namespace Aviat\Ion\Cache;
 interface CacheInterface {
 
 	/**
-	 * Retreive a cached value if it exists, otherwise, get the value
+	 * Retrieve a cached value if it exists, otherwise, get the value
 	 * from the passed arguments
 	 *
 	 * @param object $object - object to retrieve fresh value from
@@ -29,7 +29,7 @@ interface CacheInterface {
 	public function get($object, $method, array $args=[]);
 
 	/**
-	 * Retreive a fresh value, and update the cache
+	 * Retrieve a fresh value, and update the cache
 	 *
 	 * @param object $object - object to retrieve fresh value from
 	 * @param string $method - method name to call
diff --git a/src/Aviat/Ion/Cache/CacheManager.php b/src/Aviat/Ion/Cache/CacheManager.php
index 34fc4887..d03947a2 100644
--- a/src/Aviat/Ion/Cache/CacheManager.php
+++ b/src/Aviat/Ion/Cache/CacheManager.php
@@ -13,6 +13,7 @@
 namespace Aviat\Ion\Cache;
 
 use Aviat\Ion\ConfigInterface;
+use Aviat\Ion\Cache\Driver\DriverInterface;
 
 /**
  * Class proxying cached and fresh values from the selected cache driver
@@ -20,7 +21,7 @@ use Aviat\Ion\ConfigInterface;
 class CacheManager implements CacheInterface {
 
 	/**
-	 * @var CacheDriverInterface
+	 * @var DriverInterface
 	 */
 	protected $driver;
 
diff --git a/src/Aviat/Ion/Cache/CacheDriverInterface.php b/src/Aviat/Ion/Cache/Driver/DriverInterface.php
similarity index 80%
rename from src/Aviat/Ion/Cache/CacheDriverInterface.php
rename to src/Aviat/Ion/Cache/Driver/DriverInterface.php
index 9813f9bc..2f826c21 100644
--- a/src/Aviat/Ion/Cache/CacheDriverInterface.php
+++ b/src/Aviat/Ion/Cache/Driver/DriverInterface.php
@@ -10,12 +10,12 @@
  * @license	 MIT
  */
 
-namespace Aviat\Ion\Cache;
+namespace Aviat\Ion\Cache\Driver;
 
 /**
  * Interface for cache drivers
  */
-interface CacheDriverInterface {
+interface DriverInterface {
 	/**
 	 * Retreive a value from the cache backend
 	 *
@@ -29,7 +29,7 @@ interface CacheDriverInterface {
 	 *
 	 * @param string $key
 	 * @param mixed $value
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function set($key, $value);
 
@@ -37,7 +37,7 @@ interface CacheDriverInterface {
 	 * Invalidate a cached value
 	 *
 	 * @param string $key
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function invalidate($key);
 
@@ -48,4 +48,4 @@ interface CacheDriverInterface {
 	 */
 	public function invalidateAll();
 }
-// End of CacheDriverInterface.php
\ No newline at end of file
+// End of DriverInterface.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/DriverTrait.php b/src/Aviat/Ion/Cache/Driver/DriverTrait.php
new file mode 100644
index 00000000..57b6b750
--- /dev/null
+++ b/src/Aviat/Ion/Cache/Driver/DriverTrait.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Ion
+ *
+ * Building blocks for web development
+ *
+ * @package	 Ion
+ * @author	  Timothy J. Warren
+ * @copyright   Copyright (c) 2015 - 2016
+ * @license	 MIT
+ */
+
+namespace Aviat\Ion\Cache\Driver;
+
+use Aviat\Ion\Json;
+use Aviat\Ion\JsonException;
+
+/**
+ * Abstract base for Cache drivers to share common functionality
+ */
+trait DriverTrait  {
+
+	/**
+	 * Key prefix for key / value cache stores
+	 */
+	protected static $CACHE_KEY_PREFIX = "hbac:cache:";
+
+	/**
+	 * Set key prefix for cache drivers that have global keys
+	 *
+	 * @param string $key - the raw key name
+	 * @return string - the prefixed key name
+	 */
+	protected function prefix($key)
+	{
+		return static::$CACHE_KEY_PREFIX . $key;
+	}
+
+	/**
+	 * Converts data to cache to a string representation for storage in a cache
+	 *
+	 * @param mixed $data - data to store in the cache backend
+	 * @return string
+	 */
+	protected function serialize($data)
+	{
+		return Json::encode($data);
+	}
+
+	/**
+	 * Convert serialized data from cache backend to native types
+	 *
+	 * @param string $data - data from cache backend
+	 * @return mixed
+	 * @throws JsonException
+	 */
+	protected function unserialize($data)
+	{
+		return Json::decode($data);
+	}
+}
+// End of DriverTrait.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/NullDriver.php b/src/Aviat/Ion/Cache/Driver/NullDriver.php
index aca42a2c..863d684b 100644
--- a/src/Aviat/Ion/Cache/Driver/NullDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/NullDriver.php
@@ -11,32 +11,20 @@
  */
 
 namespace Aviat\Ion\Cache\Driver;
-
 use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Cache\CacheDriverInterface;
 
 /**
  * The Driver for no real cache
  */
-class NullDriver implements CacheDriverInterface {
+class NullDriver implements DriverInterface {
 
 	/**
 	 * 'Cache' for Null data store
 	 */
-	protected $data;
+	protected $data = [];
 
 	/**
-	 * Create the Null cache driver
-	 *
-	 * @param ConfigInterface $config The configuration management class
-	 */
-	public function __construct(ConfigInterface $config)
-	{
-		$this->data = [];
-	}
-
-	/**
-	 * Retreive a value from the cache backend
+	 * Retrieve a value from the cache backend
 	 *
 	 * @param string $key
 	 * @return mixed
@@ -53,7 +41,7 @@ class NullDriver implements CacheDriverInterface {
 	 *
 	 * @param string $key
 	 * @param mixed $value
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function set($key, $value)
 	{
@@ -65,7 +53,7 @@ class NullDriver implements CacheDriverInterface {
 	 * Invalidate a cached value
 	 *
 	 * @param string $key
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function invalidate($key)
 	{
diff --git a/src/Aviat/Ion/Cache/Driver/RedisDriver.php b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
index 85e140d5..dc385aa3 100644
--- a/src/Aviat/Ion/Cache/Driver/RedisDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
@@ -13,11 +13,15 @@
 namespace Aviat\Ion\Cache\Driver;
 
 use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Cache\CacheDriverInterface;
 
 use Predis\Client;
 
-class RedisDriver implements CacheDriverInterface {
+/**
+ * Cache Driver for a Redis backend
+ */
+class RedisDriver implements DriverInterface {
+
+	use DriverTrait;
 	
 	/**
 	 * THe Predis library instance
@@ -35,6 +39,10 @@ class RedisDriver implements CacheDriverInterface {
 	{
 		$redisConfig = $config->get('redis');
 
+		// If you don't have a redis password set, and you attempt to send an
+		// empty string, Redis will think you want to authenticate with a password
+		// that is an empty string. To work around this, empty string passwords
+		// are considered to be a lack of a password
 		if (array_key_exists('password', $redisConfig) && $redisConfig['password'] === '')
 		{
 			unset($redisConfig['password']);
@@ -54,36 +62,45 @@ class RedisDriver implements CacheDriverInterface {
 	/**
 	 * Retrieve a value from the cache backend
 	 *
-	 * @param string $key
+	 * @param string $rawKey
 	 * @return mixed
 	 */
-	public function get($key)
+	public function get($rawKey)
 	{
-		return json_decode($this->redis->get($key));
+		$key = $this->prefix($rawKey);
+		$serializedData = $this->redis->get($key);
+
+		return $this->unserialize($serializedData);
 	}
 	
 	/**
 	 * Set a cached value
 	 *
-	 * @param string $key
+	 * @param string $rawKey
 	 * @param mixed $value
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
-	public function set($key, $value)
+	public function set($rawKey, $value)
 	{
-		$this->redis->set($key, json_encode($value));
+		$key = $this->prefix($rawKey);
+		$serializedData = $this->serialize($value);
+
+		$this->redis->set($key, $serializedData);
+
 		return $this;
 	}
 	
 	/**
 	 * Invalidate a cached value
 	 *
-	 * @param string $key
-	 * @return CacheDriverInterface
+	 * @param string $rawKey
+	 * @return DriverInterface
 	 */
-	public function invalidate($key)
+	public function invalidate($rawKey)
 	{
+		$key = $this->prefix($rawKey);
 		$this->redis->del($key);
+
 		return $this;
 	}
 	
@@ -94,7 +111,7 @@ class RedisDriver implements CacheDriverInterface {
 	 */
 	public function invalidateAll()
 	{
-		$this->redis->flushDB();
+		$this->redis->flushdb();
 	}
 }
 // End of RedisDriver.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
index f3bbc64d..703128ec 100644
--- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php
+++ b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
@@ -13,14 +13,15 @@
 namespace Aviat\Ion\Cache\Driver;
 
 use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Cache\CacheDriverInterface;
 use Aviat\Ion\Exception\ConfigException;
 use Aviat\Ion\Model\DB;
 
 /**
  * Driver for caching via a traditional SQL database
  */
-class SQLDriver extends DB implements CacheDriverInterface  {
+class SQLDriver extends DB implements DriverInterface  {
+
+	use DriverTrait;
 
 	/**
 	 * The query builder object
@@ -60,12 +61,14 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 			->get();
 			
 		$row = $query->fetch(\PDO::FETCH_ASSOC);
-		if ( ! empty($row))
+
+		if (empty($row))
 		{
-			return json_decode($row['value']);
+			return NULL;
 		}
-		
-		return NULL;
+
+		$serializedData = $row['value'];
+		return $this->unserialize($serializedData);
 	}
 
 	/**
@@ -73,15 +76,17 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 	 *
 	 * @param string $key
 	 * @param mixed $value
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function set($key, $value)
 	{
+		$serializedData = $this->serialize($value);
+
 		$this->db->set([
 			'key' => $key,
-			'value' => json_encode($value),
+			'value' => $serializedData,
 		]);
-		
+
 		$this->db->insert('cache');
 
 		return $this;
@@ -91,7 +96,7 @@ class SQLDriver extends DB implements CacheDriverInterface  {
 	 * Invalidate a cached value
 	 *
 	 * @param string $key
-	 * @return CacheDriverInterface
+	 * @return DriverInterface
 	 */
 	public function invalidate($key)
 	{
diff --git a/src/Aviat/Ion/Json.php b/src/Aviat/Ion/Json.php
index 42370b19..b1581ecc 100644
--- a/src/Aviat/Ion/Json.php
+++ b/src/Aviat/Ion/Json.php
@@ -60,7 +60,15 @@ class Json {
 	 */
 	public static function decode($json, $assoc = TRUE, $depth = 512, $options = 0)
 	{
-		$data = json_decode($json, $assoc, $depth, $options);
+		// Don't try to decode null
+		if (empty($json))
+		{
+			return NULL;
+		}
+
+		// cast json to string so that streams from guzzle are correctly decoded
+		$data = json_decode((string) $json, $assoc, $depth, $options);
+
 		self::check_json_error();
 		return $data;
 	}
diff --git a/tests/AnimeClient/Model/AnimeCollectionModelTest.php b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
index 1004b75d..5c931c15 100644
--- a/tests/AnimeClient/Model/AnimeCollectionModelTest.php
+++ b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
@@ -31,7 +31,7 @@ class AnimeCollectionModelTest extends AnimeClient_TestCase {
 	public function testSanity()
 	{
 		$friend = new Friend($this->collectionModel);
-		$this->assertInstanceOf('Aviat\AnimeClient\Model\DB', $this->collectionModel);
+		$this->assertInstanceOf('Aviat\Ion\Model\DB', $this->collectionModel);
 		$this->assertInstanceOf('Aviat\AnimeClient\Model\Anime', $friend->anime_model);
 	}
 
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index d778f14b..6b32e3ba 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -8,6 +8,7 @@ use GuzzleHttp\Psr7\Response;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response as HttpResponse;
 
+use Aviat\Ion\Json;
 use Aviat\AnimeClient\AnimeClient;
 
 define('ROOT_DIR', __DIR__ . '/../');
@@ -119,6 +120,36 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 		$this->container->set('response', new HttpResponse());
 	}
 
+	/**
+	 * Simplify getting test data
+	 *
+	 * Takes multiple path arguments
+	 *
+	 * @return string - contents of the data file
+	 */
+	public function getMockFile()
+	{
+		$args = func_get_args();
+		array_unshift($args, TEST_DATA_DIR);
+		$filePath = implode(DIRECTORY_SEPARATOR, $args);
+
+		return file_get_contents($filePath);
+	}
+
+	/**
+	 * Simplify getting mocked test data
+	 *
+	 * Takes multiple path arguments
+	 *
+	 * @return mixed - the decoded data
+	 */
+	public function getMockFileData()
+	{
+		$rawData = call_user_func_array([$this, 'getMockFile'], func_get_args());
+
+		return Json::decode($rawData);
+	}
+
 	/**
 	 * Create a mock guzzle client for testing
 	 * api call methods
diff --git a/tests/AnimeClient/Model/BaseDBModelTest.php b/tests/Ion/Model/BaseDBModelTest.php
similarity index 59%
rename from tests/AnimeClient/Model/BaseDBModelTest.php
rename to tests/Ion/Model/BaseDBModelTest.php
index dbf9a40c..bdaf1954 100644
--- a/tests/AnimeClient/Model/BaseDBModelTest.php
+++ b/tests/Ion/Model/BaseDBModelTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use Aviat\AnimeClient\Model\DB as BaseDBModel;
+use Aviat\Ion\Model\DB as BaseDBModel;
 
 class BaseDBModelTest extends AnimeClient_TestCase {
 
 	public function testBaseDBModelSanity()
 	{
-		$baseDBModel = new BaseDBModel($this->container);
+		$baseDBModel = new BaseDBModel($this->container->get('config'));
 		$this->assertTrue(is_object($baseDBModel));
 	}
 }
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9df960d1..27f1c52e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,9 +3,6 @@
  * Global setup for unit tests
  */
 
-use Aviat\Ion\Json;
-use Aviat\AnimeClient\AnimeClient;
-
 // Work around the silly timezone error
 $timezone = ini_get('date.timezone');
 if ($timezone === '' || $timezone === FALSE)
diff --git a/tests/mocks.php b/tests/mocks.php
index d4884bbe..fca39551 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -6,7 +6,6 @@
 use Aviat\Ion\Enum;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Transformer\AbstractTransformer;
 use Aviat\Ion\View;
 use Aviat\Ion\View\HtmlView;

From 1ccce00e469e7b48a4644f4da56f6503944c961d Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 1 Aug 2016 13:10:00 -0400
Subject: [PATCH 23/65] Add dev dependencies, augment gitignore

---
 .gitignore    |  4 +++-
 composer.json | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d8a5863..72c6903d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,6 @@ build/**
 !build/*.php
 app/config/*.toml
 !app/config/*.toml.example
-phinx.yml
\ No newline at end of file
+phinx.yml
+.idea/
+Caddyfile
\ No newline at end of file
diff --git a/composer.json b/composer.json
index bf012bc2..3a168e70 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,18 @@
 		"predis/predis": "1.1.*",
 		"psr/http-message": "~1.0",
 		"psr/log": "~1.0",
-		"robmorgan/phinx": "0.4.*",
 		"yosymfony/toml": "0.3.*",
 		"zendframework/zend-diactoros": "1.3.*",
 		"maximebf/consolekit": "^1.0"
 	},
 	"require-dev": {
-		"codeclimate/php-test-reporter": "dev-master"
+		"codeclimate/php-test-reporter": "dev-master",
+		"pdepend/pdepend": "^2.2",
+		"sebastian/phpcpd": "^2.0",
+		"theseer/phpdox": "0.8.1.1",
+		"phploc/phploc": "^3.0",
+		"phpmd/phpmd": "^2.4",
+		"phpunit/phpunit": "^5.4",
+		"robmorgan/phinx": "^0.6.4"
 	}
 }

From cc65cc9cf176597f4f66acca7690bbbfac5a69e5 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 1 Aug 2016 14:38:23 -0400
Subject: [PATCH 24/65] Set up mutation testing for unit tests

---
 .gitignore                       |  3 ++-
 composer.json                    |  3 ++-
 humbug.json.dist                 | 12 ++++++++++++
 phpunit.xml                      | 29 +++++++++++++++++++++++++++++
 tests/Ion/ConfigTest.php         |  4 +++-
 tests/Ion/Di/ContainerTest.php   | 16 ++++++++++++++--
 tests/Ion/Type/ArrayTypeTest.php |  9 +++++++++
 7 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 humbug.json.dist
 create mode 100644 phpunit.xml

diff --git a/.gitignore b/.gitignore
index 72c6903d..78031d83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ app/config/*.toml
 !app/config/*.toml.example
 phinx.yml
 .idea/
-Caddyfile
\ No newline at end of file
+Caddyfile
+build/humbuglog.txt
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 3a168e70..0a7b0777 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
 		"phploc/phploc": "^3.0",
 		"phpmd/phpmd": "^2.4",
 		"phpunit/phpunit": "^5.4",
-		"robmorgan/phinx": "^0.6.4"
+		"robmorgan/phinx": "^0.6.4",
+		"humbug/humbug": "~1.0@dev"
 	}
 }
diff --git a/humbug.json.dist b/humbug.json.dist
new file mode 100644
index 00000000..d1e38834
--- /dev/null
+++ b/humbug.json.dist
@@ -0,0 +1,12 @@
+{
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "build\/humbuglog.txt",
+        "json": "build\/humbug.json"
+    }
+}
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..6f5df955
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        colors="true"
+        stopOnFailure="false"
+        bootstrap="tests/bootstrap.php"
+        beStrictAboutTestsThatDoNotTestAnything="true"
+>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/Aviat/Ion</directory>
+            <directory suffix=".php">src/Aviat/AnimeClient</directory>
+        </whitelist>
+    </filter>
+    <testsuites>
+        <testsuite name="Ion">
+            <directory>tests/Ion</directory>
+        </testsuite>
+        <testsuite name="AnimeClient">
+            <directory>tests/AnimeClient</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <server name="HTTP_USER_AGENT" value="Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0" />
+        <server name="HTTP_HOST" value="localhost" />
+        <server name="SERVER_NAME" value="localhost" />
+        <server name="REQUEST_URI" value="/" />
+        <server name="REQUEST_METHOD" value="GET" />
+    </php>
+</phpunit>
\ No newline at end of file
diff --git a/tests/Ion/ConfigTest.php b/tests/Ion/ConfigTest.php
index 3cd84de2..ca716cf8 100644
--- a/tests/Ion/ConfigTest.php
+++ b/tests/Ion/ConfigTest.php
@@ -23,7 +23,8 @@ class ConfigTest extends AnimeClient_TestCase {
 
 	public function testConfigSet()
 	{
-		$this->config->set('foo', 'foobar');
+		$ret = $this->config->set('foo', 'foobar');
+		$this->assertInstanceOf('Aviat\Ion\Config', $ret);
 		$this->assertEquals('foobar', $this->config->get('foo'));
 
 		$this->config->set(['apple', 'sauce', 'is'], 'great');
@@ -31,6 +32,7 @@ class ConfigTest extends AnimeClient_TestCase {
 		$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()
diff --git a/tests/Ion/Di/ContainerTest.php b/tests/Ion/Di/ContainerTest.php
index f4002582..bbf22627 100644
--- a/tests/Ion/Di/ContainerTest.php
+++ b/tests/Ion/Di/ContainerTest.php
@@ -51,6 +51,15 @@ class ContainerTest extends AnimeClient_TestCase {
 		}
 	}
 
+	public function testGetSet()
+	{
+		$container = $this->container->set('foo', function() {});
+
+		$this->assertInstanceOf('Aviat\Ion\Di\Container', $container);
+		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
+		$this->assertTrue(is_callable($container->get('foo')));
+	}
+
 	public function testLoggerMethods()
 	{
 		// Does the container have the default logger?
@@ -63,8 +72,11 @@ class ContainerTest extends AnimeClient_TestCase {
 		$logger2->pushHandler(new TestHandler());
 
 		// Set the logger channels
-		$this->container->setLogger($logger1);
-		$this->container->setLogger($logger2, 'test');
+		$container = $this->container->setLogger($logger1);
+		$container2 = $this->container->setLogger($logger2, 'test');
+
+		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
+		$this->assertInstanceOf('Aviat\Ion\Di\Container', $container2);
 
 		$this->assertEquals($logger1, $this->container->getLogger('default'));
 		$this->assertEquals($logger2, $this->container->getLogger('test'));
diff --git a/tests/Ion/Type/ArrayTypeTest.php b/tests/Ion/Type/ArrayTypeTest.php
index db2d56c6..e78315ee 100644
--- a/tests/Ion/Type/ArrayTypeTest.php
+++ b/tests/Ion/Type/ArrayTypeTest.php
@@ -79,6 +79,15 @@ class ArrayTypeTest extends AnimeClient_TestCase {
 		$this->assertEquals($expected, $actual);
 	}
 
+	public function testSet()
+	{
+		$obj = $this->arr([]);
+		$arraytype = $obj->set('foo', 'bar');
+
+		$this->assertInstanceOf('Aviat\Ion\Type\ArrayType', $arraytype);
+		$this->assertEquals('bar', $obj->get('foo'));
+	}
+
 	public function testGet()
 	{
 		$array = [1, 2, 3, 4, 5];

From b14413af3f8bf91af8ce7872893feab58945c80c Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 13:47:14 -0400
Subject: [PATCH 25/65] Attempt to fix gitlab ci build

---
 build/docker_install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 7dca9c3f..df5633ea 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -20,4 +20,5 @@ chmod +x /usr/local/bin/phpunit
 docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
 docker-php-ext-install gd
 docker-php-ext-install mcrypt
+docker-php-ext-install xsl
 docker-php-ext-install zip
\ No newline at end of file

From aac478a455530e4ac2f1b2ee56378706c9dc88b5 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 14:08:02 -0400
Subject: [PATCH 26/65] Another attempt to fix gitlab ci build

---
 build/docker_install.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/build/docker_install.sh b/build/docker_install.sh
index df5633ea..e7b4a8d1 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -10,7 +10,21 @@ set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
 apt-get update -yqq
-apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 libfreetype6-dev libjpeg-dev libmcrypt-dev libpng12-dev zlib1g-dev -yqq
+apt-get install \
+	git \
+	unzip \
+	libfreetype6 \
+	libjpeg62-turbo \
+	libmcrypt4 \
+	libpng12-0 \
+	libfreetype6-dev \
+	libjpeg-dev \
+	libmcrypt-dev \
+	libpng12-dev \
+	libxslt1-dev \
+	libxslt1.1 \
+	zlib1g-dev \
+	-yqq
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar

From 282fb44603d997f8cb98909d6b7eabbae630db01 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 14:14:38 -0400
Subject: [PATCH 27/65] Don't install dev dependencies in test environments

---
 .gitlab-ci.yml | 2 +-
 .travis.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78229a40..5609409c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ before_script:
     - bash build/docker_install.sh > /dev/null
     # Install composer dependencies
     - curl -sS https://getcomposer.org/installer | php
-    - php composer.phar install
+    - php composer.phar install --no-dev
 
 # Composer stores all downloaded packages in the vendor/ directory.
 # Do not use the following if the vendor/ directory is commited to
diff --git a/.travis.yml b/.travis.yml
index a863b2c5..cf72aec6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 install:
-  - composer install
+  - composer install --no-dev
 
 php:
   - 5.5

From 30834be3a8660cd620184230751d753c9fb647a6 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 14:30:36 -0400
Subject: [PATCH 28/65] Attempt hhvm testing on gitlab ci, adjust acceptable
 failures on travis

---
 .gitlab-ci.yml | 27 +++++++++++++++++++--------
 .travis.yml    |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5609409c..0bea8b39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,3 @@
-before_script:
-    # Install dependencies
-    - bash build/docker_install.sh > /dev/null
-    # Install composer dependencies
-    - curl -sS https://getcomposer.org/installer | php
-    - php composer.phar install --no-dev
-
 # Composer stores all downloaded packages in the vendor/ directory.
 # Do not use the following if the vendor/ directory is commited to
 # your git repository.
@@ -16,11 +9,29 @@ services:
     - redis:latest
 
 test:5.6:
+    before_script:
+      - bash build/docker_install.sh > /dev/null
+      - curl -sS https://getcomposer.org/installer | php
+      - php composer.phar install --no-dev
     image: php:5.6
     script:
       - phpunit -c build
 
 test:7:
+    before_script:
+      - bash build/docker_install.sh > /dev/null
+      - curl -sS https://getcomposer.org/installer | php
+      - php composer.phar install --no-dev
     image: php:7
     script:
-      - phpunit -c build
\ No newline at end of file
+      - phpunit -c build
+
+test:hhvm:
+    before_script:
+      - curl -sS https://getcomposer.org/installer | hhvm
+      - hhvm composer.phar install --no-dev
+      - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
+      - chmod +x /usr/local/bin/phpunit
+    image: diegomarangoni/hhvm:cli
+    script:
+      - hhvm `which phpunit` -c build
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index cf72aec6..8de0e34a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ after_script:
 
 matrix:
   allow_failures:
+    - php: 5.5
     - php: nightly
     - php: hhvm
 

From d30e90937b46073773434cbd1d799a95914a21bd Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 18:09:55 -0400
Subject: [PATCH 29/65] try a different docker container for running hhvm tests

---
 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bea8b39..99346c5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,7 @@ test:7:
 
 test:hhvm:
     before_script:
-      - curl -sS https://getcomposer.org/installer | hhvm
-      - hhvm composer.phar install --no-dev
-      - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-      - chmod +x /usr/local/bin/phpunit
-    image: diegomarangoni/hhvm:cli
+      - composer install -g phpunit
+    image: 51systems/docker-gitlab-ci-runner-hhvm
     script:
-      - hhvm `which phpunit` -c build
\ No newline at end of file
+      - phpunit -c build
\ No newline at end of file

From f163ea41d6289e0d9a2434514f15a1daf5e397b7 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 18:25:28 -0400
Subject: [PATCH 30/65] actually use the correct composer command to install
 phpunit for hhvm

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99346c5d..f3ebbddc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ test:7:
 
 test:hhvm:
     before_script:
-      - composer install -g phpunit
+      - composer global require "phpunit/phpunit"
     image: 51systems/docker-gitlab-ci-runner-hhvm
     script:
       - phpunit -c build
\ No newline at end of file

From 1d6e347b7877dd0f5df1c37b976c23ef497dea46 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 3 Aug 2016 18:43:09 -0400
Subject: [PATCH 31/65] Another attempt at hhvm setup

---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3ebbddc..265afb81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,10 @@ test:7:
 
 test:hhvm:
     before_script:
-      - composer global require "phpunit/phpunit"
+      - /usr/local/bin/composer self-update
+      - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
+      - chmod +x /usr/local/bin/phpunit
+      - composer install --no-dev
     image: 51systems/docker-gitlab-ci-runner-hhvm
     script:
       - phpunit -c build
\ No newline at end of file

From 3335093e87212eb75488ff9c3b9c9cf9e8778591 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 9 Aug 2016 11:08:45 -0400
Subject: [PATCH 32/65] Move Ion namespace into composer dependency

---
 RoboFile.php                                  | 278 ++++++++++++++++++
 build/ion_header_comment.txt                  |  10 -
 build/phpunit.xml                             |   4 -
 build/update_header_comments.php              |  10 -
 composer.json                                 |  10 +-
 phpunit.xml                                   |   4 -
 src/Aviat/Ion/ArrayWrapper.php                |  34 ---
 src/Aviat/Ion/Cache/CacheInterface.php        |  48 ---
 src/Aviat/Ion/Cache/CacheManager.php          | 117 --------
 .../Ion/Cache/Driver/DriverInterface.php      |  51 ----
 src/Aviat/Ion/Cache/Driver/DriverTrait.php    |  62 ----
 src/Aviat/Ion/Cache/Driver/NullDriver.php     |  74 -----
 src/Aviat/Ion/Cache/Driver/RedisDriver.php    | 117 --------
 src/Aviat/Ion/Cache/Driver/SQLDriver.php      | 119 --------
 src/Aviat/Ion/Config.php                      | 106 -------
 src/Aviat/Ion/ConfigInterface.php             |  41 ---
 src/Aviat/Ion/Di/Container.php                | 134 ---------
 src/Aviat/Ion/Di/ContainerAware.php           |  49 ---
 src/Aviat/Ion/Di/ContainerAwareInterface.php  |  36 ---
 src/Aviat/Ion/Di/ContainerInterface.php       |  47 ---
 .../Ion/Di/Exception/ContainerException.php   |  21 --
 .../Ion/Di/Exception/NotFoundException.php    |  22 --
 src/Aviat/Ion/Enum.php                        |  49 ---
 src/Aviat/Ion/Exception/ConfigException.php   |  20 --
 src/Aviat/Ion/Friend.php                      | 129 --------
 src/Aviat/Ion/Json.php                        | 130 --------
 src/Aviat/Ion/JsonException.php               |  18 --
 src/Aviat/Ion/Model.php                       |  21 --
 src/Aviat/Ion/Model/DB.php                    |  51 ----
 src/Aviat/Ion/StaticInstance.php              |  63 ----
 src/Aviat/Ion/StringWrapper.php               |  33 ---
 .../Ion/Transformer/AbstractTransformer.php   |  42 ---
 .../Ion/Transformer/TransformerInterface.php  |  27 --
 src/Aviat/Ion/Type/ArrayType.php              | 261 ----------------
 src/Aviat/Ion/Type/StringType.php             |  23 --
 src/Aviat/Ion/View.php                        | 137 ---------
 src/Aviat/Ion/View/HtmlView.php               |  69 -----
 src/Aviat/Ion/View/HttpView.php               |  91 ------
 src/Aviat/Ion/View/JsonView.php               |  47 ---
 tests/Ion/BaseModelTest.php                   |  12 -
 tests/Ion/Cache/CacheManagerTest.php          |  40 ---
 tests/Ion/Cache/Driver/CacheDriverBase.php    |  43 ---
 tests/Ion/Cache/Driver/NullDriverTest.php     |  17 --
 tests/Ion/Cache/Driver/RedisDriver2Test.php   |  38 ---
 tests/Ion/Cache/Driver/RedisDriverTest.php    |  29 --
 tests/Ion/Cache/Driver/SQLDriverTest.php      |  20 --
 tests/Ion/ConfigTest.php                      | 120 --------
 tests/Ion/Di/ContainerAwareTest.php           |  39 ---
 tests/Ion/Di/ContainerTest.php                |  89 ------
 tests/Ion/EnumTest.php                        |  68 -----
 tests/Ion/FriendTest.php                      |  56 ----
 tests/Ion/JsonTest.php                        |  68 -----
 tests/Ion/Model/BaseDBModelTest.php           |  12 -
 .../Transformer/AbstractTransformerTest.php   |  89 ------
 tests/Ion/Type/ArrayTypeTest.php              | 173 -----------
 tests/Ion/View/HtmlViewTest.php               |  25 --
 tests/Ion/View/HttpViewTest.php               |  46 ---
 tests/Ion/View/JsonViewTest.php               |  43 ---
 58 files changed, 282 insertions(+), 3350 deletions(-)
 create mode 100644 RoboFile.php
 delete mode 100644 build/ion_header_comment.txt
 delete mode 100644 src/Aviat/Ion/ArrayWrapper.php
 delete mode 100644 src/Aviat/Ion/Cache/CacheInterface.php
 delete mode 100644 src/Aviat/Ion/Cache/CacheManager.php
 delete mode 100644 src/Aviat/Ion/Cache/Driver/DriverInterface.php
 delete mode 100644 src/Aviat/Ion/Cache/Driver/DriverTrait.php
 delete mode 100644 src/Aviat/Ion/Cache/Driver/NullDriver.php
 delete mode 100644 src/Aviat/Ion/Cache/Driver/RedisDriver.php
 delete mode 100644 src/Aviat/Ion/Cache/Driver/SQLDriver.php
 delete mode 100644 src/Aviat/Ion/Config.php
 delete mode 100644 src/Aviat/Ion/ConfigInterface.php
 delete mode 100644 src/Aviat/Ion/Di/Container.php
 delete mode 100644 src/Aviat/Ion/Di/ContainerAware.php
 delete mode 100644 src/Aviat/Ion/Di/ContainerAwareInterface.php
 delete mode 100644 src/Aviat/Ion/Di/ContainerInterface.php
 delete mode 100644 src/Aviat/Ion/Di/Exception/ContainerException.php
 delete mode 100644 src/Aviat/Ion/Di/Exception/NotFoundException.php
 delete mode 100644 src/Aviat/Ion/Enum.php
 delete mode 100644 src/Aviat/Ion/Exception/ConfigException.php
 delete mode 100644 src/Aviat/Ion/Friend.php
 delete mode 100644 src/Aviat/Ion/Json.php
 delete mode 100644 src/Aviat/Ion/JsonException.php
 delete mode 100644 src/Aviat/Ion/Model.php
 delete mode 100644 src/Aviat/Ion/Model/DB.php
 delete mode 100644 src/Aviat/Ion/StaticInstance.php
 delete mode 100644 src/Aviat/Ion/StringWrapper.php
 delete mode 100644 src/Aviat/Ion/Transformer/AbstractTransformer.php
 delete mode 100644 src/Aviat/Ion/Transformer/TransformerInterface.php
 delete mode 100644 src/Aviat/Ion/Type/ArrayType.php
 delete mode 100644 src/Aviat/Ion/Type/StringType.php
 delete mode 100644 src/Aviat/Ion/View.php
 delete mode 100644 src/Aviat/Ion/View/HtmlView.php
 delete mode 100644 src/Aviat/Ion/View/HttpView.php
 delete mode 100644 src/Aviat/Ion/View/JsonView.php
 delete mode 100644 tests/Ion/BaseModelTest.php
 delete mode 100644 tests/Ion/Cache/CacheManagerTest.php
 delete mode 100644 tests/Ion/Cache/Driver/CacheDriverBase.php
 delete mode 100644 tests/Ion/Cache/Driver/NullDriverTest.php
 delete mode 100644 tests/Ion/Cache/Driver/RedisDriver2Test.php
 delete mode 100644 tests/Ion/Cache/Driver/RedisDriverTest.php
 delete mode 100644 tests/Ion/Cache/Driver/SQLDriverTest.php
 delete mode 100644 tests/Ion/ConfigTest.php
 delete mode 100644 tests/Ion/Di/ContainerAwareTest.php
 delete mode 100644 tests/Ion/Di/ContainerTest.php
 delete mode 100644 tests/Ion/EnumTest.php
 delete mode 100644 tests/Ion/FriendTest.php
 delete mode 100644 tests/Ion/JsonTest.php
 delete mode 100644 tests/Ion/Model/BaseDBModelTest.php
 delete mode 100644 tests/Ion/Transformer/AbstractTransformerTest.php
 delete mode 100644 tests/Ion/Type/ArrayTypeTest.php
 delete mode 100644 tests/Ion/View/HtmlViewTest.php
 delete mode 100644 tests/Ion/View/HttpViewTest.php
 delete mode 100644 tests/Ion/View/JsonViewTest.php

diff --git a/RoboFile.php b/RoboFile.php
new file mode 100644
index 00000000..b63ee609
--- /dev/null
+++ b/RoboFile.php
@@ -0,0 +1,278 @@
+<?php
+if ( ! function_exists('glob_recursive'))
+{
+	// Does not support flag GLOB_BRACE
+	function glob_recursive($pattern, $flags = 0)
+	{
+		$files = glob($pattern, $flags);
+
+		foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir)
+		{
+			$files = array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags));
+		}
+
+		return $files;
+	}
+}
+
+/**
+ * This is project's console commands configuration for Robo task runner.
+ *
+ * @see http://robo.li/
+ */
+class RoboFile extends \Robo\Tasks
+{
+	protected $taskDirs = [
+		'build/api',
+		'build/coverage',
+		'build/logs',
+		'build/pdepend',
+		'build/phpdox',
+	];
+
+
+	/**
+	 * Do static analysis tasks
+	 */
+	public function analyze()
+	{
+		$this->prepare();
+		$this->lint();
+		$this->phploc(TRUE);
+		$this->dependencyReport();
+		$this->phpcpdReport();
+	}
+
+	/**
+	 * Run all tests, generate coverage, generate docs, generate code statistics
+	 */
+	public function build()
+	{
+		$this->analyze();
+		$this->coverage();
+		$this->docs();
+	}
+
+	/**
+	 * Cleanup temporary files
+	 */
+	public function clean()
+	{
+		$cleanFiles = [
+			'build/humbug.json',
+			'build/humbug-log.txt',
+		];
+		array_map(function ($file) {
+			@unlink($file);
+		}, $cleanFiles);
+
+		$this->_cleanDir($this->taskDirs);
+		$this->_deleteDir($this->taskDirs);
+	}
+
+	/**
+	 * Run unit tests and generate coverage reports
+	 */
+	public function coverage()
+	{
+		$this->taskPhpUnit()
+			->configFile('build/phpunit.xml')
+			->printed(true)
+			->run();
+	}
+
+	/**
+	 * Generate documentation with phpdox
+	 */
+	public function docs()
+	{
+		$cmd_parts = [
+			'cd build',
+			'../vendor/bin/phpdox',
+			'cd ..'
+		];
+		$this->_run($cmd_parts, ' && ');
+	}
+
+	/**
+	 * Verify that source files are valid
+	 */
+	public function lint()
+	{
+		$files = $this->getAllSourceFiles();
+
+		$chunks = array_chunk($files, 6);
+		$collection = $this->collection();
+
+		foreach($chunks as $chunk)
+		{
+			$this->parallelLint($collection, $chunk);
+		}
+
+		$collection->run();
+	}
+
+
+	/**
+	 * Run mutation tests with humbug
+	 *
+	 * @param bool $stats - if true, generates stats rather than running mutation tests
+	 */
+	public function mutate($stats = FALSE)
+	{
+		$test_parts = [
+			'vendor/bin/humbug'
+		];
+
+		$stat_parts = [
+			'vendor/bin/humbug',
+			'--skip-killed=yes',
+			'-v',
+			'./build/humbug.json'
+		];
+
+		$cmd_parts = ($stats) ? $stat_parts : $test_parts;
+		$this->_run($cmd_parts);
+	}
+
+	/**
+	 * Run the phploc tool
+	 *
+	 * @param bool $report - if true, generates reports instead of direct output
+	 */
+	public function phploc($report = FALSE)
+	{
+		// Command for generating reports
+		$report_cmd_parts = [
+			'vendor/bin/phploc',
+			'--log-csv=build/logs/phploc.csv',
+			'--log-xml=build/logs/phploc.xml',
+			'src',
+			'tests'
+		];
+
+		// Command for generating direct output
+		$normal_cmd_parts = [
+			'vendor/bin/phploc',
+			'--count-tests',
+			'src',
+			'tests'
+		];
+
+		$cmd_parts = ($report) ? $report_cmd_parts : $normal_cmd_parts;
+
+		$this->_run($cmd_parts);
+	}
+
+	/**
+	 * Create temporary directories
+	 */
+	public function prepare()
+	{
+		$this->clean();
+		array_map([$this, '_mkdir'], $this->taskDirs);
+	}
+
+	/**
+	 * Lint php files and run unit tests
+	 */
+	public function test()
+	{
+		$this->lint();
+		$this->taskPHPUnit()
+			->configFile('phpunit.xml')
+			->printed(true)
+			->run();
+	}
+
+	/**
+	 * Watches for file updates, and automatically runs appropriate actions
+	 */
+	public function watch()
+	{
+		$this->taskWatch()
+			->monitor('composer.json', function() {
+				$this->taskComposerUpdate()->run();
+			})
+			->monitor('src', function () {
+				$this->taskExec('test')->run();
+			})->run();
+	}
+
+	/**
+	 * Create pdepend reports
+	 */
+	protected function dependencyReport()
+	{
+		$cmd_parts = [
+			'vendor/bin/pdepend',
+			'--jdepend-xml=build/logs/jdepend.xml',
+			'--jdepend-chart=build/pdepend/dependencies.svg',
+			'--overview-pyramid=build/pdepend/overview-pyramid.svg',
+			'src'
+		];
+		$this->_run($cmd_parts);
+	}
+
+	/**
+	 * Get the total list of source files, including tests
+	 *
+	 * @return array
+	 */
+	protected function getAllSourceFiles()
+	{
+		$files = array_merge(
+			glob_recursive('build/*.php'),
+			glob_recursive('src/*.php'),
+			glob_recursive('tests/*.php'),
+			glob('*.php')
+		);
+
+		sort($files);
+
+		return $files;
+	}
+
+	/**
+	 * Run php's linter in one parallel task for the passed chunk
+	 *
+	 * @param Collection $collection
+	 * @param array $chunk
+	 */
+	protected function parallelLint($collection, array $chunk)
+	{
+		$task = $this->taskParallelExec();
+
+		foreach($chunk as $file)
+		{
+			$task = $task->process("php -l {$file}");
+		}
+
+		$collection->add($task);
+	}
+
+	/**
+	 * Generate copy paste detector report
+	 */
+	protected function phpcpdReport()
+	{
+		$cmd_parts = [
+			'vendor/bin/phpcpd',
+			'--log-pmd build/logs/pmd-cpd.xml',
+			'src'
+		];
+		$this->_run($cmd_parts);
+	}
+
+	/**
+	 * Short cut for joining an array of command arguments
+	 * and then running it
+	 *
+	 * @param array $cmd_parts - command arguments
+	 * @param string $join_on - what to join the command arguments with
+	 */
+	protected function _run(array $cmd_parts, $join_on = ' ')
+	{
+		$this->_exec(implode($join_on, $cmd_parts));
+	}
+}
\ No newline at end of file
diff --git a/build/ion_header_comment.txt b/build/ion_header_comment.txt
deleted file mode 100644
index 50a30257..00000000
--- a/build/ion_header_comment.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
\ No newline at end of file
diff --git a/build/phpunit.xml b/build/phpunit.xml
index 3c63f182..0b605295 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -8,14 +8,10 @@
 	>
 	<filter>
 		<whitelist>
-			<directory suffix=".php">../src/Aviat/Ion</directory>
 			<directory suffix=".php">../src/Aviat/AnimeClient</directory>
 		</whitelist>
 	</filter>
 	<testsuites>
-		<testsuite name="Ion">
-			<directory>../tests/Ion</directory>
-		</testsuite>
 		<testsuite name="AnimeClient">
 			<directory>../tests/AnimeClient</directory>
 		</testsuite>
diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index 852cf635..a7423f3b 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -7,10 +7,6 @@ $animeclient_file_patterns = [
 	'src/Aviat/AnimeClient/*.php'
 ];
 
-$ion_file_patterns = [
-	'src/Aviat/Ion/*.php'
-];
-
 if ( ! function_exists('glob_recursive'))
 {
 	// Does not support flag GLOB_BRACE
@@ -80,10 +76,4 @@ $loose_files = [
 ];
 replace_files($loose_files, '/animeclient_header_comment.txt');
 
-foreach ($ion_file_patterns as $glob)
-{
-	$files = glob_recursive($glob);
-	replace_files($files, '/ion_header_comment.txt');
-}
-
 echo "Successfully updated headers \n";
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 0a7b0777..f769e115 100644
--- a/composer.json
+++ b/composer.json
@@ -7,13 +7,10 @@
 		"aura/html": "2.*",
 		"aura/router": "3.*",
 		"aura/session": "2.*",
-		"aviat4ion/query": "2.5.*",
-		"container-interop/container-interop": "1.*",
-		"danielstjules/stringy": "~2.1",
+		"aviat/ion": "dev-master",
 		"filp/whoops": "2.0.*",
 		"guzzlehttp/guzzle": "6.*",
 		"monolog/monolog": "1.*",
-		"predis/predis": "1.1.*",
 		"psr/http-message": "~1.0",
 		"psr/log": "~1.0",
 		"yosymfony/toml": "0.3.*",
@@ -21,7 +18,6 @@
 		"maximebf/consolekit": "^1.0"
 	},
 	"require-dev": {
-		"codeclimate/php-test-reporter": "dev-master",
 		"pdepend/pdepend": "^2.2",
 		"sebastian/phpcpd": "^2.0",
 		"theseer/phpdox": "0.8.1.1",
@@ -29,6 +25,8 @@
 		"phpmd/phpmd": "^2.4",
 		"phpunit/phpunit": "^5.4",
 		"robmorgan/phinx": "^0.6.4",
-		"humbug/humbug": "~1.0@dev"
+		"humbug/humbug": "~1.0@dev",
+		"consolidation/robo": "~1.0@dev",
+		"henrikbjorn/lurker": "^1.1.0"
 	}
 }
diff --git a/phpunit.xml b/phpunit.xml
index 6f5df955..18ac4012 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,14 +7,10 @@
 >
     <filter>
         <whitelist>
-            <directory suffix=".php">src/Aviat/Ion</directory>
             <directory suffix=".php">src/Aviat/AnimeClient</directory>
         </whitelist>
     </filter>
     <testsuites>
-        <testsuite name="Ion">
-            <directory>tests/Ion</directory>
-        </testsuite>
         <testsuite name="AnimeClient">
             <directory>tests/AnimeClient</directory>
         </testsuite>
diff --git a/src/Aviat/Ion/ArrayWrapper.php b/src/Aviat/Ion/ArrayWrapper.php
deleted file mode 100644
index 74ec7da4..00000000
--- a/src/Aviat/Ion/ArrayWrapper.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use Aviat\Ion\Type\ArrayType;
-
-/**
- * Wrapper to shortcut creating ArrayType objects
- */
-trait ArrayWrapper {
-
-	/**
-	 * Convenience method for wrapping an array
-	 * with the array type class
-	 *
-	 * @param array $arr
-	 * @return ArrayType
-	 */
-	public function arr(array $arr)
-	{
-		return new ArrayType($arr);
-	}
-}
-// End of ArrayWrapper.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/CacheInterface.php b/src/Aviat/Ion/Cache/CacheInterface.php
deleted file mode 100644
index 4a4413bf..00000000
--- a/src/Aviat/Ion/Cache/CacheInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Cache;
-
-/**
- * Interface for retrieving values from cache
- */
-interface CacheInterface {
-
-	/**
-	 * Retrieve a cached value if it exists, otherwise, get the value
-	 * from the passed arguments
-	 *
-	 * @param object $object - object to retrieve fresh value from
-	 * @param string $method - method name to call
-	 * @param [array] $args - the arguments to pass to the retrieval method
-	 * @return mixed - the cached or fresh data
-	 */
-	public function get($object, $method, array $args=[]);
-
-	/**
-	 * Retrieve a fresh value, and update the cache
-	 *
-	 * @param object $object - object to retrieve fresh value from
-	 * @param string $method - method name to call
-	 * @param [array] $args - the arguments to pass to the retrieval method
-	 * @return mixed - the fresh data
-	 */
-	public function getFresh($object, $method, array $args=[]);
-
-	/**
-	 * Clear the entire cache
-	 *
-	 * @return void
-	 */
-	public function purge();
-}
-// End of CacheInterface.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/CacheManager.php b/src/Aviat/Ion/Cache/CacheManager.php
deleted file mode 100644
index d03947a2..00000000
--- a/src/Aviat/Ion/Cache/CacheManager.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Cache;
-
-use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Cache\Driver\DriverInterface;
-
-/**
- * Class proxying cached and fresh values from the selected cache driver
- */
-class CacheManager implements CacheInterface {
-
-	/**
-	 * @var DriverInterface
-	 */
-	protected $driver;
-
-	/**
-	 * Retrieve the appropriate driver from the container
-	 *
-	 * @param ConfigInterface $config The configuration management class
-	 */
-	public function __construct(ConfigInterface $config)
-	{
-		$driverConf = $config->get('cache_driver');
-
-		if (empty($driverConf))
-		{
-			$driverConf = 'NullDriver';
-		}
-
-		$driverClass = __NAMESPACE__ . "\\Driver\\{$driverConf}";
-		$driver = new $driverClass($config);
-
-		$this->driver = $driver;
-	}
-
-	/**
-	 * Retrieve a cached value if it exists, otherwise, get the value
-	 * from the passed arguments
-	 *
-	 * @param object $object - object to retrieve fresh value from
-	 * @param string $method - method name to call
-	 * @param [array] $args - the arguments to pass to the retrieval method
-	 * @return mixed - the cached or fresh data
-	 */
-	public function get($object, $method, array $args=[])
-	{
-		$hash = $this->generateHashForMethod($object, $method, $args);
-
-		$data = $this->driver->get($hash);
-
-		if (empty($data))
-		{
-			$data = call_user_func_array([$object, $method], $args);
-			$this->driver->set($hash, $data);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Retrieve a fresh value from the method, and update the cache
-	 * @param object $object - object to retrieve fresh value from
-	 * @param string $method - method name to call
-	 * @param [array] $args - the arguments to pass to the retrieval method
-	 * @return mixed - the fresh data
-	 */
-	public function getFresh($object, $method, array $args=[])
-	{
-		$hash = $this->generateHashForMethod($object, $method, $args);
-		$data = call_user_func_array([$object, $method], $args);
-		$this->driver->set($hash, $data);
-		return $data;
-	}
-
-	/**
-	 * Clear the entire cache
-	 *
-	 * @return void
-	 */
-	public function purge()
-	{
-		$this->driver->invalidateAll();
-	}
-
-	/**
-	 * Generate a hash as a cache key from the current method call
-	 *
-	 * @param object $object
-	 * @param string $method
-	 * @param array $args
-	 * @return string
-	 */
-	protected function generateHashForMethod($object, $method, array $args)
-	{
-		$classname = get_class($object);
-		$keyObj = [
-			'class' => $classname,
-			'method' => $method,
-			'args' => $args,
-		];
-		$hash = sha1(json_encode($keyObj));
-		return $hash;
-	}
-}
-// End of CacheManager.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/DriverInterface.php b/src/Aviat/Ion/Cache/Driver/DriverInterface.php
deleted file mode 100644
index 2f826c21..00000000
--- a/src/Aviat/Ion/Cache/Driver/DriverInterface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Cache\Driver;
-
-/**
- * Interface for cache drivers
- */
-interface DriverInterface {
-	/**
-	 * Retreive a value from the cache backend
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key);
-
-	/**
-	 * Set a cached value
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @return DriverInterface
-	 */
-	public function set($key, $value);
-
-	/**
-	 * Invalidate a cached value
-	 *
-	 * @param string $key
-	 * @return DriverInterface
-	 */
-	public function invalidate($key);
-
-	/**
-	 * Clear the contents of the cache
-	 *
-	 * @return void
-	 */
-	public function invalidateAll();
-}
-// End of DriverInterface.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/DriverTrait.php b/src/Aviat/Ion/Cache/Driver/DriverTrait.php
deleted file mode 100644
index 57b6b750..00000000
--- a/src/Aviat/Ion/Cache/Driver/DriverTrait.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Cache\Driver;
-
-use Aviat\Ion\Json;
-use Aviat\Ion\JsonException;
-
-/**
- * Abstract base for Cache drivers to share common functionality
- */
-trait DriverTrait  {
-
-	/**
-	 * Key prefix for key / value cache stores
-	 */
-	protected static $CACHE_KEY_PREFIX = "hbac:cache:";
-
-	/**
-	 * Set key prefix for cache drivers that have global keys
-	 *
-	 * @param string $key - the raw key name
-	 * @return string - the prefixed key name
-	 */
-	protected function prefix($key)
-	{
-		return static::$CACHE_KEY_PREFIX . $key;
-	}
-
-	/**
-	 * Converts data to cache to a string representation for storage in a cache
-	 *
-	 * @param mixed $data - data to store in the cache backend
-	 * @return string
-	 */
-	protected function serialize($data)
-	{
-		return Json::encode($data);
-	}
-
-	/**
-	 * Convert serialized data from cache backend to native types
-	 *
-	 * @param string $data - data from cache backend
-	 * @return mixed
-	 * @throws JsonException
-	 */
-	protected function unserialize($data)
-	{
-		return Json::decode($data);
-	}
-}
-// End of DriverTrait.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/NullDriver.php b/src/Aviat/Ion/Cache/Driver/NullDriver.php
deleted file mode 100644
index 863d684b..00000000
--- a/src/Aviat/Ion/Cache/Driver/NullDriver.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Cache\Driver;
-use Aviat\Ion\ConfigInterface;
-
-/**
- * The Driver for no real cache
- */
-class NullDriver implements DriverInterface {
-
-	/**
-	 * 'Cache' for Null data store
-	 */
-	protected $data = [];
-
-	/**
-	 * Retrieve a value from the cache backend
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key)
-	{
-		return (array_key_exists($key, $this->data))
-			? $this->data[$key]
-			: NULL;
-	}
-
-	/**
-	 * Set a cached value
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @return DriverInterface
-	 */
-	public function set($key, $value)
-	{
-		$this->data[$key] = $value;
-		return $this;
-	}
-
-	/**
-	 * Invalidate a cached value
-	 *
-	 * @param string $key
-	 * @return DriverInterface
-	 */
-	public function invalidate($key)
-	{
-		unset($this->data[$key]);
-		return $this;
-	}
-
-	/**
-	 * Clear the contents of the cache
-	 *
-	 * @return void
-	 */
-	public function invalidateAll()
-	{
-		$this->data = [];
-	}
-}
-// End of NullDriver.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/RedisDriver.php b/src/Aviat/Ion/Cache/Driver/RedisDriver.php
deleted file mode 100644
index dc385aa3..00000000
--- a/src/Aviat/Ion/Cache/Driver/RedisDriver.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Cache\Driver;
-
-use Aviat\Ion\ConfigInterface;
-
-use Predis\Client;
-
-/**
- * Cache Driver for a Redis backend
- */
-class RedisDriver implements DriverInterface {
-
-	use DriverTrait;
-	
-	/**
-	 * THe Predis library instance
-	 *
-	 * @var Client
-	 */
-	protected $redis;
-	
-	/**
-	 * Create the Redis cache driver
-	 *
-	 * @param ConfigInterface $config The configuration management class
-	 */
-	public function __construct(ConfigInterface $config)
-	{
-		$redisConfig = $config->get('redis');
-
-		// If you don't have a redis password set, and you attempt to send an
-		// empty string, Redis will think you want to authenticate with a password
-		// that is an empty string. To work around this, empty string passwords
-		// are considered to be a lack of a password
-		if (array_key_exists('password', $redisConfig) && $redisConfig['password'] === '')
-		{
-			unset($redisConfig['password']);
-		}
-		
-		$this->redis = new Client($redisConfig);
-	}
-
-	/**
-	 * Disconnect from redis
-	 */
-	public function __destruct()
-	{
-		$this->redis = null;
-	}
-	
-	/**
-	 * Retrieve a value from the cache backend
-	 *
-	 * @param string $rawKey
-	 * @return mixed
-	 */
-	public function get($rawKey)
-	{
-		$key = $this->prefix($rawKey);
-		$serializedData = $this->redis->get($key);
-
-		return $this->unserialize($serializedData);
-	}
-	
-	/**
-	 * Set a cached value
-	 *
-	 * @param string $rawKey
-	 * @param mixed $value
-	 * @return DriverInterface
-	 */
-	public function set($rawKey, $value)
-	{
-		$key = $this->prefix($rawKey);
-		$serializedData = $this->serialize($value);
-
-		$this->redis->set($key, $serializedData);
-
-		return $this;
-	}
-	
-	/**
-	 * Invalidate a cached value
-	 *
-	 * @param string $rawKey
-	 * @return DriverInterface
-	 */
-	public function invalidate($rawKey)
-	{
-		$key = $this->prefix($rawKey);
-		$this->redis->del($key);
-
-		return $this;
-	}
-	
-	/**
-	 * Clear the contents of the cache
-	 *
-	 * @return void
-	 */
-	public function invalidateAll()
-	{
-		$this->redis->flushdb();
-	}
-}
-// End of RedisDriver.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php
deleted file mode 100644
index 703128ec..00000000
--- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Cache\Driver;
-
-use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Exception\ConfigException;
-use Aviat\Ion\Model\DB;
-
-/**
- * Driver for caching via a traditional SQL database
- */
-class SQLDriver extends DB implements DriverInterface  {
-
-	use DriverTrait;
-
-	/**
-	 * The query builder object
-	 * @var object $db
-	 */
-	protected $db;
-
-	/**
-	 * Create the driver object
-	 *
-	 * @param ConfigInterface $config
-	 * @throws ConfigException
-	 */
-	public function __construct(ConfigInterface $config)
-	{
-		parent::__construct($config);
-
-		if ( ! array_key_exists('cache', $this->db_config))
-		{
-			throw new ConfigException("Missing '[cache]' section in database config.");
-		}
-
-		$this->db = \Query($this->db_config['cache']);
-	}
-
-	/**
-	 * Retrieve a value from the cache backend
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key)
-	{
-		$query = $this->db->select('value')
-			->from('cache')
-			->where('key', $key)
-			->get();
-			
-		$row = $query->fetch(\PDO::FETCH_ASSOC);
-
-		if (empty($row))
-		{
-			return NULL;
-		}
-
-		$serializedData = $row['value'];
-		return $this->unserialize($serializedData);
-	}
-
-	/**
-	 * Set a cached value
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @return DriverInterface
-	 */
-	public function set($key, $value)
-	{
-		$serializedData = $this->serialize($value);
-
-		$this->db->set([
-			'key' => $key,
-			'value' => $serializedData,
-		]);
-
-		$this->db->insert('cache');
-
-		return $this;
-	}
-
-	/**
-	 * Invalidate a cached value
-	 *
-	 * @param string $key
-	 * @return DriverInterface
-	 */
-	public function invalidate($key)
-	{
-		$this->db->where('key', $key)
-			->delete('cache');
-			
-		return $this;
-	}
-
-	/**
-	 * Clear the contents of the cache
-	 *
-	 * @return void
-	 */
-	public function invalidateAll()
-	{
-		$this->db->truncate('cache');
-	}
-}
-// End of SQLDriver.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Config.php b/src/Aviat/Ion/Config.php
deleted file mode 100644
index c0dea9f0..00000000
--- a/src/Aviat/Ion/Config.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-
-use Aviat\Ion\Exception\ConfigException;
-
-use InvalidArgumentException;
-
-/**
- * Wrapper for configuration values
- */
-class Config implements ConfigInterface {
-
-	use ArrayWrapper;
-
-	/**
-	 * Config object
-	 *
-	 * @var \Aviat\Ion\Type\ArrayType
-	 */
-	protected $map = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param array $config_array
-	 */
-	public function __construct(array $config_array = [])
-	{
-		$this->map = $this->arr($config_array);
-	}
-
-	/**
-	 * Get a config value
-	 *
-	 * @param array|string $key
-	 * @return mixed
-	 * @throws ConfigException
-	 */
-	public function get($key)
-	{
-		if (is_array($key))
-		{
-			return $this->map->get_deep_key($key);
-		}
-
-		return $this->map->get($key);
-	}
-
-	/**
-	 * Remove a config value
-	 *
-	 * @param  string|array $key
-	 * @return void
-	 */
-	public function delete($key)
-	{
-		if (is_array($key))
-		{
-			$this->map->set_deep_key($key, NULL);
-		}
-		else
-		{
-			$pos =& $this->map->get($key);
-			$pos = NULL;
-		}
-	}
-
-	/**
-	 * Set a config value
-	 *
-	 * @param integer|string|array $key
-	 * @param mixed $value
-	 * @throws InvalidArgumentException
-	 * @return Config
-	 */
-	public function set($key, $value)
-	{
-		if (is_array($key))
-		{
-			$this->map->set_deep_key($key, $value);
-		}
-		else if (is_scalar($key) && ! empty($key))
-		{
-			$this->map->set($key, $value);
-		}
-		else
-		{
-			throw new InvalidArgumentException("Key must be integer, string, or array, and cannot be empty");
-		}
-
-		return $this;
-	}
-}
-// End of config.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/ConfigInterface.php b/src/Aviat/Ion/ConfigInterface.php
deleted file mode 100644
index 9c644bae..00000000
--- a/src/Aviat/Ion/ConfigInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-interface ConfigInterface {
-	/**
-	 * Get a config value
-	 *
-	 * @param array|string $key
-	 * @return mixed
-	 */
-	public function get($key);
-
-	/**
-	 * Set a config value
-	 *
-	 * @param integer|string|array $key
-	 * @param mixed $value
-	 * @throws \InvalidArgumentException
-	 * @return ConfigInterface
-	 */
-	public function set($key, $value);
-
-	/**
-	 * Remove a config value
-	 *
-	 * @param  string|array $key
-	 * @return void
-	 */
-	public function delete($key);
-}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/Container.php b/src/Aviat/Ion/Di/Container.php
deleted file mode 100644
index c864d394..00000000
--- a/src/Aviat/Ion/Di/Container.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di;
-
-use Psr\Log\LoggerInterface;
-
-/**
- * Dependency container
- */
-class Container implements ContainerInterface {
-
-	/**
-	 * Array with class instances
-	 *
-	 * @var array
-	 */
-	protected $container = [];
-
-	/**
-	 * Map of logger instances
-	 *
-	 * @var array
-	 */
-	protected $loggers = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param array $values (optional)
-	 */
-	public function __construct(array $values = [])
-	{
-		$this->container = $values;
-		$this->loggers = [];
-	}
-
-	/**
-	 * Finds an entry of the container by its identifier and returns it.
-	 *
-	 * @param string $id Identifier of the entry to look for.
-	 *
-	 * @throws NotFoundException  No entry was found for this identifier.
-	 * @throws ContainerException Error while retrieving the entry.
-	 *
-	 * @return mixed Entry.
-	 */
-	public function get($id)
-	{
-		if ( ! is_string($id))
-		{
-			throw new Exception\ContainerException("Id must be a string");
-		}
-
-		if ($this->has($id))
-		{
-			return $this->container[$id];
-		}
-
-		throw new Exception\NotFoundException("Item '{$id}' does not exist in container.");
-	}
-
-	/**
-	 * Add a value to the container
-	 *
-	 * @param string $id
-	 * @param mixed $value
-	 * @return ContainerInterface
-	 */
-	public function set($id, $value)
-	{
-		$this->container[$id] = $value;
-		return $this;
-	}
-
-	/**
-	 * Returns true if the container can return an entry for the given identifier.
-	 * Returns false otherwise.
-	 *
-	 * @param string $id Identifier of the entry to look for.
-	 *
-	 * @return boolean
-	 */
-	public function has($id)
-	{
-		return array_key_exists($id, $this->container);
-	}
-
-	/**
-	 * Determine whether a logger channel is registered
-	 * @param  string  $key The logger channel
-	 * @return boolean
-	 */
-	public function hasLogger($key = 'default')
-	{
-		return array_key_exists($key, $this->loggers);
-	}
-
-	/**
-	 * Add a logger to the Container
-	 *
-	 * @param LoggerInterface $logger
-	 * @param string          $key    The logger 'channel'
-	 * @return ContainerInterface
-	 */
-	public function setLogger(LoggerInterface $logger, $key = 'default')
-	{
-		$this->loggers[$key] = $logger;
-		return $this;
-	}
-
-	/**
-	 * Retrieve a logger for the selected channel
-	 *
-	 * @param  string $key The logger to retreive
-	 * @return LoggerInterface|null
-	 */
-	public function getLogger($key = 'default')
-	{
-		return ($this->hasLogger($key))
-			? $this->loggers[$key]
-			: NULL;
-	}
-}
-// End of Container.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/ContainerAware.php b/src/Aviat/Ion/Di/ContainerAware.php
deleted file mode 100644
index 8aaf0168..00000000
--- a/src/Aviat/Ion/Di/ContainerAware.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di;
-
-/**
- * Trait implementation of ContainerAwareInterface
- */
-trait ContainerAware {
-
-	/**
-	 * Di Container
-	 *
-	 * @var ContainerInterface
-	 */
-	protected $container;
-
-	/**
-	 * Set the container for the current object
-	 *
-	 * @param ContainerInterface $container
-	 * @return $this
-	 */
-	public function setContainer(ContainerInterface $container)
-	{
-		$this->container = $container;
-		return $this;
-	}
-
-	/**
-	 * Get the container object
-	 *
-	 * @return ContainerInterface
-	 */
-	public function getContainer()
-	{
-		return $this->container;
-	}
-}
-// End of ContainerAware.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/ContainerAwareInterface.php b/src/Aviat/Ion/Di/ContainerAwareInterface.php
deleted file mode 100644
index 64de7b6b..00000000
--- a/src/Aviat/Ion/Di/ContainerAwareInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di;
-
-/**
- * Interface for a class that is aware of the Di Container
- */
-interface ContainerAwareInterface {
-
-	/**
-	 * Set the container for the current object
-	 *
-	 * @param ContainerInterface $container
-	 * @return void
-	 */
-	public function setContainer(ContainerInterface $container);
-
-	/**
-	 * Get the container object
-	 *
-	 * @return ContainerInterface
-	 */
-	public function getContainer();
-
-}
-// End of ContainerAwareInterface.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/ContainerInterface.php b/src/Aviat/Ion/Di/ContainerInterface.php
deleted file mode 100644
index f6b0e0bb..00000000
--- a/src/Aviat/Ion/Di/ContainerInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di;
-
-use Psr\Log\LoggerInterface;
-
-/**
- * Interface for the Dependency Injection Container
- */
-interface ContainerInterface extends \Interop\Container\ContainerInterface {
-
-	/**
-	 * Add a value to the container
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @return ContainerInterface
-	 */
-	public function set($key, $value);
-
-	/**
-	 * Add a logger to the Container
-	 *
-	 * @param LoggerInterface $logger
-	 * @param string          $key    The logger 'channel'
-	 * @return Container
-	 */
-	public function setLogger(LoggerInterface $logger, $key = 'default');
-
-	/**
-	 * Retrieve a logger for the selected channel
-	 *
-	 * @param  string $key The logger to retreive
-	 * @return LoggerInterface|null
-	 */
-	public function getLogger($key = 'default');
-}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/Exception/ContainerException.php b/src/Aviat/Ion/Di/Exception/ContainerException.php
deleted file mode 100644
index 0f82e9e6..00000000
--- a/src/Aviat/Ion/Di/Exception/ContainerException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di\Exception;
-
-/**
- * Generic exception for Di Container
- */
-class ContainerException extends \Exception implements \Interop\Container\Exception\ContainerException {
-
-}
-// End of ContainerException.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/Exception/NotFoundException.php b/src/Aviat/Ion/Di/Exception/NotFoundException.php
deleted file mode 100644
index 5374da78..00000000
--- a/src/Aviat/Ion/Di/Exception/NotFoundException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Di\Exception;
-
-/**
- * Exception for Di Container when trying to access a
- * key that doesn't exist in the container
- */
-class NotFoundException extends ContainerException implements \Interop\Container\Exception\NotFoundException {
-
-}
-// End of NotFoundException.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Enum.php b/src/Aviat/Ion/Enum.php
deleted file mode 100644
index 5c69179e..00000000
--- a/src/Aviat/Ion/Enum.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use ReflectionClass;
-
-/**
- * Class emulating an enumeration type
- *
- * @method bool isValid(mixed $key)
- * @method array getConstList()
- */
-abstract class Enum {
-
-	use StaticInstance;
-
-	/**
-	 * Return the list of constant values for the Enum
-	 *
-	 * @return array
-	 */
-	protected function getConstList()
-	{
-		$reflect = new ReflectionClass($this);
-		return $reflect->getConstants();
-	}
-
-	/**
-	 * Verify that a constant value is valid
-	 * @param  mixed  $key
-	 * @return boolean
-	 */
-	protected function isValid($key)
-	{
-		$values = array_values($this->getConstList());
-		return in_array($key, $values);
-	}
-}
-// End of Enum.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Exception/ConfigException.php b/src/Aviat/Ion/Exception/ConfigException.php
deleted file mode 100644
index ea1d21c3..00000000
--- a/src/Aviat/Ion/Exception/ConfigException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package	 Ion
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license	 MIT
- */
-
-namespace Aviat\Ion\Exception;
-
-/**
- * Exception for bad configuration
- */
-class ConfigException extends \InvalidArgumentException {
-
-}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Friend.php b/src/Aviat/Ion/Friend.php
deleted file mode 100644
index 1761cd58..00000000
--- a/src/Aviat/Ion/Friend.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionProperty;
-use InvalidArgumentException;
-use BadMethodCallException;
-
-/**
- * Friend class for testing
- */
-class Friend {
-
-	/**
-	 * Object to create a friend of
-	 * @var object
-	 */
-	private $_friend_;
-
-	/**
-	 * Reflection class of the object
-	 * @var object
-	 */
-	private $_reflect_;
-
-	/**
-	 * Create a friend object
-	 *
-	 * @param object $obj
-	 */
-	public function __construct($obj)
-	{
-		if ( ! is_object($obj))
-		{
-			throw new InvalidArgumentException("Friend must be an object");
-		}
-
-		$this->_friend_ = $obj;
-		$this->_reflect_ = new ReflectionClass($obj);
-	}
-
-	/**
-	 * Retrieve a friend's property
-	 *
-	 * @param  string $key
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if ($this->_reflect_->hasProperty($key))
-		{
-			$property = $this->_get_property($key);
-			return $property->getValue($this->_friend_);
-		}
-
-		return NULL;
-	}
-
-	/**
-	 * Set a friend's property
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @return void
-	 */
-	public function __set($key, $value)
-	{
-		if ($this->_reflect_->hasProperty($key))
-		{
-			$property = $this->_get_property($key);
-			$property->setValue($this->_friend_, $value);
-		}
-	}
-
-	/**
-	 * Calls a protected or private method on the friend
-	 *
-	 * @param  string $method
-	 * @param  array $args
-	 * @return mixed
-	 */
-	public function __call($method, $args)
-	{
-		if ( ! $this->_reflect_->hasMethod($method))
-		{
-			throw new BadMethodCallException("Method '{$method}' does not exist");
-		}
-
-		$friendMethod = new ReflectionMethod($this->_friend_, $method);
-		$friendMethod->setAccessible(TRUE);
-		return $friendMethod->invokeArgs($this->_friend_, $args);
-	}
-
-	/**
-	 * Iterates over parent classes to get a ReflectionProperty
-	 *
-	 * @codeCoverageIgnore
-	 * @param  string $name
-	 * @return ReflectionProperty|null
-	 */
-	private function _get_property($name)
-	{
-		try
-		{
-			$property = $this->_reflect_->getProperty($name);
-			$property->setAccessible(TRUE);
-			return $property;
-		}
-		// Return NULL on any exception, so no further logic needed
-		// in the catch block
-		catch (\Exception $e)
-		{
-			return NULL;
-		}
-	}
-}
-// End of Friend.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Json.php b/src/Aviat/Ion/Json.php
deleted file mode 100644
index b1581ecc..00000000
--- a/src/Aviat/Ion/Json.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use Aviat\Ion\Type\StringType;
-
-/**
- * Helper class for json convenience methods
- */
-class Json {
-
-	/**
-	 * Encode data in json format
-	 *
-	 * @param mixed $data
-	 * @param int $options
-	 * @param int $depth
-	 * @return string
-	 */
-	public static function encode($data, $options = 0, $depth = 512)
-	{
-		$json = json_encode($data, $options, $depth);
-		self::check_json_error();
-		return $json;
-	}
-
-	/**
-	 * Encode data in json format and save to a file
-	 *
-	 * @param string $filename
-	 * @param mixed $data
-	 * @param int $json_options - Options to pass to json_encode
-	 * @param int $file_options - Options to pass to file_get_contents
-	 * @return int
-	 */
-	public static function encodeFile($filename, $data, $json_options = 0, $file_options = 0)
-	{
-		$json = self::encode($data, $json_options);
-		return file_put_contents($filename, $json, $file_options);
-	}
-
-	/**
-	 * Decode data from json
-	 *
-	 * @param string $json
-	 * @param bool $assoc
-	 * @param int $depth
-	 * @param int $options
-	 * @return mixed
-	 */
-	public static function decode($json, $assoc = TRUE, $depth = 512, $options = 0)
-	{
-		// Don't try to decode null
-		if (empty($json))
-		{
-			return NULL;
-		}
-
-		// cast json to string so that streams from guzzle are correctly decoded
-		$data = json_decode((string) $json, $assoc, $depth, $options);
-
-		self::check_json_error();
-		return $data;
-	}
-
-	/**
-	 * Decode json data loaded from the passed filename
-	 *
-	 * @param string $filename
-	 * @param bool $assoc
- 	 * @param int $depth
- 	 * @param int $options
-	 * @return mixed
-	 */
-	public static function decodeFile($filename, $assoc = TRUE, $depth = 512, $options = 0)
-	{
-		$json = file_get_contents($filename);
-		return self::decode($json, $assoc, $depth, $options);
-	}
-
-	/**
-	 * Determines whether a string is valid json
-	 *
-	 * @param  string  $string
-	 * @return boolean
-	 */
-	public static function isJson($string)
-	{
-		return StringType::create($string)->isJson();
-	}
-
-	/**
-	 * Call the json error functions to check for errors encoding/decoding
-	 *
-	 * @throws JsonException
-	 */
-	protected static function check_json_error()
-	{
-		$constant_map = [
-			JSON_ERROR_NONE => 'JSON_ERROR_NONE',
-			JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH',
-			JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH',
-			JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR',
-			JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX',
-			JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8',
-			JSON_ERROR_RECURSION => 'JSON_ERROR_RECURSION',
-			JSON_ERROR_INF_OR_NAN => 'JSON_ERROR_INF_OR_NAN',
-			JSON_ERROR_UNSUPPORTED_TYPE => 'JSON_ERROR_UNSUPPORTED_TYPE'
-		];
-
-		$error = json_last_error();
-		$message = json_last_error_msg();
-
-		if (\JSON_ERROR_NONE !== $error)
-		{
-			throw new JsonException("{$constant_map[$error]} - {$message}", $error);
-		}
-	}
-}
-// End of JSON.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/JsonException.php b/src/Aviat/Ion/JsonException.php
deleted file mode 100644
index 5be77c4f..00000000
--- a/src/Aviat/Ion/JsonException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-class JsonException extends \InvalidArgumentException {
-
-}
-// End of JsonException.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Model.php b/src/Aviat/Ion/Model.php
deleted file mode 100644
index ac723592..00000000
--- a/src/Aviat/Ion/Model.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-/**
- * Common base for all Models
- */
-class Model {
-	use StringWrapper;
-}
-// End of Model.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Model/DB.php b/src/Aviat/Ion/Model/DB.php
deleted file mode 100644
index 3043c33a..00000000
--- a/src/Aviat/Ion/Model/DB.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Model;
-
-use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Model as BaseModel;
-
-/**
- * Base model for database interaction
- */
-class DB extends BaseModel {
-	/**
-	 * The query builder object
-	 * @var object $db
-	 */
-	protected $db;
-
-	/**
-	 * The config manager
-	 * @var ConfigInterface
-	 */
-	protected $config;
-
-	/**
-	 * The database connection information array
-	 * @var array $db_config
-	 */
-	protected $db_config;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ConfigInterface $config
-	 */
-	public function __construct(ConfigInterface $config)
-	{
-		$this->config = $config;
-		$this->db_config = (array)$config->get('database');
-	}
-}
-// End of DB.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/StaticInstance.php b/src/Aviat/Ion/StaticInstance.php
deleted file mode 100644
index 7a67b931..00000000
--- a/src/Aviat/Ion/StaticInstance.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-/**
- * Trait to allow calling a method statically,
- * as well as with an instance
- */
-trait StaticInstance {
-	/**
-	 * Instance for 'faking' static methods
-	 *
-	 * @var object
-	 */
-	private static $instance = [];
-
-	/**
-	 * Call methods protected to allow for
-	 * static and instance calling
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $method
-	 * @param array $args
-	 * @retun mixed
-	 */
-	public function __call($method, $args)
-	{
-		if (method_exists($this, $method))
-		{
-			return call_user_func_array([$this, $method], $args);
-		}
-	}
-
-	/**
-	 * Call non-static methods statically, so that
-	 * an instance of the class isn't required
-	 *
-	 * @param string $method
-	 * @param array $args
-	 * @return mixed
-	 */
-	public static function __callStatic($method, $args)
-	{
-		$class = get_called_class();
-		if ( ! array_key_exists($class, self::$instance))
-		{
-			self::$instance[$class] = new $class();
-		}
-
-		return call_user_func_array([self::$instance[$class], $method], $args);
-	}
-}
-// End of StaticInstance.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/StringWrapper.php b/src/Aviat/Ion/StringWrapper.php
deleted file mode 100644
index 568dfd99..00000000
--- a/src/Aviat/Ion/StringWrapper.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use Aviat\Ion\Type\StringType;
-
-/**
- * Trait to add convenience method for creating StringType objects
- */
-trait StringWrapper {
-
-	/**
-	 * Wrap the String in the Stringy class
-	 *
-	 * @param string $str
-	 * @return StringType
-	 */
-	public function string($str)
-	{
-		return StringType::create($str);
-	}
-}
-// End of StringWrapper.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Transformer/AbstractTransformer.php b/src/Aviat/Ion/Transformer/AbstractTransformer.php
deleted file mode 100644
index f0bb1b4b..00000000
--- a/src/Aviat/Ion/Transformer/AbstractTransformer.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Transformer;
-
-/**
- * Base class for data trasformation
- */
-abstract class AbstractTransformer implements TransformerInterface {
-
-	use \Aviat\Ion\StringWrapper;
-
-	/**
-	 * Mutate the data structure
-	 *
-	 * @param array|object $item
-	 * @return mixed
-	 */
-	abstract public function transform($item);
-
-	/**
-	 * Transform a set of structures
-	 *
-	 * @param  array|object $collection
-	 * @return array
-	 */
-	public function transform_collection($collection)
-	{
-		$list = (array)$collection;
-		return array_map([$this, 'transform'], $list);
-	}
-}
-// End of AbstractTransformer.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Transformer/TransformerInterface.php b/src/Aviat/Ion/Transformer/TransformerInterface.php
deleted file mode 100644
index 25170386..00000000
--- a/src/Aviat/Ion/Transformer/TransformerInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Transformer;
-
-/**
- * Interface for data transformation classes
- */
-interface TransformerInterface {
-
-	/**
-	 * Mutate the data structure
-	 *
-	 * @param array|object $item
-	 * @return mixed
-	 */
-	public function transform($item);
-}
\ No newline at end of file
diff --git a/src/Aviat/Ion/Type/ArrayType.php b/src/Aviat/Ion/Type/ArrayType.php
deleted file mode 100644
index c3d78f8e..00000000
--- a/src/Aviat/Ion/Type/ArrayType.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Type;
-
-/**
- * Wrapper class for native array methods for convenience
- *
- * @method array chunk(int $size, bool $preserve_keys = FALSE)
- * @method array pluck(mixed $column_key, mixed $index_key = NULL)
- * @method array filter(callable $callback = NULL, int $flag = 0)
- */
-class ArrayType {
-
-	/**
-	 * The current array
-	 *
-	 * @var array
-	 */
-	protected $arr;
-
-	/**
-	 * Map generated methods to their native implementations
-	 *
-	 * @var array
-	 */
-	protected $native_methods = [
-		'chunk' => 'array_chunk',
-		'pluck' => 'array_column',
-		'key_diff' => 'array_diff_key',
-		'diff' => 'array_diff',
-		'filter' => 'array_filter',
-		'flip' => 'array_flip',
-		'intersect' => 'array_intersect',
-		'keys' => 'array_keys',
-		'merge' => 'array_merge',
-		'pad' => 'array_pad',
-		'product' => 'array_product',
-		'random' => 'array_rand',
-		'reduce' => 'array_reduce',
-		'reverse' => 'array_reverse',
-		'sum' => 'array_sum',
-		'unique' => 'array_unique',
-		'values' => 'array_values',
-	];
-
-	/**
-	 * Native methods that modify the passed in array
-	 *
-	 * @var array
-	 */
-	protected $native_in_place_methods = [
-		'shuffle' => 'shuffle',
-		'shift' => 'array_shift',
-		'unshift' => 'array_unshift',
-		'push' => 'array_push',
-		'pop' => 'array_pop',
-	];
-
-	/**
-	 * Create an ArrayType wrapper class
-	 *
-	 * @param array $arr
-	 */
-	public function __construct(array &$arr)
-	{
-		$this->arr =& $arr;
-	}
-
-	/**
-	 * Call one of the dynamically created methods
-	 *
-	 * @param string $method
-	 * @param array $args
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	public function __call($method, $args)
-	{
-		// Simple mapping for the majority of methods
-		if (array_key_exists($method, $this->native_methods))
-		{
-			$func = $this->native_methods[$method];
-			// Set the current array as the first argument of the method
-			array_unshift($args, $this->arr);
-			return call_user_func_array($func, $args);
-		}
-
-		// Mapping for in-place methods
-		if (array_key_exists($method, $this->native_in_place_methods))
-		{
-			$func = $this->native_in_place_methods[$method];
-			$func($this->arr);
-			return $this->arr;
-		}
-
-		throw new \InvalidArgumentException("Method '{$method}' does not exist");
-	}
-
-	/**
-	 * Does the passed key exist in the current array?
-	 *
-	 * @param string $key
-	 * @return bool
-	 */
-	public function has_key($key)
-	{
-		return array_key_exists($key, $this->arr);
-	}
-
-	/**
-	 * Fill an array with the specified value
-	 *
-	 * @param int $start_index
-	 * @param int $num
-	 * @param mixed $value
-	 * @return array
-	 */
-	public function fill($start_index, $num, $value)
-	{
-		return array_fill($start_index, $num, $value);
-	}
-
-	/**
-	 * Call a callback on each item of the array
-	 *
-	 * @param callable $callback
-	 * @return array
-	 */
-	public function map(callable $callback)
-	{
-		return array_map($callback, $this->arr);
-	}
-
-	/**
-	 * Find an array key by its associated value
-	 *
-	 * @param mixed $value
-	 * @param bool $strict
-	 * @return false|integer|string
-	 */
-	public function search($value, $strict = FALSE)
-	{
-		return array_search($value, $this->arr, $strict);
-	}
-
-	/**
-	 * Determine if the array has the passed value
-	 *
-	 * @param mixed $value
-	 * @param bool $strict
-	 * @return bool
-	 */
-	public function has($value, $strict = FALSE)
-	{
-		return in_array($value, $this->arr, $strict);
-	}
-
-	/**
-	 * Return the array, or a key
-	 *
-	 * @param string|integer|null $key
-	 * @return mixed
-	 */
-	public function &get($key = NULL)
-	{
-		$value = NULL;
-		if (is_null($key))
-		{
-			$value =& $this->arr;
-		}
-		else
-		{
-			if ($this->has_key($key))
-			{
-				$value =& $this->arr[$key];
-			}
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Set a key on the array
-	 *
-	 * @param mixed $key
-	 * @param mixed $value
-	 * @return ArrayType
-	 */
-	public function set($key, $value)
-	{
-		$this->arr[$key] = $value;
-		return $this;
-	}
-
-	/**
-	 * Return a reference to the value of an arbitrary key on the array
-	 *
-	 * @param  array $key
-	 * @return mixed
-	 */
-	public function &get_deep_key(array $key)
-	{
-		$pos =& $this->arr;
-
-		foreach ($key as $level)
-		{
-			if (empty($pos) || ! is_array($pos))
-			{
-				// Directly returning a NULL value here will
-				// result in a reference error. This isn't
-				// excess code, just what's required for this
-				// unique situation.
-				$pos = NULL;
-				return $pos;
-			}
-			$pos =& $pos[$level];
-		}
-
-		return $pos;
-	}
-
-	/**
-	 * Sets the value of an arbitrarily deep key in the array
-	 * and returns the modified array
-	 *
-	 * @param array  $key
-	 * @param mixed $value
-	 * @return array
-	 */
-	public function set_deep_key(array $key, $value)
-	{
-		$pos =& $this->arr;
-
-		// Iterate through the levels of the array,
-		// create the levels if they don't exist
-		foreach ($key as $level)
-		{
-			if ( ! is_array($pos) && empty($pos))
-			{
-				$pos = [];
-				$pos[$level] = [];
-			}
-			$pos =& $pos[$level];
-		}
-
-		$pos = $value;
-
-		return $this->arr;
-	}
-}
-// End of ArrayType.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Type/StringType.php b/src/Aviat/Ion/Type/StringType.php
deleted file mode 100644
index 02c8cd81..00000000
--- a/src/Aviat/Ion/Type/StringType.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\Type;
-
-use Stringy\Stringy;
-
-/**
- * Wrapper around Stringy
- */
-class StringType extends Stringy {
-
-}
-// End of StringType.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/View.php b/src/Aviat/Ion/View.php
deleted file mode 100644
index daaece4d..00000000
--- a/src/Aviat/Ion/View.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion;
-
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Type\StringType;
-
-/**
- * Base view response class
- */
-abstract class View {
-
-	use Di\ContainerAware;
-	use StringWrapper;
-
-	/**
-	 * HTTP response Object
-	 *
-	 * @var Zend\Diactoros\Response
-	 */
-	public $response;
-
-	/**
-	 * Redirect response object
-	 *
-	 * @var Zend\Diactoros\RedirectResponse
-	 */
-	protected $redirectResponse;
-
-	/**
-	 * Response mime type
-	 *
-	 * @var string
-	 */
-	protected $contentType = '';
-
-	/**
-	 * String of response to be output
-	 *
-	 * @var StringType
-	 */
-	protected $output;
-
-	/**
-	 * If the view has sent output via
-	 * __toString or send method
-	 *
-	 * @var boolean
-	 */
-	protected $hasRendered = FALSE;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		$this->setContainer($container);
-		$this->response = $container->get('response');
-		$this->redirectResponse = NULL;
-	}
-
-	/**
-	 * Send output to client
-	 */
-	public function __destruct()
-	{
-		if ( ! $this->hasRendered)
-		{
-			$this->send();
-		}
-	}
-
-	/**
-	 * Return rendered output
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		$this->hasRendered = TRUE;
-		return $this->getOutput();
-	}
-
-	/**
-	 * Set the output string
-	 *
-	 * @param string $string
-	 * @return View
-	 */
-	public function setOutput($string)
-	{
-		$this->response->getBody()->write($string);
-
-		return $this;
-	}
-
-	/**
-	 * Append additional output
-	 *
-	 * @param string $string
-	 * @return View
-	 */
-	public function appendOutput($string)
-	{
-		return $this->setOutput($string);
-	}
-
-	/**
-	 * Get the current output string
-	 *
-	 * @return string
-	 */
-	public function getOutput()
-	{
-		return $this->response->getBody()->__toString();
-	}
-
-	/**
-	 * Send output to client
-	 *
-	 * @return void
-	 */
-	abstract public function send();
-}
-// End of View.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/View/HtmlView.php b/src/Aviat/Ion/View/HtmlView.php
deleted file mode 100644
index d73cad04..00000000
--- a/src/Aviat/Ion/View/HtmlView.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\View;
-
-use Aviat\Ion\Di\ContainerInterface;
-
-/**
- * View class for outputting HTML
- */
-class HtmlView extends HttpView {
-
-	/**
-	 * HTML generator/escaper helper
-	 *
-	 * @var Aura\Html\HelperLocator
-	 */
-	protected $helper;
-
-	/**
-	 * Create the Html View
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		parent::__construct($container);
-		$this->helper = $container->get('html-helper');
-	}
-
-	/**
-	 * Response mime type
-	 *
-	 * @var string
-	 */
-	protected $contentType = 'text/html';
-
-	/**
-	 * Render a basic html Template
-	 *
-	 * @param string $path
-	 * @param array $data
-	 * @return string
-	 */
-	public function render_template($path, $data)
-	{
-		$data['helper'] = $this->helper;
-		$data['escape'] = $this->helper->escape();
-		$data['container'] = $this->container;
-
-		ob_start();
-		extract($data);
-		include_once $path;
-		$buffer = ob_get_contents();
-		ob_end_clean();
-
-		return $buffer;
-	}
-}
-// End of HtmlView.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/View/HttpView.php b/src/Aviat/Ion/View/HttpView.php
deleted file mode 100644
index 7ff97f01..00000000
--- a/src/Aviat/Ion/View/HttpView.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\View;
-
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Response\SapiEmitter;
-use Aviat\Ion\View as BaseView;
-
-/**
- * Base view class for Http output
- */
-class HttpView extends BaseView {
-
-	/**
-	 * Do a redirect
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $url
-	 * @param int $code
-	 * @return void
-	 */
-	public function redirect($url, $code)
-	{
-		ob_start();
-		$message = $this->response->getReasonPhrase($code);
-		$this->setStatusCode($code);
-		$this->response->withHeader('Location', $url);
-
-		if (PHP_SAPI !== 'cli')
-		{
-			header("HTTP/1.1 ${code} ${message}");
-			header("Location: {$url}");
-		}
-
-		$this->hasRendered = TRUE;
-		ob_end_clean();
-	}
-
-	/**
-	 * Set the status code of the request
-	 *
-	 * @param int $code
-	 * @return HttpView
-	 */
-	public function setStatusCode($code)
-	{
-		$this->response = $this->response->withStatus($code)
-			->withProtocolVersion('1.1');
-		return $this;
-	}
-
-	/**
-	 * Send output to client
-	 *
-	 * @return void
-	 */
-	public function send()
-	{
-		$this->hasRendered = TRUE;
-		$this->output();
-	}
-
-	/**
-	 * Send the appropriate response
-	 *
-	 * @codeCoverageIgnore
-	 * @return void
-	 */
-	protected function output()
-	{
-		$this->response->withHeader('Content-type', "{$this->contentType};charset=utf-8")
-			->withHeader('Content-Security-Policy', "script-src 'self'")
-			->withHeader('X-Content-Type-Options', 'nosniff')
-			->withHeader('X-XSS-Protection', '1;mode=block')
-			->withHeader('X-Frame-Options', 'SAMEORIGIN');
-
-		$sender = new SapiEmitter($this->response);
-		$sender->emit($this->response);
-	}
-
-}
\ No newline at end of file
diff --git a/src/Aviat/Ion/View/JsonView.php b/src/Aviat/Ion/View/JsonView.php
deleted file mode 100644
index a65dd558..00000000
--- a/src/Aviat/Ion/View/JsonView.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Ion
- *
- * Building blocks for web development
- *
- * @package     Ion
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @license     MIT
- */
-
-namespace Aviat\Ion\View;
-
-use Aviat\Ion\Json;
-use Aviat\Ion\View\HttpView;
-use Aviat\Ion\View as BaseView;
-
-/**
- * View class to serialize Json
- */
-class JsonView extends HttpView {
-
-	/**
-	 * Response mime type
-	 *
-	 * @var string
-	 */
-	protected $contentType = 'application/json';
-
-	/**
-	 * Set the output string
-	 *
-	 * @param mixed $string
-	 * @return BaseView
-	 */
-	public function setOutput($string)
-	{
-		if ( ! is_string($string))
-		{
-			$string = Json::encode($string);
-		}
-
-		return parent::setOutput($string);
-	}
-}
-// End of JsonView.php
\ No newline at end of file
diff --git a/tests/Ion/BaseModelTest.php b/tests/Ion/BaseModelTest.php
deleted file mode 100644
index edc2a2f4..00000000
--- a/tests/Ion/BaseModelTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-use Aviat\Ion\Model as BaseModel;
-
-class BaseModelTest extends AnimeClient_TestCase {
-
-	public function testBaseModelSanity()
-	{
-		$baseModel = new BaseModel();
-		$this->assertTrue(is_object($baseModel));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/CacheManagerTest.php b/tests/Ion/Cache/CacheManagerTest.php
deleted file mode 100644
index 7d88dcc1..00000000
--- a/tests/Ion/Cache/CacheManagerTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-use Aviat\Ion\Friend;
-use Aviat\Ion\Cache\CacheManager;
-
-class CacheManagerText extends AnimeClient_TestCase {
-
-	protected $cachedTime;
-
-	public function __call($name, $args)
-	{
-		return call_user_func_array($name, $args);
-	}
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->cache = new CacheManager($this->container->get('config'), $this->container);
-		$this->friend = new Friend($this->cache);
-	}
-
-	public function testGet()
-	{
-		$this->cachedTime = $this->cache->get($this, 'time');
-		$this->assertEquals($this->cache->get($this, 'time'), $this->cachedTime);
-	}
-
-	public function testGetFresh()
-	{
-		$this->assertNotEquals($this->cache->getFresh($this, 'time'), $this->cachedTime);
-	}
-
-	public function testPurge()
-	{
-		$this->cachedTime = $this->cache->get($this, 'time');
-		$key = $this->friend->generateHashForMethod($this, 'time', []);
-		$this->cache->purge();
-		$this->assertEmpty($this->friend->driver->get($key));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/CacheDriverBase.php b/tests/Ion/Cache/Driver/CacheDriverBase.php
deleted file mode 100644
index d1e333aa..00000000
--- a/tests/Ion/Cache/Driver/CacheDriverBase.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-trait CacheDriverBase {
-	
-	protected $foo = [
-		'bar' => [
-			'baz' => 'foobar'
-		]
-	];
-	
-	protected $bar = 'secondvalue';
-	
-	public function testHasCacheDriver()
-	{
-		$this->assertTrue((bool) $this->driver);
-	}
-	
-	public function testDriverGetSet()
-	{
-		$this->driver->set('foo', $this->foo);
-		$this->driver->set('bar', 'baz');
-		$this->assertEquals($this->driver->get('foo'), $this->foo);
-		$this->assertEquals($this->driver->get('bar'), 'baz');
-	}
-	
-	public function testInvalidate()
-	{
-		$this->driver->set('foo', $this->foo);
-		$this->driver->invalidate('foo');
-		$this->assertEmpty($this->driver->get('foo'));
-	}
-	
-	public function testInvalidateAll()
-	{
-		$this->driver->set('foo', $this->foo);
-		$this->driver->set('bar', $this->bar);
-		
-		$this->driver->invalidateAll();
-		
-		$this->assertEmpty($this->driver->get('foo'));
-		$this->assertEmpty($this->driver->get('bar'));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/NullDriverTest.php b/tests/Ion/Cache/Driver/NullDriverTest.php
deleted file mode 100644
index df6606d4..00000000
--- a/tests/Ion/Cache/Driver/NullDriverTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require_once('CacheDriverBase.php');
-
-use Aviat\Ion\Cache\Driver\NullDriver;
-
-class CacheNullDriverTest extends AnimeClient_TestCase {
-	use CacheDriverBase;
-
-	protected $driver;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->driver = new NullDriver($this->container->get('config'));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/RedisDriver2Test.php b/tests/Ion/Cache/Driver/RedisDriver2Test.php
deleted file mode 100644
index 62f5482d..00000000
--- a/tests/Ion/Cache/Driver/RedisDriver2Test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-require_once('CacheDriverBase.php');
-
-use Aviat\Ion\Config;
-use Aviat\Ion\Cache\Driver\RedisDriver;
-
-class CacheRedisDriverTestTwo extends AnimeClient_TestCase {
-	use CacheDriverBase;
-
-	protected $driver;
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		// Setup config with port and password
-		$config =  new Config([
-			'redis' => [
-				'host' => (array_key_exists('REDIS_HOST', $_ENV)) ? $_ENV['REDIS_HOST'] : 'localhost',
-				'port' => 6379,
-				'password' => '',
-				'database' => 13,
-			]
-		]);
-		$this->driver = new RedisDriver($config);
-	}
-
-	public function tearDown()
-	{
-		parent::tearDown();
-
-		if ( ! is_null($this->driver))
-		{
-			$this->driver->__destruct();
-		}
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/RedisDriverTest.php b/tests/Ion/Cache/Driver/RedisDriverTest.php
deleted file mode 100644
index ed1209f5..00000000
--- a/tests/Ion/Cache/Driver/RedisDriverTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-require_once('CacheDriverBase.php');
-
-use Aviat\Ion\Cache\Driver\RedisDriver;
-
-class CacheRedisDriverTest extends AnimeClient_TestCase {
-	use CacheDriverBase;
-	
-	protected $driver;
-	
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->driver = new RedisDriver($this->container->get('config'));
-	}
-
-	public function tearDown()
-	{
-		parent::tearDown();
-
-		if ( ! is_null($this->driver))
-		{
-			$this->driver->__destruct();
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Cache/Driver/SQLDriverTest.php b/tests/Ion/Cache/Driver/SQLDriverTest.php
deleted file mode 100644
index 4cd98659..00000000
--- a/tests/Ion/Cache/Driver/SQLDriverTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once('CacheDriverBase.php');
-
-use Aviat\Ion\Friend;
-use Aviat\Ion\Cache\Driver\SQLDriver;
-
-class CacheSQLDriverTest extends AnimeClient_TestCase {
-	use CacheDriverBase;
-	
-	protected $driver;
-	
-	public function setUp()
-	{
-		parent::setUp();
-		$this->driver = new SQLDriver($this->container->get('config'));
-		$friend = new Friend($this->driver);
-		$friend->db->query('CREATE TABLE IF NOT EXISTS "cache" ("key" TEXT NULL, "value" TEXT NULL, PRIMARY KEY ("key"))');
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/ConfigTest.php b/tests/Ion/ConfigTest.php
deleted file mode 100644
index ca716cf8..00000000
--- a/tests/Ion/ConfigTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-use Aviat\Ion\Config;
-
-class ConfigTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		$this->config = new Config([
-			'foo' => 'bar',
-			'asset_path' => '/assets',
-			'bar' => 'baz'
-		]);
-	}
-
-	public function testConfigGet()
-	{
-		$this->assertEquals('bar', $this->config->get('foo'));
-		$this->assertEquals('baz', $this->config->get('bar'));
-		$this->assertNull($this->config->get('baz'));
-		$this->assertNull($this->config->get(['apple', 'sauce', 'is']));
-	}
-
-	public function testConfigSet()
-	{
-		$ret = $this->config->set('foo', 'foobar');
-		$this->assertInstanceOf('Aviat\Ion\Config', $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', $this->config->get(['apple', 'sauce', 'is']), "Array argument get for config failed.");
-
-	}
-
-	public function testConfigBadSet()
-	{
-		$this->setExpectedException('InvalidArgumentException');
-		$this->config->set(NULL, FALSE);
-	}
-
-	public function dataConfigDelete()
-	{
-		return [
-			'top level delete' => [
-				'key' => 'apple',
-				'assertKeys' => [
-					[
-						'path' => ['apple', 'sauce', 'is'],
-						'expected' => NULL
-					],
-					[
-						'path' => ['apple', 'sauce'],
-						'expected' => NULL
-					],
-					[
-						'path' => 'apple',
-						'expected' => NULL
-					]
-				]
-			],
-			'mid level delete' => [
-				'key' => ['apple', 'sauce'],
-				'assertKeys' => [
-					[
-						'path' => ['apple', 'sauce', 'is'],
-						'expected' => NULL
-					],
-					[
-						'path' => ['apple', 'sauce'],
-						'expected' => NULL
-					],
-					[
-						'path' => 'apple',
-						'expected' => [
-							'sauce' => NULL
-						]
-					]
-				]
-			],
-			'deep delete' => [
-				'key' => ['apple', 'sauce', 'is'],
-				'assertKeys' => [
-					[
-						'path' => ['apple', 'sauce', 'is'],
-						'expected' => NULL
-					],
-					[
-						'path' => ['apple', 'sauce'],
-						'expected' => [
-							'is' => NULL
-						]
-					]
-				]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataConfigDelete
-	 */
-	public function testConfigDelete($key, $assertKeys)
-	{
-		$config = new Config([]);
-		$config->set(['apple', 'sauce', 'is'], 'great');
-		$config->delete($key);
-
-		foreach($assertKeys as $pair)
-		{
-			$this->assertEquals($pair['expected'], $config->get($pair['path']));
-		}
-	}
-
-	public function testGetNonExistentConfigItem()
-	{
-		$this->assertNull($this->config->get('foobar'));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Di/ContainerAwareTest.php b/tests/Ion/Di/ContainerAwareTest.php
deleted file mode 100644
index dd506721..00000000
--- a/tests/Ion/Di/ContainerAwareTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-use Aviat\Ion\Di\Container;
-use Aviat\Ion\Di\ContainerAware;
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Di\Exception\ContainerException;
-
-class Aware {
-	use ContainerAware;
-	
-	public function __construct(ContainerInterface $container)
-	{
-		$this->container = $container;
-	}
-}
-
-
-class ContainerAwareTest extends AnimeClient_TestCase {
-	
-	public function setUp()
-	{
-		$this->container = new Container();
-		$this->aware = new Aware($this->container);
-	}
-	
-	public function testContainerAwareTrait()
-	{
-		// The container was set in setup
-		// check that the get method returns the same
-		$this->assertSame($this->container, $this->aware->getContainer());
-		
-		$container2 = new Container([
-			'foo' => 'bar',
-			'baz' => 'foobar'
-		]);
-		$this->aware->setContainer($container2);
-		$this->assertSame($container2, $this->aware->getContainer());
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Di/ContainerTest.php b/tests/Ion/Di/ContainerTest.php
deleted file mode 100644
index bbf22627..00000000
--- a/tests/Ion/Di/ContainerTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-use Aviat\Ion\Di\Container;
-use Aviat\Ion\Di\Exception\ContainerException;
-use Monolog\Logger;
-use Monolog\Handler\TestHandler;
-use Monolog\Handler\NullHandler;
-
-
-class ContainerTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		$this->container = new Container();
-	}
-
-	public function dataGetWithException()
-	{
-		return [
-			'Bad index type: number' => [
-				'id' => 42,
-				'exception' => 'Aviat\Ion\Di\Exception\ContainerException',
-				'message' => 'Id must be a string'
-			],
-			'Bad index type: array' => [
-				'id' => [],
-				'exception' => 'Aviat\Ion\Di\Exception\ContainerException',
-				'message' => 'Id must be a string'
-			],
-			'Non-existent id' => [
-				'id' => 'foo',
-				'exception' => 'Aviat\Ion\Di\Exception\NotFoundException',
-				'message' => "Item 'foo' does not exist in container."
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetWithException
-	 */
-	public function testGetWithException($id, $exception, $message)
-	{
-		try
-		{
-			$this->container->get($id);
-		}
-		catch(ContainerException $e)
-		{
-			$this->assertInstanceOf($exception, $e);
-			$this->assertEquals($message, $e->getMessage());
-		}
-	}
-
-	public function testGetSet()
-	{
-		$container = $this->container->set('foo', function() {});
-
-		$this->assertInstanceOf('Aviat\Ion\Di\Container', $container);
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
-		$this->assertTrue(is_callable($container->get('foo')));
-	}
-
-	public function testLoggerMethods()
-	{
-		// Does the container have the default logger?
-		$this->assertFalse($this->container->hasLogger());
-		$this->assertFalse($this->container->hasLogger('default'));
-
-		$logger1 = new Logger('default');
-		$logger2 = new Logger('testing');
-		$logger1->pushHandler(new NullHandler());
-		$logger2->pushHandler(new TestHandler());
-
-		// Set the logger channels
-		$container = $this->container->setLogger($logger1);
-		$container2 = $this->container->setLogger($logger2, 'test');
-
-		$this->assertInstanceOf('Aviat\Ion\Di\ContainerInterface', $container);
-		$this->assertInstanceOf('Aviat\Ion\Di\Container', $container2);
-
-		$this->assertEquals($logger1, $this->container->getLogger('default'));
-		$this->assertEquals($logger2, $this->container->getLogger('test'));
-		$this->assertNull($this->container->getLogger('foo'));
-
-		$this->assertTrue($this->container->hasLogger());
-		$this->assertTrue($this->container->hasLogger('default'));
-		$this->assertTrue($this->container->hasLogger('test'));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/EnumTest.php b/tests/Ion/EnumTest.php
deleted file mode 100644
index 5a766b19..00000000
--- a/tests/Ion/EnumTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-use Aviat\Ion\Enum;
-
-class EnumTest extends AnimeClient_TestCase {
-
-	protected $expectedConstList = [
-		'FOO' => 'bar',
-		'BAR' => 'foo',
-		'FOOBAR' => 'baz'
-	];
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->enum = new TestEnum();
-	}
-
-	public function testStaticGetConstList()
-	{
-		$actual = TestEnum::getConstList();
-		$this->assertEquals($this->expectedConstList, $actual);
-	}
-
-	public function testGetConstList()
-	{
-		$actual = $this->enum->getConstList();
-		$this->assertEquals($this->expectedConstList, $actual);
-	}
-
-	public function dataIsValid()
-	{
-		return [
-			'Valid' => [
-				'value' => 'baz',
-				'expected' => TRUE,
-				'static' => FALSE
-			],
-			'ValidStatic' => [
-				'value' => 'baz',
-				'expected' => TRUE,
-				'static' => TRUE
-			],
-			'Invalid' => [
-				'value' => 'foobar',
-				'expected' => FALSE,
-				'static' => FALSE
-			],
-			'InvalidStatic' => [
-				'value' => 'foobar',
-				'expected' => FALSE,
-				'static' => TRUE
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataIsValid
-	 */
-	public function testIsValid($value, $expected, $static)
-	{
-		$actual = ($static)
-			? TestEnum::isValid($value)
-			: $this->enum->isValid($value);
-
-		$this->assertEquals($expected, $actual);
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/FriendTest.php b/tests/Ion/FriendTest.php
deleted file mode 100644
index 1569eb42..00000000
--- a/tests/Ion/FriendTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-use Aviat\Ion\Friend;
-
-class FriendTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$obj = new FriendTestClass();
-		$this->friend = new Friend($obj);
-	}
-
-	public function testPrivateMethod()
-	{
-		$actual = $this->friend->getPrivate();
-		$this->assertEquals(23, $actual);
-	}
-
-	public function testProtectedMethod()
-	{
-		$actual = $this->friend->getProtected();
-		$this->assertEquals(4, $actual);
-	}
-
-	public function testGet()
-	{
-		$this->assertEquals(356, $this->friend->protected);
-		$this->assertNull($this->friend->foo); // Return NULL for non-existend properties
-		$this->assertEquals(47, $this->friend->parentProtected);
-		$this->assertEquals(84, $this->friend->grandParentProtected);
-		$this->assertNull($this->friend->parentPrivate); // Can't get a parent's privates
-	}
-
-	public function testSet()
-	{
-		$this->friend->private = 123;
-		$this->assertEquals(123, $this->friend->private);
-
-		$this->friend->foo = 32;
-		$this->assertNull($this->friend->foo);
-	}
-
-	public function testBadInvokation()
-	{
-		$this->setExpectedException('InvalidArgumentException', 'Friend must be an object');
-
-		$friend = new Friend('foo');
-	}
-
-	public function testBadMethod()
-	{
-		$this->setExpectedException('BadMethodCallException', "Method 'foo' does not exist");
-		$this->friend->foo();
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/JsonTest.php b/tests/Ion/JsonTest.php
deleted file mode 100644
index 44cb4bbe..00000000
--- a/tests/Ion/JsonTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-use Aviat\Ion\Json;
-use Aviat\Ion\JsonException;
-
-class JsonTest extends AnimeClient_TestCase {
-
-	public function testEncode()
-	{
-		$data = (object) [
-			'foo' => [1, 2, 3, 4]
-		];
-		$expected = '{"foo":[1,2,3,4]}';
-		$this->assertEquals($expected, Json::encode($data));
-	}
-
-	public function dataEncodeDecode()
-	{
-		return [
-			'set1' => [
-				'data' => [
-					'apple' => [
-						'sauce' => ['foo','bar','baz']
-					]
-				],
-				'expected_size' => 39,
-				'expected_json' => '{"apple":{"sauce":["foo","bar","baz"]}}'
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataEncodeDecode
-	 */
-	public function testEncodeDecodeFile($data, $expected_size, $expected_json)
-	{
-		$target_file = _dir(self::TEST_DATA_DIR, 'json_write.json');
-
-		$actual_size = Json::encodeFile($target_file, $data);
-		$actual_json = file_get_contents($target_file);
-
-		$this->assertTrue(Json::isJson($actual_json));
-		$this->assertEquals($expected_size, $actual_size);
-		$this->assertEquals($expected_json, $actual_json);
-
-		$this->assertEquals($data, Json::decodeFile($target_file));
-
-		unlink($target_file);
-	}
-
-	public function testDecode()
-	{
-		$json = '{"foo":[1,2,3,4]}';
-		$expected = [
-			'foo' => [1, 2, 3, 4]
-		];
-		$this->assertEquals($expected, Json::decode($json));
-		$this->assertEquals((object)$expected, Json::decode($json, false));
-
-		$badJson = '{foo:{1|2}}';
-		$this->setExpectedException(
-			'Aviat\Ion\JsonException',
-			'JSON_ERROR_SYNTAX - Syntax error',
-			JSON_ERROR_SYNTAX
-		);
-		Json::decode($badJson);
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Model/BaseDBModelTest.php b/tests/Ion/Model/BaseDBModelTest.php
deleted file mode 100644
index bdaf1954..00000000
--- a/tests/Ion/Model/BaseDBModelTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-use Aviat\Ion\Model\DB as BaseDBModel;
-
-class BaseDBModelTest extends AnimeClient_TestCase {
-
-	public function testBaseDBModelSanity()
-	{
-		$baseDBModel = new BaseDBModel($this->container->get('config'));
-		$this->assertTrue(is_object($baseDBModel));
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Transformer/AbstractTransformerTest.php b/tests/Ion/Transformer/AbstractTransformerTest.php
deleted file mode 100644
index 246658ac..00000000
--- a/tests/Ion/Transformer/AbstractTransformerTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-class AbstractTransformerTest extends AnimeClient_TestCase {
-	
-	protected $transformer;
-
-
-	public function setUp()
-	{
-		$this->transformer = new TestTransformer();
-	}
-	
-	public function dataTransformCollection()
-	{
-		return [
-			'object' => [
-				'original' => [
-					(object)[
-						['name' => 'Comedy'],
-						['name' => 'Romance'],
-						['name' => 'School'],
-						['name' => 'Harem']
-					],
-					(object)[
-						['name' => 'Action'],
-						['name' => 'Comedy'],
-						['name' => 'Magic'],
-						['name' => 'Fantasy'],
-						['name' => 'Mahou Shoujo']
-					],
-					(object)[
-						['name' => 'Comedy'],
-						['name' => 'Sci-Fi']
-					]
-				],
-				'expected' => [
-					['Comedy', 'Romance', 'School', 'Harem'],
-					['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
-					['Comedy', 'Sci-Fi']
-				]
-			],
-			'array' => [
-				'original' => [
-					[
-						['name' => 'Comedy'],
-						['name' => 'Romance'],
-						['name' => 'School'],
-						['name' => 'Harem']
-					],
-					[
-						['name' => 'Action'],
-						['name' => 'Comedy'],
-						['name' => 'Magic'],
-						['name' => 'Fantasy'],
-						['name' => 'Mahou Shoujo']
-					],
-					[
-						['name' => 'Comedy'],
-						['name' => 'Sci-Fi']
-					]
-				],
-				'expected' => [
-					['Comedy', 'Romance', 'School', 'Harem'],
-					['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo'],
-					['Comedy', 'Sci-Fi']
-				]
-			],
-		];
-	}
-	
-	public function testTransform()
-	{
-		$data = $this->dataTransformCollection();
-		$original = $data['object']['original'][0];
-		$expected = $data['object']['expected'][0];
-		
-		$actual = $this->transformer->transform($original);
-		$this->assertEquals($expected, $actual);
-	}
-
-	/**
-	 * @dataProvider dataTransformCollection
-	 */
-	public function testTransformCollection($original, $expected)
-	{
-		$actual = $this->transformer->transform_collection($original);
-		$this->assertEquals($expected, $actual);
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/Type/ArrayTypeTest.php b/tests/Ion/Type/ArrayTypeTest.php
deleted file mode 100644
index e78315ee..00000000
--- a/tests/Ion/Type/ArrayTypeTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-class ArrayTypeTest extends AnimeClient_TestCase {
-	use Aviat\Ion\ArrayWrapper;
-
-
-	public function setUp()
-	{
-		parent::setUp();
-	}
-
-	public function dataCall()
-	{
-		$method_map = [
-			'chunk' => 'array_chunk',
-			'pluck' => 'array_column',
-			'assoc_diff' => 'array_diff_assoc',
-			'key_diff' => 'array_diff_key',
-			'diff' => 'array_diff',
-			'filter' => 'array_filter',
-			'flip' => 'array_flip',
-			'intersect' => 'array_intersect',
-			'keys' => 'array_keys',
-			'merge' => 'array_merge',
-			'pad' => 'array_pad',
-			'random' => 'array_rand',
-			'reduce' => 'array_reduce',
-		];
-
-		return [
-			'array_merge' => [
-				'method' => 'merge',
-				'array' => [1, 3, 5, 7],
-				'args' => [[2, 4, 6, 8]],
-				'expected' => [1, 3, 5, 7, 2, 4, 6, 8]
-			],
-			'array_product' => [
-				'method' => 'product',
-				'array' => [1, 2, 3],
-				'args' => [],
-				'expected' => 6
-			],
-			'array_reverse' => [
-				'method' => 'reverse',
-				'array' => [1, 2, 3, 4, 5],
-				'args' => [],
-				'expected' => [5, 4, 3, 2, 1]
-			],
-			'array_sum' => [
-				'method' => 'sum',
-				'array' => [1, 2, 3, 4, 5, 6],
-				'args' => [],
-				'expected' => 21
-			],
-			'array_unique' => [
-				'method' => 'unique',
-				'array' => [1, 1, 3, 2, 2, 2, 3, 3, 5],
-				'args' => [SORT_REGULAR],
-				'expected' => [0 => 1, 2 => 3, 3 => 2, 8 => 5]
-			],
-			'array_values' => [
-				'method' => 'values',
-				'array' => ['foo' => 'bar', 'baz' => 'foobar'],
-				'args' => [],
-				'expected' => ['bar', 'foobar']
-			]
-		];
-	}
-
-	/**
-	 * Test the array methods defined for the __Call method
-	 *
-	 * @dataProvider dataCall
-	 */
-	public function testCall($method, $array, $args, $expected)
-	{
-		$obj = $this->arr($array);
-		$actual = $obj->__call($method, $args);
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testSet()
-	{
-		$obj = $this->arr([]);
-		$arraytype = $obj->set('foo', 'bar');
-
-		$this->assertInstanceOf('Aviat\Ion\Type\ArrayType', $arraytype);
-		$this->assertEquals('bar', $obj->get('foo'));
-	}
-
-	public function testGet()
-	{
-		$array = [1, 2, 3, 4, 5];
-		$obj = $this->arr($array);
-		$this->assertEquals($array, $obj->get());
-		$this->assertEquals(1, $obj->get(0));
-		$this->assertEquals(5, $obj->get(4));
-	}
-
-	public function testGetDeepKey()
-	{
-		$arr = [
-			'foo' => 'bar',
-			'baz' => [
-				'bar' => 'foobar'
-			]
-		];
-		$obj = $this->arr($arr);
-		$this->assertEquals('foobar', $obj->get_deep_key(['baz', 'bar']));
-		$this->assertNull($obj->get_deep_key(['foo', 'bar', 'baz']));
-	}
-
-	public function testMap()
-	{
-		$obj = $this->arr([1, 2, 3]);
-		$actual = $obj->map(function($item) {
-			return $item * 2;
-		});
-
-		$this->assertEquals([2, 4, 6], $actual);
-	}
-
-	public function testBadCall()
-	{
-		$obj = $this->arr([]);
-
-		$this->setExpectedException('InvalidArgumentException', "Method 'foo' does not exist");
-		$obj->foo();
-	}
-
-	public function testShuffle()
-	{
-		$original = [1, 2, 3, 4];
-		$test = [1, 2, 3, 4];
-		$obj = $this->arr($test);
-		$actual = $obj->shuffle();
-
-		//$this->assertNotEquals($actual, $original);
-		$this->assertTrue(is_array($actual));
-	}
-
-	public function testHasKey()
-	{
-		$obj = $this->arr([
-			'a' => 'b',
-			'z' => 'y'
-		]);
-		$this->assertTrue($obj->has_key('a'));
-		$this->assertFalse($obj->has_key('b'));
-	}
-
-	public function testHas()
-	{
-		$obj = $this->arr([1, 2, 6, 8, 11]);
-		$this->assertTrue($obj->has(8));
-		$this->assertFalse($obj->has(8745));
-	}
-
-	public function testSearch()
-	{
-		$obj = $this->arr([1, 2, 5, 7, 47]);
-		$actual = $obj->search(47);
-		$this->assertEquals(4, $actual);
-	}
-
-	public function testFill()
-	{
-		$obj = $this->arr([]);
-		$expected = ['?', '?', '?'];
-		$actual = $obj->fill(0, 3, '?');
-		$this->assertEquals($actual, $expected);
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/View/HtmlViewTest.php b/tests/Ion/View/HtmlViewTest.php
deleted file mode 100644
index cab5aecf..00000000
--- a/tests/Ion/View/HtmlViewTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-include_once __DIR__ . "/HttpViewTest.php";
-
-class HtmlViewTest extends HttpViewTest {
-
-	protected $template_path;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->view = new TestHtmlView($this->container);
-	}
-
-	public function testRenderTemplate()
-	{
-		$path = _dir(self::TEST_VIEW_DIR, 'test_view.php');
-		$expected = '<tag>foo</tag>';
-		$actual = $this->view->render_template($path, [
-			'var' => 'foo'
-		]);
-		$this->assertEquals($expected, $actual);
-	}
-
-}
\ No newline at end of file
diff --git a/tests/Ion/View/HttpViewTest.php b/tests/Ion/View/HttpViewTest.php
deleted file mode 100644
index 0112246d..00000000
--- a/tests/Ion/View/HttpViewTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Aviat\Ion\Friend;
-
-class HttpViewTest extends AnimeClient_TestCase {
-
-	protected $view;
-	protected $friend;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->view = new TestHttpView($this->container);
-		$this->friend = new Friend($this->view);
-	}
-
-	public function testGetOutput()
-	{
-		$this->friend->setOutput('foo');
-		$this->assertEquals('foo', $this->friend->getOutput());
-		$this->assertFalse($this->friend->hasRendered);
-
-		$this->assertEquals($this->friend->getOutput(), $this->friend->__toString());
-		$this->assertTrue($this->friend->hasRendered);
-	}
-
-	public function testSetOutput()
-	{
-		$same = $this->view->setOutput('<h1></h1>');
-		$this->assertEquals($same, $this->view);
-		$this->assertEquals('<h1></h1>', $this->view->getOutput());
-	}
-
-	public function testAppendOutput()
-	{
-		$this->view->setOutput('<h1>');
-		$this->view->appendOutput('</h1>');
-		$this->assertEquals('<h1></h1>', $this->view->getOutput());
-	}
-
-	public function testSetStatusCode()
-	{
-		$view = $this->view->setStatusCode(404);
-		$this->assertEquals(404, $view->response->getStatusCode());
-	}
-}
\ No newline at end of file
diff --git a/tests/Ion/View/JsonViewTest.php b/tests/Ion/View/JsonViewTest.php
deleted file mode 100644
index 0c21bb54..00000000
--- a/tests/Ion/View/JsonViewTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-use Aviat\Ion\Friend;
-
-include_once __DIR__ . "/HttpViewTest.php";
-
-class JsonViewTest extends HttpViewTest {
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		$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);
-
-		// Json encode non-string
-		$content = ['foo' => 'bar'];
-		$expected = json_encode($content);
-		$view->setOutput($content);
-		$this->assertEquals($expected, $this->view->getOutput());
-	}
-
-	public function testSetOutput()
-	{
-		// Directly set string
-		$view = new TestJsonView($this->container);
-		$content = '{}';
-		$expected = '{}';
-		$view->setOutput($content);
-		$this->assertEquals($expected, $view->getOutput());
-	}
-
-	public function testOutput()
-	{
-		$this->assertEquals('application/json', $this->friend->contentType);
-	}
-}
\ No newline at end of file

From f1a6f99fc495450f054af64fc82671e608adadce Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 29 Aug 2016 14:51:32 -0400
Subject: [PATCH 33/65] Convert Dependency injection bootstrap file to use
 factory functions, rather than direct instances

---
 app/bootstrap.php | 89 ++++++++++++++++++++++++++++++-----------------
 composer.json     |  5 +--
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 38c96305..a3bcd2b2 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -38,58 +38,85 @@ return function(array $config_array = []) {
 	// -------------------------------------------------------------------------
 
 	// Create Config Object
-	$config = new Config($config_array);
-	$container->set('config', $config);
+	$container->set('config', function() {
+		return new Config();
+	});
+	$container->setInstance('config', new Config($config_array));
 
 	// Create Cache Object
-	$container->set('cache', new CacheManager($config));
+	$container->set('cache', function($container) {
+		return new CacheManager($container->get('config'));
+	});
 
 	// Create Aura Router Object
-	$container->set('aura-router', new RouterContainer);
+	$container->set('aura-router', function() {
+		return new RouterContainer;
+	});
 
 	// Create Html helper Object
-	$html_helper = (new HelperLocatorFactory)->newInstance();
-	$html_helper->set('menu', function() use ($container) {
-		$menu_helper = new Helper\Menu();
-		$menu_helper->setContainer($container);
-		return $menu_helper;
+	$container->set('html-helper', function($container) {
+		$html_helper = (new HelperLocatorFactory)->newInstance();
+		$html_helper->set('menu', function() use ($container) {
+			$menu_helper = new Helper\Menu();
+			$menu_helper->setContainer($container);
+			return $menu_helper;
+		});
+
+		return $html_helper;
 	});
-	$container->set('html-helper', $html_helper);
 
 	// Create Request/Response Objects
-	$request = ServerRequestFactory::fromGlobals(
-		$_SERVER,
-		$_GET,
-		$_POST,
-		$_COOKIE,
-		$_FILES
-	);
-	$container->set('request', $request);
-	$container->set('response', new Response());
+	$container->set('request', function() {
+		return ServerRequestFactory::fromGlobals(
+			$_SERVER,
+			$_GET,
+			$_POST,
+			$_COOKIE,
+			$_FILES
+		);
+	});
+	$container->set('response', function() {
+		return new Response;
+	});
 
 	// Create session Object
-	$session = (new SessionFactory())->newInstance($_COOKIE);
-	$container->set('session', $session);
+	$container->set('session', function() {
+		return (new SessionFactory())->newInstance($_COOKIE);
+	});
 
 	// Miscellaneous helper methods
-	$util = new Util($container);
-	$container->set('anime-client', $util);
-	$container->set('util', $util);
+	$container->set('util', function($container) {
+		return new Util($container);
+	});
 
 	// Models
-	$container->set('api-model', new Model\API($container));
-	$container->set('anime-model', new Model\Anime($container));
-	$container->set('manga-model', new Model\Manga($container));
-	$container->set('anime-collection-model', new Model\AnimeCollection($container));
+	$container->set('api-model', function($container) {
+		return new Model\API($container);
+	});
+	$container->set('anime-model', function($container) {
+		return new Model\Anime($container);
+	});
+	$container->set('manga-model', function($container) {
+		return new Model\Manga($container);
+	});
+	$container->set('anime-collection-model', function($container) {
+		return new Model\AnimeCollection($container);
+	});
 
 	// Miscellaneous Classes
-	$container->set('auth', new HummingbirdAuth($container));
-	$container->set('url-generator', new UrlGenerator($container));
+	$container->set('auth', function($container) {
+		return new HummingbirdAuth($container);
+	});
+	$container->set('url-generator', function($container) {
+		return new UrlGenerator($container);
+	});
 
 	// -------------------------------------------------------------------------
 	// Dispatcher
 	// -------------------------------------------------------------------------
-	$container->set('dispatcher', new Dispatcher($container));
+	$container->set('dispatcher', function($container) {
+		return new Dispatcher($container);
+	});
 
 	return $container;
 };
diff --git a/composer.json b/composer.json
index f769e115..42ba9c65 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,8 @@
 		"phpunit/phpunit": "^5.4",
 		"robmorgan/phinx": "^0.6.4",
 		"humbug/humbug": "~1.0@dev",
-		"consolidation/robo": "~1.0@dev",
-		"henrikbjorn/lurker": "^1.1.0"
+		"consolidation/robo": "~1.0@RC",
+		"henrikbjorn/lurker": "^1.1.0",
+		"symfony/var-dumper": "^3.1"
 	}
 }

From d6f9ceb5c7ebc943288ffca1c957f0c170ab52d4 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 29 Aug 2016 15:36:36 -0400
Subject: [PATCH 34/65] Fix tests broken due to changes in container

---
 src/Aviat/AnimeClient/Command/BaseCommand.php | 35 +++++++++++++------
 .../AnimeClient/Auth/HummingbirdAuthTest.php  |  2 +-
 tests/AnimeClient/ControllerTest.php          |  2 +-
 tests/AnimeClient/DispatcherTest.php          | 24 +++----------
 tests/AnimeClient/Helper/MenuHelperTest.php   |  2 +-
 tests/AnimeClient/MenuGeneratorTest.php       |  2 +-
 .../Model/AnimeCollectionModelTest.php        |  6 ++--
 tests/AnimeClient/Model/MangaModelTest.php    |  2 +-
 tests/AnimeClient/UrlGeneratorTest.php        |  4 +--
 tests/AnimeClient_TestCase.php                | 14 ++++++--
 10 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/Aviat/AnimeClient/Command/BaseCommand.php b/src/Aviat/AnimeClient/Command/BaseCommand.php
index bd50731f..923df39a 100644
--- a/src/Aviat/AnimeClient/Command/BaseCommand.php
+++ b/src/Aviat/AnimeClient/Command/BaseCommand.php
@@ -63,23 +63,38 @@ class BaseCommand extends Command {
 			$container = new Container();
 
 			// Create Config Object
-			$config = new Config($config_array);
-			$container->set('config', $config);
+			$container->set('config', function() {
+				return new Config();
+			});
+			$container->setInstance('config', $config_array);
 
 			// Create Cache Object
-			$container->set('cache', new CacheManager($config));
+			$container->set('cache', function($container) {
+				return new CacheManager($container->get('config'));
+			});
 
 			// Create session Object
-			$session = (new SessionFactory())->newInstance($_COOKIE);
-			$container->set('session', $session);
+			$container->set('session', function() {
+				return (new SessionFactory())->newInstance($_COOKIE);
+			});
 
 			// Models
-			$container->set('api-model', new Model\API($container));
-			$container->set('anime-model', new Model\Anime($container));
-			$container->set('manga-model', new Model\Manga($container));
+			$container->set('api-model', function($container) {
+				return new Model\API($container);
+			});
+			$container->set('anime-model', function($container) {
+				return new Model\Anime($container);
+			});
+			$container->set('manga-model', function($container) {
+				return new Model\Manga($container);
+			});
 
-			$container->set('auth', new HummingbirdAuth($container));
-			$container->set('util', new Util($container));
+			$container->set('auth', function($container) {
+				return new HummingbirdAuth($container);
+			});
+			$container->set('util', function($container) {
+				return new Util($container);
+			});
 
 			return $container;
 		};
diff --git a/tests/AnimeClient/Auth/HummingbirdAuthTest.php b/tests/AnimeClient/Auth/HummingbirdAuthTest.php
index db9ea932..d2476127 100644
--- a/tests/AnimeClient/Auth/HummingbirdAuthTest.php
+++ b/tests/AnimeClient/Auth/HummingbirdAuthTest.php
@@ -24,7 +24,7 @@ class HummingbirdAuthTest extends AnimeClient_TestCase {
 		$auth = new HummingbirdAuth($this->container);
 		$friend = new Friend($auth);
 		$this->auth = $friend;
-		$this->container->set('session', self::$session);
+		$this->container->setInstance('session', self::$session);
 	}
 
 	public function dataAuthenticate()
diff --git a/tests/AnimeClient/ControllerTest.php b/tests/AnimeClient/ControllerTest.php
index 6b67f59c..043b587b 100644
--- a/tests/AnimeClient/ControllerTest.php
+++ b/tests/AnimeClient/ControllerTest.php
@@ -33,7 +33,7 @@ class ControllerTest extends AnimeClient_TestCase {
 			'database' => '',
 			'file' => ":memory:"
 		]);
-		$this->container->set('config', $config);
+		$this->container->setInstance('config', $config);
 
 		$this->assertInstanceOf(
 			'Aviat\AnimeClient\Controller',
diff --git a/tests/AnimeClient/DispatcherTest.php b/tests/AnimeClient/DispatcherTest.php
index 4c87a4ce..811e1c6c 100644
--- a/tests/AnimeClient/DispatcherTest.php
+++ b/tests/AnimeClient/DispatcherTest.php
@@ -29,39 +29,25 @@ class DispatcherTest extends AnimeClient_TestCase {
 			'SERVER_NAME' => $host
 		]);
 
-		$request = ServerRequestFactory::fromGlobals(
-			$_SERVER,
-			$_GET,
-			$_POST,
-			$_COOKIE,
-			$_FILES
-		);
-
-		$old_config = $this->container->get('config');
+		$this->setSuperGlobals([
+			'_SERVER' => $_SERVER
+		]);
 
 		$logger = new Logger('test_logger');
 		$logger->pushHandler(new TestHandler(Logger::DEBUG));
 
-		// Add the appropriate objects to the container
-		$this->container = new Container([
-			'config' => $old_config,
-			'request' => $request,
-			'response' => new Response,
-			'aura-router' => new RouterContainer
-		]);
-
 		$this->container->setLogger($logger, 'default');
 
 		if ( ! empty($config))
 		{
 			$config = new Config($config);
-			$this->container->set('config', $config);
+			$this->container->setInstance('config', $config);
 		}
 
 		$this->router = new Dispatcher($this->container);
 		$this->config = $this->container->get('config');
 		$this->urlGenerator = new UrlGenerator($this->container);
-		$this->container->set('url-generator', $this->urlGenerator);
+		$this->container->setInstance('url-generator', $this->urlGenerator);
 	}
 
 	public function testRouterSanity()
diff --git a/tests/AnimeClient/Helper/MenuHelperTest.php b/tests/AnimeClient/Helper/MenuHelperTest.php
index d9ec76f4..38740428 100644
--- a/tests/AnimeClient/Helper/MenuHelperTest.php
+++ b/tests/AnimeClient/Helper/MenuHelperTest.php
@@ -43,7 +43,7 @@ class MenuHelperTest extends AnimeClient_TestCase {
 		// Set config for tests
 		$config = $this->container->get('config');
 		$config->set('menus', $menus);
-		$this->container->set('config', $config);
+		$this->container->setInstance('config', $config);
 
 		foreach($menus as $case => $config)
 		{
diff --git a/tests/AnimeClient/MenuGeneratorTest.php b/tests/AnimeClient/MenuGeneratorTest.php
index 2bb1b265..5906aaec 100644
--- a/tests/AnimeClient/MenuGeneratorTest.php
+++ b/tests/AnimeClient/MenuGeneratorTest.php
@@ -66,7 +66,7 @@ class MenuGeneratorTest extends AnimeClient_TestCase {
 		];
 		$config = $this->container->get('config');
 		$config->set('menus', $menus);
-		$this->container->set('config', $config);
+		$this->container->setInstance('config', $config);
 		$expected = '';
 
 		$this->assertEquals($expected, $this->generator->generate('manga_list'));
diff --git a/tests/AnimeClient/Model/AnimeCollectionModelTest.php b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
index 5c931c15..faa66244 100644
--- a/tests/AnimeClient/Model/AnimeCollectionModelTest.php
+++ b/tests/AnimeClient/Model/AnimeCollectionModelTest.php
@@ -10,7 +10,7 @@ class AnimeCollectionModelTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->container->set('config', new Config([
+		$this->container->setInstance('config', new Config([
 			'database' => [
 				'collection' => [
 					'type' => 'sqlite',
@@ -37,7 +37,7 @@ class AnimeCollectionModelTest extends AnimeClient_TestCase {
 
 	public function testInvalidDatabase()
 	{
-		$this->container->set('config', new Config([
+		$this->container->setInstance('config', new Config([
 			'database' => [
 				'collection' => [
 					'type' => 'sqlite',
@@ -57,7 +57,7 @@ class AnimeCollectionModelTest extends AnimeClient_TestCase {
 
 	public function testNonExistentDatabase()
 	{
-		$this->container->set('config', new Config([
+		$this->container->setInstance('config', new Config([
 			'database' => [
 				'collection' => [
 					'type' => 'sqlite',
diff --git a/tests/AnimeClient/Model/MangaModelTest.php b/tests/AnimeClient/Model/MangaModelTest.php
index bc97fca7..9eca4ca0 100644
--- a/tests/AnimeClient/Model/MangaModelTest.php
+++ b/tests/AnimeClient/Model/MangaModelTest.php
@@ -12,7 +12,7 @@ class MangaModelTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->container->set('util', new MockUtil($this->container));
+		$this->container->setInstance('util', new MockUtil($this->container));
 		$this->model = new Friend(new TestMangaModel($this->container));
 		$this->mockDir = __DIR__ . '/../../test_data/manga_list';
 	}
diff --git a/tests/AnimeClient/UrlGeneratorTest.php b/tests/AnimeClient/UrlGeneratorTest.php
index aea2e044..7ae7e07d 100644
--- a/tests/AnimeClient/UrlGeneratorTest.php
+++ b/tests/AnimeClient/UrlGeneratorTest.php
@@ -83,7 +83,7 @@ class UrlGeneratorTest extends AnimeClient_TestCase {
 	public function testFullUrl($config, $path, $type, $expected)
 	{
 		$config = new Config($config);
-		$this->container->set('config', $config);
+		$this->container->setInstance('config', $config);
 		$urlGenerator = new UrlGenerator($this->container);
 
 		$result = $urlGenerator->full_url($path, $type);
@@ -127,7 +127,7 @@ class UrlGeneratorTest extends AnimeClient_TestCase {
 	public function testBaseUrl($config, $type, $expected)
 	{
 		$config = new Config($config);
-		$this->container->set('config', $config);
+		$this->container->setInstance('config', $config);
 		$urlGenerator = new UrlGenerator($this->container);
 
 		$result = $urlGenerator->base_url($type);
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 6b32e3ba..9f1f7865 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -91,7 +91,13 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 		// Set up DI container
 		$di = require _dir($APP_DIR, 'bootstrap.php');
 		$container = $di($config_array);
-		$container->set('session-handler', self::$session_handler);
+
+		// Use mock session handler
+		$container->set('session-handler', function() {
+			$session_handler = new TestSessionHandler();
+			session_set_save_handler($session_handler, TRUE);
+			return $session_handler;
+		});
 
 		$this->container = $container;
 	}
@@ -116,8 +122,10 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 			['Zend\Diactoros\ServerRequestFactory', 'fromGlobals'],
 			array_merge($default, $supers)
 		);
-		$this->container->set('request', $request);
-		$this->container->set('response', new HttpResponse());
+		$this->container->setInstance('request', $request);
+		$this->container->set('repsone', function() {
+			return new HttpResponse();
+		});
 	}
 
 	/**

From 756db0654068e96ca29d3caa1003e6f902684723 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 29 Aug 2016 15:50:59 -0400
Subject: [PATCH 35/65] Build/doc generation updates

---
 RoboFile.php                                  |  72 ++-
 .../ClosingFileAndLocationCommentStandard.xml |  28 +
 .../Utf8EncodingAndByteOrderMarkStandard.xml  |   7 +
 .../ConstructorNameStandard.xml               |  31 +
 .../ValidClassNameStandard.xml                |  21 +
 .../ValidFileNameStandard.xml                 |  21 +
 .../ValidMethodNameStandard.xml               |  27 +
 .../ValidVariableNameStandard.xml             |  31 +
 .../StrictComparisonOperatorStandard.xml      |  40 ++
 .../Docs/Strings/DoubleQuoteUsageStandard.xml |  28 +
 .../Sniffs/Commenting/InlineCommentSniff.php  | 187 ++++++
 .../Sniffs/Files/ByteOrderMarkSniff.php       |  98 +++
 .../Sniffs/Files/Utf8EncodingSniff.php        | 222 +++++++
 .../Operators/LogicalOperatorAndSniff.php     |  81 +++
 .../StrictComparisonOperatorSniff.php         |  81 +++
 .../UppercaseLogicalOperatorOrSniff.php       |  84 +++
 .../Sniffs/Strings/DoubleQuoteUsageSniff.php  | 464 +++++++++++++++
 .../WhiteSpace/DisallowSpaceIndentSniff.php   |  87 +++
 .../DisallowWitheSpaceAroundPhpTagsSniff.php  |  95 +++
 .../Sniffs/WhiteSpace/ElseOnNewLineSniff.php  |  82 +++
 .../WhiteSpace/LogicalNotSpacingSniff.php     |  75 +++
 .../Files/AbstractClosingCommentSniff.php     | 104 ++++
 .../Files/ClosingFileCommentSniff.php         | 109 ++++
 .../Files/ClosingLocationCommentSniff.php     | 182 ++++++
 .../ConstructorNameSniff.php                  | 142 +++++
 .../NamingConventions/ValidClassNameSniff.php |  84 +++
 .../NamingConventions/ValidFileNameSniff.php  |  84 +++
 .../ValidMethodNameSniff.php                  | 161 +++++
 .../ValidVariableNameSniff.php                | 562 ++++++++++++++++++
 build/CodeIgniter/ruleset.xml                 |  47 ++
 build/animeclient_header_comment.txt          |   7 +-
 build/phpcs.xml                               |  79 +++
 build/phpdox.xml                              | 191 +++---
 build/phpunit.xml                             |   4 +-
 composer.json                                 |  14 +-
 phpdoc.dist.xml                               |   7 +-
 phpunit.xml                                   |   2 +-
 37 files changed, 3526 insertions(+), 115 deletions(-)
 create mode 100644 build/CodeIgniter/Docs/Files/ClosingFileAndLocationCommentStandard.xml
 create mode 100644 build/CodeIgniter/Docs/Files/Utf8EncodingAndByteOrderMarkStandard.xml
 create mode 100644 build/CodeIgniter/Docs/NamingConventions/ConstructorNameStandard.xml
 create mode 100644 build/CodeIgniter/Docs/NamingConventions/ValidClassNameStandard.xml
 create mode 100644 build/CodeIgniter/Docs/NamingConventions/ValidFileNameStandard.xml
 create mode 100644 build/CodeIgniter/Docs/NamingConventions/ValidMethodNameStandard.xml
 create mode 100644 build/CodeIgniter/Docs/NamingConventions/ValidVariableNameStandard.xml
 create mode 100644 build/CodeIgniter/Docs/Operators/StrictComparisonOperatorStandard.xml
 create mode 100755 build/CodeIgniter/Docs/Strings/DoubleQuoteUsageStandard.xml
 create mode 100644 build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/Files/ByteOrderMarkSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/Files/Utf8EncodingSniff.php
 create mode 100644 build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
 create mode 100644 build/CodeIgniter/Sniffs/Operators/UppercaseLogicalOperatorOrSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/Strings/DoubleQuoteUsageSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/WhiteSpace/DisallowWitheSpaceAroundPhpTagsSniff.php
 create mode 100644 build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php
 create mode 100755 build/CodeIgniter/Sniffs/WhiteSpace/LogicalNotSpacingSniff.php
 create mode 100644 build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/Files/ClosingLocationCommentSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php
 create mode 100644 build/CodeIgniter/UnusedSniffs/NamingConventions/ValidFileNameSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php
 create mode 100755 build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php
 create mode 100644 build/CodeIgniter/ruleset.xml
 create mode 100644 build/phpcs.xml

diff --git a/RoboFile.php b/RoboFile.php
index b63ee609..6198da5e 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -20,16 +20,33 @@ if ( ! function_exists('glob_recursive'))
  *
  * @see http://robo.li/
  */
-class RoboFile extends \Robo\Tasks
-{
+class RoboFile extends \Robo\Tasks {
+
+	/**
+	 * Directories used by analysis tools
+	 *
+	 * @var array
+	 */
 	protected $taskDirs = [
-		'build/api',
-		'build/coverage',
 		'build/logs',
 		'build/pdepend',
 		'build/phpdox',
 	];
 
+	/**
+	 * Directories to remove with the clean task
+	 *
+	 * @var array
+	 */
+	protected $cleanDirs = [
+		'coverage',
+		'docs',
+		'phpdoc',
+		'build/logs',
+		'build/phpdox',
+		'build/pdepend'
+	];
+
 
 	/**
 	 * Do static analysis tasks
@@ -39,6 +56,7 @@ class RoboFile extends \Robo\Tasks
 		$this->prepare();
 		$this->lint();
 		$this->phploc(TRUE);
+		$this->phpcs(TRUE);
 		$this->dependencyReport();
 		$this->phpcpdReport();
 	}
@@ -66,8 +84,17 @@ class RoboFile extends \Robo\Tasks
 			@unlink($file);
 		}, $cleanFiles);
 
-		$this->_cleanDir($this->taskDirs);
-		$this->_deleteDir($this->taskDirs);
+		// So the task doesn't complain,
+		// make any 'missing' dirs to cleanup
+		array_map(function ($dir) {
+			if ( ! is_dir($dir))
+			{
+				`mkdir -p {$dir}`;
+			}
+		}, $this->cleanDirs);
+
+		$this->_cleanDir($this->cleanDirs);
+		$this->_deleteDir($this->cleanDirs);
 	}
 
 	/**
@@ -135,6 +162,29 @@ class RoboFile extends \Robo\Tasks
 		$this->_run($cmd_parts);
 	}
 
+	/**
+	 * Run the phpcs tool
+	 *
+	 * @param bool $report - if true, generates reports instead of direct output
+	 */
+	public function phpcs($report = FALSE)
+	{
+		$report_cmd_parts = [
+			'vendor/bin/phpcs',
+			'--standard=./build/phpcs.xml',
+			'--report-checkstyle=./build/logs/phpcs.xml',
+		];
+
+		$normal_cmd_parts = [
+			'vendor/bin/phpcs',
+			'--standard=./build/phpcs.xml',
+		];
+
+		$cmd_parts = ($report) ? $report_cmd_parts : $normal_cmd_parts;
+
+		$this->_run($cmd_parts);
+	}
+
 	/**
 	 * Run the phploc tool
 	 *
@@ -145,6 +195,7 @@ class RoboFile extends \Robo\Tasks
 		// Command for generating reports
 		$report_cmd_parts = [
 			'vendor/bin/phploc',
+			'--count-tests',
 			'--log-csv=build/logs/phploc.csv',
 			'--log-xml=build/logs/phploc.xml',
 			'src',
@@ -169,7 +220,6 @@ class RoboFile extends \Robo\Tasks
 	 */
 	public function prepare()
 	{
-		$this->clean();
 		array_map([$this, '_mkdir'], $this->taskDirs);
 	}
 
@@ -196,7 +246,11 @@ class RoboFile extends \Robo\Tasks
 			})
 			->monitor('src', function () {
 				$this->taskExec('test')->run();
-			})->run();
+			})
+			->monitor('tests', function () {
+				$this->taskExec('test')->run();
+			})
+			->run();
 	}
 
 	/**
@@ -265,7 +319,7 @@ class RoboFile extends \Robo\Tasks
 	}
 
 	/**
-	 * Short cut for joining an array of command arguments
+	 * Shortcut for joining an array of command arguments
 	 * and then running it
 	 *
 	 * @param array $cmd_parts - command arguments
diff --git a/build/CodeIgniter/Docs/Files/ClosingFileAndLocationCommentStandard.xml b/build/CodeIgniter/Docs/Files/ClosingFileAndLocationCommentStandard.xml
new file mode 100644
index 00000000..5dd3d3c8
--- /dev/null
+++ b/build/CodeIgniter/Docs/Files/ClosingFileAndLocationCommentStandard.xml
@@ -0,0 +1,28 @@
+<documentation title="Closing comments instead of PHP closing tag">
+    <standard>
+    <![CDATA[
+    The PHP closing tag on a PHP document ?> is optional to the PHP parser. However, if used, any whitespace following the closing tag, whether introduced by the developer, user, or an FTP application, can cause unwanted output, PHP errors, or if the latter are suppressed, blank pages. For this reason, all PHP files should OMIT the closing PHP tag, and instead use a comment block to mark the end of file and it's location relative to the application root. This allows you to still identify a file as being complete and not truncated.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid closing comments">
+        <![CDATA[
+<?php
+
+  echo "Here's my code!";
+
+/* End of file myfile.php */
+/* Location: ./system/modules/mymodule/myfile.php */ 
+        ]]>
+        </code>
+        <code title="Examples of invalid closing comments">
+        <![CDATA[
+<?php
+
+  echo "Here's my code!";
+
+?> 
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/Files/Utf8EncodingAndByteOrderMarkStandard.xml b/build/CodeIgniter/Docs/Files/Utf8EncodingAndByteOrderMarkStandard.xml
new file mode 100644
index 00000000..d3a0d9b2
--- /dev/null
+++ b/build/CodeIgniter/Docs/Files/Utf8EncodingAndByteOrderMarkStandard.xml
@@ -0,0 +1,7 @@
+<documentation title="Unicode (UTF-8) encoding without BOM">
+    <standard>
+    <![CDATA[
+    Files should be saved with Unicode (UTF-8) encoding. The BOM should not be used. Unlike UTF-16 and UTF-32, there's no byte order to indicate in a UTF-8 encoded file, and the BOM can have a negative side effect in PHP of sending output, preventing the application from being able to set its own headers. Unix line endings should be used (LF).
+    ]]>
+    </standard>
+</documentation>
diff --git a/build/CodeIgniter/Docs/NamingConventions/ConstructorNameStandard.xml b/build/CodeIgniter/Docs/NamingConventions/ConstructorNameStandard.xml
new file mode 100644
index 00000000..46b3e695
--- /dev/null
+++ b/build/CodeIgniter/Docs/NamingConventions/ConstructorNameStandard.xml
@@ -0,0 +1,31 @@
+<documentation title="Constructor Names">
+    <standard>
+    <![CDATA[
+    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid constructor name">
+        <![CDATA[
+class Super_class
+{
+  function Super_class()
+  {
+    echo 'Some code here !';
+  }
+}
+        ]]>
+        </code>
+        <code title="Examples of invalid constructor name">
+        <![CDATA[
+class Super_class
+{
+  function __constructor()
+  {
+    echo 'Some code here !';
+  }
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/NamingConventions/ValidClassNameStandard.xml b/build/CodeIgniter/Docs/NamingConventions/ValidClassNameStandard.xml
new file mode 100644
index 00000000..3721b67e
--- /dev/null
+++ b/build/CodeIgniter/Docs/NamingConventions/ValidClassNameStandard.xml
@@ -0,0 +1,21 @@
+<documentation title="Class names">
+    <standard>
+    <![CDATA[
+    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid class names">
+        <![CDATA[
+class Super_class
+        ]]>
+        </code>
+        <code title="Examples of invalid class names">
+        <![CDATA[
+class SuperClass // words not separated with underscores and words next to the first one start with an upper case
+class superclass // words not separated with underscores
+class Super_Class // words next to the first one start with an upper case
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/NamingConventions/ValidFileNameStandard.xml b/build/CodeIgniter/Docs/NamingConventions/ValidFileNameStandard.xml
new file mode 100644
index 00000000..331fa444
--- /dev/null
+++ b/build/CodeIgniter/Docs/NamingConventions/ValidFileNameStandard.xml
@@ -0,0 +1,21 @@
+<documentation title="File names">
+    <standard>
+    <![CDATA[
+    To be able to find which class is contained in a file, file names should be case-insensitively equal to class names. Some operating systems and tools are case-insensitive, though other are. So, file names should be in lower case to avoid any trouble.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid file names">
+        <![CDATA[
+super_class.php
+        ]]>
+        </code>
+        <code title="Examples of invalid file names">
+        <![CDATA[
+superclass.php // words not separated with underscores
+SuperClass.php // not in lower case and words not separated with underscores
+Super_class.php // not in lower case
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/NamingConventions/ValidMethodNameStandard.xml b/build/CodeIgniter/Docs/NamingConventions/ValidMethodNameStandard.xml
new file mode 100644
index 00000000..a669c448
--- /dev/null
+++ b/build/CodeIgniter/Docs/NamingConventions/ValidMethodNameStandard.xml
@@ -0,0 +1,27 @@
+<documentation title="Function and Method Names">
+    <standard>
+    <![CDATA[
+    Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.
+    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid method names">
+        <![CDATA[
+function get_file_properties() // descriptive, underscore separator, and all lowercase letters
+private function _get_file_properties()
+        ]]>
+        </code>
+        <code title="Examples of invalid method names">
+        <![CDATA[
+function fileproperties() // not descriptive and needs underscore separator
+function fileProperties() // not descriptive and uses CamelCase
+function getfileproperties() // Better! But still missing underscore separator
+function getFileProperties() // uses CamelCase
+function get_the_file_properties_from_the_file() // wordy
+private function get_the_file_properties() // not prefixed with an underscor, though private
+function _get_the_file_properties() // prefixed with an underscor, though public
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/NamingConventions/ValidVariableNameStandard.xml b/build/CodeIgniter/Docs/NamingConventions/ValidVariableNameStandard.xml
new file mode 100644
index 00000000..14362b74
--- /dev/null
+++ b/build/CodeIgniter/Docs/NamingConventions/ValidVariableNameStandard.xml
@@ -0,0 +1,31 @@
+<documentation title="Variable names">
+    <standard>
+    <![CDATA[
+    Namely, variables should contain only lowercase letters, use underscore separators, and be reasonably named to indicate their purpose and contents. Very short, non-word variables should only be used as iterators in for() loops.
+    Methods and variables that are only accessed internally by your class, such as utility and helper functions that your public methods use for code abstraction, should be prefixed with an underscore.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of valid variable names">
+        <![CDATA[
+for ($j = 0; $j < 10; $j++)
+$str
+$buffer
+$group_id
+$last_city
+private $_internal_data;
+        ]]>
+        </code>
+        <code title="Examples of invalid variable names">
+        <![CDATA[
+$j = 'foo'; // single letter variables should only be used in for() loops
+$Str // contains uppercase letters
+$bufferedText // uses CamelCasing, and could be shortened without losing semantic meaning
+$groupid // multiple words, needs underscore separator
+$name_of_last_city_used // too long
+private $internal_data; // not prefixed with an underscor, though private
+$_public_attribute; // prefixed with an underscor, though public
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/Operators/StrictComparisonOperatorStandard.xml b/build/CodeIgniter/Docs/Operators/StrictComparisonOperatorStandard.xml
new file mode 100644
index 00000000..92fc74fe
--- /dev/null
+++ b/build/CodeIgniter/Docs/Operators/StrictComparisonOperatorStandard.xml
@@ -0,0 +1,40 @@
+<documentation title="Strict comparison operators">
+    <standard>
+    <![CDATA[
+    Some PHP functions return FALSE on failure, but may also have a valid return value of "" or 0, which would evaluate to FALSE in loose comparisons. Be explicit by comparing the variable type when using these return values in conditionals to ensure the return value is indeed what you expect, and not a value that has an equivalent loose-type evaluation.
+    Use the same stringency in returning and checking your own variables. Use === and !== as necessary.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid strict comparison">
+        <![CDATA[
+if (strpos($str, 'foo') === FALSE) {
+  echo 'Do something.';
+}
+
+function build_string($str = "")
+{
+  if ($str === "") {
+    echo 'Buid string.';
+  }
+}
+        ]]>
+        </code>
+        <code title="Invalid loose comparison">
+        <![CDATA[
+// If 'foo' is at the beginning of the string, strpos will return a 0,
+// resulting in this conditional evaluating as TRUE
+if (strpos($str, 'foo') == FALSE) {
+  echo 'Do something.';
+}
+
+function build_string($str = "")
+{
+  if ($str == "") { // uh-oh! What if FALSE or the integer 0 is passed as an argument?
+    echo 'Buid string.';
+  }
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Docs/Strings/DoubleQuoteUsageStandard.xml b/build/CodeIgniter/Docs/Strings/DoubleQuoteUsageStandard.xml
new file mode 100755
index 00000000..137130c2
--- /dev/null
+++ b/build/CodeIgniter/Docs/Strings/DoubleQuoteUsageStandard.xml
@@ -0,0 +1,28 @@
+<documentation title="Double-quoted strings">
+    <standard>
+    <![CDATA[
+    Always use single quoted strings unless you need variables parsed, and in cases where you do need variables parsed, use braces to prevent greedy token parsing. You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Examples of invalid double-quoted strings">
+        <![CDATA[
+"My String" // no variable parsing, so no use for double quotes
+"My string $foo" // needs braces
+'SELECT foo FROM bar WHERE baz = \'bag\'' // ugly
+'\r\n' // it isn't wrong, but it won't be interpreted as a new line feed
+        ]]>
+        </code>
+        <code title="Examples of valid double-quoted strings">
+        <![CDATA[
+'My String'
+"My string {$foo}" // variables in strings may be enclosed with braces in 2 ways
+"My string ${foo}"
+"My string {$foo['bar']}" // variables in strings may be an array entry
+"My string {$foo->bar}" // variables in strings may be an object attribute
+"SELECT foo FROM bar WHERE baz = 'bag'"
+"\n" // not specified in Code Igniter coding standard, but it should be allowed
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>
diff --git a/build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php b/build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php
new file mode 100644
index 00000000..d8e51eb9
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Commenting/InlineCommentSniff.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Commenting_InlineCommentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Commenting_InlineCommentSniff.
+ *
+ * Ensure the use of single line comments within code (i.e //)
+ * and blank lines between large comment blocks and code.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+namespace CodeIgniter\Sniffs\Commenting;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class InlineCommentSniff implements Sniff
+{
+    /**
+     * @var int Limit defining long comments.
+     * Long comments count $longCommentLimit or more lines.
+     */
+    public $longCommentLimit = 5;
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_COMMENT
+        );
+    }//end register()
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // keep testing only if it's about the first comment of the block
+        $previousCommentPtr = $phpcsFile->findPrevious($tokens[$stackPtr]['code'], $stackPtr - 1);
+        if ($tokens[$previousCommentPtr]['line'] !== $tokens[$stackPtr]['line'] - 1) {
+            if (TRUE !== $this->_checkCommentStyle($phpcsFile, $stackPtr)) {
+                return;
+            }
+
+            $commentLines = $this->_getCommentBlock($phpcsFile, $stackPtr);
+
+            if (count($commentLines) >= $this->longCommentLimit) {
+                $this->_checkBlankLinesAroundLongComment($phpcsFile, $commentLines);
+            }
+        }
+    }//end process()
+
+
+    /**
+     * Add error to $phpcsFile, if comment pointed by $stackPtr doesn't start
+     * with '//'.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        that has to be a comment.
+     *
+     * @return bool TRUE if the content of the token pointed by $stackPtr starts
+     *              with //, FALSE if an error was added to $phpcsFile.
+     */
+    private function _checkCommentStyle(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        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} === '*'
+        ) {
+            $error  = 'Multi lines comments are not allowed; use "// Comment" DocBlock comments instead';
+            $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
+            return FALSE;
+        } else if (substr($tokens[$stackPtr]['content'], 0, 2) !== '//') {
+            $error  = 'Use single line or DocBlock comments within code';
+            $phpcsFile->addError($error, $stackPtr, 'WrongStyle');
+            return FALSE;
+        }
+        return TRUE;
+    }//_checkCommentStyle()
+
+
+    /**
+     * Gather into an array all comment lines to which $stackPtr belongs.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  Pointer to the first comment line.
+     *
+     * @return type array Pointers to tokens making up the comment block.
+     */
+    private function _getCommentBlock(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $commentLines = array($stackPtr);
+        $nextComment  = $stackPtr;
+        $lastLine     = $tokens[$stackPtr]['line'];
+
+        while (($nextComment = $phpcsFile->findNext($tokens[$stackPtr]['code'], ($nextComment + 1), null, false)) !== false) {
+            if (($tokens[$nextComment]['line'] - 1) !== $lastLine) {
+                // Not part of the block.
+                break;
+            }
+
+            $lastLine       = $tokens[$nextComment]['line'];
+            $commentLines[] = $nextComment;
+        }
+
+        return $commentLines;
+    }//_getCommentBlock()
+
+
+    /**
+     * Add errors to $phpcsFile, if $commentLines isn't enclosed with blank lines.
+     *
+     * @param File $phpcsFile    The current file being scanned.
+     * @param array                $commentLines Lines of the comment block being checked.
+     *
+     * @return bool TRUE if $commentLines is enclosed with at least a blank line
+     * before and after, FALSE otherwise.
+     */
+    private function _checkBlankLinesAroundLongComment(File $phpcsFile, array $commentLines)
+    {
+        $hasBlankLinesAround = TRUE;
+        $tokens = $phpcsFile->getTokens();
+
+        // check blank line before the long comment
+        $firstCommentPtr = reset($commentLines);
+        $firstPreviousSpacePtr = $firstCommentPtr - 1;
+        while (T_WHITESPACE === $tokens[$firstPreviousSpacePtr]['code'] && $firstPreviousSpacePtr > 0) {
+            $firstPreviousSpacePtr--;
+        }
+        if ($tokens[$firstPreviousSpacePtr]['line'] >= $tokens[$firstCommentPtr]['line'] - 1) {
+            $error  = "Please add a blank line before comments counting more than {$this->longCommentLimit} lines.";
+            $phpcsFile->addError($error, $firstCommentPtr, 'LongCommentWithoutSpacing');
+            $hasBlankLinesAround = FALSE;
+        }
+
+        // check blank line after the long comment
+        $lastCommentPtr = end($commentLines);
+        $lastNextSpacePtr = $lastCommentPtr + 1;
+        while (T_WHITESPACE === $tokens[$lastNextSpacePtr]['code'] && $lastNextSpacePtr < count($tokens)) {
+            $lastNextSpacePtr++;
+        }
+        if ($tokens[$lastNextSpacePtr]['line'] <= $tokens[$lastCommentPtr]['line'] + 1) {
+            $error  = "Please add a blank line after comments counting more than {$this->longCommentLimit} lines.";
+            $phpcsFile->addError($error, $lastCommentPtr, 'LongCommentWithoutSpacing');
+            $hasBlankLinesAround = FALSE;
+        }
+
+        return $hasBlankLinesAround;
+    }//end _checkBlanksAroundLongComment()
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/Files/ByteOrderMarkSniff.php b/build/CodeIgniter/Sniffs/Files/ByteOrderMarkSniff.php
new file mode 100755
index 00000000..edd534e5
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Files/ByteOrderMarkSniff.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Files_ByteOrderMarkSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Files_ByteOrderMarkSniff.
+ *
+ * Ensures that no BOM appears at the beginning of file.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Files;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ByteOrderMarkSniff implements Sniff
+{
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array( T_OPEN_TAG );
+    }//end register()
+
+    /**
+     * List of supported BOM definitions.
+     *
+     * Use encoding names as keys and hex BOM representations as values.
+     *
+     * @return array
+     */
+    protected function getBomDefinitions()
+    {
+        return array(
+            'UTF-8'       => 'efbbbf',
+            'UTF-16 (BE)' => 'feff',
+            'UTF-16 (LE)' => 'fffe',
+            'UTF-32 (BE)' => '0000feff',
+            'UTF-32 (LE)' => 'fffe0000'
+        );
+    }//end getBomDefinitions()
+
+    /**
+     * Process tokens.
+     *
+     * Actually, only proceed when we're at index 0, this should be the only case
+     * that will contain BOM. Then check if BOM definition matches what
+     * we've found as file's inline HTML. Inline HTML could be longer than just BOM
+     * so make sure you test as much as needed.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr )
+    {
+        // We are only interested if this is the first open tag.
+        if ($stackPtr !== 0) {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+                return;
+            }
+        }
+
+        $tokens = $phpcsFile->getTokens();
+        $fileStartString = $tokens[0]['content'];
+        foreach ($this->getBomDefinitions() as $bomName => $expectedBomHex) {
+            $bomByteLength = strlen($expectedBomHex) / 2;
+            $fileStartHex = bin2hex(substr($fileStartString, 0, $bomByteLength));
+            if ($fileStartHex === $expectedBomHex) {
+                $error = "File contains a $bomName byte order mark (BOM).";
+                $phpcsFile->addError($error, $stackPtr);
+                break;
+            }
+        }
+    }//end process()
+}
diff --git a/build/CodeIgniter/Sniffs/Files/Utf8EncodingSniff.php b/build/CodeIgniter/Sniffs/Files/Utf8EncodingSniff.php
new file mode 100755
index 00000000..9c13bbc2
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Files/Utf8EncodingSniff.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Files_Utf8EncodingSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Files_Utf8EncodingSniff.
+ *
+ * Ensures that PHP files are encoded with Unicode (UTF-8) encoding.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Files;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class Utf8EncodingSniff implements Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_OPEN_TAG
+        );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // We are only interested if this is the first open tag.
+        if ($stackPtr !== 0) {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+                return;
+            }
+        }
+
+        $file_path = $phpcsFile->getFilename();
+        $file_name = basename($file_path);
+        $file_content = file_get_contents($file_path);
+        if (false === mb_check_encoding($file_content, 'UTF-8')) {
+            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding.';
+            $phpcsFile->addError($error, 0);
+        }
+        if ( ! self::_checkUtf8W3c($file_content)) {
+            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding, but it did not successfully pass the W3C test.';
+            $phpcsFile->addError($error, 0);
+        }
+        if ( ! self::_checkUtf8Rfc3629($file_content)) {
+            $error = 'File "' . $file_name . '" should be saved with Unicode (UTF-8) encoding, but it did not meet RFC3629 requirements.';
+            $phpcsFile->addError($error, 0);
+        }
+    }//end process()
+
+
+    /**
+     * Checks that the string $content contains only valid UTF-8 chars
+     * using W3C's method.
+     * Returns true if $content contains only UTF-8 chars, false otherwise.
+     *
+     * @param string $content String to check.
+     *
+     * @return bool true if $content contains only UTF-8 chars, false otherwise.
+     *
+     * @see http://w3.org/International/questions/qa-forms-utf-8.html
+     */
+    private static function _checkUtf8W3c($content)
+    {
+        $content_chunks=self::mb_chunk_split($content, 4096, '');
+    	foreach($content_chunks as $content_chunk)
+		{
+			$preg_result= preg_match(
+            '%^(?:
+                  [\x09\x0A\x0D\x20-\x7E]            # ASCII
+                | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+                |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+                | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+                |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+                |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+                | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+                |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+            )*$%xs',
+            $content_chunk
+			);
+			if($preg_result!==1)
+			{
+				return false;
+			}
+
+		}
+		return true;
+    }//end _checkUtf8W3c()
+
+    /**
+     * Checks that the string $content contains only valid UTF-8 chars
+     * using the method described in RFC 3629.
+     * Returns true if $content contains only UTF-8 chars, false otherwise.
+     *
+     * @param string $content String to check.
+     *
+     * @return bool true if $content contains only UTF-8 chars, false otherwise.
+     *
+     * @see http://www.php.net/manual/en/function.mb-detect-encoding.php#85294
+     */
+    private static function _checkUtf8Rfc3629($content)
+    {
+        $len = strlen($content);
+        for ($i = 0; $i < $len; $i++) {
+            $c = ord($content[$i]);
+            if ($c > 128) {
+                if (($c >= 254)) {
+                    return false;
+                } elseif ($c >= 252) {
+                    $bits=6;
+                } elseif ($c >= 248) {
+                    $bits=5;
+                } elseif ($c >= 240) {
+                    $bytes = 4;
+                } elseif ($c >= 224) {
+                    $bytes = 3;
+                } elseif ($c >= 192) {
+                    $bytes = 2;
+                } else {
+                    return false;
+                } if (($i + $bytes) > $len) {
+                    return false;
+                } while ($bytes > 1) {
+                    $i++;
+                    $b = ord($content[$i]);
+                    if ($b < 128 || $b > 191) {
+                        return false;
+                    }
+                    $bytes--;
+                }
+            }
+        }
+        return true;
+    }//_checkUtf8Rfc3629()
+
+	 /**
+     * Splits a string to chunks of given size
+	 * This helps to avoid segmentation fault errors when large text is given
+     * Returns array of strings after splitting
+     *
+     * @param string $str String to split.
+	 * @param int $len number of characters per chunk
+     *
+     * @return array string array after splitting
+     *
+     * @see http://php.net/manual/en/function.chunk-split.php
+     */
+	private static function mb_chunk_split($str, $len, $glue)
+	{
+		if (empty($str)) return false;
+		$array = self::mbStringToArray ($str);
+		$n = -1;
+		$new = Array();
+		foreach ($array as $char) {
+			$n++;
+			if ($n < $len) $new []= $char;
+			elseif ($n == $len) {
+				$new []= $glue . $char;
+				$n = 0;
+			}
+		}
+		return $new;
+	}//mb_chunk_split
+	/**
+     * Supporting function for mb_chunk_split
+     *
+     * @param string $str
+	 *
+     * @return array
+     *
+     * @see http://php.net/manual/en/function.chunk-split.php
+     */
+	private static function mbStringToArray ($str)
+	{
+		if (empty($str)) return false;
+		$len = mb_strlen($str);
+		$array = array();
+		for ($i = 0; $i < $len; $i++) {
+			$array[] = mb_substr($str, $i, 1);
+		}
+		return $array;
+	}
+
+
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php b/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
new file mode 100644
index 00000000..072181b5
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Operators_LogicalOperatorAndSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Operators_LogicalOperatorAndSniff.
+ *
+ * Ensures that the logical operator 'AND' is in upper case and suggest the use of its symbolic equivalent.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Operators;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class LogicalOperatorAndSniff implements Sniff
+{
+	/**
+     * Returns an array of tokens this test wants to listen for: symbolic and literal operators and.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_LOGICAL_AND,
+        );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $operator_token = $tokens[$stackPtr];
+        $operator_string = $operator_token['content'];
+        $operator_code = $operator_token['code'];
+
+        if ($operator_string !== strtoupper($operator_string)) {
+            $error_message = 'Logical operator should be in upper case;'
+                . ' use "' . strtoupper($operator_string)
+                . '" instead of "' . $operator_string . '"';
+            $phpcsFile->addError($error_message, $stackPtr);
+        }
+
+        $warning_message = 'The symbolic form "&&" is preferred over the literal form "AND"';
+        $phpcsFile->addWarning($warning_message, $stackPtr);
+
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php b/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
new file mode 100755
index 00000000..fe229f62
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Operators_StrictComparisonOperatorSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Operators_StrictComparisonOperatorSniff.
+ *
+ * Ensures that only strict comparison operators are used instead of
+ * equal and not equal operators.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Operators;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class StrictComparisonOperatorSniff implements Sniff
+{
+    private static $_replacements = array(
+        T_IS_EQUAL     => '===',
+        T_IS_NOT_EQUAL => '!==',
+    );
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_IS_EQUAL,
+            T_IS_NOT_EQUAL,
+        );
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $operator_token = $tokens[$stackPtr];
+        $operator_string = $operator_token['content'];
+        $operator_code = $operator_token['code'];
+
+        $error_message = '"==" and "!=" are prohibited; use "'
+            . self::$_replacements[$operator_code] . '" instead of "'
+            . $operator_string . '".';
+        $phpcsFile->addError($error_message, $stackPtr);
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/Operators/UppercaseLogicalOperatorOrSniff.php b/build/CodeIgniter/Sniffs/Operators/UppercaseLogicalOperatorOrSniff.php
new file mode 100644
index 00000000..cda26c01
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Operators/UppercaseLogicalOperatorOrSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Operators_UppercaseLogicalOperatorOrSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Operators_UppercaseLogicalOperatorOrSniff.
+ *
+ * Ensures that the logical operator 'OR' is in upper cases and its symbolic equivalent.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Operators;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class UppercaseLogicalOperatorOrSniff implements Sniff
+{
+    /**
+     * Returns an array of tokens this test wants to listen for: literal and symbolic operators or.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_BOOLEAN_OR,
+            T_LOGICAL_OR,
+        );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $operator_token = $tokens[$stackPtr];
+        $operator_string = $operator_token['content'];
+        $operator_code = $operator_token['code'];
+
+        if ($operator_code == T_BOOLEAN_OR) {
+            $error_message = 'Logical operator "' . $operator_string
+                . '" is prohibited; use "OR" instead';
+            $phpcsFile->addError($error_message, $stackPtr, 'UseOf||InsteadOfOR');
+        }
+        // it is literal, if it is not symbolic
+        else if ($operator_string !== strtoupper($operator_string)) {
+            $error_message = 'Logical operator should be in upper case;'
+                . ' use "' . strtoupper($operator_string)
+                . '" instead of "' . $operator_string . '"';
+            $phpcsFile->addError($error_message, $stackPtr, 'UseOfLowercaseOr');
+        }
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/Strings/DoubleQuoteUsageSniff.php b/build/CodeIgniter/Sniffs/Strings/DoubleQuoteUsageSniff.php
new file mode 100755
index 00000000..2c54d71d
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/Strings/DoubleQuoteUsageSniff.php
@@ -0,0 +1,464 @@
+<?php
+
+/**
+ * CodeIgniter_Sniffs_Strings_DoubleQuoteUsageSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Strings;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * CodeIgniter_Sniffs_Strings_DoubleQuoteUsageSniff.
+ *
+ * Ensures that double-quoted strings are used only to parse variables,
+ * to avoid escape characters before single quotes or for chars that need
+ * to be interpreted like \r, \n or \t.
+ * If a double-quoted string contain both single and double quotes
+ * but no variable, then a warning is raised to encourage the use of
+ * single-quoted strings.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class VariableUsageSniff implements Sniff
+{
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		/*
+		return array(
+			T_DOUBLE_QUOTED_STRING,
+			T_CONSTANT_ENCAPSED_STRING,
+		);
+		*/
+		return array();
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param File $phpcsFile The current file being scanned.
+	 * @param int                  $stackPtr  The position of the current token
+	 *                                        in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$string = $tokens[$stackPtr]['content'];
+		// makes sure that it is about a double quote string,
+		// since variables are not parsed out of double quoted string
+		$openDblQtStr = substr($string, 0, 1);
+		if (0 === strcmp($openDblQtStr, '"')) {
+			$this->processDoubleQuotedString($phpcsFile, $stackPtr, $string);
+		} else if (0 === strcmp($openDblQtStr, "'")) {
+			$this->processSingleQuotedString($phpcsFile, $stackPtr, $string);
+		}
+	}//end process()
+
+
+	/**
+	 * Processes this test, when the token encountered is a double-quoted string.
+	 *
+	 * @param File $phpcsFile   The current file being scanned.
+	 * @param int                  $stackPtr    The position of the current token
+	 *                                          in the stack passed in $tokens.
+	 * @param string               $dblQtString The double-quoted string content,
+	 *                                          i.e. without quotes.
+	 *
+	 * @return void
+	 */
+	protected function processDoubleQuotedString (File $phpcsFile, $stackPtr, $dblQtString)
+	{
+		$variableFound = FALSE;
+		$strTokens = token_get_all('<?php '.$dblQtString);
+		$strPtr = 1; // skip php opening tag added by ourselves
+		$requireDblQuotes = FALSE;
+		while ($strPtr < count($strTokens)) {
+			$strToken = $strTokens[$strPtr];
+			if (is_array($strToken)) {
+				if (in_array($strToken[0], array(T_DOLLAR_OPEN_CURLY_BRACES, T_CURLY_OPEN))) {
+					$strPtr++;
+					try {
+						$this->_parseVariable($strTokens, $strPtr);
+					} catch (Exception $err) {
+						$error = 'There is no variable, object nor array between curly braces. Please use the escape char for $ or {.';
+						$phpcsFile->addError($error, $stackPtr);
+					}
+					$variableFound = TRUE;
+					if ('}' !== $strTokens[$strPtr]) {
+						$error = 'There is no matching closing curly brace.';
+						$phpcsFile->addError($error, $stackPtr);
+					}
+					// don't move forward, since it will be done in the main loop
+					// $strPtr++;
+				} else if (T_VARIABLE === $strToken[0]) {
+					$variableFound = TRUE;
+					$error = "Variable {$strToken[1]} in double-quoted strings should be enclosed with curly braces. Please consider {{$strToken[1]}}";
+					$phpcsFile->addError($error, $stackPtr);
+				}
+			}
+			$strPtr++;
+		}
+		return $variableFound;
+	}//end processDoubleQuotedString()
+
+
+	/**
+	 * Processes this test, when the token encountered is a single-quoted string.
+	 *
+	 * @param File $phpcsFile   The current file being scanned.
+	 * @param int                  $stackPtr    The position of the current token
+	 *                                          in the stack passed in $tokens.
+	 * @param string               $sglQtString The single-quoted string content,
+	 *                                          i.e. without quotes.
+	 *
+	 * @return void
+	 */
+	protected function processSingleQuotedString (File $phpcsFile, $stackPtr, $sglQtString)
+	{
+		$variableFound = FALSE;
+		$strTokens = token_get_all('<?php '.$sglQtString);
+		$strPtr = 1; // skip php opening tag added by ourselves
+		while ($strPtr < count($strTokens)) {
+			$strToken = $strTokens[$strPtr];
+			if (is_array($strToken)) {
+				if (T_VARIABLE === $strToken[0]) {
+					$error = "Variables like {$strToken[1]} should be in double-quoted strings only.";
+					$phpcsFile->addError($error, $stackPtr);
+				}
+			}
+			$strPtr++;
+		}
+		return $variableFound;
+	}//end processSingleQuotedString()
+
+	/**
+	 * Grammar rule to parse the use of a variable. Please notice that it
+	 * doesn't manage the leading $.
+	 *
+	 * _parseVariable ::= <variable>
+	 *     | <variable>_parseObjectAttribute()
+	 *     | <variable>_parseArrayIndexes()
+	 *
+	 * @exception Exception raised if $strTokens starting from $strPtr
+	 *                      doesn't matched the rule.
+	 *
+	 * @param array $strTokens Tokens to parse.
+	 * @param int   $strPtr    Pointer to the token where parsing starts.
+	 *
+	 * @return array The attribute name associated to index 'var', an array with
+	 * indexes 'obj' and 'attr' or an array with indexes 'arr' and 'idx'.
+	 */
+	private function _parseVariable ($strTokens, &$strPtr)
+	{
+		if ( ! in_array($strTokens[$strPtr][0], array(T_VARIABLE, T_STRING_VARNAME))) {
+			throw new Exception ('Expected variable name.');
+		}
+		$var = $strTokens[$strPtr][1];
+		$strPtr++;
+		$startStrPtr = $strPtr;
+		try {
+			$attr = $this->_parseObjectAttribute($strTokens, $strPtr);
+			return array ('obj' => $var, 'attr' => $attr);
+		} catch (Exception $err) {
+			if ($strPtr !== $startStrPtr) {
+				throw $err;
+			}
+		}
+		try {
+			$idx = $this->_parseArrayIndexes($strTokens, $strPtr);
+			return array ('arr' => $var, 'idx' => $idx);
+		} catch (Exception $err) {
+			if ($strPtr !== $startStrPtr) {
+				throw $err;
+			}
+		}
+		return array ('var' => $var);
+	}//end _parseVariable()
+
+
+	/**
+	 * Grammar rule to parse the use of an object attribute.
+	 *
+	 * _parseObjectAttribute ::= -><attribute>
+	 *     | -><attribute>_parseObjectAttribute()
+	 *     | -><attribute>_parseArrayIndexes()
+	 *
+	 * @exception Exception raised if $strTokens starting from $strPtr
+	 *                      doesn't matched the rule.
+	 *
+	 * @param array $strTokens Tokens to parse.
+	 * @param int   $strPtr    Pointer to the token where parsing starts.
+	 *
+	 * @return mixed The attribute name as a string, an array with indexes
+	 * 'obj' and 'attr' or an array with indexes 'arr' and 'idx'.
+	 */
+	private function _parseObjectAttribute ($strTokens, &$strPtr)
+	{
+		if (T_OBJECT_OPERATOR !== $strTokens[$strPtr][0]) {
+			throw new Exception ('Expected ->.');
+		}
+		$strPtr++;
+		if (T_STRING !== $strTokens[$strPtr][0]) {
+			throw new Exception ('Expected an object attribute.');
+		}
+		$attr = $strTokens[$strPtr][1];
+		$strPtr++;
+		$startStrPtr = $strPtr;
+		try {
+			$sub_attr = $this->_parseObjectAttribute($strTokens, $strPtr);
+			return array ('obj' => $attr, 'attr' => $sub_attr);
+		} catch (Exception $err) {
+			if ($strPtr !== $startStrPtr) {
+				throw $err;
+			}
+		}
+		try {
+			$idx = $this->_parseArrayIndexes($strTokens, $strPtr);
+			return array ('arr' => $attr, 'idx' => $idx);
+		} catch (Exception $err) {
+			if ($strPtr !== $startStrPtr) {
+				throw $err;
+			}
+		}
+		return $attr;
+	}//end _parseObjectAttribute()
+
+
+	/**
+	 * Grammar rule to parse the use of one or more array indexes.
+	 *
+	 * _parseArrayIndexes ::= _parseArrayIndex()+
+	 *
+	 * @exception Exception raised if $strTokens starting from $strPtr
+	 *                      doesn't matched the rule.
+	 *
+	 * @param array $strTokens Tokens to parse.
+	 * @param int   $strPtr    Pointer to the token where parsing starts.
+	 *
+	 * @return array Indexes in the same order as in the string.
+	 */
+	private function _parseArrayIndexes ($strTokens, &$strPtr)
+	{
+		$indexes = array($this->_parseArrayIndex($strTokens, $strPtr));
+		try {
+			while (1) {
+				$startStrPtr = $strPtr;
+				$indexes [] = $this->_parseArrayIndex($strTokens, $strPtr);
+			}
+		} catch (Exception $err) {
+			if (0 !== ($strPtr - $startStrPtr)) {
+				throw $err;
+			}
+			return $indexes;
+		}
+	}//end _parseArrayIndexes()
+
+
+	/**
+	 * Grammar rule to parse the use of array index.
+	 *
+	 * _parseArrayIndex ::= [<index>]
+	 *
+	 * @exception Exception raised if $strTokens starting from $strPtr
+	 *                      doesn't matched the rule.
+	 *
+	 * @param array $strTokens Tokens to parse.
+	 * @param int   $strPtr    Pointer to the token where parsing starts.
+	 *
+	 * @return string Index between the 2 square brackets
+	 */
+	private function _parseArrayIndex ($strTokens, &$strPtr)
+	{
+		if ('[' !== $strTokens[$strPtr]) {
+			throw new Exception ('Expected [.');
+		}
+		$strPtr++;
+		if (! in_array($strTokens[$strPtr][0], array(T_CONSTANT_ENCAPSED_STRING, T_LNUMBER))) {
+			throw new Exception ('Expected an array index.');
+		}
+		$index = $strTokens[$strPtr][1];
+		$strPtr++;
+		if (']' !== $strTokens[$strPtr]) {
+			throw new Exception ('Expected ].');
+		}
+		$strPtr++;
+		return $index;
+	}//end _parseArrayIndex()
+
+}//end class
+
+/**
+ * CodeIgniter_Sniffs_Strings_VariableUsageSniff.
+ *
+ * Ensures that variables parsed in double-quoted strings are enclosed with
+ * braces to prevent greedy token parsing.
+ * Single-quoted strings don't parse variables, so there is no risk of greedy
+ * token parsing.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class DoubleQuoteUsageSniff extends VariableUsageSniff
+{
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_DOUBLE_QUOTED_STRING,
+            T_CONSTANT_ENCAPSED_STRING,
+        );
+    }//end register()
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // no variable are in the string from here
+        $tokens = $phpcsFile->getTokens();
+        $qtString = $tokens[$stackPtr]['content'];
+        // makes sure that it is about a double quote string,
+        // since variables are not parsed out of double quoted string
+        $open_qt_str = substr($qtString, 0, 1);
+
+        // clean the enclosing quotes
+        $qtString = substr($qtString, 1, strlen($qtString) - 1 - 1);
+
+        if (0 === strcmp($open_qt_str, '"')) {
+            $this->processDoubleQuotedString($phpcsFile, $stackPtr, $qtString);
+        } else if (0 === strcmp($open_qt_str, "'")) {
+            $this->processSingleQuotedString($phpcsFile, $stackPtr, $qtString);
+        }
+    }//end process()
+
+
+    /**
+     * Processes this test, when the token encountered is a double-quoted string.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $qtString  The double-quoted string content,
+     *                                        i.e. without quotes.
+     *
+     * @return void
+     */
+    protected function processDoubleQuotedString (File $phpcsFile, $stackPtr, $qtString)
+    {
+        // so there should be at least a single quote or a special char
+        // if there are the 2 kinds of quote and no special char, then add a warning
+        $has_variable = parent::processDoubleQuotedString($phpcsFile, $stackPtr, '"'.$qtString.'"');
+        $has_specific_sequence = $this->_hasSpecificSequence($qtString);
+        $dbl_qt_at = strpos($qtString, '"');
+        $smpl_qt_at = strpos($qtString, "'");
+        if (false === $has_variable && false === $has_specific_sequence
+            && false === $smpl_qt_at
+        ) {
+            $error = 'Single-quoted strings should be used unless it contains variables, special chars like \n or single quotes.';
+            $phpcsFile->addError($error, $stackPtr);
+        } else if (false !== $smpl_qt_at && false !== $dbl_qt_at
+            && false === $has_variable && false === $has_specific_sequence
+        ) {
+            $warning = 'It is encouraged to use a single-quoted string, since it doesn\'t contain any variable nor special char though it mixes single and double quotes.';
+            $phpcsFile->addWarning($warning, $stackPtr);
+        }
+    }//end processDoubleQuotedString()
+
+
+    /**
+     * Processes this test, when the token encountered is a single-quoted string.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $qtString  The single-quoted string content,
+     *                                        i.e. without quotes.
+     *
+     * @return void
+     */
+    protected function processSingleQuotedString (File $phpcsFile, $stackPtr, $qtString)
+    {
+        // if there is single quotes without additional double quotes,
+        // then user is allowed to use double quote to avoid having to
+        // escape single quotes. Don't add the warning, if an error was
+        // already added, because a variable was found in a single-quoted
+        // string.
+        $has_variable = parent::processSingleQuotedString($phpcsFile, $stackPtr, "'".$qtString."'");
+        $dbl_qt_at = strpos($qtString, '"');
+        $smpl_qt_at = strpos($qtString, "'");
+        if (false === $has_variable && false !== $smpl_qt_at && false === $dbl_qt_at) {
+            $warning = 'You may also use double-quoted strings if the string contains single quotes, so you do not have to use escape characters.';
+            $phpcsFile->addWarning($warning, $stackPtr);
+        }
+    }//end processSingleQuotedString()
+
+    /**
+     * Return TRUE, if a sequence of chars that is parsed in a specific way
+     * in double-quoted strings is found, FALSE otherwise.
+     *
+     * @param string $string String in which sequence of special chars will
+     * be researched.
+     *
+     * @return TRUE, if a sequence of chars that is parsed in a specific way
+     * in double-quoted strings is found, FALSE otherwise.
+     *
+     * @link http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.double
+     */
+    private function _hasSpecificSequence($string)
+    {
+        $hasSpecificSequence = FALSE;
+        $specialMeaningStrs = array('\n', '\r', '\t', '\v', '\f');
+        foreach ($specialMeaningStrs as $splStr) {
+            if (FALSE !== strpos($string, $splStr)) {
+                $hasSpecificSequence = TRUE;
+            }
+        }
+        $specialMeaningPtrns = array('\[0-7]{1,3}', '\x[0-9A-Fa-f]{1,2}');
+        foreach ($specialMeaningPtrns as $splPtrn) {
+            if (1 === preg_match("/{$splPtrn}/", $string)) {
+                $hasSpecificSequence = TRUE;
+            }
+        }
+        return $hasSpecificSequence;
+    }//end _hasSpecificSequence()
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
new file mode 100755
index 00000000..55eb4d9b
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_DisallowSpaceIndentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@gmail.com>
+ * @copyright 2011 Thomas ERNEST
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_DisallowSpaceIndentSniff.
+ *
+ * Ensures the use of tabs for indentation.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@gmail.com>
+ * @copyright 2011 Thomas ERNEST
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class DisallowSpaceIndentSniff implements Sniff
+{
+
+    /**
+     * A list of tokenizers this sniff supports.
+     *
+     * @var array
+     */
+    public $supportedTokenizers = array(
+                                   'PHP',
+                                   'JS',
+                                   'CSS',
+                                  );
+
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(T_WHITESPACE);
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile All the tokens found in the document.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        // Make sure this is whitespace used for indentation.
+        $line = $tokens[$stackPtr]['line'];
+        if ($stackPtr > 0 && $tokens[($stackPtr - 1)]['line'] === $line) {
+            return;
+        }
+
+        if (strpos($tokens[$stackPtr]['content'], " ") !== false) {
+            $error = 'Tabs must be used to indent lines; spaces are not allowed for code indentation';
+            $phpcsFile->addError($error, $stackPtr);
+        }
+    }//end process()
+
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/Sniffs/WhiteSpace/DisallowWitheSpaceAroundPhpTagsSniff.php b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowWitheSpaceAroundPhpTagsSniff.php
new file mode 100755
index 00000000..615271e7
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowWitheSpaceAroundPhpTagsSniff.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_DisallowWitheSpaceAroundPhpTagsSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_DisallowWitheSpaceAroundPhpTagsSniff.
+ *
+ * Ensures that no whitespace precedes the opening PHP tag
+ * or follows the closing PHP tag.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class DisallowWitheSpaceAroundPhpTagsSniff implements Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+                T_OPEN_TAG,
+                T_CLOSE_TAG
+               );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $php_tag_token = $tokens[$stackPtr];
+        $php_tag_code = $php_tag_token['code'];
+
+        if (T_OPEN_TAG === $php_tag_code) {
+            // opening php tag should be the first token.
+            // any whitespace beofre an opening php tag is tokenized
+            // as T_INLINE_HTML, so no need to check the content of the token.
+            $isFirst = 0 === $stackPtr;
+            if ( ! $isFirst) {
+                $error = 'Any char before the opening PHP tag is prohibited. Please remove newline or indentation before the opening PHP tag.';
+                $phpcsFile->addError($error, $stackPtr);
+            }
+        } else {
+            // if (T_CLOSE_TAG === $php_tag_code)
+            // closing php tag should be the last token
+            // and it must not contain any whitespace.
+            $php_tag_string = $php_tag_token['content'];
+            $isLast = count($tokens) - 1 === $stackPtr;
+            // both of the two closing php tags contains 2 chars exactly.
+            $containsEndTagOnly = strlen($php_tag_string) > 2;
+            if ( ! $isLast || ! $containsEndTagOnly ) {
+                $error = 'Any char after the closing PHP tag is prohibited. Please removes newline or spaces after the closing PHP tag.';
+                $phpcsFile->addError($error, $stackPtr);
+            }
+        }
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php b/build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php
new file mode 100644
index 00000000..03687d7d
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/WhiteSpace/ElseOnNewLineSniff.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_ElseOnNewLineSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_ElseOnNewLineSniff.
+ *
+ * Ensures that control structures else and elseif stand on new lines.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ElseOnNewLineSniff implements Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_ELSE,
+            T_ELSEIF,
+        );
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $else_token = $tokens[$stackPtr];
+        $previous_non_blank_token_ptr = $phpcsFile->findPrevious(array(T_WHITESPACE), $stackPtr - 1, null, true);
+
+        if (false === $previous_non_blank_token_ptr) {
+        	// else is no preceded with any symbol, but it is not the responsibility of this sniff.
+        	return;
+        }
+
+        $previous_non_blank_token = $tokens[$previous_non_blank_token_ptr];
+        if ($previous_non_blank_token['line'] === $else_token['line']) {
+            $error = '"' . $else_token['content'] . '" should be on a new line.';
+            $phpcsFile->addError($error, $stackPtr);
+        }
+
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/Sniffs/WhiteSpace/LogicalNotSpacingSniff.php b/build/CodeIgniter/Sniffs/WhiteSpace/LogicalNotSpacingSniff.php
new file mode 100755
index 00000000..2e242e4d
--- /dev/null
+++ b/build/CodeIgniter/Sniffs/WhiteSpace/LogicalNotSpacingSniff.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_LogicalNotSpacingSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_WhiteSpace_LogicalNotSpacingSniff.
+ *
+ * Ensures that at exactly a space precedes and follows the logical operator !.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\WhiteSpace;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class LogicalNotSpacingSniff implements Sniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_BOOLEAN_NOT,
+        );
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $operator_token = $tokens[$stackPtr];
+
+        $previous_token = $tokens[$stackPtr - 1];
+        $next_token = $tokens[$stackPtr + 1];
+        if (T_WHITESPACE !== $previous_token['code'] || T_WHITESPACE !== $next_token['code']) {
+            $error = 'Logical operator ! should always be preceded and followed with a whitespace.';
+            $phpcsFile->addError($error, $stackPtr);
+        }
+    }//end process()
+
+
+}//end class
+
+?>
\ No newline at end of file
diff --git a/build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php b/build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php
new file mode 100644
index 00000000..dfdde6fa
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/Files/AbstractClosingCommentSniff.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Files_AbstractClosingCommentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Files_AbstractClosingCommentSniff.
+ *
+ * Defines some methods used by
+ * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff
+ * and CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Files;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class AbstractClosingCommentSniff implements Sniff
+{
+    /**
+     * As an abstract class, this sniff is not associated to any token.
+     */
+    public function register()
+    {
+      return array();
+    }
+
+    /**
+     * As an abstract class, this sniff is not dedicated to process a token.
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+      $error = __CLASS__.'::'.__METHOD__.' is abstract. Please develop this method in a child class.';
+      throw new PHP_CodeSniffer_Exception($error);
+    }
+
+    /**
+     * Returns the comment without its delimiter(s) as well as leading
+     * and traling whitespaces.
+     *
+     * It removes the first #, the two first / (i.e. //) or the first /*
+     * and last \*\/. If a comment starts with /**, then the last * will remain
+     * as well as whitespaces between this star and the comment content.
+     *
+     * @param string $comment Comment containing either comment delimiter(s) and
+     * trailing or leading whitspaces to clean.
+     *
+     * @return string Comment without comment delimiter(s) and whitespaces.
+     */
+    protected static function _getCommentContent ($comment)
+    {
+        if (self::_stringStartsWith($comment, '#')) {
+            $comment = substr($comment, 1);
+        } else if (self::_stringStartsWith($comment, '//')) {
+            $comment = substr($comment, 2);
+        } else if (self::_stringStartsWith($comment, '/*')) {
+            $comment = substr($comment, 2, strlen($comment) - 2 - 2);
+        }
+        $comment = trim($comment);
+        return $comment;
+    }//_getCommentContent()
+
+
+    /**
+     * Binary safe string comparison between $needle and
+     * the beginning of $haystack. Returns true if $haystack starts with
+     * $needle, false otherwise.
+     *
+     * @param string $haystack The string to search in.
+     * @param string $needle   The string to search for.
+     *
+     * @return bool true if $haystack starts with $needle, false otherwise.
+     */
+    protected static function _stringStartsWith ($haystack, $needle)
+    {
+        $startsWith = false;
+        if (strlen($needle) <= strlen($haystack)) {
+            $haystackBeginning = substr($haystack, 0, strlen($needle));
+            if (0 === strcmp($haystackBeginning, $needle)) {
+                $startsWith = true;
+            }
+        }
+        return $startsWith;
+    }//_stringStartsWith()
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php b/build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php
new file mode 100755
index 00000000..d060e082
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/Files/ClosingFileCommentSniff.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Files_ClosingFileCommentSniff.
+ *
+ * Ensures that a comment containing the file name is available at the end of file.
+ * Only other comments and whitespaces are allowed to follow this specific comment.
+ *
+ * It may be all kind of comment like multi-line and inline C-style comments as
+ * well as PERL-style comments. Any number of white may separate comment delimiters
+ * from comment content. However, content has to be equal to template
+ * "End of file <file_name>". Comparison between content and template is
+ * case-sensitive.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Files;
+
+use PHP_CodeSniffer\Files\File;
+
+class ClosingFileCommentSniff extends AbstractClosingCommentSniff
+{
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_OPEN_TAG,
+        );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // We are only interested if this is the first open tag.
+        if ($stackPtr !== 0) {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+                return;
+            }
+        }
+
+        $fullFilename = $phpcsFile->getFilename();
+        $filename = basename($fullFilename);
+        $commentTemplate = "End of file $filename";
+
+        $tokens = $phpcsFile->getTokens();
+        $currentToken = count($tokens) - 1;
+        $hasClosingFileComment = false;
+        $isNotAWhitespaceOrAComment = false;
+        while ($currentToken >= 0
+            && ! $isNotAWhitespaceOrAComment
+            && ! $hasClosingFileComment
+        ) {
+            $token = $tokens[$currentToken];
+            $tokenCode = $token['code'];
+            if (T_COMMENT === $tokenCode) {
+                $commentString = self::_getCommentContent($token['content']);
+                if (0 === strcmp($commentString, $commentTemplate)) {
+                    $hasClosingFileComment = true;
+                }
+            } else if (T_WHITESPACE === $tokenCode) {
+                // Whitespaces are allowed between the closing file comment,
+                // other comments and end of file
+            } else {
+                $isNotAWhitespaceOrAComment = true;
+            }
+            $currentToken--;
+        }
+
+        if ( ! $hasClosingFileComment) {
+            $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
+            $phpcsFile->addError($error, $currentToken);
+        }
+    }//end process()
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/Files/ClosingLocationCommentSniff.php b/build/CodeIgniter/UnusedSniffs/Files/ClosingLocationCommentSniff.php
new file mode 100755
index 00000000..ed842114
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/Files/ClosingLocationCommentSniff.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff.
+ *
+ * Ensures that a comment containing the file location exists at the end of file.
+ * Only other comments and whitespaces are allowed between this comment and
+ * the end of file.
+ *
+ * It may be all kind of comment like multi-line and inline C-style comments as
+ * well as PERL-style comments. Any number of white may separate comment delimiters
+ * from comment content. However, content has to be equal to template
+ * "Location: <file_path_relative_to_application_root>".
+ * Comparison between content and template is case-sensitive.
+ *
+ * There are several ways to configure the application root. In order of priority :
+ *   - Configuration variable ci_application_root.
+ *   - Rule property applicationRoot.
+ *   - Default value '/application/'
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2006 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\Files;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Common;
+
+class ClosingLocationCommentSniff extends AbstractClosingCommentSniff
+{
+    public $applicationRoot = '/application/';
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_OPEN_TAG
+        );
+
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // We are only interested if this is the first open tag.
+        if ($stackPtr !== 0) {
+            if ($phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1)) !== false) {
+                return;
+            }
+        }
+
+        $filePath = $phpcsFile->getFilename();
+        $tokens = $phpcsFile->getTokens();
+        // removes the application root from the beginning of the file path
+        $locationPath = self::_getLocationPath($filePath, $this->_getAppRoot());
+        // add an error, if application root doesn't exist in current file path
+        if (false === $locationPath) {
+            $error = 'Unable to find "' . $this->_getAppRoot() . '" in file path "' . $filePath . '". Please set your project\'s application root.';
+            $phpcsFile->addError($error, count($tokens) - 1);
+            return;
+        }
+        // generates the expected comment
+        $commentTemplate = "Location: $locationPath";
+
+        $currentToken = count($tokens) - 1;
+        $hasClosingLocationComment = false;
+        $isNotAWhitespaceOrAComment = false;
+        while ($currentToken >= 0
+            && ! $isNotAWhitespaceOrAComment
+            && ! $hasClosingLocationComment
+        ) {
+            $token = $tokens[$currentToken];
+            $tokenCode = $token['code'];
+            if (T_COMMENT === $tokenCode) {
+                $commentString = self::_getCommentContent($token['content']);
+                if (0 === strcmp($commentString, $commentTemplate)) {
+                    $hasClosingLocationComment = true;
+                }
+            } else if (T_WHITESPACE === $tokenCode) {
+                // Whitespaces are allowed between the closing file comment,
+                //other comments and end of file
+            } else {
+                $isNotAWhitespaceOrAComment = true;
+            }
+            $currentToken--;
+        }
+
+        if ( ! $hasClosingLocationComment) {
+            $error = 'No comment block marks the end of file instead of the closing PHP tag. Please add a comment block containing only "' . $commentTemplate . '".';
+            $phpcsFile->addError($error, $currentToken);
+        }
+    }//end process()
+
+
+    /**
+     * Returns the relative path from $appRoot to $filePath, or false if
+     * $appRoot cannot be found in $filePath, because $appRoot is not a parent
+     * of $filePath.
+     *
+     * @param string $filePath Full path to the file being proceed.
+     * @param string $appRoot  Partial or full path to the CodeIgniter
+     * application root of the file being proceed. It must not contain the
+     * full path to the application root, but at least the name of the
+     * application root. Parent directory of the application root are allowed
+     * but not mandatory.
+     *
+     * @return string|bool The relative path from $appRoot to $filePath, or
+     * false if $appRoot cannot be found in $filePath.
+     */
+    private static function _getLocationPath ($filePath, $appRoot)
+    {
+        // removes the path to application root
+        // from the beginning of the file path
+        $appRootAt = strpos($filePath, $appRoot);
+        if (false === $appRootAt) {
+            return false;
+        }
+        $localPath = substr($filePath, $appRootAt + strlen($appRoot));
+        // ensures the location path to be a relative path starting with "./".
+        if ( ! self::_stringStartsWith($localPath, './')) {
+            $localPath = './' . $localPath;
+        } else if ( ! self::_stringStartsWith($localPath, '.')
+            && self::_stringStartsWith($localPath, '/')
+        ) {
+            $localPath = '.' . $localPath;
+        }
+        return $localPath;
+    }//end _getLocationPath()
+
+
+    /**
+     * Returns the application root that should be used first.
+     *
+     * There are several ways to configure the application root.
+     * In order of priority :
+     *   - Configuration variable ci_application_root.
+     *   - Rule property applicationRoot.
+     *   - Default value '/application/'
+     *
+     * @return string Path to your project application root.
+     */
+    private function _getAppRoot()
+    {
+        $appRoot = Common::getConfigData('ci_application_root');
+        if (null === $appRoot) {
+            $appRoot = $this->applicationRoot;
+        }
+        return $appRoot;
+    }//end _getAppRoot()
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php b/build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php
new file mode 100755
index 00000000..983bb287
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/NamingConventions/ConstructorNameSniff.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ConstructorNameSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@gmail.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ConstructorNameSniff.
+ *
+ * Favor PHP 4 constructor syntax, which uses "function ClassName()".
+ * Avoid PHP 5 constructor syntax, which uses "function __construct()".
+ *
+ * @todo Try to avoid overly long and verbose names.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@gmail.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+class ConstructorNameSniff extends AbstractScopeSniff
+{
+
+
+    public $php5Constructors = '1';
+
+
+    /**
+     * Constructs the test with the tokens it wishes to listen for.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+
+    }//end __construct()
+
+
+    /**
+     * Processes this test when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param int                  $currScope A pointer to the start of the scope.
+     *
+     * @return void
+     */
+    protected function processTokenWithinScope(
+        File $phpcsFile,
+        $stackPtr,
+        $currScope
+    ) {
+        $methodName = $phpcsFile->getDeclarationName($stackPtr);
+        $className  = $phpcsFile->getDeclarationName($currScope);
+
+	$isPhp4Constructor = strcasecmp($methodName, $className) === 0;
+	$isPhp5Constructor = strcasecmp($methodName, '__construct') === 0;
+        if ($this->php5Constructors != '0') {
+            if ($isPhp4Constructor) {
+                $error = "PHP4 style constructors are not allowed; use \"__construct\" instead";
+                $phpcsFile->addError($error, $stackPtr);
+            }
+        } else {
+            if ($isPhp5Constructor) {
+                $error = "PHP5 style constructors are not allowed; use \"$className\" instead";
+                $phpcsFile->addError($error, $stackPtr);
+            }
+        }
+        if ( ! $isPhp4Constructor && ! $isPhp5Constructor ) {
+            return;
+        }
+
+        $tokens = $phpcsFile->getTokens();
+
+        $parentClassName = $phpcsFile->findExtendedClassName($currScope);
+        $wrongConstructor = '';
+        // prepares the error message and wrong constructor
+        if ($this->php5Constructors != '0') {
+            $error = 'PHP4 style calls to parent constructors are not allowed.';
+            $error = "$error Please use \"parent::__construct\" instead.";
+            if (false !== $parentClassName) {
+                $wrongConstructor = $parentClassName;
+            }
+            // Else $wrongConstructor will be empty
+            // and the test expression will always be false.
+            // It doesn't check that no parent method should be called
+            // when no parent class is defined.
+        } else {
+            $error = 'PHP5 style calls to parent constructors are not allowed.';
+            if (false !== $parentClassName) {
+                $error = "$error Please use \"parent::$parentClassName\" instead.";
+            }
+            $wrongConstructor = '__construct';
+        }
+
+        // looks for the use of a wrong constructor.
+        $endFunctionIndex = $tokens[$stackPtr]['scope_closer'];
+        $doubleColonIndex = $phpcsFile->findNext(
+            array(T_DOUBLE_COLON),
+            $stackPtr,
+            $endFunctionIndex
+        );
+        while ($doubleColonIndex) {
+            if ($tokens[($doubleColonIndex + 1)]['code'] === T_STRING
+                && $tokens[($doubleColonIndex + 1)]['content'] === $wrongConstructor
+            ) {
+                $phpcsFile->addError($error, ($doubleColonIndex + 1));
+            }
+
+            $doubleColonIndex = $phpcsFile->findNext(
+                array(T_DOUBLE_COLON),
+                $doubleColonIndex + 1,
+                $endFunctionIndex
+            );
+        }
+
+    }//end processTokenWithinScope()
+
+	protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
+	{
+		// TODO: Implement processTokenOutsideScope() method.
+	}
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php
new file mode 100755
index 00000000..2b24327d
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidClassNameSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidClassNameSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidClassNameSniff.
+ *
+ * Ensures that class and interface names have their first letter uppercase
+ * and that words are separated with an underscore, and not CamelCased.
+ *
+ * @todo Try to avoid overly long and verbose names in using property rule and
+ * configuration variable to set limits. Have a look at
+ * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ValidClassNameSniff implements Sniff
+{
+
+
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_CLASS,
+            T_INTERFACE,
+        );
+
+    }//end register()
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        // get the class name
+        $className = trim($phpcsFile->getDeclarationName($stackPtr));
+        // compute the expected class name
+        // [^_] means "something different from _", but not "nothing or something different from _"
+        $lcClassNameChunk = preg_replace('/([^_])([A-Z])/', '${1}_${2}', $className);
+        $expectedClassName
+            = strtoupper($className[0]) . strtolower(substr($lcClassNameChunk,1));
+        // ensures that the current class name
+        // and the expected class name are identical
+        if (0 !== strcmp($className, $expectedClassName)) {
+            $error =  'Class names should always have their first letter uppercase. Multiple words should be separated with an underscore, and not CamelCased. Please consider ' . $expectedClassName . ' instead of ' . $className . '.';
+            $phpcsFile->addError($error, $stackPtr);
+        }
+    }//end process()
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidFileNameSniff.php b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidFileNameSniff.php
new file mode 100644
index 00000000..7f10fa44
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidFileNameSniff.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidFileNameSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidFileNameSniff.
+ *
+ * Tests that the file name matchs the name of the class  that it contains in lower case.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baobaz.com>
+ * @copyright 2011 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class ValidFileNameSniff implements Sniff
+{
+    /**
+     * Returns an array of tokens this test wants to listen for.
+     *
+     * @return array
+     */
+    public function register()
+    {
+        return array(
+            T_CLASS,
+            T_INTERFACE,
+        );
+    }//end register()
+
+
+    /**
+     * Processes this test, when one of its tokens is encountered.
+     *
+     * @param File $phpcsFile The file being scanned.
+     * @param int                  $stackPtr  The position of the current token in the
+     *                                        stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        // computes the expected filename based on the name of the class or interface that it contains.
+        $decNamePtr = $phpcsFile->findNext(T_STRING, $stackPtr);
+        $decName = $tokens[$decNamePtr]['content'];
+        $expectedFileName = strtolower($decName);
+        // extracts filename without extension from its path.
+        $fullPath = $phpcsFile->getFilename();
+        $fileNameAndExt = basename($fullPath);
+        $fileName = substr($fileNameAndExt, 0, strrpos($fileNameAndExt, '.'));
+
+        if ($expectedFileName !== $fileName) {
+            $errorTemplate = 'Filename "%s" doesn\'t match the name of the %s that it contains "%s" in lower case. "%s" was expected.';
+            $errorMessage = sprintf(
+                $errorTemplate,
+                $fileName,
+                strtolower($tokens[$stackPtr]['content']), // class or interface
+                $decName,
+                $expectedFileName
+            );
+            $phpcsFile->addError($errorMessage, 0);
+        }
+    }//end process()
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php
new file mode 100755
index 00000000..34e973c6
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidMethodNameSniff.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
+ *
+ * Ensures that class methods and functions areentirely lowercased and that
+ * words are separated with an underscore, and not CamelCased.
+ * Ensures that private class methods are prefixed with an underscore and that
+ * all other methods are not prefixed with an underscored.
+ * Ensures that names longer than 50 chars are prohibited. Likewise names longer
+ * than 35 chars raise a warning.
+ *
+ * @todo Use a rule property or a configuration variable to allow users to set
+ * their own maximum lengths for function and method names. Have a look at
+ * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff and application root.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+
+namespace CodeIgniter\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Sniffs\AbstactScopeSniff;
+use PHP_CodeSniffer\Files\File;
+
+class ValidMethodNameSniff extends AbstractScopeSniff
+{
+    /**
+     * A list of all PHP magic methods.
+     *
+     * @var array
+     */
+    protected static $magicMethods = array(
+                               'construct',
+                               'destruct',
+                               'call',
+                               'callStatic',
+                               'get',
+                               'set',
+                               'isset',
+                               'unset',
+                               'sleep',
+                               'wakeup',
+                               'toString',
+                               'set_state',
+                               'clone',
+                              );
+
+    /**
+     * Defines which token(s) in which scope(s) will be proceed.
+     */
+    public function __construct()
+    {
+        parent::__construct(array(T_CLASS, T_INTERFACE), array(T_FUNCTION), true);
+
+    }//end __construct()
+
+
+    /**
+     * Processes the tokens within the scope.
+     *
+     * @param File $phpcsFile The file being processed.
+     * @param int                  $stackPtr  The position where this token was
+     *                                        found.
+     * @param int                  $currScope The position of the current scope.
+     *
+     * @return void
+     */
+    protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScope)
+    {
+        $methodName = $phpcsFile->getDeclarationName($stackPtr);
+        if ($methodName === null) {
+            // Ignore closures.
+            return;
+        }
+
+        $className  = $phpcsFile->getDeclarationName($currScope);
+
+        // Is this a magic method i.e. is prefixed with "__".
+        if (0 === strcmp(substr($methodName, 0, 2), '__')) {
+            $magicPart = substr($methodName, 2);
+            if (in_array($magicPart, self::$magicMethods) === false) {
+                 $error = "Method name \"$className::$methodName\" is invalid; only PHP magic methods should be prefixed with a double underscore";
+                 $phpcsFile->addError($error, $stackPtr);
+            }
+
+            return;
+        }
+
+        // PHP4 constructors are allowed to break our rules.
+        if ($methodName === $className) {
+            return;
+        }
+
+        // PHP4 destructors are allowed to break our rules.
+        if ($methodName === '_'.$className) {
+            return;
+        }
+
+        if (0 !== strcmp($methodName, strtolower($methodName))) {
+            $uscrdMethodName = preg_replace('/([A-Z])/', '_${1}', $methodName);
+            $expectedMethodName = strtolower($uscrdMethodName);
+            $error = "Class methods should be entirely lowercased. Please consider \"$expectedMethodName\" instead of \"$methodName\".";
+            $phpcsFile->addError($error, $stackPtr);
+            return;
+        }
+
+        $methodProps    = $phpcsFile->getMethodProperties($stackPtr);
+        $scope          = $methodProps['scope'];
+        $scopeSpecified = $methodProps['scope_specified'];
+
+        // If it's a private method, it must have an underscore on the front.
+        if ($scope === 'private' && $methodName{0} !== '_') {
+            $error = "Private method name \"$className::$methodName\" must be prefixed with an underscore";
+            $phpcsFile->addError($error, $stackPtr);
+            return;
+        }
+
+        // If it's not a private method, it must not have an underscore on the front.
+        if ($scope !== 'private' && $methodName{0} === '_') {
+            if (true === $scopeSpecified) {
+                $error = "Public method name \"$className::$methodName\" must not be prefixed with an underscore";
+            } else {
+                $error = ucfirst($scope)." method name \"$className::$methodName\" must not be prefixed with an underscore";
+            }
+            $phpcsFile->addError($error, $stackPtr);
+            return;
+        }
+
+        // If name is too verbose,
+        // then either an error or a warning is displayed.
+        $error_limit = 50;
+        $warning_limit = 35;
+        if (strlen($methodName) > $error_limit) {
+            $error = "Overly long and verbose names are prohibited. Please find a name shorter than $error_limit chars.";
+            $phpcsFile->addError($error, $stackPtr);
+            return;
+        } else if (strlen($methodName) > $warning_limit) {
+            $warning = "Try to avoid overly long and verbose names in finding a name shorter than $warning_limit chars.";
+            $phpcsFile->addWarning($warning, $stackPtr);
+        }
+    }//end processTokenWithinScope()
+
+}//end class
+
+?>
diff --git a/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php
new file mode 100755
index 00000000..c4d8798c
--- /dev/null
+++ b/build/CodeIgniter/UnusedSniffs/NamingConventions/ValidVariableNameSniff.php
@@ -0,0 +1,562 @@
+<?php
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidVariableNameSniff.
+ *
+ * PHP version 5
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+/**
+ * CodeIgniter_Sniffs_NamingConventions_ValidVariableNameSniff.
+ *
+ * Ensures that variable names contain only lowercase letters,
+ * use underscore separators.
+ * Ensures that class attribute names are prefixed with an underscore,
+ * only when they are private.
+ * Ensure that variable names are longer than 3 chars except those declared
+ * in for loops.
+ *
+ * @todo Try to avoid overly long and verbose names in using property rule and
+ * configuration variable to set limits. Have a look at
+ * CodeIgniter_Sniffs_NamingConventions_ValidMethodNameSniff.
+ * @todo Use a property rule or a configuration variable to allow users to set
+ * minimum variable name length. Have a look at
+ * CodeIgniter_Sniffs_Files_ClosingLocationCommentSniff and application root.
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Thomas Ernest <thomas.ernest@baoabz.com>
+ * @copyright 2010 Thomas Ernest
+ * @license   http://thomas.ernest.fr/developement/php_cs/licence GNU General Public License
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+namespace CodeIgniter\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
+use PHP_CodeSniffer\Files\File;
+
+class ValidVariableNameSniff extends AbstractVariableSniff
+{
+
+
+    /**
+     * Processes class member variables.
+     *
+     * @param File $phpcsFile The file being scanned.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    protected function processMemberVar(File $phpcsFile, $stackPtr)
+    {
+        // get variable name and properties
+        $tokens = $phpcsFile->getTokens();
+        $varTk = $tokens[$stackPtr];
+        $varName = substr($varTk['content'], 1);
+        $varProps = $phpcsFile->getMemberProperties($stackPtr);
+        // check(s)
+        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName) ) {
+            return;
+        }
+        if ( ! $this->checkVisibilityPrefix($phpcsFile, $stackPtr, $varName, $varProps)) {
+            return;
+        }
+        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+            return;
+        }
+
+    }//end processMemberVar()
+
+
+    /**
+     * Processes normal variables.
+     *
+     * @param File $phpcsFile The file where this token was found.
+     * @param int                  $stackPtr  The position where the token was found.
+     *
+     * @return void
+     */
+    protected function processVariable(File $phpcsFile, $stackPtr)
+    {
+        // get variable name
+        $tokens = $phpcsFile->getTokens();
+        $varTk = $tokens[$stackPtr];
+        $varName = substr($varTk['content'], 1);
+        // skip the current object variable, i.e. $this
+        if (0 === strcmp($varName, 'this')) {
+            return;
+        }
+        // check(s)
+        if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+            return;
+        }
+        if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+            return;
+        }
+
+    }//end processVariable()
+
+
+    /**
+     * Processes variables in double quoted strings.
+     *
+     * @param File $phpcsFile The file where this token was found.
+     * @param int                  $stackPtr  The position where the token was found.
+     *
+     * @return void
+     */
+    protected function processVariableInString(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $stringTk = $tokens[$stackPtr];
+        $stringString = $stringTk['content'];
+        $varAt = self::_getVariablePosition($stringString, 0);
+        while (false !== $varAt) {
+            // get variable name
+            $matches = array();
+            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', substr($stringString, $varAt), $matches);
+            $varName = $matches[1];
+            // check(s)
+            if ( ! $this->checkLowerCase($phpcsFile, $stackPtr, $varName)) {
+                return;
+            }
+            if ( ! $this->checkLength($phpcsFile, $stackPtr, $varName)) {
+                return;
+            }
+            // prepare checking next variable
+            $varAt = self::_getVariablePosition($stringString, $varAt + 1);
+        }
+
+    }//end processVariableInString()
+
+
+    /**
+     * Checks that the variable name is all in lower case, else it add an error
+     * to $phpcsFile. Returns true if variable name is all in lower case, false
+     * otherwise.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $varName   The name of the variable to
+     *                                        procced without $, { nor }.
+     *
+     * @return bool true if variable name is all in lower case, false otherwise.
+     */
+    protected function checkLowerCase(File $phpcsFile, $stackPtr, $varName)
+    {
+        $isInLowerCase = true;
+        if (0 !== strcmp($varName, strtolower($varName))) {
+            // get the expected variable name
+            $varNameWithUnderscores = preg_replace('/([A-Z])/', '_${1}', $varName);
+            $expectedVarName = strtolower(ltrim($varNameWithUnderscores, '_'));
+            // adapts the error message to the error case
+            if (strlen($varNameWithUnderscores) > strlen($varName)) {
+                $error = 'Variables should not use CamelCasing or start with a Capital.';
+            } else {
+                $error = 'Variables should be entirely lowercased.';
+            }
+            $error = $error . 'Please consider "' . $expectedVarName
+                . '" instead of "' . $varName . '".';
+            // adds the error and changes return value
+            $phpcsFile->addError($error, $stackPtr);
+            $isInLowerCase = false;
+        }
+        return $isInLowerCase;
+    }//end checkLowerCase()
+
+    /**
+     * Checks that an underscore is used at the beginning of a variable only if
+     * it is about a private variable. If it isn't a private variable, then it
+     * must not be prefixed with an underscore. Returns true if $varName is
+     * properly prefixed according to the variable visibility provided in
+     * $varProps, false otherwise.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $varName   The name of the variable to
+     *                                        procced without $, { nor }.
+     * @param array                $varProps  Member variable properties like
+     *                                        its visibility.
+     *
+     * @return bool true if variable name is prefixed with an underscore only
+     * when it is about a private variable, false otherwise.
+     */
+    protected function checkVisibilityPrefix(File $phpcsFile, $stackPtr, $varName, $varProps)
+    {
+        $isVisibilityPrefixRight = true;
+        $scope = $varProps['scope'];
+        // If it's a private variable, it must have an underscore on the front.
+        if ($scope === 'private' && $varName{0} !== '_') {
+            $error = "Private variable name \"$varName\" must be prefixed with an underscore";
+            $phpcsFile->addError($error, $stackPtr);
+            $isVisibilityPrefixRight = false;
+        } else if ($scope !== 'private' && $varName{0} === '_') {
+            // If it's not a private variable,
+            // then it must not start with an underscore.
+            if (isset ($scopeSpecified) && true === $scopeSpecified) {
+                $error = "Public variable name \"$varName\" must not be prefixed with an underscore";
+            } else {
+                $error = ucfirst($scope) . " variable name \"$varName\" must not be prefixed with an underscore";
+            }
+            $phpcsFile->addError($error, $stackPtr);
+            $isVisibilityPrefixRight = false;
+        }
+        return $isVisibilityPrefixRight;
+    }//end checkVisibilityPrefix()
+
+    /**
+     * Checks that variable name length is not too short. Returns true, if it
+     * meets minimum length requirement, false otherwise.
+     *
+     * A variable name is too short if it is shorter than the minimal
+     * length and it isn't in the list of allowed short names nor declared in a
+     * for loop (in which it would be nested).
+     * The minimal length is defined in the function. It is 3 chars now.
+     * The list of allowed short names is defined in the function.
+     * It is case-sensitive. It contains only 'ci' now.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $varName   The name of the variable to
+     *                                        procced without $, { nor }.
+     *
+     * @return bool false if variable name $varName is shorter than the minimal
+     * length and it isn't in the list of allowed short names nor declared in a
+     * for loop (in which it would be nested), otherwise true.
+     */
+    protected function checkLength(File $phpcsFile, $stackPtr, $varName)
+    {
+        $minLength = 3;
+        $allowedShortName = array('ci');
+
+        $isLengthRight = true;
+        // cleans variable name
+        $varName = ltrim($varName, '_');
+        if (strlen($varName) <= $minLength) {
+            // skips adding an error, if it is a specific variable name
+            if (in_array($varName, $allowedShortName)) {
+                return $isLengthRight;
+            }
+            // skips adding an error, if the variable is in a for loop
+            if (false !== self::_isInForLoop($phpcsFile, $stackPtr, $varName)) {
+                return $isLengthRight;
+            }
+            // adds the error message finally
+            $error = 'Very short'
+                . (
+                    $minLength > 0 ?
+                    ' (i.e. less than ' . ($minLength + 1) . ' chars)'
+                    : ''
+                )
+                . ', non-word variables like "' . $varName
+                . '" should only be used as iterators in for() loops.';
+            $phpcsFile->addError($error, $stackPtr);
+            $isLengthRight = false;
+        }
+        return $isLengthRight;
+    }//end checkLength()
+
+    /**
+     * Returns the position of closest previous T_FOR, if token associated with
+     * $stackPtr in $phpcsFile is in a for loop, otherwise false.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     * @param string               $varName   The name of the variable to
+     *                                        procced without $, { nor }.
+     *
+     * @return int|bool Position of T_FOR if token associated with $stackPtr in
+     *                  $phpcsFile is in the head of a for loop, otherwise false.
+     */
+    private static function _isInForLoop(File $phpcsFile, $stackPtr, $varName)
+    {
+        $keepLookingFromPtr = $stackPtr;
+        while (false !== $keepLookingFromPtr) {
+            // looks if it is in (head or body) of a for loop
+            $forPtr = self::_isInForLoopHead($phpcsFile, $keepLookingFromPtr);
+            if (false === $forPtr) {
+                $forPtr = self::_isInForLoopBody($phpcsFile, $keepLookingFromPtr);
+            }
+            // checks if it is declared in here and prepares next step
+            if (false !== $forPtr) {
+                if (false !== self::_isDeclaredInForLoop($phpcsFile, $forPtr, $varName)) {
+                    return $forPtr;
+                }
+                $keepLookingFromPtr = $forPtr;
+            } else {
+                $keepLookingFromPtr = false;
+            }
+        }
+        return false;
+    }//end _isInForLoop()
+
+    /**
+     * Returns the position of closest previous T_FOR, if token associated with
+     * $stackPtr in $phpcsFile is in the head of a for loop, otherwise false.
+     * The head is the code placed between parenthesis next to the key word
+     * 'for' : for (<loop_head>) {<loop_body>}.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return int|bool Position of T_FOR if token associated with $stackPtr in
+     *                  $phpcsFile is in the head of a for loop, otherwise false.
+     */
+    private static function _isInForLoopHead(File $phpcsFile, $stackPtr)
+    {
+        $isInForLoop = false;
+        $tokens = $phpcsFile->getTokens();
+        $currentTk = $tokens[$stackPtr];
+        if (array_key_exists('nested_parenthesis', $currentTk)) {
+            $nestedParenthesis = $currentTk['nested_parenthesis'];
+            foreach ( $nestedParenthesis as $openParPtr => $closeParPtr) {
+                $nonWhitspacePtr = $phpcsFile->findPrevious(
+                    array(T_WHITESPACE),
+                    $openParPtr - 1,
+                    null,
+                    true,
+                    null,
+                    true
+                );
+                if (false !== $nonWhitspacePtr) {
+                    $isFor = T_FOR === $tokens[$nonWhitspacePtr]['code'];
+                    if ($isFor) {
+                        $isInForLoop = $nonWhitspacePtr;
+                        break;
+                    }
+                }
+            }
+        }
+        return $isInForLoop;
+    }//end _isInForLoopHead()
+
+    /**
+     * Returns the position of closest previous T_FOR, if token associated with
+     * $stackPtr in $phpcsFile is in the body of a for loop, otherwise false.
+     * The body are the instructions placed after parenthesis of a 'for'
+     * declaration, enclosed with curly brackets usually.
+     * 'for' : for (<loop_head>) {<loop_body>}.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $stackPtr  The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return int|bool Position of T_FOR if token associated with $stackPtr in
+     *                  $phpcsFile is in the body of a for loop, otherwise false.
+     */
+    private static function _isInForLoopBody(File $phpcsFile, $stackPtr)
+    {
+        $isInForLoop = false;
+        $tokens = $phpcsFile->getTokens();
+        // get englobing hierarchy
+        $parentPtrAndCode = $tokens[$stackPtr]['conditions'];
+        krsort($parentPtrAndCode);
+
+        // looks for a for loop having a body not enclosed with curly brackets,
+        // which involves that its body contains only one instruction.
+        if (is_array($parentPtrAndCode) && ! empty($parentPtrAndCode)) {
+            $parentCode = reset($parentPtrAndCode);
+            $parentPtr = key($parentPtrAndCode);
+            $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
+        } else {
+            $parentCode = 0;
+            $parentPtr = 0;
+            $openBracketPtr = 0;
+        }
+        $openResearchScopePtr = $stackPtr;
+        // recursive search, since a for statement may englobe other inline
+        // control statement or may be near to function calls, etc...
+        while (false !== $openResearchScopePtr) {
+            $closeParPtr = $phpcsFile->findPrevious(
+                array(T_CLOSE_PARENTHESIS),
+                $openResearchScopePtr,
+                null,
+                false,
+                null,
+                true
+            );
+            // is there a closing parenthesis with a control statement before
+            // the previous instruction ?
+            if (false !== $closeParPtr) {
+                // is there no opening curly bracket specific to
+                // set of instructions, between the closing parenthesis
+                // and the current token ?
+                if ($openBracketPtr < $closeParPtr) {
+                    // starts the search from the token before the closing
+                    // parenthesis, if it isn't a for statement
+                    $openResearchScopePtr = $closeParPtr - 1;
+                    // is this parenthesis associated with a for statement ?
+                    $closeParenthesisTk = $tokens[$closeParPtr];
+                    if (array_key_exists('parenthesis_owner', $closeParenthesisTk)) {
+                        $mayBeForPtr = $closeParenthesisTk['parenthesis_owner'];
+                        $mayBeForTk = $tokens[$mayBeForPtr];
+                        if (T_FOR === $mayBeForTk['code']) {
+                            return $mayBeForPtr;
+                        }
+                    }
+                } else {
+                    // if it is about a for loop, don't go further
+                    // and detect it after one more loop execution, do it now
+                    if (T_FOR === $parentCode) {
+                        return $parentPtr;
+                    }
+                    // starts the search from the token before the one
+                    // englobing the current statement
+                    $openResearchScopePtr = $parentPtr - 1;
+                    // re-initialize variables about the englobing structure
+                    if (is_array($parentPtrAndCode)) {
+                        $parentCode = next($parentPtrAndCode);
+                        $parentPtr = key($parentPtrAndCode);
+                        $openBracketPtr = $tokens[$parentPtr]['scope_opener'];
+                    }
+                }
+            } else {
+                $openResearchScopePtr = false;
+            }
+        }
+        // looks for a for loop having a body enclosed with curly brackets
+        foreach ($parentPtrAndCode as $parentPtr => $parentCode) {
+            if (T_FOR === $parentCode) {
+                return $parentPtr;
+            }
+        }
+        return false;
+    }//end _isInForLoopBody()
+
+    /**
+     * Returns true if a variable declared in the head of the for loop pointed
+     * by $forPtr in file $phpcsFile has the name $varName.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $forPtr    The position of the 'for' token
+     *                                        in the stack passed in $tokens.
+     * @param string               $varName   The name of the variable to
+     *                                        procced without $, { nor }.
+     *
+     * @return int|bool true if a variable declared in the head of the for loop
+     * pointed by $forPtr in file $phpcsFile has the name $varName.
+     */
+    private static function _isDeclaredInForLoop(File $phpcsFile, $forPtr, $varName)
+    {
+        $isDeclaredInFor = false;
+        $tokens = $phpcsFile->getTokens();
+        $forVarPtrs = self::_getVarDeclaredInFor($phpcsFile, $forPtr);
+        foreach ($forVarPtrs as $forVarPtr) {
+            $forVarTk = $tokens[$forVarPtr];
+            // get variable name
+            $matches = array();
+            preg_match('/^\$\{?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\}?/', $forVarTk['content'], $matches);
+            $forVarName = $matches[1];
+            if (0 === strcmp($forVarName, $varName)) {
+                $isDeclaredInFor = $forVarPtr;
+                break;
+            }
+        }
+        return $isDeclaredInFor;
+    }//end _isDeclaredInForLoop()
+
+    /**
+     * Returns list of pointers to variables declared in for loop associated to
+     * $forPtr in file $phpcsFile.
+     *
+     * All pointers in the result list are pointing to token with code
+     * T_VARIABLE. An exception is raised, if $forPtr doesn't point a token with
+     * code T_FOR.
+     *
+     * @param File $phpcsFile The current file being processed.
+     * @param int                  $forPtr    The position of the current token
+     *                                        in the stack passed in $tokens.
+     *
+     * @return array List of pointers to variables declared in for loop $forPtr.
+     */
+    private static function _getVarDeclaredInFor(File $phpcsFile, $forPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+        $forTk = $tokens[$forPtr];
+        if (T_FOR !== $forTk['code']) {
+            throw new PHP_CodeSniffer_Exception('$forPtr must be of type T_FOR');
+        }
+        $openParPtr = $forTk['parenthesis_opener'];
+        $openParenthesisTk = $tokens[$openParPtr];
+        $endOfDeclPtr = $phpcsFile->findNext(array(T_SEMICOLON), $openParPtr);
+        $forVarPtrs = array();
+        $varPtr = $phpcsFile->findNext(
+            array(T_VARIABLE),
+            $openParPtr + 1,
+            $endOfDeclPtr
+        );
+        while (false !== $varPtr) {
+            $forVarPtrs [] = $varPtr;
+            $varPtr = $phpcsFile->findNext(
+                array(T_VARIABLE),
+                $varPtr + 1,
+                $endOfDeclPtr
+            );
+        }
+        return $forVarPtrs;
+    }//end _getVarDeclaredInFor()
+
+    /**
+     * Returns the position of first occurrence of a PHP variable starting with
+     * $ in $haystack from $offset.
+     *
+     * @param string $haystack The string to search in.
+     * @param int    $offset   The optional offset parameter allows you to
+     *                         specify which character in haystack to start
+     *                         searching. The returned position is still
+     *                         relative to the beginning of haystack.
+     *
+     * @return mixed The position as an integer
+     *               or the boolean false, if no variable is found.
+     */
+    private static function _getVariablePosition($haystack, $offset = 0)
+    {
+        $var_starts_at = strpos($haystack, '$', $offset);
+        $is_a_var = false;
+        while (false !== $var_starts_at && ! $is_a_var) {
+            // makes sure that $ is used for a variable and not as a symbol,
+            // if $ is protected with the escape char, then it is a symbol.
+            if (0 !== strcmp($haystack[$var_starts_at - 1], '\\')) {
+                if (0 === strcmp($haystack[$var_starts_at + 1], '{')) {
+                    // there is an opening brace in the right place
+                    // so it looks for the closing brace in the right place
+                    $hsChunk2 = substr($haystack, $var_starts_at + 2);
+                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\}/', $hsChunk2)) {
+                        $is_a_var = true;
+                    }
+                } else {
+                    $hsChunk1 = substr($haystack, $var_starts_at + 1);
+                    if (1 === preg_match('/^[a-zA-Z_\x7f-\xff]/', $hsChunk1)) {
+                        // $ is used for a variable and not as a symbol,
+                        // since what follows $ matchs the definition of
+                        // a variable label for PHP.
+                        $is_a_var = true;
+                    }
+                }
+            }
+            // update $var_starts_at for the next variable
+            // only if no variable was found, since it is returned otherwise.
+            if ( ! $is_a_var) {
+                $var_starts_at = strpos($haystack, '$', $var_starts_at + 1);
+            }
+        }
+        if ($is_a_var) {
+            return $var_starts_at;
+        } else {
+            return false;
+        }
+    }//end _getVariablePosition()
+}//end class
+
+?>
diff --git a/build/CodeIgniter/ruleset.xml b/build/CodeIgniter/ruleset.xml
new file mode 100644
index 00000000..83974072
--- /dev/null
+++ b/build/CodeIgniter/ruleset.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ruleset name="CodeIgniter">
+  <description>CodeIgniter coding standard as described at http://codeigniter.com/user_guide/general/styleguide.html.</description>
+  <rule ref="Generic.Files.LineEndings">
+    <properties>
+      <property name="eolChar" value="\n"/>
+    </properties>
+  </rule>
+
+  <!-- PHP files should OMIT the closing PHP tag -->
+  <rule ref="Zend.Files.ClosingTag"/>
+  <!-- Always use full PHP opening tags -->
+  <rule ref="Generic.PHP.DisallowShortOpenTag"/>
+
+  <!-- Constants should always be fully uppercase -->
+  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
+  <!-- TRUE, FALSE, and NULL keywords should always be fully uppercase -->
+  <rule ref="Generic.PHP.UpperCaseConstant"/>
+
+  <!-- One statement per line -->
+  <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
+
+  <!-- Classes and functions should be commented -->
+  <rule ref="PEAR.Commenting.ClassComment"/>
+  <rule ref="PEAR.Commenting.FunctionComment"/>
+  <rule ref="Squiz.Commenting.FunctionCommentThrowTag"/>
+  <!-- Use warnings for docblock comments for files and variables, since nothing is cleary explained -->
+  <rule ref="PEAR.Commenting.FileComment">
+    <properties>
+      <property name="error" value="false"/>
+    </properties>
+  </rule>
+  <rule ref="Squiz.Commenting.VariableComment">
+    <properties>
+      <property name="error" value="false"/>
+    </properties>
+  </rule>
+
+  <!-- Use Allman style indenting. With the exception of Class declarations,
+       braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them. -->
+  <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
+  <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
+  <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
+
+  <!-- @todo Please see PHP_CodeSniffer_Standards_CodeIgniter_CodeIgniterCodingStandard for more details about what there is to do -->
+</ruleset>
+
diff --git a/build/animeclient_header_comment.txt b/build/animeclient_header_comment.txt
index a2a4ecb8..66b34887 100644
--- a/build/animeclient_header_comment.txt
+++ b/build/animeclient_header_comment.txt
@@ -3,9 +3,12 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2016  Timothy J. Warren
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @version     3.1
  * @license     MIT
  */
\ No newline at end of file
diff --git a/build/phpcs.xml b/build/phpcs.xml
new file mode 100644
index 00000000..58d9c542
--- /dev/null
+++ b/build/phpcs.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<ruleset name="Tim's Coding Standard">
+	<description>A variation of the CodeIgniter standard</description>
+
+	<file>../src/</file>
+
+	<encoding>utf-8</encoding>
+
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n"/>
+		</properties>
+	</rule>
+
+	<!-- PHP files should OMIT the closing PHP tag -->
+	<rule ref="Zend.Files.ClosingTag"/>
+	<!-- Always use full PHP opening tags -->
+	<rule ref="Generic.PHP.DisallowShortOpenTag"/>
+
+	<!-- Constants should always be fully uppercase -->
+	<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
+	<!-- TRUE, FALSE, and NULL keywords should always be fully uppercase -->
+	<rule ref="Generic.PHP.UpperCaseConstant"/>
+
+	<!-- One statement per line -->
+	<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
+
+	<!-- Classes and functions should be commented -->
+	<rule ref="PEAR.Commenting.ClassComment">
+		<exclude name="PEAR.Commenting.ClassComment.MissingCategoryTag" />
+		<exclude name="PEAR.Commenting.ClassComment.MissingPackageTag" />
+		<exclude name="PEAR.Commenting.ClassComment.MissingAuthorTag" />
+		<exclude name="PEAR.Commenting.ClassComment.MissingLicenseTag" />
+		<exclude name="PEAR.Commenting.ClassComment.MissingLinkTag" />
+	</rule>
+	<rule ref="PEAR.Commenting.FunctionComment">
+		<!-- Exclude this sniff because it doesn't understand multiple types -->
+		<exclude name="PEAR.Commenting.FunctionComment.MissingParamComment" />
+		<exclude name="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+	</rule>
+
+	<!-- Use warnings for docblock comments for files and variables, since nothing is cleary explained -->
+	<rule ref="PEAR.Commenting.FileComment">
+		<exclude name="PEAR.Commenting.FileComment.InvalidVersion" />
+		<exclude name="PEAR.Commenting.FileComment.MissingCategoryTag" />
+		<properties>
+			<property name="error" value="false"/>
+		</properties>
+	</rule>
+
+	<rule ref="Squiz.Commenting.FunctionCommentThrowTag"/>
+	<rule ref="Squiz.Commenting.VariableComment">
+		<properties>
+			<property name="error" value="false"/>
+		</properties>
+	</rule>
+
+	<!-- Use Allman style indenting. With the exception of Class declarations,
+         braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them. -->
+	<rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
+	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
+
+	<!-- Use only short array syntax -->
+	<rule ref="Generic.Arrays.DisallowLongArraySyntax" />
+
+	<rule ref="Generic.PHP.ForbiddenFunctions">
+		<properties>
+			<property name="forbiddenFunctions" type="array" value="create_function=>null,eval=>null" />
+		</properties>
+	</rule>
+
+	<!-- Inherit CodeIgniter Rules -->
+	<rule ref="./CodeIgniter">
+		<properties>
+			<property name="error" value="false" />
+		</properties>
+	</rule>
+</ruleset>
\ No newline at end of file
diff --git a/build/phpdox.xml b/build/phpdox.xml
index 0be4b97d..09f85dce 100644
--- a/build/phpdox.xml
+++ b/build/phpdox.xml
@@ -1,131 +1,128 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--  This is a skeleton phpDox config file - Check http://phpDox.de for latest version and more info -->
 <phpdox xmlns="http://xml.phpdox.net/config" silent="false">
-    <!--  @silent: true | false to enable or disable visual output of progress -->
+	<!--  @silent: true | false to enable or disable visual output of progress -->
 
-    <!-- Additional bootstrap files to load for additional parsers, enrichers and/or engines -->
-    <!-- Place as many require nodes as you feel like in this container -->
-    <!-- syntax: <require file="/path/to/file.php" /> -->
-    <bootstrap />
+	<!-- Additional bootstrap files to load for additional parsers, enrichers and/or engines -->
+	<!-- Place as many require nodes as you feel like in this container -->
+	<!-- syntax: <require file="/path/to/file.php" /> -->
+	<bootstrap />
 
-    <!-- A phpDox project to process, you can have multiple projects in one config file -->
-    <project name="Hummingbird Anime Client" source="../src" workdir="phpdox/xml">
-        <!--  @name    - The name of the project -->
-        <!--  @source  - The source directory of the application to process -->
-        <!--  @workdir - The directory to store the xml data files in -->
+	<!-- A phpDox project to process, you can have multiple projects in one config file -->
+	<project name="Hummingbird Anime Client" source="../src" workdir="phpdox/xml">
+		<!--  @name	- The name of the project -->
+		<!--  @source  - The source directory of the application to process -->
+		<!--  @workdir - The directory to store the xml data files in -->
 
-        <!--  A phpDox config file can define additional variables (properties) per project -->
-        <!--  <property name="some.name" value="the.value" /> -->
+		<!--  A phpDox config file can define additional variables (properties) per project -->
+		<!--  <property name="some.name" value="the.value" /> -->
 
-        <!--  Values can make use of previously defined properties -->
-        <!--  The following are defined by default:
+		<!--  Values can make use of previously defined properties -->
+		<!--  The following are defined by default:
 
-                ${basedir}                Directory the loaded config file is in
+				${basedir}				Directory the loaded config file is in
 
-                ${phpDox.home}            Directory of the phpDox installation
-                ${phpDox.file}            The current config file
-                ${phpDox.version}         phpDox' version number
+				${phpDox.home}			Directory of the phpDox installation
+				${phpDox.file}			The current config file
+				${phpDox.version}		 phpDox' version number
 
-                ${phpDox.project.name}    The value of project/@name if set, otherwise 'unnamed'
-                ${phpDox.project.source}  The value of project/@source if set, otherwise '${basedir}/src'
-                ${phpDox.project.workdir} The value of project/@workdir if set, otherwise '${basedir}/build/phpdox/xml'
+				${phpDox.project.name}	The value of project/@name if set, otherwise 'unnamed'
+				${phpDox.project.source}  The value of project/@source if set, otherwise '${basedir}/src'
+				${phpDox.project.workdir} The value of project/@workdir if set, otherwise '${basedir}/build/phpdox/xml'
 
-                ${phpDox.php.version}     The PHP Version of the interpreter in use
+				${phpDox.php.version}	 The PHP Version of the interpreter in use
 
-         -->
+		 -->
 
-        <!--  Additional configuration for the collecting process (parsing of php code, generation of xml data) -->
-        <collector publiconly="false" backend="parser" encoding="auto">
-            <!--  @publiconly - Flag to disable/enable processing of non public methods and members -->
-            <!--  @backend    - The collector backend to use, currently only shipping with 'parser' -->
-            <!--  @encoding   - Charset encoding of source files (overwrite default 'auto' if detection fails) -->
+		<!--  Additional configuration for the collecting process (parsing of php code, generation of xml data) -->
+		<collector publiconly="false" backend="parser" encoding="auto">
+			<!--  @publiconly - Flag to disable/enable processing of non public methods and members -->
+			<!--  @backend	- The collector backend to use, currently only shipping with 'parser' -->
+			<!--  @encoding   - Charset encoding of source files (overwrite default 'auto' if detection fails) -->
 
-            <!--  <include / exclude filter for filelist generator, mask must follow fnmatch() requirements  -->
-            <include mask="*.php" />
-            <exclude mask="" />
+			<!--  <include / exclude filter for filelist generator, mask must follow fnmatch() requirements  -->
+			<include mask="*.php" />
+			<exclude mask="" />
 
-            <!--  How to handle inheritance -->
-            <inheritance resolve="true">
-                <!--  @resolve - Flag to enable/disable resolving of inheritance -->
+			<!--  How to handle inheritance -->
+			<inheritance resolve="true">
+				<!--  @resolve - Flag to enable/disable resolving of inheritance -->
 
-                <!--  You can define multiple (external) dependencies to be included -->
-                <!--  <dependency  path="" -->
-                <!--    @path  - path to a directory containing an index.xml for a dependency project -->
-            </inheritance>
+				<!--  You can define multiple (external) dependencies to be included -->
+				<!--  <dependency  path="" -->
+				<!--	@path  - path to a directory containing an index.xml for a dependency project -->
+			</inheritance>
 
-        </collector>
+		</collector>
 
-        <!--  Configuration of generation process -->
-        <generator output="../docs">
-            <!-- @output - (Base-)Directory to store output data in -->
+		<!--  Configuration of generation process -->
+		<generator output="../docs">
+			<!-- @output - (Base-)Directory to store output data in -->
 
-            <!-- A generation process consists of one or more build tasks and of (optional) enrich sources -->
+			<!-- A generation process consists of one or more build tasks and of (optional) enrich sources -->
 
-            <enrich base="logs">
-                <!-- @base - (Base-)Directory of datafiles used for enrich process -->
+			<enrich base="logs">
+				<!-- @base - (Base-)Directory of datafiles used for enrich process -->
 
-                <!--<source type="...">-->
-                <!-- @type - the handler for the enrichment -->
-                <!--         known types by default are: build, checkstyle, git, phpcs, phploc, phpunit, pmd -->
+				<!--<source type="...">-->
+				<!-- @type - the handler for the enrichment -->
+				<!--		 known types by default are: build, checkstyle, git, phpcs, phploc, phpunit, pmd -->
 
-                <!-- every enrichment source can have additional configuration nodes, most probably need a logfile -->
-                <!-- <file name="path/to/log.xml" /> -->
-                <!--</source> -->
+				<!-- every enrichment source can have additional configuration nodes, most probably need a logfile -->
+				<!-- <file name="path/to/log.xml" /> -->
+				<!--</source> -->
 
-                <!-- add phploc output -->
-                <source type="phploc">
-	                <file name="phploc.xml" />
-                </source>
+				<!-- add phploc output -->
+				<source type="phploc">
+					<file name="phploc.xml" />
+				</source>
 
-                <!-- git vcs information -->
-                <source type="git">
-                    <git binary="/usr/bin/git" />
-                    <history enabled="true" limit="15" cache="${phpDox.project.workdir}/gitlog.xml" />
-                </source>
+				<!-- git vcs information -->
+				<source type="git">
+					<git binary="/usr/bin/git" />
+					<history enabled="true" limit="15" cache="${phpDox.project.workdir}/gitlog.xml" />
+				</source>
 
-                <!-- PHP Code Sniffer findings -->
-                <!--
-                <source type="phpcs">
-                    <file name="logs/phpcs.xml" />
-                </source>
-                -->
+				<!-- PHP Code Sniffer findings -->
+				<source type="checkstyle">
+					<file name="phpcs.xml" />
+				</source>
 
-                <!-- PHPMessDetector -->
-                <!--
-                <source type="pmd">
-                    <file name="pmd.xml" />
-                </source>
-                -->
+				<!-- PHPMessDetector -->
+				<!--
+				<source type="pmd">
+					<file name="pmd.xml" />
+				</source>
+				-->
 
-                <!-- PHPUnit Coverage XML -->
-                <source type="phpunit">
-                    <!-- <coverage path="clover.xml" />-->
-                    <!--           @path - the directory where the xml code coverage report can be found -->
-                    <!--<filter directory="${phpDox.project.source}" />-->
-                    <!-- @directory - path of the phpunit config whitelist filter directory -->
-                </source>
-                <!--
-                <source type="phpunit">
-                    <filter directory="${phpDox.project.source}" />
-                </source>
-                -->
+				<!-- PHPUnit Coverage XML -->
+				<source type="phpunit">
+					<coverage path="coverage/clover.xml" />
+					<!-- <coverage path="clover.xml" />-->
+					<!--		   @path - the directory where the xml code coverage report can be found -->
+					<!--<filter directory="${phpDox.project.source}" />-->
+					<!-- @directory - path of the phpunit config whitelist filter directory -->
+				</source>
+				<source type="phpunit">
+					<filter directory="${phpDox.project.source}" />
+				</source>
 
-            </enrich>
+			</enrich>
 
-            <!-- <build engine="..." enabled="true" output="..." /> -->
-            <!--   @engine  - The name of the engine this build task uses, use ./phpDox - -engines to get a list of available engines -->
-            <!--   @enabled - Flag to enable/disable this engine, default: enabled=true -->
-            <!--   @output  - (optional) Output directory; if relative (no / as first char) it is interpreted as relative to generator/@output -->
+			<!-- <build engine="..." enabled="true" output="..." /> -->
+			<!--   @engine  - The name of the engine this build task uses, use ./phpDox - -engines to get a list of available engines -->
+			<!--   @enabled - Flag to enable/disable this engine, default: enabled=true -->
+			<!--   @output  - (optional) Output directory; if relative (no / as first char) it is interpreted as relative to generator/@output -->
 
-            <!-- An engine and thus build node can have additional configuration child nodes, please check the documentation for the engine to find out more -->
+			<!-- An engine and thus build node can have additional configuration child nodes, please check the documentation for the engine to find out more -->
 
-            <!--  default engine "html" -->
-            <build engine="html" enabled="true">
-                <template dir="${phpDox.home}/templates/html" />
-                <file extension="html" />
-            </build>
+			<!--  default engine "html" -->
+			<build engine="html" enabled="true">
+				<template dir="${phpDox.home}/templates/html" />
+				<file extension="html" />
+			</build>
 
-        </generator>
-    </project>
+		</generator>
+	</project>
 
 </phpdox>
\ No newline at end of file
diff --git a/build/phpunit.xml b/build/phpunit.xml
index 0b605295..eb673fed 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -8,7 +8,7 @@
 	>
 	<filter>
 		<whitelist>
-			<directory suffix=".php">../src/Aviat/AnimeClient</directory>
+			<directory suffix=".php">../src</directory>
 		</whitelist>
 	</filter>
 	<testsuites>
@@ -17,7 +17,7 @@
 		</testsuite>
 	</testsuites>
 	<logging>
-		<log type="coverage-html" target="coverage"/>
+		<log type="coverage-html" target="../coverage"/>
 		<log type="coverage-clover" target="logs/clover.xml"/>
 		<log type="coverage-crap4j" target="logs/crap4j.xml"/>
 		<log type="coverage-xml" target="logs/coverage" />
diff --git a/composer.json b/composer.json
index 42ba9c65..c2198852 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,17 @@
 	"name": "timw4mail/hummingbird-anime-client",
 	"description": "A self-hosted anime/manga client for hummingbird.",
 	"license":"MIT",
+	"autoload": {
+		"psr-4": {
+			"Aviat\\Ion\\": "src/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Aviat\\Ion\\Tests\\": "tests/",
+			"CodeIgniter\\": "build/CodeIgniter/"
+		}
+	},
 	"require": {
 		"abeautifulsite/simpleimage": "2.5.*",
 		"aura/html": "2.*",
@@ -28,6 +39,7 @@
 		"humbug/humbug": "~1.0@dev",
 		"consolidation/robo": "~1.0@RC",
 		"henrikbjorn/lurker": "^1.1.0",
-		"symfony/var-dumper": "^3.1"
+		"symfony/var-dumper": "^3.1",
+		"squizlabs/php_codesniffer": "^3.0.0@alpha"
 	}
 }
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 194e906e..ce3e6389 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -2,15 +2,16 @@
 <phpdoc>
 	<title>Hummingbird Anime Client</title>
 	<parser>
-		<target>docs</target>
+		<target>phpdoc</target>
 	</parser>
 	<transformer>
-		<target>docs</target>
+		<target>phpdoc</target>
 	</transformer>
 	<transformations>
 		<template name="clean" />
 	</transformations>
 	<files>
-		<directory>src/Aviat</directory>
+		<directory>src</directory>
+		<directory>vendor/aviat/ion</directory>
 	</files>
 </phpdoc>
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 18ac4012..b71b4a2e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,7 +7,7 @@
 >
     <filter>
         <whitelist>
-            <directory suffix=".php">src/Aviat/AnimeClient</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
     <testsuites>

From bf01e41e327be8dd4f786c01ff89b513f31d5c6c Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 29 Aug 2016 16:36:13 -0400
Subject: [PATCH 36/65] Move src files to root of src/

---
 composer.json                                 |  4 ++--
 index.php                                     | 21 +------------------
 src/{Aviat/AnimeClient => }/AnimeClient.php   |  2 +-
 .../AnimeClient => }/Auth/HummingbirdAuth.php |  0
 .../AnimeClient => }/Command/BaseCommand.php  |  2 +-
 .../AnimeClient => }/Command/CacheImages.php  |  0
 .../AnimeClient => }/Command/ClearCache.php   |  0
 src/{Aviat/AnimeClient => }/Controller.php    |  0
 .../AnimeClient => }/Controller/Anime.php     |  0
 .../Controller/Collection.php                 |  0
 .../AnimeClient => }/Controller/Manga.php     |  0
 src/{Aviat/AnimeClient => }/Dispatcher.php    |  8 +++----
 src/{Aviat/AnimeClient => }/Helper/Menu.php   |  0
 .../Hummingbird/Enum/AnimeAiringStatus.php    |  0
 .../Hummingbird/Enum/AnimeShowType.php        |  0
 .../Hummingbird/Enum/AnimeWatchingStatus.php  |  0
 .../Hummingbird/Enum/MangaReadingStatus.php   |  0
 .../Transformer/AnimeListTransformer.php      |  0
 .../Transformer/MangaListTransformer.php      |  0
 .../Transformer/MangaListsZipper.php          |  0
 src/{Aviat/AnimeClient => }/MenuGenerator.php |  0
 src/{Aviat/AnimeClient => }/Model/API.php     |  0
 src/{Aviat/AnimeClient => }/Model/Anime.php   |  0
 .../Model/AnimeCollection.php                 |  0
 .../AnimeClient => }/Model/Collection.php     |  0
 src/{Aviat/AnimeClient => }/Model/DB.php      |  0
 src/{Aviat/AnimeClient => }/Model/Manga.php   |  0
 src/{Aviat/AnimeClient => }/RoutingBase.php   |  0
 src/{Aviat/AnimeClient => }/UrlGenerator.php  |  0
 src/{Aviat/AnimeClient => }/Util.php          |  0
 tests/bootstrap.php                           | 19 -----------------
 31 files changed, 8 insertions(+), 48 deletions(-)
 rename src/{Aviat/AnimeClient => }/AnimeClient.php (96%)
 rename src/{Aviat/AnimeClient => }/Auth/HummingbirdAuth.php (100%)
 rename src/{Aviat/AnimeClient => }/Command/BaseCommand.php (97%)
 rename src/{Aviat/AnimeClient => }/Command/CacheImages.php (100%)
 rename src/{Aviat/AnimeClient => }/Command/ClearCache.php (100%)
 rename src/{Aviat/AnimeClient => }/Controller.php (100%)
 rename src/{Aviat/AnimeClient => }/Controller/Anime.php (100%)
 rename src/{Aviat/AnimeClient => }/Controller/Collection.php (100%)
 rename src/{Aviat/AnimeClient => }/Controller/Manga.php (100%)
 rename src/{Aviat/AnimeClient => }/Dispatcher.php (98%)
 rename src/{Aviat/AnimeClient => }/Helper/Menu.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Enum/AnimeAiringStatus.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Enum/AnimeShowType.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Enum/AnimeWatchingStatus.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Enum/MangaReadingStatus.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Transformer/AnimeListTransformer.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Transformer/MangaListTransformer.php (100%)
 rename src/{Aviat/AnimeClient => }/Hummingbird/Transformer/MangaListsZipper.php (100%)
 rename src/{Aviat/AnimeClient => }/MenuGenerator.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/API.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/Anime.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/AnimeCollection.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/Collection.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/DB.php (100%)
 rename src/{Aviat/AnimeClient => }/Model/Manga.php (100%)
 rename src/{Aviat/AnimeClient => }/RoutingBase.php (100%)
 rename src/{Aviat/AnimeClient => }/UrlGenerator.php (100%)
 rename src/{Aviat/AnimeClient => }/Util.php (100%)

diff --git a/composer.json b/composer.json
index c2198852..64c450ea 100644
--- a/composer.json
+++ b/composer.json
@@ -4,12 +4,12 @@
 	"license":"MIT",
 	"autoload": {
 		"psr-4": {
-			"Aviat\\Ion\\": "src/"
+			"Aviat\\AnimeClient\\": "src/"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"Aviat\\Ion\\Tests\\": "tests/",
+			"Aviat\\AnimeClient\\Tests\\": "tests/",
 			"CodeIgniter\\": "build/CodeIgniter/"
 		}
 	},
diff --git a/index.php b/index.php
index 571f1987..edab666c 100644
--- a/index.php
+++ b/index.php
@@ -34,27 +34,9 @@ function _dir()
 
 // Define base directories
 $APP_DIR = _dir(__DIR__, 'app');
-$SRC_DIR = _dir(__DIR__, 'src');
 $CONF_DIR = _dir($APP_DIR, 'config');
 
-/**
- * Set up autoloaders
- *
- * @codeCoverageIgnore
- * @return void
- */
-spl_autoload_register(function($class) use ($SRC_DIR) {
-	$class_parts = explode('\\', $class);
-	$ns_path = $SRC_DIR . '/' . implode('/', $class_parts) . ".php";
-
-	if (file_exists($ns_path))
-	{
-		require_once($ns_path);
-		return;
-	}
-});
-
-// Set up autoloader for third-party dependencies
+// Load composer autoloader
 require _dir(__DIR__, '/vendor/autoload.php');
 
 // -------------------------------------------------------------------------
@@ -86,7 +68,6 @@ $container = $di($config_array);
 
 // Unset 'constants'
 unset($APP_DIR);
-unset($SRC_DIR);
 unset($CONF_DIR);
 
 // -----------------------------------------------------------------------------
diff --git a/src/Aviat/AnimeClient/AnimeClient.php b/src/AnimeClient.php
similarity index 96%
rename from src/Aviat/AnimeClient/AnimeClient.php
rename to src/AnimeClient.php
index f737124d..390c6a3e 100644
--- a/src/Aviat/AnimeClient/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -15,7 +15,7 @@ namespace Aviat\AnimeClient;
 
 use Yosymfony\Toml\Toml;
 
-define('SRC_DIR', realpath(__DIR__ . '/../../'));
+define('SRC_DIR', realpath(__DIR__));
 
 /**
  * Application constants
diff --git a/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
similarity index 100%
rename from src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
rename to src/Auth/HummingbirdAuth.php
diff --git a/src/Aviat/AnimeClient/Command/BaseCommand.php b/src/Command/BaseCommand.php
similarity index 97%
rename from src/Aviat/AnimeClient/Command/BaseCommand.php
rename to src/Command/BaseCommand.php
index 923df39a..800ff51e 100644
--- a/src/Aviat/AnimeClient/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -53,7 +53,7 @@ class BaseCommand extends Command {
 	 */
 	protected function setupContainer()
 	{
-		$CONF_DIR = realpath(__DIR__ . '/../../../../app/config/');
+		$CONF_DIR = realpath(__DIR__ . '/../../app/config/');
 		require_once $CONF_DIR . '/base_config.php'; // $base_config
 
 		$config = AnimeClient::load_toml($CONF_DIR);
diff --git a/src/Aviat/AnimeClient/Command/CacheImages.php b/src/Command/CacheImages.php
similarity index 100%
rename from src/Aviat/AnimeClient/Command/CacheImages.php
rename to src/Command/CacheImages.php
diff --git a/src/Aviat/AnimeClient/Command/ClearCache.php b/src/Command/ClearCache.php
similarity index 100%
rename from src/Aviat/AnimeClient/Command/ClearCache.php
rename to src/Command/ClearCache.php
diff --git a/src/Aviat/AnimeClient/Controller.php b/src/Controller.php
similarity index 100%
rename from src/Aviat/AnimeClient/Controller.php
rename to src/Controller.php
diff --git a/src/Aviat/AnimeClient/Controller/Anime.php b/src/Controller/Anime.php
similarity index 100%
rename from src/Aviat/AnimeClient/Controller/Anime.php
rename to src/Controller/Anime.php
diff --git a/src/Aviat/AnimeClient/Controller/Collection.php b/src/Controller/Collection.php
similarity index 100%
rename from src/Aviat/AnimeClient/Controller/Collection.php
rename to src/Controller/Collection.php
diff --git a/src/Aviat/AnimeClient/Controller/Manga.php b/src/Controller/Manga.php
similarity index 100%
rename from src/Aviat/AnimeClient/Controller/Manga.php
rename to src/Controller/Manga.php
diff --git a/src/Aviat/AnimeClient/Dispatcher.php b/src/Dispatcher.php
similarity index 98%
rename from src/Aviat/AnimeClient/Dispatcher.php
rename to src/Dispatcher.php
index 1d57e3c9..6f79959c 100644
--- a/src/Aviat/AnimeClient/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -12,9 +12,6 @@
  */
 namespace Aviat\AnimeClient;
 
-use Aura\Web\Request;
-use Aura\Web\Response;
-
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Friend;
 
@@ -38,7 +35,7 @@ class Dispatcher extends RoutingBase {
 
 	/**
 	 * Class wrapper for input superglobals
-	 * @var object
+	 * @var Psr\Http\Message\ServerRequestInterface
 	 */
 	protected $request;
 
@@ -215,6 +212,7 @@ class Dispatcher extends RoutingBase {
 	{
 		$default_namespace = AnimeClient::DEFAULT_CONTROLLER_NAMESPACE;
 		$path = str_replace('\\', '/', $default_namespace);
+		$path = str_replace('Aviat/AnimeClient/', '', $path);
 		$path = trim($path, '/');
 		$actual_path = realpath(\_dir(AnimeClient::SRC_DIR, $path));
 		$class_files = glob("{$actual_path}/*.php");
@@ -273,7 +271,7 @@ class Dispatcher extends RoutingBase {
 		$params = [];
 
 		switch($failure->failedRule) {
-			case 'Aura\Router\Rule\Alows':
+			case 'Aura\Router\Rule\Allows':
 				$params = [
 					'http_code' => 405,
 					'title' => '405 Method Not Allowed',
diff --git a/src/Aviat/AnimeClient/Helper/Menu.php b/src/Helper/Menu.php
similarity index 100%
rename from src/Aviat/AnimeClient/Helper/Menu.php
rename to src/Helper/Menu.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Enum/AnimeAiringStatus.php b/src/Hummingbird/Enum/AnimeAiringStatus.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Enum/AnimeAiringStatus.php
rename to src/Hummingbird/Enum/AnimeAiringStatus.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Enum/AnimeShowType.php b/src/Hummingbird/Enum/AnimeShowType.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Enum/AnimeShowType.php
rename to src/Hummingbird/Enum/AnimeShowType.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Enum/AnimeWatchingStatus.php b/src/Hummingbird/Enum/AnimeWatchingStatus.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Enum/AnimeWatchingStatus.php
rename to src/Hummingbird/Enum/AnimeWatchingStatus.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Enum/MangaReadingStatus.php b/src/Hummingbird/Enum/MangaReadingStatus.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Enum/MangaReadingStatus.php
rename to src/Hummingbird/Enum/MangaReadingStatus.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Transformer/AnimeListTransformer.php b/src/Hummingbird/Transformer/AnimeListTransformer.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Transformer/AnimeListTransformer.php
rename to src/Hummingbird/Transformer/AnimeListTransformer.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListTransformer.php b/src/Hummingbird/Transformer/MangaListTransformer.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListTransformer.php
rename to src/Hummingbird/Transformer/MangaListTransformer.php
diff --git a/src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListsZipper.php b/src/Hummingbird/Transformer/MangaListsZipper.php
similarity index 100%
rename from src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListsZipper.php
rename to src/Hummingbird/Transformer/MangaListsZipper.php
diff --git a/src/Aviat/AnimeClient/MenuGenerator.php b/src/MenuGenerator.php
similarity index 100%
rename from src/Aviat/AnimeClient/MenuGenerator.php
rename to src/MenuGenerator.php
diff --git a/src/Aviat/AnimeClient/Model/API.php b/src/Model/API.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/API.php
rename to src/Model/API.php
diff --git a/src/Aviat/AnimeClient/Model/Anime.php b/src/Model/Anime.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/Anime.php
rename to src/Model/Anime.php
diff --git a/src/Aviat/AnimeClient/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/AnimeCollection.php
rename to src/Model/AnimeCollection.php
diff --git a/src/Aviat/AnimeClient/Model/Collection.php b/src/Model/Collection.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/Collection.php
rename to src/Model/Collection.php
diff --git a/src/Aviat/AnimeClient/Model/DB.php b/src/Model/DB.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/DB.php
rename to src/Model/DB.php
diff --git a/src/Aviat/AnimeClient/Model/Manga.php b/src/Model/Manga.php
similarity index 100%
rename from src/Aviat/AnimeClient/Model/Manga.php
rename to src/Model/Manga.php
diff --git a/src/Aviat/AnimeClient/RoutingBase.php b/src/RoutingBase.php
similarity index 100%
rename from src/Aviat/AnimeClient/RoutingBase.php
rename to src/RoutingBase.php
diff --git a/src/Aviat/AnimeClient/UrlGenerator.php b/src/UrlGenerator.php
similarity index 100%
rename from src/Aviat/AnimeClient/UrlGenerator.php
rename to src/UrlGenerator.php
diff --git a/src/Aviat/AnimeClient/Util.php b/src/Util.php
similarity index 100%
rename from src/Aviat/AnimeClient/Util.php
rename to src/Util.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 27f1c52e..95115763 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -31,27 +31,8 @@ function _dir()
 // -----------------------------------------------------------------------------
 
 require _dir(__DIR__, 'AnimeClient_TestCase.php');
-
-// Define base path constants
 require _dir(__DIR__, '../vendor/autoload.php');
 
-/**
- * Set up autoloaders
- *
- * @codeCoverageIgnore
- * @return void
- */
-spl_autoload_register(function ($class) {
-	$class_parts = explode('\\', $class);
-	$ns_path = realpath(__DIR__ . '/../src') . '/' . implode('/', $class_parts) . ".php";
-
-	if (file_exists($ns_path))
-	{
-		require_once($ns_path);
-		return;
-	}
-});
-
 // -----------------------------------------------------------------------------
 // Ini Settings
 // -----------------------------------------------------------------------------

From 4607d146a4030941fba43abcd60efa56a60681f2 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 29 Aug 2016 17:09:56 -0400
Subject: [PATCH 37/65] Move tests to tests/ directory

---
 build/phpunit.xml                             |   2 +-
 phpunit.xml                                   |   2 +-
 tests/{AnimeClient => }/AnimeClientTest.php   |   0
 .../Auth/HummingbirdAuthTest.php              |   0
 .../Command/BaseCommandTest.php               |   0
 tests/{AnimeClient => }/ControllerTest.php    |   0
 tests/{AnimeClient => }/DispatcherTest.php    |   0
 .../Helper/MenuHelperTest.php                 |   0
 tests/{AnimeClient => }/MenuGeneratorTest.php |   0
 .../Model/AnimeCollectionModelTest.php        |   0
 .../Model/AnimeModelTest.php                  |   5 +-
 .../Model/BaseApiModelTest.php                |   0
 .../Model/MangaModelTest.php                  |   2 +-
 tests/{AnimeClient => }/RequirementsTest.php  |   0
 tests/{AnimeClient => }/RoutingBaseTest.php   |   0
 .../Transformer/AnimeListTransformerTest.php  |   4 +-
 .../Transformer/MangaListTransformerTest.php  |   4 +-
 .../Transformer/MangaListsZipperTest.php      |   4 +-
 tests/{AnimeClient => }/UrlGeneratorTest.php  |   0
 tests/{AnimeClient => }/UtilTest.php          | 158 +++++++++---------
 20 files changed, 92 insertions(+), 89 deletions(-)
 rename tests/{AnimeClient => }/AnimeClientTest.php (100%)
 rename tests/{AnimeClient => }/Auth/HummingbirdAuthTest.php (100%)
 rename tests/{AnimeClient => }/Command/BaseCommandTest.php (100%)
 rename tests/{AnimeClient => }/ControllerTest.php (100%)
 rename tests/{AnimeClient => }/DispatcherTest.php (100%)
 rename tests/{AnimeClient => }/Helper/MenuHelperTest.php (100%)
 rename tests/{AnimeClient => }/MenuGeneratorTest.php (100%)
 rename tests/{AnimeClient => }/Model/AnimeCollectionModelTest.php (100%)
 rename tests/{AnimeClient => }/Model/AnimeModelTest.php (90%)
 rename tests/{AnimeClient => }/Model/BaseApiModelTest.php (100%)
 rename tests/{AnimeClient => }/Model/MangaModelTest.php (97%)
 rename tests/{AnimeClient => }/RequirementsTest.php (100%)
 rename tests/{AnimeClient => }/RoutingBaseTest.php (100%)
 rename tests/{AnimeClient/Hummingbird => }/Transformer/AnimeListTransformerTest.php (86%)
 rename tests/{AnimeClient/Hummingbird => }/Transformer/MangaListTransformerTest.php (93%)
 rename tests/{AnimeClient/Hummingbird => }/Transformer/MangaListsZipperTest.php (77%)
 rename tests/{AnimeClient => }/UrlGeneratorTest.php (100%)
 rename tests/{AnimeClient => }/UtilTest.php (91%)

diff --git a/build/phpunit.xml b/build/phpunit.xml
index eb673fed..c4e9b784 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -13,7 +13,7 @@
 	</filter>
 	<testsuites>
 		<testsuite name="AnimeClient">
-			<directory>../tests/AnimeClient</directory>
+			<directory>../tests</directory>
 		</testsuite>
 	</testsuites>
 	<logging>
diff --git a/phpunit.xml b/phpunit.xml
index b71b4a2e..73a77ae7 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,7 +12,7 @@
     </filter>
     <testsuites>
         <testsuite name="AnimeClient">
-            <directory>tests/AnimeClient</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
     <php>
diff --git a/tests/AnimeClient/AnimeClientTest.php b/tests/AnimeClientTest.php
similarity index 100%
rename from tests/AnimeClient/AnimeClientTest.php
rename to tests/AnimeClientTest.php
diff --git a/tests/AnimeClient/Auth/HummingbirdAuthTest.php b/tests/Auth/HummingbirdAuthTest.php
similarity index 100%
rename from tests/AnimeClient/Auth/HummingbirdAuthTest.php
rename to tests/Auth/HummingbirdAuthTest.php
diff --git a/tests/AnimeClient/Command/BaseCommandTest.php b/tests/Command/BaseCommandTest.php
similarity index 100%
rename from tests/AnimeClient/Command/BaseCommandTest.php
rename to tests/Command/BaseCommandTest.php
diff --git a/tests/AnimeClient/ControllerTest.php b/tests/ControllerTest.php
similarity index 100%
rename from tests/AnimeClient/ControllerTest.php
rename to tests/ControllerTest.php
diff --git a/tests/AnimeClient/DispatcherTest.php b/tests/DispatcherTest.php
similarity index 100%
rename from tests/AnimeClient/DispatcherTest.php
rename to tests/DispatcherTest.php
diff --git a/tests/AnimeClient/Helper/MenuHelperTest.php b/tests/Helper/MenuHelperTest.php
similarity index 100%
rename from tests/AnimeClient/Helper/MenuHelperTest.php
rename to tests/Helper/MenuHelperTest.php
diff --git a/tests/AnimeClient/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php
similarity index 100%
rename from tests/AnimeClient/MenuGeneratorTest.php
rename to tests/MenuGeneratorTest.php
diff --git a/tests/AnimeClient/Model/AnimeCollectionModelTest.php b/tests/Model/AnimeCollectionModelTest.php
similarity index 100%
rename from tests/AnimeClient/Model/AnimeCollectionModelTest.php
rename to tests/Model/AnimeCollectionModelTest.php
diff --git a/tests/AnimeClient/Model/AnimeModelTest.php b/tests/Model/AnimeModelTest.php
similarity index 90%
rename from tests/AnimeClient/Model/AnimeModelTest.php
rename to tests/Model/AnimeModelTest.php
index 796a9f8b..10821e43 100644
--- a/tests/AnimeClient/Model/AnimeModelTest.php
+++ b/tests/Model/AnimeModelTest.php
@@ -9,7 +9,7 @@ class AnimeModelTest extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 		$this->animeModel = new Friend(new TestAnimeModel($this->container));
-		$this->mockDir = __DIR__ . '/../../test_data/anime_list/search_mocks';
+		$this->mockDir = __DIR__ . '/../test_data/anime_list/search_mocks';
 	}
 
 	public function dataSearch()
@@ -50,7 +50,8 @@ class AnimeModelTest extends AnimeClient_TestCase {
 		], "[]");
 		$this->animeModel->__set('client', $client);
 
-		$this->setExpectedException('\RuntimeException');
+		$this->expectException('RuntimeException');
+
 		$this->animeModel->search('');
 	}
 }
\ No newline at end of file
diff --git a/tests/AnimeClient/Model/BaseApiModelTest.php b/tests/Model/BaseApiModelTest.php
similarity index 100%
rename from tests/AnimeClient/Model/BaseApiModelTest.php
rename to tests/Model/BaseApiModelTest.php
diff --git a/tests/AnimeClient/Model/MangaModelTest.php b/tests/Model/MangaModelTest.php
similarity index 97%
rename from tests/AnimeClient/Model/MangaModelTest.php
rename to tests/Model/MangaModelTest.php
index 9eca4ca0..8835df9a 100644
--- a/tests/AnimeClient/Model/MangaModelTest.php
+++ b/tests/Model/MangaModelTest.php
@@ -14,7 +14,7 @@ class MangaModelTest extends AnimeClient_TestCase {
 		parent::setUp();
 		$this->container->setInstance('util', new MockUtil($this->container));
 		$this->model = new Friend(new TestMangaModel($this->container));
-		$this->mockDir = __DIR__ . '/../../test_data/manga_list';
+		$this->mockDir = __DIR__ . '/../test_data/manga_list';
 	}
 
 	public function testZipperLists()
diff --git a/tests/AnimeClient/RequirementsTest.php b/tests/RequirementsTest.php
similarity index 100%
rename from tests/AnimeClient/RequirementsTest.php
rename to tests/RequirementsTest.php
diff --git a/tests/AnimeClient/RoutingBaseTest.php b/tests/RoutingBaseTest.php
similarity index 100%
rename from tests/AnimeClient/RoutingBaseTest.php
rename to tests/RoutingBaseTest.php
diff --git a/tests/AnimeClient/Hummingbird/Transformer/AnimeListTransformerTest.php b/tests/Transformer/AnimeListTransformerTest.php
similarity index 86%
rename from tests/AnimeClient/Hummingbird/Transformer/AnimeListTransformerTest.php
rename to tests/Transformer/AnimeListTransformerTest.php
index 26e98ecc..396203fa 100644
--- a/tests/AnimeClient/Hummingbird/Transformer/AnimeListTransformerTest.php
+++ b/tests/Transformer/AnimeListTransformerTest.php
@@ -9,8 +9,8 @@ class AnimeListTransformerTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->start_file = __DIR__ . '/../../../test_data/anime_list/anime-completed.json';
-		$this->res_file = __DIR__ . '/../../../test_data/anime_list/anime-completed-transformed.json';
+		$this->start_file = __DIR__ . '/../test_data/anime_list/anime-completed.json';
+		$this->res_file = __DIR__ . '/../test_data/anime_list/anime-completed-transformed.json';
 		$this->transformer = new AnimeListTransformer();
 		$this->transformerFriend = new Friend($this->transformer);
 	}
diff --git a/tests/AnimeClient/Hummingbird/Transformer/MangaListTransformerTest.php b/tests/Transformer/MangaListTransformerTest.php
similarity index 93%
rename from tests/AnimeClient/Hummingbird/Transformer/MangaListTransformerTest.php
rename to tests/Transformer/MangaListTransformerTest.php
index 65c4d244..36f0913c 100644
--- a/tests/AnimeClient/Hummingbird/Transformer/MangaListTransformerTest.php
+++ b/tests/Transformer/MangaListTransformerTest.php
@@ -8,8 +8,8 @@ class MangaListTransformerTest extends AnimeClient_TestCase {
 	public function setUp()
 	{
 		parent::setUp();
-		$this->start_file = __DIR__ . '/../../../test_data/manga_list/manga-zippered.json';
-		$this->res_file = __DIR__ . '/../../../test_data/manga_list/manga-transformed.json';
+		$this->start_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
+		$this->res_file = __DIR__ . '/../test_data/manga_list/manga-transformed.json';
 		$this->transformer = new MangaListTransformer();
 	}
 
diff --git a/tests/AnimeClient/Hummingbird/Transformer/MangaListsZipperTest.php b/tests/Transformer/MangaListsZipperTest.php
similarity index 77%
rename from tests/AnimeClient/Hummingbird/Transformer/MangaListsZipperTest.php
rename to tests/Transformer/MangaListsZipperTest.php
index eb105e91..d5bc9aa3 100644
--- a/tests/AnimeClient/Hummingbird/Transformer/MangaListsZipperTest.php
+++ b/tests/Transformer/MangaListsZipperTest.php
@@ -10,8 +10,8 @@ class MangaListsZipperTest extends AnimeClient_TestCase {
 
 	public function setUp()
 	{
-		$this->start_file = __DIR__ . '/../../../test_data/manga_list/manga.json';
-		$this->res_file = __DIR__ . '/../../../test_data/manga_list/manga-zippered.json';
+		$this->start_file = __DIR__ . '/../test_data/manga_list/manga.json';
+		$this->res_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
 
 		$json = Json::decodeFile($this->start_file);
 		$this->mangaListsZipper = new MangaListsZipper($json);
diff --git a/tests/AnimeClient/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php
similarity index 100%
rename from tests/AnimeClient/UrlGeneratorTest.php
rename to tests/UrlGeneratorTest.php
diff --git a/tests/AnimeClient/UtilTest.php b/tests/UtilTest.php
similarity index 91%
rename from tests/AnimeClient/UtilTest.php
rename to tests/UtilTest.php
index 67492ce5..de9e8840 100644
--- a/tests/AnimeClient/UtilTest.php
+++ b/tests/UtilTest.php
@@ -1,78 +1,80 @@
-<?php
-
-use Aviat\AnimeClient\Util;
-
-class UtilTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->util = new Util($this->container);
-	}
-
-	public function testIsSelected()
-	{
-		// Failure to match
-		$this->assertEquals('', Util::is_selected('foo', 'bar'));
-
-		// Matches
-		$this->assertEquals('selected', Util::is_selected('foo', 'foo'));
-	}
-
-	public function testIsNotSelected()
-	{
-		// Failure to match
-		$this->assertEquals('selected', Util::is_not_selected('foo', 'bar'));
-
-		// Matches
-		$this->assertEquals('', Util::is_not_selected('foo', 'foo'));
-	}
-
-	public function dataIsViewPage()
-	{
-		return [
-			[
-				'uri' => '/anime/update',
-				'expected' => FALSE
-			],
-			[
-				'uri' => '/anime/watching',
-				'expected' => TRUE
-			],
-			[
-				'uri' => '/manga/reading',
-				'expected' => TRUE
-			],
-			[
-				'uri' => '/manga/update',
-				'expected' => FALSE
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataIsViewPage
-	 */
-	public function testIsViewPage($uri, $expected)
-	{
-		$this->setSuperGlobals([
-			'_SERVER' => [
-				'REQUEST_URI' => $uri
-			]
-		]);
-		$this->assertEquals($expected, $this->util->is_view_page());
-	}
-
-	/**
-	 * @dataProvider dataIsViewPage
-	 */
-	public function testIsFormPage($uri, $expected)
-	{
-		$this->setSuperGlobals([
-			'_SERVER' => [
-				'REQUEST_URI' => $uri
-			]
-		]);
-		$this->assertEquals(!$expected, $this->util->is_form_page());
-	}
-}
+<?php
+
+namespace Aviat\AnimeClient\Tests;
+
+use Aviat\AnimeClient\Util;
+
+class UtilTest extends \AnimeClient_TestCase {
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->util = new Util($this->container);
+	}
+
+	public function testIsSelected()
+	{
+		// Failure to match
+		$this->assertEquals('', Util::is_selected('foo', 'bar'));
+
+		// Matches
+		$this->assertEquals('selected', Util::is_selected('foo', 'foo'));
+	}
+
+	public function testIsNotSelected()
+	{
+		// Failure to match
+		$this->assertEquals('selected', Util::is_not_selected('foo', 'bar'));
+
+		// Matches
+		$this->assertEquals('', Util::is_not_selected('foo', 'foo'));
+	}
+
+	public function dataIsViewPage()
+	{
+		return [
+			[
+				'uri' => '/anime/update',
+				'expected' => FALSE
+			],
+			[
+				'uri' => '/anime/watching',
+				'expected' => TRUE
+			],
+			[
+				'uri' => '/manga/reading',
+				'expected' => TRUE
+			],
+			[
+				'uri' => '/manga/update',
+				'expected' => FALSE
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsViewPage
+	 */
+	public function testIsViewPage($uri, $expected)
+	{
+		$this->setSuperGlobals([
+			'_SERVER' => [
+				'REQUEST_URI' => $uri
+			]
+		]);
+		$this->assertEquals($expected, $this->util->is_view_page());
+	}
+
+	/**
+	 * @dataProvider dataIsViewPage
+	 */
+	public function testIsFormPage($uri, $expected)
+	{
+		$this->setSuperGlobals([
+			'_SERVER' => [
+				'REQUEST_URI' => $uri
+			]
+		]);
+		$this->assertEquals(!$expected, $this->util->is_form_page());
+	}
+}

From 52b19593388492ae7486692eab34b4373d8c29a0 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 30 Aug 2016 10:01:18 -0400
Subject: [PATCH 38/65] Update header comments

---
 app/bootstrap.php                                 | 14 ++++++++++++++
 app/config/base_config.php                        |  9 ++++++---
 app/config/menus.php                              |  9 ++++++---
 app/config/minify_config.php                      | 13 ++++++++-----
 app/config/minify_css_groups.php                  |  9 ++++++---
 app/config/minify_js_groups.php                   |  9 ++++++---
 app/config/routes.php                             |  9 ++++++---
 public/css.php                                    | 13 ++++++++-----
 public/js.php                                     | 13 ++++++++-----
 src/AnimeClient.php                               |  9 ++++++---
 src/Auth/HummingbirdAuth.php                      |  9 ++++++---
 src/Command/BaseCommand.php                       |  9 ++++++---
 src/Command/CacheImages.php                       | 11 +++++++----
 src/Command/ClearCache.php                        | 11 +++++++----
 src/Controller.php                                |  9 ++++++---
 src/Controller/Anime.php                          |  9 ++++++---
 src/Controller/Collection.php                     |  9 ++++++---
 src/Controller/Manga.php                          |  9 ++++++---
 src/Dispatcher.php                                |  9 ++++++---
 src/Helper/Menu.php                               |  9 ++++++---
 src/Hummingbird/Enum/AnimeAiringStatus.php        |  9 ++++++---
 src/Hummingbird/Enum/AnimeShowType.php            |  9 ++++++---
 src/Hummingbird/Enum/AnimeWatchingStatus.php      |  9 ++++++---
 src/Hummingbird/Enum/MangaReadingStatus.php       |  9 ++++++---
 .../Transformer/AnimeListTransformer.php          |  9 ++++++---
 .../Transformer/MangaListTransformer.php          |  9 ++++++---
 src/Hummingbird/Transformer/MangaListsZipper.php  |  9 ++++++---
 src/MenuGenerator.php                             |  9 ++++++---
 src/Model/API.php                                 |  9 ++++++---
 src/Model/Anime.php                               |  9 ++++++---
 src/Model/AnimeCollection.php                     | 15 +++++++++------
 src/Model/Collection.php                          |  9 ++++++---
 src/Model/DB.php                                  |  9 ++++++---
 src/Model/Manga.php                               |  9 ++++++---
 src/RoutingBase.php                               |  9 ++++++---
 src/UrlGenerator.php                              |  9 ++++++---
 36 files changed, 235 insertions(+), 116 deletions(-)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index a3bcd2b2..e648b7b1 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,4 +1,18 @@
 <?php
+/**
+ * Hummingbird Anime Client
+ *
+ * An API client for Hummingbird to manage anime and manga watch lists
+ *
+ * PHP version 5.6
+ *
+ * @package     HummingbirdAnimeClient
+ * @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     3.1
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 /**
  * Bootstrap / Dependency Injection
diff --git a/app/config/base_config.php b/app/config/base_config.php
index 3a390191..8f7a13c2 100644
--- a/app/config/base_config.php
+++ b/app/config/base_config.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 // ----------------------------------------------------------------------------
diff --git a/app/config/menus.php b/app/config/menus.php
index 4f4ed728..e9fb72b7 100644
--- a/app/config/menus.php
+++ b/app/config/menus.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 return [
diff --git a/app/config/minify_config.php b/app/config/minify_config.php
index 28198664..aa1073f0 100644
--- a/app/config/minify_config.php
+++ b/app/config/minify_config.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * @package	 HummingbirdAnimeClient
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
- * @license	 MIT
+ * PHP version 5.6
+ *
+ * @package     HummingbirdAnimeClient
+ * @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     3.1
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 // --------------------------------------------------------------------------
diff --git a/app/config/minify_css_groups.php b/app/config/minify_css_groups.php
index 63d39ea8..ee678a2d 100644
--- a/app/config/minify_css_groups.php
+++ b/app/config/minify_css_groups.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 // --------------------------------------------------------------------------
diff --git a/app/config/minify_js_groups.php b/app/config/minify_js_groups.php
index 0b7e766e..236f7828 100644
--- a/app/config/minify_js_groups.php
+++ b/app/config/minify_js_groups.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 // --------------------------------------------------------------------------
diff --git a/app/config/routes.php b/app/config/routes.php
index 8ace6518..ea536ddd 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 use Aviat\AnimeClient\AnimeClient;
diff --git a/public/css.php b/public/css.php
index 46bc1915..df1fd142 100644
--- a/public/css.php
+++ b/public/css.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * @package	 HummingbirdAnimeClient
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
- * @license	 MIT
+ * PHP version 5.6
+ *
+ * @package     HummingbirdAnimeClient
+ * @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     3.1
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\EasyMin;
diff --git a/public/js.php b/public/js.php
index 5926b46c..6314df4a 100644
--- a/public/js.php
+++ b/public/js.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * @package	 HummingbirdAnimeClient
- * @author	  Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
- * @license	 MIT
+ * PHP version 5.6
+ *
+ * @package     HummingbirdAnimeClient
+ * @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     3.1
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\EasyMin;
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index 390c6a3e..cfb27521 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient;
diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
index ac9625cf..ed734bfc 100644
--- a/src/Auth/HummingbirdAuth.php
+++ b/src/Auth/HummingbirdAuth.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Auth;
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index 800ff51e..d02cb691 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Command;
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index 34e68843..5b5f0398 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Command;
@@ -72,7 +75,7 @@ class CacheImages extends BaseCommand {
 	 * @return void
 	 * @throws \ConsoleKit\ConsoleException
 	 */
-	public function execute(array $args, array $options = array())
+	public function execute(array $args, array $options = [])
 	{
 		$this->setContainer($this->setupContainer());
 		$this->util = new Util($this->container);
diff --git a/src/Command/ClearCache.php b/src/Command/ClearCache.php
index a319b02e..0de7ddd3 100644
--- a/src/Command/ClearCache.php
+++ b/src/Command/ClearCache.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Command;
@@ -25,7 +28,7 @@ class ClearCache extends BaseCommand {
 	 * @return void
 	 * @throws \ConsoleKit\ConsoleException
 	 */
-	public function execute(array $args, array $options = array())
+	public function execute(array $args, array $options = [])
 	{
 		$this->setContainer($this->setupContainer());
 		$cache = $this->container->get('cache');
diff --git a/src/Controller.php b/src/Controller.php
index f558ee5b..631624e6 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient;
 
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 47512258..27830017 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Controller;
diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php
index 24a78be3..a5847d62 100644
--- a/src/Controller/Collection.php
+++ b/src/Controller/Collection.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Controller;
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 504c246d..40141e11 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient\Controller;
 
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 6f79959c..0bf11fab 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient;
 
diff --git a/src/Helper/Menu.php b/src/Helper/Menu.php
index 51c1e104..0d4e7d39 100644
--- a/src/Helper/Menu.php
+++ b/src/Helper/Menu.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Helper;
diff --git a/src/Hummingbird/Enum/AnimeAiringStatus.php b/src/Hummingbird/Enum/AnimeAiringStatus.php
index 1ba9512d..30f763ca 100644
--- a/src/Hummingbird/Enum/AnimeAiringStatus.php
+++ b/src/Hummingbird/Enum/AnimeAiringStatus.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Enum;
diff --git a/src/Hummingbird/Enum/AnimeShowType.php b/src/Hummingbird/Enum/AnimeShowType.php
index 3dd64d51..83bfa5e4 100644
--- a/src/Hummingbird/Enum/AnimeShowType.php
+++ b/src/Hummingbird/Enum/AnimeShowType.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Enum;
diff --git a/src/Hummingbird/Enum/AnimeWatchingStatus.php b/src/Hummingbird/Enum/AnimeWatchingStatus.php
index 227a4112..9e3f21f2 100644
--- a/src/Hummingbird/Enum/AnimeWatchingStatus.php
+++ b/src/Hummingbird/Enum/AnimeWatchingStatus.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Enum;
diff --git a/src/Hummingbird/Enum/MangaReadingStatus.php b/src/Hummingbird/Enum/MangaReadingStatus.php
index dd95dfc5..0ed64fa9 100644
--- a/src/Hummingbird/Enum/MangaReadingStatus.php
+++ b/src/Hummingbird/Enum/MangaReadingStatus.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Enum;
diff --git a/src/Hummingbird/Transformer/AnimeListTransformer.php b/src/Hummingbird/Transformer/AnimeListTransformer.php
index c6de9eea..415daae3 100644
--- a/src/Hummingbird/Transformer/AnimeListTransformer.php
+++ b/src/Hummingbird/Transformer/AnimeListTransformer.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Transformer;
diff --git a/src/Hummingbird/Transformer/MangaListTransformer.php b/src/Hummingbird/Transformer/MangaListTransformer.php
index 4fdef4e1..e795d8fc 100644
--- a/src/Hummingbird/Transformer/MangaListTransformer.php
+++ b/src/Hummingbird/Transformer/MangaListTransformer.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Transformer;
diff --git a/src/Hummingbird/Transformer/MangaListsZipper.php b/src/Hummingbird/Transformer/MangaListsZipper.php
index 3994e5c4..978cdd5c 100644
--- a/src/Hummingbird/Transformer/MangaListsZipper.php
+++ b/src/Hummingbird/Transformer/MangaListsZipper.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Hummingbird\Transformer;
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index 35c91855..76a5a320 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient;
diff --git a/src/Model/API.php b/src/Model/API.php
index ddd9f819..3bf4fcec 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient\Model;
 
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 449b2648..2fcfcd13 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Model;
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index 2f54be93..0cc49786 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Model;
@@ -67,7 +70,7 @@ class AnimeCollection extends Collection {
 	 */
 	public function get_media_type_list()
 	{
-		$output = array();
+		$output = [];
 
 		$query = $this->db->select('id, type')
 			->from('media')
@@ -173,8 +176,8 @@ class AnimeCollection extends Collection {
 	}
 
 	/**
-	 * Remove a colleciton item
-	 * 
+	 * Remove a collection item
+	 *
 	 * @param  array $data
 	 * @return void
 	 */
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index 6e611603..f50d3296 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Model;
diff --git a/src/Model/DB.php b/src/Model/DB.php
index 8ad0e9f0..cd9d2f39 100644
--- a/src/Model/DB.php
+++ b/src/Model/DB.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient\Model;
 
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 8cb51f26..7de34f72 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 
 namespace Aviat\AnimeClient\Model;
diff --git a/src/RoutingBase.php b/src/RoutingBase.php
index 01692f75..4c32bf6c 100644
--- a/src/RoutingBase.php
+++ b/src/RoutingBase.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient;
 
diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php
index 70e1b2e5..270ed7d8 100644
--- a/src/UrlGenerator.php
+++ b/src/UrlGenerator.php
@@ -4,11 +4,14 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 namespace Aviat\AnimeClient;
 

From afbde141167a06e766f468dccbf12520392f60a0 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 30 Aug 2016 10:57:41 -0400
Subject: [PATCH 39/65] Code style fixes to satisfy phpcs

---
 .travis.yml                                   |   4 +-
 .../Operators/LogicalOperatorAndSniff.php     |   4 +-
 .../StrictComparisonOperatorSniff.php         |   2 +-
 .../WhiteSpace/DisallowSpaceIndentSniff.php   |   2 +-
 build/animeclient_header_comment.txt          |   4 +-
 build/phpcs.xml                               |   9 +-
 build/update_header_comments.php              |   4 +-
 index.php                                     |  10 +-
 phpdoc.dist.xml                               |   5 +-
 src/Command/CacheImages.php                   |  21 +-
 src/Controller.php                            |  10 +-
 src/Controller/Anime.php                      |   9 +-
 src/Controller/Manga.php                      |  14 +-
 src/Dispatcher.php                            |   1 +
 src/Model/API.php                             |   8 +-
 src/Model/Anime.php                           |  19 +-
 src/Model/AnimeCollection.php                 |   2 +-
 src/Model/Collection.php                      |   2 +-
 src/Model/Manga.php                           |   4 +-
 src/UrlGenerator.php                          |   4 +-
 src/Util.php                                  | 397 +++++++++---------
 21 files changed, 288 insertions(+), 247 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8de0e34a..f5cce27a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 install:
-  - composer install --no-dev
+  - composer install
 
 php:
   - 5.5
@@ -17,7 +17,7 @@ before_script:
 script:
   - mkdir -p build/logs
   - phpunit -c build
-  
+
 services:
   - redis
 
diff --git a/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php b/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
index 072181b5..d7af22aa 100644
--- a/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
+++ b/build/CodeIgniter/Sniffs/Operators/LogicalOperatorAndSniff.php
@@ -67,11 +67,11 @@ class LogicalOperatorAndSniff implements Sniff
             $error_message = 'Logical operator should be in upper case;'
                 . ' use "' . strtoupper($operator_string)
                 . '" instead of "' . $operator_string . '"';
-            $phpcsFile->addError($error_message, $stackPtr);
+            $phpcsFile->addError($error_message, $stackPtr, 'LowercaseLogicalOperator');
         }
 
         $warning_message = 'The symbolic form "&&" is preferred over the literal form "AND"';
-        $phpcsFile->addWarning($warning_message, $stackPtr);
+        $phpcsFile->addWarning($warning_message, $stackPtr, 'UseOfLiteralAndOperator');
 
     }//end process()
 
diff --git a/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php b/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
index fe229f62..e30a1a05 100755
--- a/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
+++ b/build/CodeIgniter/Sniffs/Operators/StrictComparisonOperatorSniff.php
@@ -72,7 +72,7 @@ class StrictComparisonOperatorSniff implements Sniff
         $error_message = '"==" and "!=" are prohibited; use "'
             . self::$_replacements[$operator_code] . '" instead of "'
             . $operator_string . '".';
-        $phpcsFile->addError($error_message, $stackPtr);
+        $phpcsFile->addError($error_message, $stackPtr, 'NonStrictComparisonUsed');
     }//end process()
 
 
diff --git a/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
index 55eb4d9b..933dccae 100755
--- a/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
+++ b/build/CodeIgniter/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -77,7 +77,7 @@ class DisallowSpaceIndentSniff implements Sniff
 
         if (strpos($tokens[$stackPtr]['content'], " ") !== false) {
             $error = 'Tabs must be used to indent lines; spaces are not allowed for code indentation';
-            $phpcsFile->addError($error, $stackPtr);
+            $phpcsFile->addError($error, $stackPtr, 'SpacesUsedForIndentation');
         }
     }//end process()
 
diff --git a/build/animeclient_header_comment.txt b/build/animeclient_header_comment.txt
index 66b34887..fafb11dd 100644
--- a/build/animeclient_header_comment.txt
+++ b/build/animeclient_header_comment.txt
@@ -8,7 +8,7 @@
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
  * @copyright   2015 - 2016  Timothy J. Warren
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
  * @version     3.1
- * @license     MIT
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
\ No newline at end of file
diff --git a/build/phpcs.xml b/build/phpcs.xml
index 58d9c542..bea1fc42 100644
--- a/build/phpcs.xml
+++ b/build/phpcs.xml
@@ -25,6 +25,8 @@
 	<!-- One statement per line -->
 	<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
 
+
+
 	<!-- Classes and functions should be commented -->
 	<rule ref="PEAR.Commenting.ClassComment">
 		<exclude name="PEAR.Commenting.ClassComment.MissingCategoryTag" />
@@ -37,9 +39,10 @@
 		<!-- Exclude this sniff because it doesn't understand multiple types -->
 		<exclude name="PEAR.Commenting.FunctionComment.MissingParamComment" />
 		<exclude name="PEAR.Commenting.FunctionComment.SpacingAfterParamType" />
+		<exclude name="PEAR.Commenting.FunctionComment.SpacingAfterParamName" />
 	</rule>
 
-	<!-- Use warnings for docblock comments for files and variables, since nothing is cleary explained -->
+	<!-- Use warnings for docblock comments for files and variables, since nothing is clearly explained -->
 	<rule ref="PEAR.Commenting.FileComment">
 		<exclude name="PEAR.Commenting.FileComment.InvalidVersion" />
 		<exclude name="PEAR.Commenting.FileComment.MissingCategoryTag" />
@@ -58,7 +61,9 @@
 	<!-- Use Allman style indenting. With the exception of Class declarations,
          braces are always placed on a line by themselves, and indented at the same level as the control statement that "owns" them. -->
 	<rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
-	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
+	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
+		<exclude name="PEAR.WhiteSpace.ScopeClosingBrace.BreakIndent" />
+	</rule>
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
 
 	<!-- Use only short array syntax -->
diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index a7423f3b..662814e8 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -2,9 +2,9 @@
 
 $animeclient_file_patterns = [
 	'app/config/*.php',
-	'app/booststrap.php',
+	'app/bootstrap.php',
 	'src/functions.php',
-	'src/Aviat/AnimeClient/*.php'
+	'src/*.php'
 ];
 
 if ( ! function_exists('glob_recursive'))
diff --git a/index.php b/index.php
index edab666c..6db078c5 100644
--- a/index.php
+++ b/index.php
@@ -4,15 +4,17 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
+ * PHP version 5.6
+ *
  * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
+ * @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     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
  */
 use Aviat\AnimeClient\AnimeClient;
 use Whoops\Handler\PrettyPageHandler;
-use Whoops\Handler\JsonResponseHandler;
 
 // Work around the silly timezone error
 $timezone = ini_get('date.timezone');
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index ce3e6389..662d583a 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -8,10 +8,11 @@
 		<target>phpdoc</target>
 	</transformer>
 	<transformations>
-		<template name="clean" />
+		<template name="zend" />
 	</transformations>
 	<files>
 		<directory>src</directory>
-		<directory>vendor/aviat/ion</directory>
+		<directory>vendor/aviat/ion/src</directory>
+		<directory>vendor/container-interop/container-interop/src</directory>
 	</files>
 </phpdoc>
\ No newline at end of file
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index 5b5f0398..b75b540a 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -22,14 +22,32 @@ use Aviat\AnimeClient\Util;
  */
 class CacheImages extends BaseCommand {
 
+	/**
+	 * Manga Model
+	 *
+	 * @var Aviat\AnimeClient\Model\Manga
+	 */
 	protected $mangaModel;
+
+	/**
+	 * Anime Model
+	 *
+	 * @var Aviat\AnimeClient\Model\Anime
+	 */
 	protected $animeModel;
+
+	/**
+	 * Miscellaneous helper methods
+	 *
+	 * @var Aviat\AnimeClient\Util
+	 */
 	protected $util;
 
-	/*
+	/**
 	 * Convert manga images
 	 *
 	 * @throws \ConsoleKit\ConsoleException
+	 * @return void
 	 */
 	protected function getMangaImages()
 	{
@@ -51,6 +69,7 @@ class CacheImages extends BaseCommand {
 	 * Convert anime images
 	 *
 	 * @throws \ConsoleKit\ConsoleException
+	 * @return void
 	 */
 	protected function getAnimeImages()
 	{
diff --git a/src/Controller.php b/src/Controller.php
index 631624e6..a6e76876 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -19,6 +19,7 @@ use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\View\HttpView;
 use Aviat\Ion\View\HtmlView;
 use Aviat\Ion\View\JsonView;
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
 
 /**
  * Controller base, defines output methods
@@ -60,7 +61,7 @@ class Controller {
 	protected $model;
 
 	/**
-	 * Url generatation class
+	 * Url generation class
 	 * @var UrlGenerator
 	 */
 	protected $urlGenerator;
@@ -117,6 +118,8 @@ class Controller {
 
 	/**
 	 * Redirect to the default controller/url from an empty path
+	 *
+	 * @return void
 	 */
 	public function redirect_to_default()
 	{
@@ -151,7 +154,7 @@ class Controller {
 		}
 
 		$util = $this->container->get('util');
-		$double_form_page = $server_params['HTTP_REFERER'] == $this->request->getUri();
+		$double_form_page = $server_params['HTTP_REFERER'] === $this->request->getUri();
 
 		// Don't attempt to set the redirect url if
 		// the page is one of the form type pages,
@@ -214,6 +217,7 @@ class Controller {
 	 * @param HtmlView $view
 	 * @param string $template
 	 * @param array $data
+	 * @throws \InvalidArgumentException
 	 * @return string
 	 */
 	protected function load_partial($view, $template, array $data = [])
@@ -273,7 +277,7 @@ class Controller {
 
 		$view = new HtmlView($this->container);
 
-		if ($status != "")
+		if ($status !== "")
 		{
 			$message = $this->show_message($view, 'error', $status);
 		}
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 27830017..c8a83f50 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -42,6 +42,7 @@ class Anime extends BaseController {
 
 	/**
 	 * Data cache
+	 * @var Aviat\Ion\Cache\CacheInterface
 	 */
 	protected $cache;
 
@@ -103,7 +104,7 @@ class Anime extends BaseController {
 			'list' => 'list'
 		];
 
-		$data = ($type != 'all')
+		$data = ($type !== 'all')
 			? $this->cache->get($this->model, 'get_list', ['status' => $model_map[$type]])
 			: $this->cache->get($this->model, 'get_all_lists', []);
 
@@ -251,6 +252,8 @@ class Anime extends BaseController {
 
 	/**
 	 * Update an anime item
+	 *
+	 * @return void
 	 */
 	public function update()
 	{
@@ -261,12 +264,14 @@ class Anime extends BaseController {
 
 	/**
 	 * Remove an anime from the list
+	 *
+	 * @return void
 	 */
 	public function delete()
 	{
 		$response = $this->model->delete($this->request->getParsedBody());
 
-		if ($response['body'] == TRUE)
+		if ((bool)$response['body'] === TRUE)
 		{
 			$this->set_flash_message("Successfully deleted anime.", 'success');
 			$this->cache->purge();
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 40141e11..75816037 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -177,11 +177,11 @@ class Manga extends Controller {
 	 *
 	 * @return void
 	 */
- 	public function search()
- 	{
+	public function search()
+	{
 		$query_data = $this->request->getQueryParams();
- 		$this->outputJSON($this->model->search($query_data['query']));
- 	}
+		$this->outputJSON($this->model->search($query_data['query']));
+	}
 
 	/**
 	 * Update an anime item via a form submission
@@ -200,7 +200,7 @@ class Manga extends Controller {
 
 		$result = Json::decode((string)$full_result['body']);
 
-		if ($full_result['statusCode'] == 200)
+		if ((int)$full_result['statusCode'] === 200)
 		{
 			$m =& $result['manga'][0];
 			$title = ( ! empty($m['english_title']))
@@ -232,12 +232,14 @@ class Manga extends Controller {
 
 	/**
 	 * Remove an manga from the list
+	 *
+	 * @return void
 	 */
 	public function delete()
 	{
 		$response = $this->model->delete($this->request->getParsedBody());
 
-		if ($response['body'] == TRUE)
+		if ((bool)$response['body'] === TRUE)
 		{
 			$this->set_flash_message("Successfully deleted manga.", 'success');
 			$this->cache->purge();
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 0bf11fab..cd8683aa 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -138,6 +138,7 @@ class Dispatcher extends RoutingBase {
 	 * the current route
 	 *
 	 * @param \Aura\Router\Route $route
+	 * @throws \LogicException
 	 * @return array
 	 */
 	protected function process_route($route)
diff --git a/src/Model/API.php b/src/Model/API.php
index 3bf4fcec..2848560c 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -17,13 +17,9 @@ namespace Aviat\AnimeClient\Model;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\ResponseInterface;
-use GuzzleHttp\Exception\ClientException;
+use Psr\Http\Message\ResponseInterface;
 
 use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Cache\CacheInterface;
-
 use Aviat\Ion\Model;
 use Aviat\AnimeClient\AnimeClient;
 
@@ -166,7 +162,7 @@ class API extends Model {
 	 */
 	protected function sort_by_name(&$array, $sort_key)
 	{
-		$sort = array();
+		$sort = [];
 
 		foreach ($array as $key => $item)
 		{
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 2fcfcd13..5ce1a1fa 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -59,7 +59,7 @@ class Anime extends API {
 	public function update($data)
 	{
 		$auth = $this->container->get('auth');
-		if ( ! $auth->is_authenticated() || ! array_key_exists('id', $data))
+		if ( ! $auth->is_authenticated() OR ! array_key_exists('id', $data))
 		{
 			return FALSE;
 		}
@@ -86,7 +86,7 @@ class Anime extends API {
 	public function delete($data)
 	{
 		$auth = $this->container->get('auth');
-		if ( ! $auth->is_authenticated() || ! array_key_exists('id', $data))
+		if ( ! $auth->is_authenticated() OR ! array_key_exists('id', $data))
 		{
 			return FALSE;
 		}
@@ -176,7 +176,7 @@ class Anime extends API {
 	 *
 	 * @param string $name
 	 * @return array
-	 * @throws RuntimeException
+	 * @throws \RuntimeException
 	 */
 	public function search($name)
 	{
@@ -190,12 +190,12 @@ class Anime extends API {
 
 		$response = $this->get('search/anime', $config);
 
-		if ($response->getStatusCode() != 200)
+		if ((int) $response->getStatusCode() !== 200)
 		{
 			$logger->warning("Non 200 response for search api call");
 			$logger->warning($response->getBody());
 
-			throw new RuntimeException($response->getEffectiveUrl());
+			throw new \RuntimeException($response->getEffectiveUrl());
 		}
 
 		return Json::decode($response->getBody(), TRUE);
@@ -214,7 +214,7 @@ class Anime extends API {
 			'allow_redirects' => FALSE
 		];
 
-		if ($status != "all")
+		if ($status !== "all")
 		{
 			$config['query']['status'] = $status;
 		}
@@ -250,11 +250,6 @@ class Anime extends API {
 		];
 
 		$username = $this->config->get('hummingbird_username');
-		/*$auth = $this->container->get('auth');
-		if ($auth->is_authenticated())
-		{
-			$config['query']['auth_token'] = $auth->get_auth_token();
-		}*/
 
 		$response = $this->get("users/{$username}/library", $config);
 		return Json::decode($response->getBody(), TRUE);
@@ -264,7 +259,7 @@ class Anime extends API {
 	 * Handle transforming of api data
 	 *
 	 * @param string $status
-	 * @param \GuzzleHttp\Message\Response
+	 * @param \GuzzleHttp\Message\Response $response
 	 * @return array
 	 */
 	protected function transform($status, $response)
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index 0cc49786..7c43eb56 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -218,7 +218,7 @@ class AnimeCollection extends Collection {
 	 */
 	private function json_import()
 	{
-		if ( ! file_exists('import.json') || ! $this->valid_database)
+		if ( ! file_exists('import.json') OR ! $this->valid_database)
 		{
 			return;
 		}
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index f50d3296..d4bb5a3d 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -32,7 +32,7 @@ class Collection extends DB {
 
 	/**
 	 * Whether the database is valid for querying
-	 * @var bool
+	 * @var boolean
 	 */
 	protected $valid_database = FALSE;
 
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 7de34f72..6e8748e5 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -144,7 +144,7 @@ class Manga extends API {
 	 *
 	 * @param string $name
 	 * @return array
-	 * @throws RuntimeException
+	 * @throws \RuntimeException
 	 */
 	public function search($name)
 	{
@@ -160,7 +160,7 @@ class Manga extends API {
 
 		$response = $this->get('search.json', $config);
 
-		if ($response->getStatusCode() != 200)
+		if ((int) $response->getStatusCode() !== 200)
 		{
 			$logger->warning("Non 200 response for search api call");
 			$logger->warning($response->getBody());
diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php
index 270ed7d8..e9a94d64 100644
--- a/src/UrlGenerator.php
+++ b/src/UrlGenerator.php
@@ -24,6 +24,7 @@ class UrlGenerator extends RoutingBase {
 
 	/**
 	 * The current HTTP host
+	 * @var string
 	 */
 	protected $host;
 
@@ -43,7 +44,7 @@ class UrlGenerator extends RoutingBase {
 	 *
 	 * @return string
 	 */
-	public function asset_url(/*...*/)
+	public function asset_url()
 	{
 		$args = func_get_args();
 		$base_url = rtrim($this->url(""), '/');
@@ -106,6 +107,7 @@ class UrlGenerator extends RoutingBase {
 	 * Full default path for the list pages
 	 *
 	 * @param string $type
+	 * @throws \InvalidArgumentException
 	 * @return string
 	 */
 	public function default_url($type)
diff --git a/src/Util.php b/src/Util.php
index cfabaca3..e26d7be0 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -1,195 +1,204 @@
-<?php
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * @package     HummingbirdAnimeClient
- * @author      Timothy J. Warren
- * @copyright   Copyright (c) 2015 - 2016
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- * @license     MIT
- */
-namespace Aviat\AnimeClient;
-
-use abeautifulsite\SimpleImage;
-use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Di\ContainerInterface;
-
-/**
- * Utility method class
- */
-class Util {
-
-	use \Aviat\Ion\Di\ContainerAware;
-
-	private static $form_pages = [
-		'edit',
-		'add',
-		'update',
-		'update_form',
-		'login',
-		'logout',
-		'details'
-	];
-
-	/**
-	 * The config manager
-	 * @var ConfigInterface
-	 */
-	private $config;
-
-	/**
-	 * Set up the Util class
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		$this->setContainer($container);
-		$this->config = $container->get('config');
-	}
-
-	/**
-	 * HTML selection helper function
-	 *
-	 * @param string $a - First item to compare
-	 * @param string $b - Second item to compare
-	 * @return string
-	 */
-	public static function is_selected($a, $b)
-	{
-		return ($a === $b) ? 'selected' : '';
-	}
-
-	/**
-	 * Inverse of selected helper function
-	 *
-	 * @param string $a - First item to compare
-	 * @param string $b - Second item to compare
-	 * @return string
-	 */
-	public static function is_not_selected($a, $b)
-	{
-		return ($a !== $b) ? 'selected' : '';
-	}
-
-	/**
-	 * Determine whether to show the sub-menu
-	 *
-	 * @return bool
-	 */
-	public function is_view_page()
-	{
-		$url = $this->container->get('request')
-			->getUri();
-		$page_segments = explode("/", $url);
-
-		$intersect = array_intersect($page_segments, self::$form_pages);
-
-		return empty($intersect);
-	}
-
-	/**
-	 * Determine whether the page is a page with a form, and
-	 * not suitable for redirection
-	 *
-	 * @return boolean
-	 */
-	public function is_form_page()
-	{
-		return ! $this->is_view_page();
-	}
-
-	/**
-	 * Get the path of the cached version of the image. Create the cached image
-	 * if the file does not already exist
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $api_path - The original image url
-	 * @param string $series_slug - The part of the url with the series name, becomes the image name
-	 * @param string $type - Anime or Manga, controls cache path
-	 * @return string - the frontend path for the cached image
-	 * @throws DomainException
-	 */
-	public function get_cached_image($api_path, $series_slug, $type = "anime")
-	{
-		$path_parts = explode('?', basename($api_path));
-		$path = current($path_parts);
-		$ext_parts = explode('.', $path);
-		$ext = end($ext_parts);
-
-		// Workaround for some broken file extensions
-		if ($ext == "jjpg")
-		{
-			$ext = "jpg";
-		}
-
-		// Failsafe for weird urls
-		if (strlen($ext) > 3)
-		{
-			return $api_path;
-		}
-
-		$img_cache_path = $this->config->get('img_cache_path');
-		$cached_image = "{$series_slug}.{$ext}";
-		$cached_path = "{$img_cache_path}/{$type}/{$cached_image}";
-
-		// Cache the file if it doesn't already exist
-		if ( ! file_exists($cached_path))
-		{
-			if (function_exists('curl_init'))
-			{
-				$ch = curl_init($api_path);
-				$fp = fopen($cached_path, 'wb');
-				curl_setopt_array($ch, [
-					CURLOPT_FILE => $fp,
-					CURLOPT_HEADER => 0
-				]);
-				curl_exec($ch);
-				curl_close($ch);
-				fclose($fp);
-			}
-			else if (ini_get('allow_url_fopen'))
-			{
-				copy($api_path, $cached_path);
-			}
-			else
-			{
-				throw new \DomainException("Couldn't cache images because they couldn't be downloaded.");
-			}
-
-			// Resize the image
-			if ($type == 'anime')
-			{
-				$resize_width = 220;
-				$resize_height = 319;
-				$this->_resize($cached_path, $resize_width, $resize_height);
-			}
-		}
-
-		return "/public/images/{$type}/{$cached_image}";
-	}
-
-	/**
-	 * Resize an image
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $path
-	 * @param string $width
-	 * @param string $height
-	 */
-	private function _resize($path, $width, $height)
-	{
-		try
-		{
-			$img = new SimpleImage($path);
-			$img->resize($width, $height)->save();
-		}
-		catch (Exception $e)
-		{
-			// Catch image errors, since they don't otherwise affect
-			// functionality
-		}
-	}
+<?php
+/**
+ * Hummingbird Anime Client
+ *
+ * An API client for Hummingbird to manage anime and manga watch lists
+ *
+ * PHP version 5.6
+ *
+ * @package     HummingbirdAnimeClient
+ * @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     3.1
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient;
+
+use abeautifulsite\SimpleImage;
+use Aviat\Ion\ConfigInterface;
+use Aviat\Ion\Di\ContainerInterface;
+
+/**
+ * Utility method class
+ */
+class Util {
+
+	use \Aviat\Ion\Di\ContainerAware;
+
+	/**
+	 * Routes that don't require a second navigation level
+	 * @var array
+	 */
+	private static $form_pages = [
+		'edit',
+		'add',
+		'update',
+		'update_form',
+		'login',
+		'logout',
+		'details'
+	];
+
+	/**
+	 * The config manager
+	 * @var ConfigInterface
+	 */
+	private $config;
+
+	/**
+	 * Set up the Util class
+	 *
+	 * @param ContainerInterface $container
+	 */
+	public function __construct(ContainerInterface $container)
+	{
+		$this->setContainer($container);
+		$this->config = $container->get('config');
+	}
+
+	/**
+	 * HTML selection helper function
+	 *
+	 * @param string $a - First item to compare
+	 * @param string $b - Second item to compare
+	 * @return string
+	 */
+	public static function is_selected($a, $b)
+	{
+		return ($a === $b) ? 'selected' : '';
+	}
+
+	/**
+	 * Inverse of selected helper function
+	 *
+	 * @param string $a - First item to compare
+	 * @param string $b - Second item to compare
+	 * @return string
+	 */
+	public static function is_not_selected($a, $b)
+	{
+		return ($a !== $b) ? 'selected' : '';
+	}
+
+	/**
+	 * Determine whether to show the sub-menu
+	 *
+	 * @return bool
+	 */
+	public function is_view_page()
+	{
+		$url = $this->container->get('request')
+			->getUri();
+		$page_segments = explode("/", $url);
+
+		$intersect = array_intersect($page_segments, self::$form_pages);
+
+		return empty($intersect);
+	}
+
+	/**
+	 * Determine whether the page is a page with a form, and
+	 * not suitable for redirection
+	 *
+	 * @return boolean
+	 */
+	public function is_form_page()
+	{
+		return ! $this->is_view_page();
+	}
+
+	/**
+	 * Get the path of the cached version of the image. Create the cached image
+	 * if the file does not already exist
+	 *
+	 * @codeCoverageIgnore
+	 * @param string $api_path - The original image url
+	 * @param string $series_slug - The part of the url with the series name, becomes the image name
+	 * @param string $type - Anime or Manga, controls cache path
+	 * @return string - the frontend path for the cached image
+	 * @throws \DomainException
+	 */
+	public function get_cached_image($api_path, $series_slug, $type = "anime")
+	{
+		$path_parts = explode('?', basename($api_path));
+		$path = current($path_parts);
+		$ext_parts = explode('.', $path);
+		$ext = end($ext_parts);
+
+		// Workaround for some broken file extensions
+		if ($ext === "jjpg")
+		{
+			$ext = "jpg";
+		}
+
+		// Failsafe for weird urls
+		if (strlen($ext) > 3)
+		{
+			return $api_path;
+		}
+
+		$img_cache_path = $this->config->get('img_cache_path');
+		$cached_image = "{$series_slug}.{$ext}";
+		$cached_path = "{$img_cache_path}/{$type}/{$cached_image}";
+
+		// Cache the file if it doesn't already exist
+		if ( ! file_exists($cached_path))
+		{
+			if (function_exists('curl_init'))
+			{
+				$ch = curl_init($api_path);
+				$fp = fopen($cached_path, 'wb');
+				curl_setopt_array($ch, [
+					CURLOPT_FILE => $fp,
+					CURLOPT_HEADER => 0
+				]);
+				curl_exec($ch);
+				curl_close($ch);
+				fclose($fp);
+			}
+			else if (ini_get('allow_url_fopen'))
+			{
+				copy($api_path, $cached_path);
+			}
+			else
+			{
+				throw new \DomainException("Couldn't cache images because they couldn't be downloaded.");
+			}
+
+			// Resize the image
+			if ($type === 'anime')
+			{
+				$resize_width = 220;
+				$resize_height = 319;
+				$this->_resize($cached_path, $resize_width, $resize_height);
+			}
+		}
+
+		return "/public/images/{$type}/{$cached_image}";
+	}
+
+	/**
+	 * Resize an image
+	 *
+	 * @codeCoverageIgnore
+	 * @param string $path
+	 * @param string $width
+	 * @param string $height
+	 * @return void
+	 */
+	private function _resize($path, $width, $height)
+	{
+		try
+		{
+			$img = new SimpleImage($path);
+			$img->resize($width, $height)->save();
+		}
+		catch (Exception $e)
+		{
+			// Catch image errors, since they don't otherwise affect
+			// functionality
+		}
+	}
 }
\ No newline at end of file

From 9ec66803c8c93e1373ef2df6ba767ff0607f8223 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 30 Aug 2016 11:45:17 -0400
Subject: [PATCH 40/65] Update Robofile to work properly

---
 RoboFile.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/RoboFile.php b/RoboFile.php
index 6198da5e..d54b3eae 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -129,14 +129,11 @@ class RoboFile extends \Robo\Tasks {
 		$files = $this->getAllSourceFiles();
 
 		$chunks = array_chunk($files, 6);
-		$collection = $this->collection();
 
 		foreach($chunks as $chunk)
 		{
-			$this->parallelLint($collection, $chunk);
+			$this->parallelLint($chunk);
 		}
-
-		$collection->run();
 	}
 
 
@@ -290,19 +287,20 @@ class RoboFile extends \Robo\Tasks {
 	/**
 	 * Run php's linter in one parallel task for the passed chunk
 	 *
-	 * @param Collection $collection
 	 * @param array $chunk
 	 */
-	protected function parallelLint($collection, array $chunk)
+	protected function parallelLint(array $chunk)
 	{
-		$task = $this->taskParallelExec();
+		$task = $this->taskParallelExec()
+			->timeout(5)
+			->printed(FALSE);
 
 		foreach($chunk as $file)
 		{
 			$task = $task->process("php -l {$file}");
 		}
 
-		$collection->add($task);
+		$task->run();
 	}
 
 	/**
@@ -327,6 +325,6 @@ class RoboFile extends \Robo\Tasks {
 	 */
 	protected function _run(array $cmd_parts, $join_on = ' ')
 	{
-		$this->_exec(implode($join_on, $cmd_parts));
+		$this->taskExec(implode($join_on, $cmd_parts))->run();
 	}
 }
\ No newline at end of file

From c3ec94c06368e97af620dfacd2ef78ad1f1ef873 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 30 Aug 2016 11:51:35 -0400
Subject: [PATCH 41/65] Attempt to fix travis build

---
 .travis.ini | 1 -
 .travis.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 .travis.ini

diff --git a/.travis.ini b/.travis.ini
deleted file mode 100644
index 618eb2ed..00000000
--- a/.travis.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension = "redis.so"
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index f5cce27a..06518770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ php:
 
 
 before_script:
-  - phpenv config-add .travis.ini
+  - composer global require "phpunit/phpunit:5.*"
 
 script:
   - mkdir -p build/logs

From 08b61d08e9e869b86b0b986a1451d53eb0f82b24 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 30 Aug 2016 12:02:21 -0400
Subject: [PATCH 42/65] Make sure to use the version of phpunit I actually
 install

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06518770..9332f25a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,9 @@ php:
   - hhvm
   - nightly
 
-
-before_script:
-  - composer global require "phpunit/phpunit:5.*"
-
 script:
   - mkdir -p build/logs
-  - phpunit -c build
+  - vendor/bin/phpunit -c build
 
 services:
   - redis

From 5e2a68dc8435c402daef5570bfe820ce9e360b59 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 20 Oct 2016 22:09:36 -0400
Subject: [PATCH 43/65] Update EVERYTHING

---
 app/bootstrap.php                             |  7 +--
 build/animeclient_header_comment.txt          |  5 ++-
 build/update_header_comments.php              | 44 +++++++++++++------
 composer.json                                 |  2 +-
 public/css.php                                |  4 +-
 public/js.php                                 |  4 +-
 src/AnimeClient.php                           |  4 +-
 src/Auth/HummingbirdAuth.php                  |  4 +-
 src/Command/BaseCommand.php                   |  4 +-
 src/Command/CacheImages.php                   |  4 +-
 src/Command/ClearCache.php                    |  4 +-
 src/Controller.php                            | 35 +++++++--------
 src/Controller/Anime.php                      |  4 +-
 src/Controller/Collection.php                 |  4 +-
 src/Controller/Manga.php                      |  5 ++-
 src/Dispatcher.php                            |  5 ++-
 src/Helper/Menu.php                           |  4 +-
 src/Hummingbird/Enum/AnimeAiringStatus.php    |  4 +-
 src/Hummingbird/Enum/AnimeShowType.php        |  4 +-
 src/Hummingbird/Enum/AnimeWatchingStatus.php  |  4 +-
 src/Hummingbird/Enum/MangaReadingStatus.php   |  4 +-
 .../Transformer/AnimeListTransformer.php      | 20 ++++-----
 .../Transformer/MangaListTransformer.php      |  4 +-
 .../Transformer/MangaListsZipper.php          |  4 +-
 src/MenuGenerator.php                         | 11 ++---
 src/Model/API.php                             | 13 +++---
 src/Model/Anime.php                           | 10 ++---
 src/Model/AnimeCollection.php                 |  4 +-
 src/Model/Collection.php                      |  4 +-
 src/Model/DB.php                              |  5 ++-
 src/Model/Manga.php                           | 28 ++++++------
 src/RoutingBase.php                           |  5 ++-
 src/UrlGenerator.php                          |  5 ++-
 src/Util.php                                  |  6 +--
 tests/Model/MangaModelTest.php                |  6 +--
 .../Transformer/AnimeListTransformerTest.php  |  5 +--
 .../Transformer/MangaListTransformerTest.php  |  2 +-
 tests/mocks.php                               |  2 +-
 38 files changed, 153 insertions(+), 140 deletions(-)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index e648b7b1..f7d48ae9 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -14,9 +14,6 @@
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
-/**
- * Bootstrap / Dependency Injection
- */
 namespace Aviat\AnimeClient;
 
 use Aura\Html\HelperLocatorFactory;
diff --git a/build/animeclient_header_comment.txt b/build/animeclient_header_comment.txt
index fafb11dd..24806616 100644
--- a/build/animeclient_header_comment.txt
+++ b/build/animeclient_header_comment.txt
@@ -3,7 +3,7 @@
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -11,4 +11,5 @@
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
\ No newline at end of file
+ */
+
diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index 662814e8..7aa9554c 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -4,7 +4,8 @@ $animeclient_file_patterns = [
 	'app/config/*.php',
 	'app/bootstrap.php',
 	'src/functions.php',
-	'src/*.php'
+	'src/*.php',
+	'tests/**/*.php'
 ];
 
 if ( ! function_exists('glob_recursive'))
@@ -26,21 +27,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];
-	}
-	else if ($tokens[1][0] !== T_DOC_COMMENT)
-	{
-		return "<?php";
-	}
+	return $output;
 }
 
 function get_tokens($source)
@@ -53,11 +63,17 @@ 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);
 
 		$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);
diff --git a/composer.json b/composer.json
index 64c450ea..766b979e 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,6 @@
 		"consolidation/robo": "~1.0@RC",
 		"henrikbjorn/lurker": "^1.1.0",
 		"symfony/var-dumper": "^3.1",
-		"squizlabs/php_codesniffer": "^3.0.0@alpha"
+		"squizlabs/php_codesniffer": "^3.0.0@beta"
 	}
 }
diff --git a/public/css.php b/public/css.php
index df1fd142..0f2f5a42 100644
--- a/public/css.php
+++ b/public/css.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/public/js.php b/public/js.php
index 6314df4a..07f5a30a 100644
--- a/public/js.php
+++ b/public/js.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index cfb27521..fda780f8 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
index ed734bfc..07629fa9 100644
--- a/src/Auth/HummingbirdAuth.php
+++ b/src/Auth/HummingbirdAuth.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index d02cb691..5840d31e 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index b75b540a..de30f261 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Command/ClearCache.php b/src/Command/ClearCache.php
index 0de7ddd3..14c8f2f7 100644
--- a/src/Command/ClearCache.php
+++ b/src/Command/ClearCache.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Controller.php b/src/Controller.php
index a6e76876..62e52565 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,13 +13,12 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\View\HttpView;
-use Aviat\Ion\View\HtmlView;
-use Aviat\Ion\View\JsonView;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
+use InvalidArgumentException;
 
 /**
  * Controller base, defines output methods
@@ -28,7 +27,7 @@ use Doctrine\Instantiator\Exception\InvalidArgumentException;
  */
 class Controller {
 
-	use \Aviat\Ion\Di\ContainerAware;
+	use ContainerAware;
 
 	/**
 	 * Cache manager
@@ -166,7 +165,7 @@ class Controller {
 
 		if (is_null($url))
 		{
-			$url = ($util->is_view_page())
+			$url = $util->is_view_page()
 				? $this->request->url->get()
 				: $server_params['HTTP_REFERER'];
 		}
@@ -197,9 +196,9 @@ class Controller {
 	 * Get a class member
 	 *
 	 * @param string $key
-	 * @return object
+	 * @return mixed
 	 */
-	public function __get($key)
+	public function __get(string $key)
 	{
 		$allowed = ['response', 'config'];
 
@@ -217,7 +216,7 @@ class Controller {
 	 * @param HtmlView $view
 	 * @param string $template
 	 * @param array $data
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 * @return string
 	 */
 	protected function load_partial($view, $template, array $data = [])
@@ -230,17 +229,17 @@ class Controller {
 		}
 
 		$route = $router->get_route();
-		$data['route_path'] = ($route) ? $router->get_route()->path : "";
+		$data['route_path'] = $route ? $router->get_route()->path : '';
 
 
 		$template_path = _dir($this->config->get('view_path'), "{$template}.php");
 
 		if ( ! is_file($template_path))
 		{
-			throw new \InvalidArgumentException("Invalid template : {$template}");
+			throw new InvalidArgumentException("Invalid template : {$template}");
 		}
 
-		return $view->render_template($template_path, (array)$data);
+		return $view->renderTemplate($template_path, (array)$data);
 	}
 
 	/**
@@ -271,13 +270,13 @@ class Controller {
 	 * @param string $status
 	 * @return void
 	 */
-	public function login($status = "")
+	public function login(string $status = '')
 	{
-		$message = "";
+		$message = '';
 
 		$view = new HtmlView($this->container);
 
-		if ($status !== "")
+		if ($status !== '')
 		{
 			$message = $this->show_message($view, 'error', $status);
 		}
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index c8a83f50..185c631e 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php
index a5847d62..67fcb967 100644
--- a/src/Controller/Collection.php
+++ b/src/Controller/Collection.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 75816037..6ef71243 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\Ion\Json;
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index cd8683aa..a168f745 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient;
 
 use Aviat\Ion\Di\ContainerInterface;
diff --git a/src/Helper/Menu.php b/src/Helper/Menu.php
index 0d4e7d39..ddc623dc 100644
--- a/src/Helper/Menu.php
+++ b/src/Helper/Menu.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Enum/AnimeAiringStatus.php b/src/Hummingbird/Enum/AnimeAiringStatus.php
index 30f763ca..ae420a78 100644
--- a/src/Hummingbird/Enum/AnimeAiringStatus.php
+++ b/src/Hummingbird/Enum/AnimeAiringStatus.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Enum/AnimeShowType.php b/src/Hummingbird/Enum/AnimeShowType.php
index 83bfa5e4..47dcf6f5 100644
--- a/src/Hummingbird/Enum/AnimeShowType.php
+++ b/src/Hummingbird/Enum/AnimeShowType.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Enum/AnimeWatchingStatus.php b/src/Hummingbird/Enum/AnimeWatchingStatus.php
index 9e3f21f2..103ac128 100644
--- a/src/Hummingbird/Enum/AnimeWatchingStatus.php
+++ b/src/Hummingbird/Enum/AnimeWatchingStatus.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Enum/MangaReadingStatus.php b/src/Hummingbird/Enum/MangaReadingStatus.php
index 0ed64fa9..5743c792 100644
--- a/src/Hummingbird/Enum/MangaReadingStatus.php
+++ b/src/Hummingbird/Enum/MangaReadingStatus.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Transformer/AnimeListTransformer.php b/src/Hummingbird/Transformer/AnimeListTransformer.php
index 415daae3..4a6388bd 100644
--- a/src/Hummingbird/Transformer/AnimeListTransformer.php
+++ b/src/Hummingbird/Transformer/AnimeListTransformer.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -33,17 +33,17 @@ class AnimeListTransformer extends AbstractTransformer {
 	public function transform($item)
 	{
 		$anime =& $item['anime'];
-		$genres = $this->linearize_genres($item['anime']['genres']);
+		$genres = $this->linearizeGenres($item['anime']['genres']);
 
 		$rating = NULL;
 		if ($item['rating']['type'] === 'advanced')
 		{
-			$rating = (is_numeric($item['rating']['value']))
-				? intval(2 * $item['rating']['value'])
+			$rating = is_numeric($item['rating']['value'])
+				? (int) 2 * $item['rating']['value']
 				: '-';
 		}
 
-		$total_episodes = (is_numeric($anime['episode_count']))
+		$total_episodes = is_numeric($anime['episode_count'])
 			? $anime['episode_count']
 			: '-';
 
@@ -54,7 +54,7 @@ class AnimeListTransformer extends AbstractTransformer {
 			// a subset of the main title, don't list the
 			// alternate title
 			$not_subset = stripos($anime['title'], $anime['alternate_title']) === FALSE;
-			$diff = levenshtein($anime['title'], $anime['alternate_title']);
+			$diff = levenshtein($anime['title'], $anime['alternate_title'] ?? '');
 			if ($not_subset && $diff >= 5)
 			{
 				$alternate_title = $anime['alternate_title'];
@@ -129,14 +129,14 @@ class AnimeListTransformer extends AbstractTransformer {
 	/**
 	 * Simplify structure of genre list
 	 *
-	 * @param  array  $raw_genres
+	 * @param  array  $rawGenres
 	 * @return array
 	 */
-	protected function linearize_genres(array $raw_genres)
+	protected function linearizeGenres(array $rawGenres): array
 	{
 		$genres = [];
 
-		foreach ($raw_genres as $genre)
+		foreach ($rawGenres as $genre)
 		{
 			$genres[] = $genre['name'];
 		}
diff --git a/src/Hummingbird/Transformer/MangaListTransformer.php b/src/Hummingbird/Transformer/MangaListTransformer.php
index e795d8fc..7f32ca4a 100644
--- a/src/Hummingbird/Transformer/MangaListTransformer.php
+++ b/src/Hummingbird/Transformer/MangaListTransformer.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Hummingbird/Transformer/MangaListsZipper.php b/src/Hummingbird/Transformer/MangaListsZipper.php
index 978cdd5c..c3db0458 100644
--- a/src/Hummingbird/Transformer/MangaListsZipper.php
+++ b/src/Hummingbird/Transformer/MangaListsZipper.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index 76a5a320..001a8bf0 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient;
 
+use Aviat\Ion\{ArrayWrapper, StringWrapper};
 use Aviat\Ion\Di\ContainerInterface;
 
 /**
@@ -23,8 +24,8 @@ use Aviat\Ion\Di\ContainerInterface;
  */
 class MenuGenerator extends UrlGenerator {
 
-	use \Aviat\Ion\StringWrapper;
-	use \Aviat\Ion\ArrayWrapper;
+	use ArrayWrapper;
+	use StringWrapper;
 
 	/**
 	 * Html generation helper
@@ -87,7 +88,7 @@ class MenuGenerator extends UrlGenerator {
 		$parsed_config = $this->parse_config($menus);
 
 		// Bail out early on invalid menu
-		if ( ! $this->arr($parsed_config)->has_key($menu))
+		if ( ! $this->arr($parsed_config)->hasKey($menu))
 		{
 			return '';
 		}
diff --git a/src/Model/API.php b/src/Model/API.php
index 2848560c..67bd6ef6 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient\Model;
 
 use GuzzleHttp\Client;
@@ -160,7 +161,7 @@ class API extends Model {
 	 * @param string $sort_key
 	 * @return void
 	 */
-	protected function sort_by_name(&$array, $sort_key)
+	protected function sort_by_name(array &$array, string $sort_key)
 	{
 		$sort = [];
 
@@ -180,7 +181,7 @@ class API extends Model {
 	 * @param string $password
 	 * @return string|false
 	 */
-	public function authenticate($username, $password)
+	public function authenticate(string $username, string $password)
 	{
 		$response = $this->post(AnimeClient::HUMMINGBIRD_AUTH_URL, [
 			'form_params' => [
@@ -191,7 +192,7 @@ class API extends Model {
 
 		if ($response->getStatusCode() === 201)
 		{
-			return json_decode($response->getBody(), TRUE);
+			return json_decode((string)$response->getBody(), TRUE);
 		}
 
 		return FALSE;
@@ -205,7 +206,7 @@ class API extends Model {
 	 * @param  string $status
 	 * @return array
 	 */
-	protected function _get_list_from_api($status)
+	protected function _get_list_from_api(string $status): array
 	{
 		return [];
 	}
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 5ce1a1fa..0593ebdf 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -208,13 +208,13 @@ class Anime extends API {
 	 * @param string $status
 	 * @return array
 	 */
-	protected function _get_list_from_api($status = "all")
+	protected function _get_list_from_api(string $status = "all"): array
 	{
 		$config = [
 			'allow_redirects' => FALSE
 		];
 
-		if ($status !== "all")
+		if ($status !== 'all')
 		{
 			$config['query']['status'] = $status;
 		}
@@ -266,7 +266,7 @@ class Anime extends API {
 	{
 		$api_data = Json::decode($response->getBody(), TRUE);
 		$transformer = new AnimeListTransformer();
-		$transformed = $transformer->transform_collection($api_data);
+		$transformed = $transformer->transformCollection($api_data);
 		return $transformed;
 	}
 }
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index 7c43eb56..cd084449 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index d4bb5a3d..776f67c8 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
diff --git a/src/Model/DB.php b/src/Model/DB.php
index cd9d2f39..a75a6cb8 100644
--- a/src/Model/DB.php
+++ b/src/Model/DB.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 6e8748e5..3fbe8268 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -16,11 +16,11 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use GuzzleHttp\Cookie\SetCookie;
-
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Transformer;
 use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
+use Aviat\Ion\Json;
+use GuzzleHttp\Cookie\SetCookie;
+use RuntimeException;
 
 /**
  * Model for handling requests dealing with the manga list
@@ -59,7 +59,7 @@ class Manga extends API {
 	 * @param string|null $json
 	 * @return array
 	 */
-	protected function _manga_api_call($type, $url, $json = NULL)
+	protected function _manga_api_call(string $type, string $url, $json = NULL): array
 	{
 		$token = $this->container->get('auth')
 			->get_auth_token();
@@ -144,7 +144,7 @@ class Manga extends API {
 	 *
 	 * @param string $name
 	 * @return array
-	 * @throws \RuntimeException
+	 * @throws RuntimeException
 	 */
 	public function search($name)
 	{
@@ -162,10 +162,10 @@ class Manga extends API {
 
 		if ((int) $response->getStatusCode() !== 200)
 		{
-			$logger->warning("Non 200 response for search api call");
+			$logger->warning('Non 200 response for search api call');
 			$logger->warning($response->getBody());
 
-			throw new \RuntimeException($response->getEffectiveUrl());
+			throw new RuntimeException($response->getEffectiveUrl());
 		}
 
 		return Json::decode($response->getBody(), TRUE);
@@ -189,7 +189,7 @@ class Manga extends API {
 	 * @param  string $status
 	 * @return array
 	 */
-	public function _get_list_from_api($status = "All")
+	public function _get_list_from_api(string $status = "All"): array
 	{
 		$config = [
 			'query' => [
@@ -220,11 +220,9 @@ class Manga extends API {
 			return [];
 		}
 
-		$zippered_data = $this->zipper_lists($api_data);
+		$zipperedData = $this->zipperLists($api_data);
 		$transformer = new Transformer\MangaListTransformer();
-		$transformed_data = $transformer->transform_collection($zippered_data);
-
-		return $transformed_data;
+		return $transformer->transformCollection($zipperedData);
 	}
 
 	/**
@@ -281,7 +279,7 @@ class Manga extends API {
 	 * @param  array $raw_data
 	 * @return array
 	 */
-	private function zipper_lists($raw_data)
+	private function zipperLists($raw_data)
 	{
 		return (new Transformer\MangaListsZipper($raw_data))->transform();
 	}
diff --git a/src/RoutingBase.php b/src/RoutingBase.php
index 4c32bf6c..2a1f479a 100644
--- a/src/RoutingBase.php
+++ b/src/RoutingBase.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient;
 
 use Aviat\Ion\Di\ContainerInterface;
diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php
index e9a94d64..88970b08 100644
--- a/src/UrlGenerator.php
+++ b/src/UrlGenerator.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -13,6 +13,7 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+
 namespace Aviat\AnimeClient;
 
 use Aviat\Ion\Di\ContainerInterface;
diff --git a/src/Util.php b/src/Util.php
index e26d7be0..309e981a 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Hummingbird Anime Client
  *
  * An API client for Hummingbird to manage anime and manga watch lists
  *
- * PHP version 5.6
+ * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
@@ -91,7 +91,7 @@ class Util {
 	{
 		$url = $this->container->get('request')
 			->getUri();
-		$page_segments = explode("/", $url);
+		$page_segments = explode("/", (string) $url);
 
 		$intersect = array_intersect($page_segments, self::$form_pages);
 
diff --git a/tests/Model/MangaModelTest.php b/tests/Model/MangaModelTest.php
index 8835df9a..813876d9 100644
--- a/tests/Model/MangaModelTest.php
+++ b/tests/Model/MangaModelTest.php
@@ -1,11 +1,7 @@
 <?php
-use GuzzleHttp\Psr7\Response;
 
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Model\Manga as MangaModel;
-use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
 
 class MangaModelTest extends AnimeClient_TestCase {
 
@@ -22,7 +18,7 @@ class MangaModelTest extends AnimeClient_TestCase {
 		$raw_data = Json::decodeFile($this->mockDir . '/manga.json');
 		$expected = Json::decodeFile($this->mockDir . '/manga-zippered.json');
 
-		$this->assertEquals($expected, $this->model->zipper_lists($raw_data));
+		$this->assertEquals($expected, $this->model->zipperLists($raw_data));
 	}
 
 	public function testMapByStatus()
diff --git a/tests/Transformer/AnimeListTransformerTest.php b/tests/Transformer/AnimeListTransformerTest.php
index 396203fa..742e26ac 100644
--- a/tests/Transformer/AnimeListTransformerTest.php
+++ b/tests/Transformer/AnimeListTransformerTest.php
@@ -36,7 +36,7 @@ class AnimeListTransformerTest extends AnimeClient_TestCase {
 	 */
 	public function testLinearizeGenres($original, $expected)
 	{
-		$actual = $this->transformerFriend->linearize_genres($original);
+		$actual = $this->transformerFriend->linearizeGenres($original);
 		$this->assertEquals($expected, $actual);
 	}
 
@@ -44,8 +44,7 @@ class AnimeListTransformerTest extends AnimeClient_TestCase {
 	{
 		$json = Json::decodeFile($this->start_file);
 		$expected = Json::decodeFile($this->res_file);
-		$actual = $this->transformer->transform_collection($json);
-//file_put_contents($this->res_file, json_encode($actual));
+		$actual = $this->transformer->transformCollection($json);
 		$this->assertEquals($expected, $actual);
 	}
 }
\ No newline at end of file
diff --git a/tests/Transformer/MangaListTransformerTest.php b/tests/Transformer/MangaListTransformerTest.php
index 36f0913c..fad7570e 100644
--- a/tests/Transformer/MangaListTransformerTest.php
+++ b/tests/Transformer/MangaListTransformerTest.php
@@ -19,7 +19,7 @@ class MangaListTransformerTest extends AnimeClient_TestCase {
 		$orig_json = Json::decodeFile($this->start_file);
 		$expected = Json::decodeFile($this->res_file);
 
-		$actual = $this->transformer->transform_collection($orig_json);
+		$actual = $this->transformer->transformCollection($orig_json);
 		$this->assertEquals($expected, $actual);
 	}
 
diff --git a/tests/mocks.php b/tests/mocks.php
index fca39551..55ea76aa 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -150,7 +150,7 @@ class MockBaseApiModel extends BaseApiModel {
 	use MockInjectionTrait;
 	protected $base_url = 'https://httpbin.org/';
 
-	protected function _get_list_from_api($status)
+	protected function _get_list_from_api(string $status): array
 	{
 		return [];
 	}

From 27f66cfea3b748abb938b362ad02e202892482b1 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 20 Oct 2016 22:32:17 -0400
Subject: [PATCH 44/65] Update headers and namespaces

---
 ...eclient_header_comment.txt => header_comment.txt} |  0
 sonar-project.properties                             |  6 ------
 src/Auth/HummingbirdAuth.php                         |  2 +-
 src/Command/BaseCommand.php                          | 12 +++++-------
 src/Command/CacheImages.php                          |  1 +
 src/Controller.php                                   | 10 ++++++++--
 src/Controller/Anime.php                             |  2 +-
 src/Controller/Collection.php                        |  4 ++--
 src/Controller/Manga.php                             |  6 +++---
 src/MenuGenerator.php                                |  5 ++++-
 src/Model/API.php                                    |  7 +++----
 src/Model/Anime.php                                  |  2 +-
 src/Model/AnimeCollection.php                        |  2 +-
 src/Model/Manga.php                                  |  2 +-
 tests/AnimeClientTest.php                            |  2 --
 tests/AnimeClient_TestCase.php                       |  7 +++----
 tests/Auth/HummingbirdAuthTest.php                   |  5 ++---
 tests/Command/BaseCommandTest.php                    |  4 ++--
 tests/ControllerTest.php                             |  8 ++++----
 tests/DispatcherTest.php                             | 11 +++--------
 tests/MenuGeneratorTest.php                          |  3 +--
 tests/Model/AnimeCollectionModelTest.php             |  3 +--
 tests/Model/AnimeModelTest.php                       |  2 --
 tests/Model/BaseApiModelTest.php                     |  5 +----
 tests/Transformer/AnimeListTransformerTest.php       |  2 +-
 tests/Transformer/MangaListTransformerTest.php       |  2 +-
 tests/Transformer/MangaListsZipperTest.php           |  2 +-
 tests/UrlGeneratorTest.php                           |  2 +-
 tests/mocks.php                                      |  7 +++----
 29 files changed, 55 insertions(+), 71 deletions(-)
 rename build/{animeclient_header_comment.txt => header_comment.txt} (100%)
 delete mode 100644 sonar-project.properties

diff --git a/build/animeclient_header_comment.txt b/build/header_comment.txt
similarity index 100%
rename from build/animeclient_header_comment.txt
rename to build/header_comment.txt
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index b21122c4..00000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-sonar.projectKey=animeclient
-sonar.projectName=Anime Client
-sonar.projectVersion=3.0.0
-sonar.sources=src
-sonar.php.coverage.reportPath=build/logs/clover.xml
-sonar.php.tests.reportPath=build/logs/junit.xml
\ No newline at end of file
diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
index 07629fa9..ef2fefe9 100644
--- a/src/Auth/HummingbirdAuth.php
+++ b/src/Auth/HummingbirdAuth.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Auth;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Hummingbird API Authentication
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index 5840d31e..2b4c05b3 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -17,17 +17,15 @@
 namespace Aviat\AnimeClient\Command;
 
 use Aura\Session\SessionFactory;
-use ConsoleKit\Command;
-use ConsoleKit\Widgets\Box;
-
-use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
-use Aviat\Ion\Cache\CacheManager;
-
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\Auth\HummingbirdAuth;
 use Aviat\AnimeClient\Model;
 use Aviat\AnimeClient\Util;
+use Aviat\Ion\Cache\CacheManager;
+use Aviat\Ion\Config;
+use Aviat\Ion\Di\Container;
+use ConsoleKit\Command;
+use ConsoleKit\Widgets\Box;
 
 /**
  * Base class for console command setup
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index de30f261..bdb03683 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -17,6 +17,7 @@
 namespace Aviat\AnimeClient\Command;
 
 use Aviat\AnimeClient\Util;
+
 /**
  * Generates thumbnail image cache so that cover images load faster
  */
diff --git a/src/Controller.php b/src/Controller.php
index 62e52565..f5e27f1f 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -16,8 +16,14 @@
 
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
-use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
+use Aviat\Ion\Di\
+{
+	ContainerAware, ContainerInterface
+};
+use Aviat\Ion\View\
+{
+	HtmlView, HttpView, JsonView
+};
 use InvalidArgumentException;
 
 /**
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 185c631e..7ebf31a4 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -16,10 +16,10 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller as BaseController;
 use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Controller for Anime-related pages
diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php
index 67fcb967..893e5a80 100644
--- a/src/Controller/Collection.php
+++ b/src/Controller/Collection.php
@@ -16,11 +16,11 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller as BaseController;
-use Aviat\AnimeClient\UrlGenerator;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
 use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
+use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Controller for Anime collection pages
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 6ef71243..c3027af8 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -16,12 +16,12 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Json;
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller;
-use Aviat\AnimeClient\Model\Manga as MangaModel;
 use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
+use Aviat\AnimeClient\Model\Manga as MangaModel;
+use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Json;
 
 /**
  * Controller for manga list
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index 001a8bf0..ccfb2616 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -16,7 +16,10 @@
 
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\{ArrayWrapper, StringWrapper};
+use Aviat\Ion\
+{
+	ArrayWrapper, StringWrapper
+};
 use Aviat\Ion\Di\ContainerInterface;
 
 /**
diff --git a/src/Model/API.php b/src/Model/API.php
index 67bd6ef6..bb501e41 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -16,14 +16,13 @@
 
 namespace Aviat\AnimeClient\Model;
 
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Model;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
 use Psr\Http\Message\ResponseInterface;
 
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Model;
-use Aviat\AnimeClient\AnimeClient;
-
 /**
  * Base model for api interaction
  *
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 0593ebdf..67a21acd 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -16,9 +16,9 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\Ion\Json;
 
 /**
  * Model for handling requests dealing with the anime list
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index cd084449..fc7fe4c1 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\Ion\Json;
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Json;
 
 /**
  * Model for getting anime collection data
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 3fbe8268..88aa4f3c 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Hummingbird\Transformer;
 use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
+use Aviat\AnimeClient\Hummingbird\Transformer;
 use Aviat\Ion\Json;
 use GuzzleHttp\Cookie\SetCookie;
 use RuntimeException;
diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php
index 75a89554..0d75a480 100644
--- a/tests/AnimeClientTest.php
+++ b/tests/AnimeClientTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use Aviat\AnimeClient\AnimeClient;
-
 
 class AnimeClientTest extends AnimeClient_TestCase {
 
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 9f1f7865..2b7311bd 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -1,15 +1,14 @@
 <?php
 
 use Aura\Web\WebFactory;
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response as HttpResponse;
-
-use Aviat\Ion\Json;
-use Aviat\AnimeClient\AnimeClient;
+use Zend\Diactoros\ServerRequestFactory;
 
 define('ROOT_DIR', __DIR__ . '/../');
 define('TEST_DATA_DIR', __DIR__ . '/test_data');
diff --git a/tests/Auth/HummingbirdAuthTest.php b/tests/Auth/HummingbirdAuthTest.php
index d2476127..260f0494 100644
--- a/tests/Auth/HummingbirdAuthTest.php
+++ b/tests/Auth/HummingbirdAuthTest.php
@@ -1,13 +1,12 @@
 <?php
 use Aura\Session\SessionFactory;
+use Aviat\AnimeClient\Auth\HummingbirdAuth;
+use Aviat\Ion\Friend;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 
-use Aviat\Ion\Friend;
-use Aviat\AnimeClient\Auth\HummingbirdAuth;
-
 class HummingbirdAuthTest extends AnimeClient_TestCase {
 
 	static $session;
diff --git a/tests/Command/BaseCommandTest.php b/tests/Command/BaseCommandTest.php
index 46eb6b63..76b7c91a 100644
--- a/tests/Command/BaseCommandTest.php
+++ b/tests/Command/BaseCommandTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use ConsoleKit\Console;
-use Aviat\Ion\Friend;
 use Aviat\AnimeClient\Command\BaseCommand;
+use Aviat\Ion\Friend;
+use ConsoleKit\Console;
 
 class BaseCommandTest extends AnimeClient_TestCase {
 	public function setUp()
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index 043b587b..8c0e3a6e 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -1,10 +1,10 @@
 <?php
-use \Aviat\AnimeClient\Controller;
+use Aura\Router\RouterFactory;
+use Aura\Web\WebFactory;
+use Aviat\AnimeClient\Controller;
 use Aviat\AnimeClient\Controller\Anime as AnimeController;
-use Aviat\AnimeClient\Controller\Manga as MangaController;
 use Aviat\AnimeClient\Controller\Collection as CollectionController;
-use \Aura\Web\WebFactory;
-use \Aura\Router\RouterFactory;
+use Aviat\AnimeClient\Controller\Manga as MangaController;
 
 class ControllerTest extends AnimeClient_TestCase {
 
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
index 811e1c6c..142ac98d 100644
--- a/tests/DispatcherTest.php
+++ b/tests/DispatcherTest.php
@@ -1,15 +1,10 @@
 <?php
 
-use Aura\Router\RouterContainer;
-use Monolog\Logger;
-use Monolog\Handler\TestHandler;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Response;
-
-use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
 use Aviat\AnimeClient\Dispatcher;
 use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Config;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 
 
 class DispatcherTest extends AnimeClient_TestCase {
diff --git a/tests/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php
index 5906aaec..7bf2e14f 100644
--- a/tests/MenuGeneratorTest.php
+++ b/tests/MenuGeneratorTest.php
@@ -1,7 +1,6 @@
 <?php
-use Aviat\Ion\Friend;
-
 use Aviat\AnimeClient\MenuGenerator;
+use Aviat\Ion\Friend;
 
 class MenuGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/Model/AnimeCollectionModelTest.php b/tests/Model/AnimeCollectionModelTest.php
index faa66244..be984aab 100644
--- a/tests/Model/AnimeCollectionModelTest.php
+++ b/tests/Model/AnimeCollectionModelTest.php
@@ -1,10 +1,9 @@
 <?php
 
+use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 use Aviat\Ion\Config;
 use Aviat\Ion\Friend;
 
-use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
-
 class AnimeCollectionModelTest extends AnimeClient_TestCase {
 
 	public function setUp()
diff --git a/tests/Model/AnimeModelTest.php b/tests/Model/AnimeModelTest.php
index 10821e43..3f311067 100644
--- a/tests/Model/AnimeModelTest.php
+++ b/tests/Model/AnimeModelTest.php
@@ -1,7 +1,5 @@
 <?php
 use Aviat\Ion\Friend;
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Model\Anime as AnimeModel;
 
 class AnimeModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Model/BaseApiModelTest.php b/tests/Model/BaseApiModelTest.php
index d083e827..c97515b9 100644
--- a/tests/Model/BaseApiModelTest.php
+++ b/tests/Model/BaseApiModelTest.php
@@ -1,14 +1,11 @@
 <?php
 
+use Aviat\AnimeClient\Container;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Container;
-use Aviat\AnimeClient\Model\API as BaseApiModel;
-
 class BaseApiModelTest extends AnimeClient_TestCase {
 
 	public function setUp()
diff --git a/tests/Transformer/AnimeListTransformerTest.php b/tests/Transformer/AnimeListTransformerTest.php
index 742e26ac..67a18139 100644
--- a/tests/Transformer/AnimeListTransformerTest.php
+++ b/tests/Transformer/AnimeListTransformerTest.php
@@ -1,8 +1,8 @@
 <?php
 
+use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
-use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
 
 class AnimeListTransformerTest extends AnimeClient_TestCase {
 
diff --git a/tests/Transformer/MangaListTransformerTest.php b/tests/Transformer/MangaListTransformerTest.php
index fad7570e..2524de1d 100644
--- a/tests/Transformer/MangaListTransformerTest.php
+++ b/tests/Transformer/MangaListTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
+use Aviat\Ion\Json;
 
 class MangaListTransformerTest extends AnimeClient_TestCase {
 
diff --git a/tests/Transformer/MangaListsZipperTest.php b/tests/Transformer/MangaListsZipperTest.php
index d5bc9aa3..c213fbbd 100644
--- a/tests/Transformer/MangaListsZipperTest.php
+++ b/tests/Transformer/MangaListsZipperTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListsZipper;
+use Aviat\Ion\Json;
 
 class MangaListsZipperTest extends AnimeClient_TestCase {
 
diff --git a/tests/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php
index 7ae7e07d..efb77a58 100644
--- a/tests/UrlGeneratorTest.php
+++ b/tests/UrlGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Config;
 use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Config;
 
 class UrlGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/mocks.php b/tests/mocks.php
index 55ea76aa..b53cbc5e 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -3,6 +3,9 @@
  * All the mock classes that extend the classes they are used to test
  */
 
+use Aviat\AnimeClient\Model\Anime as AnimeModel;
+use Aviat\AnimeClient\Model\API as BaseApiModel;
+use Aviat\AnimeClient\Model\Manga as MangaModel;
 use Aviat\Ion\Enum;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
@@ -12,10 +15,6 @@ use Aviat\Ion\View\HtmlView;
 use Aviat\Ion\View\HttpView;
 use Aviat\Ion\View\JsonView;
 
-use Aviat\AnimeClient\Model\Anime as AnimeModel;
-use Aviat\AnimeClient\Model\Manga as MangaModel;
-use Aviat\AnimeClient\Model\API as BaseApiModel;
-
 
 // -----------------------------------------------------------------------------
 // Mock the default error handler

From bc0452aa2f5ac5a0cd029726f40ea78fac19e15e Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 1 Nov 2016 09:10:11 -0400
Subject: [PATCH 45/65] Update CI tools to exclude old PHP versions

---
 .gitlab-ci.yml | 9 ---------
 .travis.yml    | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 265afb81..e49f10eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,15 +8,6 @@ cache:
 services:
     - redis:latest
 
-test:5.6:
-    before_script:
-      - bash build/docker_install.sh > /dev/null
-      - curl -sS https://getcomposer.org/installer | php
-      - php composer.phar install --no-dev
-    image: php:5.6
-    script:
-      - phpunit -c build
-
 test:7:
     before_script:
       - bash build/docker_install.sh > /dev/null
diff --git a/.travis.yml b/.travis.yml
index 9332f25a..bd0fa78d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ install:
   - composer install
 
 php:
-  - 5.5
-  - 5.6
   - 7
   - hhvm
   - nightly
@@ -22,7 +20,6 @@ after_script:
 
 matrix:
   allow_failures:
-    - php: 5.5
     - php: nightly
     - php: hhvm
 

From 08c793b91243b913cde2e7b7aeaf15a3358a6a57 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 3 Nov 2016 11:30:22 -0400
Subject: [PATCH 46/65] Fix hhvm tests

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e49f10eb..4ac51106 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,4 +25,4 @@ test:hhvm:
       - composer install --no-dev
     image: 51systems/docker-gitlab-ci-runner-hhvm
     script:
-      - phpunit -c build
\ No newline at end of file
+      - hhvm -d hhvm.php7.all=true phpunit -c build
\ No newline at end of file

From fe912354363c6532e5015b9f1369b7f56f6afd2b Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 3 Nov 2016 11:39:24 -0400
Subject: [PATCH 47/65] Fix hhvm tests take 2

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac51106..e294bfa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,4 +25,4 @@ test:hhvm:
       - composer install --no-dev
     image: 51systems/docker-gitlab-ci-runner-hhvm
     script:
-      - hhvm -d hhvm.php7.all=true phpunit -c build
\ No newline at end of file
+      - hhvm -d hhvm.php7.all=true vendor/bin/phpunit -c build
\ No newline at end of file

From 276c4923552323b70bb782959e82b881a605e8b6 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 16 Dec 2016 21:52:59 -0500
Subject: [PATCH 48/65] Remove Hummingbird stuff

---
 build.xml                                     | 169 ------------
 src/Auth/HummingbirdAuth.php                  | 108 --------
 src/Hummingbird/Enum/AnimeAiringStatus.php    |  29 --
 src/Hummingbird/Enum/AnimeShowType.php        |  32 ---
 src/Hummingbird/Enum/AnimeWatchingStatus.php  |  31 ---
 src/Hummingbird/Enum/MangaReadingStatus.php   |  31 ---
 .../Transformer/AnimeListTransformer.php      | 147 ----------
 .../Transformer/MangaListTransformer.php      | 121 ---------
 .../Transformer/MangaListsZipper.php          |  92 -------
 tests/Auth/HummingbirdAuthTest.php            |  88 ------
 tests/Model/AnimeCollectionModelTest.php      |  76 ------
 tests/Model/AnimeModelTest.php                |  55 ----
 tests/Model/BaseApiModelTest.php              | 252 ------------------
 tests/Model/MangaModelTest.php                |  71 -----
 .../Transformer/AnimeListTransformerTest.php  |  50 ----
 .../Transformer/MangaListTransformerTest.php  | 114 --------
 tests/Transformer/MangaListsZipperTest.php    |  28 --
 17 files changed, 1494 deletions(-)
 delete mode 100644 build.xml
 delete mode 100644 src/Auth/HummingbirdAuth.php
 delete mode 100644 src/Hummingbird/Enum/AnimeAiringStatus.php
 delete mode 100644 src/Hummingbird/Enum/AnimeShowType.php
 delete mode 100644 src/Hummingbird/Enum/AnimeWatchingStatus.php
 delete mode 100644 src/Hummingbird/Enum/MangaReadingStatus.php
 delete mode 100644 src/Hummingbird/Transformer/AnimeListTransformer.php
 delete mode 100644 src/Hummingbird/Transformer/MangaListTransformer.php
 delete mode 100644 src/Hummingbird/Transformer/MangaListsZipper.php
 delete mode 100644 tests/Auth/HummingbirdAuthTest.php
 delete mode 100644 tests/Model/AnimeCollectionModelTest.php
 delete mode 100644 tests/Model/AnimeModelTest.php
 delete mode 100644 tests/Model/BaseApiModelTest.php
 delete mode 100644 tests/Model/MangaModelTest.php
 delete mode 100644 tests/Transformer/AnimeListTransformerTest.php
 delete mode 100644 tests/Transformer/MangaListTransformerTest.php
 delete mode 100644 tests/Transformer/MangaListsZipperTest.php

diff --git a/build.xml b/build.xml
deleted file mode 100644
index 35dbaf72..00000000
--- a/build.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="full-build" name="animeclient" basedir=".">
-	<autoloader autoloaderpath="${project.basedir}/vendor/autoload.php" />
-	<!-- By default, we assume all tools to be on the $PATH -->
-	<property name="pdepend" value="pdepend" />
-	<property name="phpcpd" value="phpcpd" />
-	<property name="phpdox" value="phpdox" />
-	<property name="phploc" value="phploc" />
-	<property name="phpmd" value="phpmd" />
-	<property name="phpunit" value="phpunit" />
-	<property name="sonar" value="sonar-runner" />
-
-	<target name="full-build"
-		depends="prepare,static-analysis,phpunit,phpdox"
-		description="Performs static analysis, runs the tests, and generates project documentation"
-	/>
-	<target name="quick-build"
-		depends="prepare,lint,phpunit-no-coverage"
-		description="Performs a lint check and runs the tests (without generating code coverage reports)"
-	/>
-	<target name="static-analysis"
-		depends="lint,phploc-ci,pdepend,phpcpd-ci"
-		description="Performs static analysis"
-	/>
-
-	<target name="clean" unless="clean.done" description="Cleanup build artifacts">
-		<delete dir="build/api" />
-		<delete dir="build/coverage" />
-		<delete dir="build/logs" />
-		<delete dir="build/pdepend" />
-		<delete dir="build/phpdox" />
-		<property name="clean.done" value="true" />
-	</target>
-
-	<target name="prepare" depends="clean" unless="prepare.done" description="Prepare for build">
-		<mkdir dir="build/api" />
-		<mkdir dir="build/coverage" />
-		<mkdir dir="build/logs" />
-		<mkdir dir="build/pdepend" />
-		<mkdir dir="build/phpdox" />
-		<property name="prepare.done" value="true" />
-	</target>
-
-	<target name="lint" unless="lint.done" description="Perform syntax check of sourcecode files">
-		<parallel threadcount="6">
-			<apply executable="php" passthru="true" taskname="lint">
-				<arg value="-l" />
-				<fileset dir=".">
-					<include name="src/Aviat/AnimeClient/**/*.php" />
-				</fileset>
-			</apply>
-			<apply executable="php" passthru="true" taskname="lint">
-				<arg value="-l" />
-				<fileset dir=".">
-					<include name="src/Aviat/Ion/**/*.php" />
-				</fileset>
-			</apply>
-			<apply executable="php" passthru="true" taskname="lint">
-				<arg value="-l" />
-				<fileset dir=".">
-					<include name="tests/AnimeClient/**/*.php" />
-				</fileset>
-			</apply>
-			<apply executable="php" passthru="true" taskname="lint">
-				<arg value="-l" />
-				<fileset dir=".">
-					<include name="tests/Ion/**/*.php" />
-				</fileset>
-			</apply>
-		</parallel>
-
-		<property name="lint.done" value="true" />
-	</target>
-
-	<target name="phploc" unless="phploc.done" description="Measure project size using PHPLOC and print human readable output. Intended for usage on the command line.">
-		<exec executable="${phploc}" passthru="true" taskname="phploc">
-			<arg value="--count-tests" />
-			<arg path="src" />
-			<arg path="tests" />
-		</exec>
-
-		<property name="phploc.done" value="true" />
-	</target>
-
-	<target name="phploc-ci" depends="prepare" unless="phploc.done" description="Measure project size using PHPLOC and log result in CSV and XML format. Intended for usage within a continuous integration environment.">
-		<parallel threadcount="2">
-			<phploc countTests="true" reportType="csv" reportDirectory="build/logs" reportName="phploc" taskname="csv report">
-				<fileset dir=".">
-					<include name="src/**/*.php" />
-					<include name="tests/**/*.php" />
-				</fileset>
-			</phploc>
-			<phploc countTests="true" reportType="xml" reportDirectory="build/logs" reportName="phploc" taskname="xml report">
-				<fileset dir=".">
-					<include name="src/**/*.php" />
-					<include name="tests/**/*.php" />
-				</fileset>
-			</phploc>
-		</parallel>
-
-		<property name="phploc.done" value="true" />
-	</target>
-
-	<target name="pdepend" depends="prepare" unless="pdepend.done" description="Calculate software metrics using PHP_Depend and log result in XML format. Intended for usage within a continuous integration environment.">
-		<phpdepend>
-			<fileset dir=".">
-				<include name="src/**/*.php" />
-			</fileset>
-			<logger type="jdepend-xml" outfile="build/logs/jdepend.xml" />
-			<logger type="jdepend-chart" outfile="build/pdepend/dependencies.svg" />
-			<logger type="overview-pyramid" outfile="build/pdepend/overview-pyramid.svg" />
-		</phpdepend>
-
-		<property name="pdepend.done" value="true" />
-	</target>
-
-	<target name="phpcpd" unless="phpcpd.done" description="Find duplicate code using PHPCPD and print human readable output. Intended for usage on the command line before committing.">
-		<phpcpd>
-			<formatter type="default" usefile="false" />
-			<fileset dir=".">
-				<include name="src/**/*.php" />
-			</fileset>
-		</phpcpd>
-
-		<property name="phpcpd.done" value="true" />
-	</target>
-
-	<target name="phpcpd-ci" depends="prepare" unless="phpcpd.done" description="Find duplicate code using PHPCPD and log result in XML format. Intended for usage within a continuous integration environment.">
-		<phpcpd>
-			<formatter type="pmd" outfile="build/logs/pmd-cpd.xml" />
-			<fileset dir=".">
-				<include name="src/**/*.php" />
-			</fileset>
-		</phpcpd>
-
-		<property name="phpcpd.done" value="true" />
-	</target>
-
-	<target name="phpunit" unless="phpunit.done" depends="prepare" description="Run unit tests with PHPUnit">
-		<exec executable="${phpunit}" logoutput="true" passthru="true" checkreturn="true" taskname="phpunit">
-			<arg value="--configuration" />
-			<arg path="build/phpunit.xml" />
-		</exec>
-
-		<property name="phpunit.done" value="true" />
-	</target>
-
-	<target  name="phpunit-no-coverage" depends="prepare" unless="phpunit.done" description="Run unit tests with PHPUnit (without generating code coverage reports)">
-		<exec executable="${phpunit}" passthru="true" taskname="phpunit">
-			<arg value="--configuration" />
-			<arg path="build/phpunit.xml" />
-			<arg value="--no-coverage" />
-		</exec>
-
-		<property name="phpunit.done" value="true" />
-	</target>
-
-	<target name="phpdox" depends="phploc-ci,phpunit" unless="phpdox.done" description="Generate project documentation using phpDox">
-		<exec dir="build" executable="${phpdox}" passthru="true" taskname="phpdox" />
-
-		<property name="phpdox.done" value="true" />
-	</target>
-
-	<target name="sonar" depends="phpunit" unless="sonar.done" description="Generate code analysis with sonarqube">
-		<exec executable="${sonar}" passthru="true" taskname="sonar" />
-
-		<property name="sonar.done" value="true" />
-	</target>
-</project>
\ No newline at end of file
diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
deleted file mode 100644
index ef2fefe9..00000000
--- a/src/Auth/HummingbirdAuth.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Auth;
-
-use Aviat\AnimeClient\AnimeClient;
-use Aviat\Ion\Di\ContainerInterface;
-
-/**
- * Hummingbird API Authentication
- */
-class HummingbirdAuth {
-
-	use \Aviat\Ion\Di\ContainerAware;
-
-	/**
-	 * Anime API Model
-	 *
-	 * @var \Aviat\AnimeClient\Model\API
-	 */
-	protected $model;
-
-	/**
-	 * Session object
-	 *
-	 * @var Aura\Session\Segment
-	 */
-	protected $segment;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		$this->setContainer($container);
-		$this->segment = $container->get('session')
-			->getSegment(AnimeClient::SESSION_SEGMENT);
-		$this->model = $container->get('api-model');
-	}
-
-	/**
-	 * Make the appropriate authentication call,
-	 * and save the resulting auth token if successful
-	 *
-	 * @param  string $password
-	 * @return boolean
-	 */
-	public function authenticate($password)
-	{
-		$username = $this->container->get('config')
-			->get('hummingbird_username');
-		$auth_token = $this->model->authenticate($username, $password);
-
-		if (FALSE !== $auth_token)
-		{
-			$this->segment->set('auth_token', $auth_token);
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 * Check whether the current user is authenticated
-	 *
-	 * @return boolean
-	 */
-	public function is_authenticated()
-	{
-		return ($this->get_auth_token() !== FALSE);
-	}
-
-	/**
-	 * Clear authentication values
-	 *
-	 * @return void
-	 */
-	public function logout()
-	{
-		$this->segment->clear();
-	}
-
-	/**
-	 * Retrieve the authentication token from the session
-	 *
-	 * @return string|false
-	 */
-	public function get_auth_token()
-	{
-		return $this->segment->get('auth_token', FALSE);
-	}
-}
-// End of HummingbirdAuth.php
\ No newline at end of file
diff --git a/src/Hummingbird/Enum/AnimeAiringStatus.php b/src/Hummingbird/Enum/AnimeAiringStatus.php
deleted file mode 100644
index ae420a78..00000000
--- a/src/Hummingbird/Enum/AnimeAiringStatus.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Enum;
-
-use Aviat\Ion\Enum as BaseEnum;
-
-/**
- * Status of when anime is being/was/will be aired
- */
-class AnimeAiringStatus extends BaseEnum {
-	const NOT_YET_AIRED = 'Not Yet Aired';
-	const AIRING = 'Currently Airing';
-	const FINISHED_AIRING = 'Finished Airing';
-}
-// End of AnimeAiringStatus.php
\ No newline at end of file
diff --git a/src/Hummingbird/Enum/AnimeShowType.php b/src/Hummingbird/Enum/AnimeShowType.php
deleted file mode 100644
index 47dcf6f5..00000000
--- a/src/Hummingbird/Enum/AnimeShowType.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Enum;
-
-use Aviat\Ion\Enum as BaseEnum;
-
-/**
- * Type of Anime
- */
-class AnimeShowType extends BaseEnum {
-	const TV = 'TV';
-	const MOVIE = 'Movie';
-	const OVA = 'OVA';
-	const ONA = 'ONA';
-	const SPECIAL = 'Special';
-	const MUSIC = 'Music';
-}
-// End of AnimeShowType.php
\ No newline at end of file
diff --git a/src/Hummingbird/Enum/AnimeWatchingStatus.php b/src/Hummingbird/Enum/AnimeWatchingStatus.php
deleted file mode 100644
index 103ac128..00000000
--- a/src/Hummingbird/Enum/AnimeWatchingStatus.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Enum;
-
-use Aviat\Ion\Enum as BaseEnum;
-
-/**
- * Possible values for watching status for the current anime
- */
-class AnimeWatchingStatus extends BaseEnum {
-	const WATCHING = 'currently-watching';
-	const PLAN_TO_WATCH = 'plan-to-watch';
-	const COMPLETED = 'completed';
-	const ON_HOLD = 'on-hold';
-	const DROPPED = 'dropped';
-}
-// End of AnimeWatchingStatus.php
\ No newline at end of file
diff --git a/src/Hummingbird/Enum/MangaReadingStatus.php b/src/Hummingbird/Enum/MangaReadingStatus.php
deleted file mode 100644
index 5743c792..00000000
--- a/src/Hummingbird/Enum/MangaReadingStatus.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Enum;
-
-use Aviat\Ion\Enum as BaseEnum;
-
-/**
- * Possible values for current reading status of manga
- */
-class MangaReadingStatus extends BaseEnum {
-	const READING = 'Currently Reading';
-	const PLAN_TO_READ = 'Plan to Read';
-	const DROPPED = 'Dropped';
-	const ON_HOLD = 'On Hold';
-	const COMPLETED = 'Completed';
-}
-// End of MangaReadingStatus.php
\ No newline at end of file
diff --git a/src/Hummingbird/Transformer/AnimeListTransformer.php b/src/Hummingbird/Transformer/AnimeListTransformer.php
deleted file mode 100644
index 4a6388bd..00000000
--- a/src/Hummingbird/Transformer/AnimeListTransformer.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Transformer;
-
-use Aviat\Ion\Transformer\AbstractTransformer;
-
-/**
- * Transformer for anime list
- */
-class AnimeListTransformer extends AbstractTransformer {
-
-	/**
-	 * Convert raw api response to a more
-	 * logical and workable structure
-	 *
-	 * @param  array  $item API library item
-	 * @return array
-	 */
-	public function transform($item)
-	{
-		$anime =& $item['anime'];
-		$genres = $this->linearizeGenres($item['anime']['genres']);
-
-		$rating = NULL;
-		if ($item['rating']['type'] === 'advanced')
-		{
-			$rating = is_numeric($item['rating']['value'])
-				? (int) 2 * $item['rating']['value']
-				: '-';
-		}
-
-		$total_episodes = is_numeric($anime['episode_count'])
-			? $anime['episode_count']
-			: '-';
-
-		$alternate_title = NULL;
-		if (array_key_exists('alternate_title', $anime))
-		{
-			// If the alternate title is very similar, or
-			// a subset of the main title, don't list the
-			// alternate title
-			$not_subset = stripos($anime['title'], $anime['alternate_title']) === FALSE;
-			$diff = levenshtein($anime['title'], $anime['alternate_title'] ?? '');
-			if ($not_subset && $diff >= 5)
-			{
-				$alternate_title = $anime['alternate_title'];
-			}
-		}
-
-		return [
-			'id' => $item['id'],
-			'episodes' => [
-				'watched' => $item['episodes_watched'],
-				'total' => $total_episodes,
-				'length' => $anime['episode_length'],
-			],
-			'airing' => [
-				'status' => $anime['status'],
-				'started' => $anime['started_airing'],
-				'ended' => $anime['finished_airing']
-			],
-			'anime' => [
-				'age_rating' => $anime['age_rating'],
-				'title' => $anime['title'],
-				'alternate_title' => $alternate_title,
-				'slug' => $anime['slug'],
-				'url' => $anime['url'],
-				'type' => $anime['show_type'],
-				'image' => $anime['cover_image'],
-				'genres' => $genres,
-			],
-			'watching_status' => $item['status'],
-			'notes' => $item['notes'],
-			'rewatching' => (bool) $item['rewatching'],
-			'rewatched' => $item['rewatched_times'],
-			'user_rating' => $rating,
-			'private' => (bool) $item['private'],
-		];
-	}
-
-	/**
-	 * Convert transformed data to
-	 * api response format
-	 *
-	 * @param array $item Transformed library item
-	 * @return array API library item
-	 */
-	public function untransform($item)
-	{
-		// Messy mapping of boolean values to their API string equivalents
-		$privacy = 'public';
-		if (array_key_exists('private', $item) && $item['private'])
-		{
-			$privacy = 'private';
-		}
-
-		$rewatching = 'false';
-		if (array_key_exists('rewatching', $item) && $item['rewatching'])
-		{
-			$rewatching = 'true';
-		}
-
-		return [
-			'id' => $item['id'],
-			'status' => $item['watching_status'],
-			'sane_rating_update' => $item['user_rating'] / 2,
-			'rewatching' => $rewatching,
-			'rewatched_times' => $item['rewatched'],
-			'notes' => $item['notes'],
-			'episodes_watched' => $item['episodes_watched'],
-			'privacy' => $privacy
-		];
-	}
-
-	/**
-	 * Simplify structure of genre list
-	 *
-	 * @param  array  $rawGenres
-	 * @return array
-	 */
-	protected function linearizeGenres(array $rawGenres): array
-	{
-		$genres = [];
-
-		foreach ($rawGenres as $genre)
-		{
-			$genres[] = $genre['name'];
-		}
-
-		return $genres;
-	}
-}
-// End of AnimeListTransformer.php
\ No newline at end of file
diff --git a/src/Hummingbird/Transformer/MangaListTransformer.php b/src/Hummingbird/Transformer/MangaListTransformer.php
deleted file mode 100644
index 7f32ca4a..00000000
--- a/src/Hummingbird/Transformer/MangaListTransformer.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Transformer;
-
-use Aviat\Ion\Transformer\AbstractTransformer;
-
-/**
- * Data transformation class for zippered Hummingbird manga
- */
-class MangaListTransformer extends AbstractTransformer {
-
-	use \Aviat\Ion\StringWrapper;
-
-	/**
-	 * Remap zipped anime data to a more logical form
-	 *
-	 * @param  array  $item manga entry item
-	 * @return array
-	 */
-	public function transform($item)
-	{
-		$manga =& $item['manga'];
-
-		$rating = (is_numeric($item['rating']))
-			? intval(2 * $item['rating'])
-			: '-';
-
-		$total_chapters = ($manga['chapter_count'] > 0)
-			? $manga['chapter_count']
-			: '-';
-
-		$total_volumes = ($manga['volume_count'] > 0)
-			? $manga['volume_count']
-			: '-';
-
-		$map = [
-			'id' => $item['id'],
-			'chapters' => [
-				'read' => $item['chapters_read'],
-				'total' => $total_chapters
-			],
-			'volumes' => [
-				'read' => $item['volumes_read'],
-				'total' => $total_volumes
-			],
-			'manga' => [
-				'title' => $manga['romaji_title'],
-				'alternate_title' => NULL,
-				'slug' => $manga['id'],
-				'url' => 'https://hummingbird.me/manga/' . $manga['id'],
-				'type' => $manga['manga_type'],
-				'image' => $manga['poster_image_thumb'],
-				'genres' => $manga['genres'],
-			],
-			'reading_status' => $item['status'],
-			'notes' => $item['notes'],
-			'rereading' => (bool)$item['rereading'],
-			'reread' => $item['reread_count'],
-			'user_rating' => $rating,
-		];
-
-		if (array_key_exists('english_title', $manga))
-		{
-			$diff = levenshtein($manga['romaji_title'], $manga['english_title']);
-
-			// If the titles are REALLY similar, don't bother showing both
-			if ($diff >= 5)
-			{
-				$map['manga']['alternate_title'] = $manga['english_title'];
-			}
-		}
-
-		return $map;
-	}
-
-	/**
-	 * Untransform data to update the api
-	 *
-	 * @param  array $item
-	 * @return array
-	 */
-	public function untransform($item)
-	{
-		$rereading = (array_key_exists('rereading', $item)) && (bool)$item['rereading'];
-
-		$map = [
-			'id' => $item['id'],
-			'manga_id' => $item['manga_id'],
-			'status' => $item['status'],
-			'chapters_read' => (int)$item['chapters_read'],
-			'volumes_read' => (int)$item['volumes_read'],
-			'rereading' => $rereading,
-			'reread_count' => (int)$item['reread_count'],
-			'notes' => $item['notes'],
-		];
-
-		if ($item['new_rating'] !== $item['old_rating'] && $item['new_rating'] !== "")
-		{
-			$map['rating'] = ($item['new_rating'] > 0)
-				? $item['new_rating'] / 2
-				: $item['old_rating'] / 2;
-		}
-
-		return $map;
-	}
-}
-// End of MangaListTransformer.php
\ No newline at end of file
diff --git a/src/Hummingbird/Transformer/MangaListsZipper.php b/src/Hummingbird/Transformer/MangaListsZipper.php
deleted file mode 100644
index c3db0458..00000000
--- a/src/Hummingbird/Transformer/MangaListsZipper.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Hummingbird Anime Client
- *
- * An API client for Hummingbird to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     HummingbirdAnimeClient
- * @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     3.1
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\Hummingbird\Transformer;
-
-/**
- * Merges the two separate manga lists together
- */
-class MangaListsZipper {
-
-	/**
-	 * List of manga information
-	 *
-	 * @var array
-	 */
-	protected $manga_series_list = [];
-
-	/**
-	 * List of manga tracking information
-	 *
-	 * @var array
-	 */
-	protected $manga_tracking_list = [];
-
-	/**
-	 * Create the transformer
-	 *
-	 * @param array $merge_lists The raw manga data
-	 */
-	public function __construct(array $merge_lists)
-	{
-		$this->manga_series_list = $merge_lists['manga'];
-		$this->manga_tracking_list = $merge_lists['manga_library_entries'];
-	}
-
-	/**
-	 * Do the transformation, and return the output
-	 *
-	 * @return array
-	 */
-	public function transform()
-	{
-		$this->index_manga_entries();
-
-		$output = [];
-
-		foreach ($this->manga_tracking_list as &$entry)
-		{
-			$id = $entry['manga_id'];
-			$entry['manga'] = $this->manga_series_list[$id];
-			unset($entry['manga_id']);
-
-			$output[] = $entry;
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Index manga series by the id
-	 *
-	 * @return void
-	 */
-	protected function index_manga_entries()
-	{
-		$orig_list = $this->manga_series_list;
-		$indexed_list = [];
-
-		foreach ($orig_list as $manga)
-		{
-			$id = $manga['id'];
-			$indexed_list[$id] = $manga;
-		}
-
-		$this->manga_series_list = $indexed_list;
-	}
-
-}
-// End of ManagListsZipper.php
\ No newline at end of file
diff --git a/tests/Auth/HummingbirdAuthTest.php b/tests/Auth/HummingbirdAuthTest.php
deleted file mode 100644
index 260f0494..00000000
--- a/tests/Auth/HummingbirdAuthTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-use Aura\Session\SessionFactory;
-use Aviat\AnimeClient\Auth\HummingbirdAuth;
-use Aviat\Ion\Friend;
-use GuzzleHttp\Client;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Response;
-
-class HummingbirdAuthTest extends AnimeClient_TestCase {
-
-	static $session;
-	static $sessionHandler;
-
-	public static function setUpBeforeClass()
-	{
-		self::$session = (new SessionFactory)->newInstance([]);
-	}
-
-	public function setUp()
-	{
-		parent::setUp();
-		$auth = new HummingbirdAuth($this->container);
-		$friend = new Friend($auth);
-		$this->auth = $friend;
-		$this->container->setInstance('session', self::$session);
-	}
-
-	public function dataAuthenticate()
-	{
-		$testToken = 'notReallyAValidTokenButThisIsATest';
-
-		return [
-			'successful auth call' => [
-				'username' => 'timw4mailtest',
-				'password' => 'password',
-				'response_data' => [
-					'code' => 201,
-					'body' => json_encode($testToken)
-				],
-				'session_value' => $testToken,
-				'expected' => TRUE,
-			],
-			'unsuccessful auth call' => [
-				'username' => 'foo',
-				'password' => 'foobarbaz',
-				'response_data' => [
-					'code' => 401,
-					'body' => '{"error":"Invalid credentials"}',
-				],
-				'session_value' => FALSE,
-				'expected' => FALSE,
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataAuthenticate
-	 */
-	public function testAuthenticate($username, $password, $response_data, $session_value, $expected)
-	{
-		$this->container->get('config')
-			->set('hummingbird_username', $username);
-		$model = new MockBaseApiModel($this->container);
-		$mock = new MockHandler([
-			new Response($response_data['code'], [], $response_data['body'])
-		]);
-		$handler = HandlerStack::create($mock);
-		$client = new Client([
-			'handler' => $handler,
-			'http_errors' => FALSE // Don't throw an exception for 400/500 class status codes
-		]);
-		$model->__set('client', $client);
-		$this->auth->__set('model', $model);
-
-		$actual = $this->auth->authenticate($password);
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testIsAuthenticated()
-	{
-		$data = $this->dataAuthenticate();
-		call_user_func_array([$this, 'testAuthenticate'], $data['successful auth call']);
-		$this->assertTrue($this->auth->is_authenticated());
-		$this->auth->logout();
-		$this->assertFalse($this->auth->is_authenticated());
-	}
-}
\ No newline at end of file
diff --git a/tests/Model/AnimeCollectionModelTest.php b/tests/Model/AnimeCollectionModelTest.php
deleted file mode 100644
index be984aab..00000000
--- a/tests/Model/AnimeCollectionModelTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
-use Aviat\Ion\Config;
-use Aviat\Ion\Friend;
-
-class AnimeCollectionModelTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->container->setInstance('config', new Config([
-			'database' => [
-				'collection' => [
-					'type' => 'sqlite',
-					'host' => '',
-					'user' => '',
-					'pass' => '',
-					'port' => '',
-					'name' => 'default',
-					'database'   => '',
-					'file' => ':memory:',
-				]
-			]
-		]));
-		$this->config = $this->container->get('config');
-		$this->collectionModel = new AnimeCollectionModel($this->container);
-	}
-
-	public function testSanity()
-	{
-		$friend = new Friend($this->collectionModel);
-		$this->assertInstanceOf('Aviat\Ion\Model\DB', $this->collectionModel);
-		$this->assertInstanceOf('Aviat\AnimeClient\Model\Anime', $friend->anime_model);
-	}
-
-	public function testInvalidDatabase()
-	{
-		$this->container->setInstance('config', new Config([
-			'database' => [
-				'collection' => [
-					'type' => 'sqlite',
-					'host' => '',
-					'user' => '',
-					'pass' => '',
-					'port' => '',
-					'name' => 'default',
-					'database'   => '',
-					'file' => __FILE__,
-				]
-			]
-		]));
-		$collectionModel = new Friend(new AnimeCollectionModel($this->container));
-		$this->assertFalse($collectionModel->valid_database);
-	}
-
-	public function testNonExistentDatabase()
-	{
-		$this->container->setInstance('config', new Config([
-			'database' => [
-				'collection' => [
-					'type' => 'sqlite',
-					'host' => '',
-					'user' => '',
-					'pass' => '',
-					'port' => '',
-					'name' => 'default',
-					'database'   => '',
-					'file' => '/foo/bar/baz/foobazbar.db',
-				]
-			]
-		]));
-		$collectionModel = new Friend(new AnimeCollectionModel($this->container));
-		$this->assertFalse($collectionModel->valid_database);
-	}
-}
\ No newline at end of file
diff --git a/tests/Model/AnimeModelTest.php b/tests/Model/AnimeModelTest.php
deleted file mode 100644
index 3f311067..00000000
--- a/tests/Model/AnimeModelTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-use Aviat\Ion\Friend;
-
-class AnimeModelTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->animeModel = new Friend(new TestAnimeModel($this->container));
-		$this->mockDir = __DIR__ . '/../test_data/anime_list/search_mocks';
-	}
-
-	public function dataSearch()
-	{
-		return [
-			'nonsense search' => [
-				'search' => 'foo',
-			],
-			'search for common series' => [
-				'search' => 'Fate',
-			],
-			'search for weird series' => [
-				'search' => 'Twintails',
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataSearch
-	 */
-	public function testSearch($search)
-	{
-		// Mock requests
-		$json = file_get_contents(_dir($this->mockDir, "{$search}.json"));
-		$client = $this->getMockClient(200, [
-			'Content-Type' => 'application/json'
-		], $json);
-		$this->animeModel->__set('client', $client);
-
-		$actual = $this->animeModel->search($search);
-		$this->assertEquals(json_decode($json, TRUE), $actual);
-	}
-
-	public function testSearchBadResponse()
-	{
-		$client = $this->getMockClient(400, [
-			'Content-Type' => 'application/json'
-		], "[]");
-		$this->animeModel->__set('client', $client);
-
-		$this->expectException('RuntimeException');
-
-		$this->animeModel->search('');
-	}
-}
\ No newline at end of file
diff --git a/tests/Model/BaseApiModelTest.php b/tests/Model/BaseApiModelTest.php
deleted file mode 100644
index c97515b9..00000000
--- a/tests/Model/BaseApiModelTest.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-use Aviat\AnimeClient\Container;
-use GuzzleHttp\Client;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Response;
-
-class BaseApiModelTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->model = new MockBaseApiModel($this->container);
-	}
-
-	protected function getIp()
-	{
-		$response = $this->model->get('/ip');
-		$json = json_decode($response->getBody(), TRUE);
-		$ip = $json['origin'];
-		return $ip;
-	}
-
-	public function dataClient()
-	{
-		$user_agent = "Tim's Anime Client/2.0";
-		$headers = [
-			'User-Agent' => $user_agent
-		];
-
-		return [
-			'invalid method' => [
-				'method' => 'foo',
-				'uri' => '',
-				'options' => [],
-				'expected' => NULL,
-				'is_json' => FALSE,
-			],
-			'get' => [
-				'method' => 'get',
-				'uri' => '/get',
-				'options' => [
-					'query' => [
-						'foo' => 'bar'
-					],
-					'headers' => $headers
-				],
-				'expected' => [
-					'args' => [
-						'foo' => 'bar'
-					],
-					'headers' => [
-						'Host' => 'httpbin.org',
-						'User-Agent' => $user_agent
-					],
-					'url' => 'https://httpbin.org/get?foo=bar'
-				],
-				'is_json' => TRUE
-			],
-			'post' => [
-				'method' => 'post',
-				'uri' => '/post',
-				'options' => [
-					'form_params' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => $headers
-				],
-				'expected' => [
-					'args' => [],
-					'data' => '',
-					'files' => [],
-					'form' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => [
-						'Host' => 'httpbin.org',
-						'User-Agent' => $user_agent,
-						'Content-Length' => '18',
-						'Content-Type' => 'application/x-www-form-urlencoded'
-					],
-					'json' => NULL,
-					'url' => 'https://httpbin.org/post'
-				],
-				'is_json' => TRUE
-			],
-			'put' => [
-				'method' => 'put',
-				'uri' => '/put',
-				'options' => [
-					'form_params' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => $headers
-				],
-				'expected' => [
-					'args' => [],
-					'data' => '',
-					'files' => [],
-					'form' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => [
-						'Host' => 'httpbin.org',
-						'User-Agent' => $user_agent,
-						'Content-Length' => '18',
-						'Content-Type' => 'application/x-www-form-urlencoded'
-					],
-					'json' => NULL,
-					'url' => 'https://httpbin.org/put'
-				],
-				'is_json' => TRUE
-			],
-			'patch' => [
-				'method' => 'patch',
-				'uri' => '/patch',
-				'options' => [
-					'form_params' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => $headers
-				],
-				'expected' => [
-					'args' => [],
-					'data' => '',
-					'files' => [],
-					'form' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => [
-						'Host' => 'httpbin.org',
-						'User-Agent' => $user_agent,
-						'Content-Length' => '18',
-						'Content-Type' => 'application/x-www-form-urlencoded'
-					],
-					'json' => NULL,
-					'url' => 'https://httpbin.org/patch'
-				],
-				'is_json' => TRUE
-			],
-			'delete' => [
-				'method' => 'delete',
-				'uri' => '/delete',
-				'options' => [
-					'form_params' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => $headers
-				],
-				'expected' => [
-					'args' => [],
-					'data' => '',
-					'files' => [],
-					'form' => [
-						'foo' => 'bar',
-						'baz' => 'foobar'
-					],
-					'headers' => [
-						'Host' => 'httpbin.org',
-						'User-Agent' => $user_agent,
-						'Content-Length' => '18',
-						'Content-Type' => 'application/x-www-form-urlencoded'
-					],
-					'json' => NULL,
-					'url' => 'https://httpbin.org/delete'
-				],
-				'is_json' => TRUE
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataClient
-	 */
-	public function testClient($method, $uri, $options, $expected, $is_json)
-	{
-
-		$result = $this->model->$method($uri, $options);
-
-		if (is_null($result))
-		{
-			$this->assertNull($expected);
-			return;
-		}
-
-		// Because you have to make another api call to get the origin ip
-		// address, it needs to be retreived outside of the dataProvider method
-		$expected['origin'] = $this->getIp();
-		$actual = ($is_json)
-			? json_decode($result->getBody(), TRUE)
-			: (string) $result->getBody();
-
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function dataAuthenticate()
-	{
-		$test_token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI4YTA5ZDk4Ny1iZWQxLTQyMTktYWVmOS0wMTcxYWVjYTE3ZWUiLCJzY29wZSI6WyJhbGwiXSwic3ViIjoxMDgwMTIsImlzcyI6MTQ0NTAxNzczNSwiZXhwIjoxNDUyOTY2NTM1fQ.fpha1ZDN9dSFAuHeJesfOP9pCk5-ZnZk4uv3zumRMY0';
-
-		return [
-			'successful authentication' => [
-				'username' => 'timw4mailtest',
-				'password' => 'password',
-				'response_data' => [
-					'code' => 201,
-					'body' => json_encode($test_token)
-				],
-				'expected' => $test_token
-			],
-			'failed authentication' => [
-				'username' => 'foo',
-				'password' => 'foobarbaz',
-				'response_data' => [
-					'code' => 401,
-					'body' => '{"error":"Invalid credentials"}',
-				],
-				'expected' => FALSE
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataAuthenticate
-	 */
-	public function testAuthenticate($username, $password, $response_data, $expected)
-	{
-		$mock = new MockHandler([
-			new Response($response_data['code'], [], $response_data['body'])
-		]);
-		$handler = HandlerStack::create($mock);
-		$client = new Client([
-			'handler' => $handler,
-			'http_errors' => FALSE // Don't throw an exception for 400/500 class status codes
-		]);
-
-		// Set the mock client
-		$this->model->__set('client', $client);
-
-		// Check results based on mock data
-		$actual = $this->model->authenticate($username, $password);
-		$this->assertEquals($expected, $actual, "Incorrect method return value");
-	}
-
-}
\ No newline at end of file
diff --git a/tests/Model/MangaModelTest.php b/tests/Model/MangaModelTest.php
deleted file mode 100644
index 813876d9..00000000
--- a/tests/Model/MangaModelTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-use Aviat\Ion\Friend;
-use Aviat\Ion\Json;
-
-class MangaModelTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->container->setInstance('util', new MockUtil($this->container));
-		$this->model = new Friend(new TestMangaModel($this->container));
-		$this->mockDir = __DIR__ . '/../test_data/manga_list';
-	}
-
-	public function testZipperLists()
-	{
-		$raw_data = Json::decodeFile($this->mockDir . '/manga.json');
-		$expected = Json::decodeFile($this->mockDir . '/manga-zippered.json');
-
-		$this->assertEquals($expected, $this->model->zipperLists($raw_data));
-	}
-
-	public function testMapByStatus()
-	{
-		$original = Json::decodeFile($this->mockDir . '/manga-transformed.json');
-		$expected = Json::decodeFile($this->mockDir . '/manga-mapped.json');
-		$actual = $this->model->map_by_status($original);
-
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testGetListFromApi()
-	{
-		$data = file_get_contents($this->mockDir . '/manga.json');
-		$client = $this->getMockClient(200, [
-			'Content-type' => 'application/json'
-		], $data);
-		$this->model->__set('client', $client);
-
-		$reflect = new ReflectionClass($this->model);
-		$constants = $reflect->getConstants();
-
-		$expected_all = Json::decodeFile($this->mockDir . '/manga-mapped.json');
-
-		$this->assertEquals($expected_all, $this->model->_get_list_from_api());
-
-		foreach($constants as $name => $value)
-		{
-			$key = $reflect->getConstant($name);
-			$this->assertEquals($expected_all[$key], $this->model->_get_list_from_api($key));
-		}
-	}
-
-	public function testGetList()
-	{
-		if (($var = getenv('CI')))
-		{
-			$this->markTestSkipped();
-		}
-
-		$data = file_get_contents($this->mockDir . '/manga.json');
-		$client = $this->getMockClient(200, [
-			'Content-type' => 'application/json'
-		], $data);
-		$this->model->__set('client', $client);
-
-		$expected = Json::decodeFile($this->mockDir . '/get-all-lists.json');
-		$this->assertEquals($expected['Reading'], $this->model->get_list('Reading'));
-	}
-}
\ No newline at end of file
diff --git a/tests/Transformer/AnimeListTransformerTest.php b/tests/Transformer/AnimeListTransformerTest.php
deleted file mode 100644
index 67a18139..00000000
--- a/tests/Transformer/AnimeListTransformerTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
-use Aviat\Ion\Friend;
-use Aviat\Ion\Json;
-
-class AnimeListTransformerTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->start_file = __DIR__ . '/../test_data/anime_list/anime-completed.json';
-		$this->res_file = __DIR__ . '/../test_data/anime_list/anime-completed-transformed.json';
-		$this->transformer = new AnimeListTransformer();
-		$this->transformerFriend = new Friend($this->transformer);
-	}
-
-	public function dataLinearizeGenres()
-	{
-		return [
-			[
-				'original' => [
-					['name' => 'Action'],
-					['name' => 'Comedy'],
-					['name' => 'Magic'],
-					['name' => 'Fantasy'],
-					['name' => 'Mahou Shoujo']
-				],
-				'expected' => ['Action', 'Comedy', 'Magic', 'Fantasy', 'Mahou Shoujo']
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataLinearizeGenres
-	 */
-	public function testLinearizeGenres($original, $expected)
-	{
-		$actual = $this->transformerFriend->linearizeGenres($original);
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function testTransform()
-	{
-		$json = Json::decodeFile($this->start_file);
-		$expected = Json::decodeFile($this->res_file);
-		$actual = $this->transformer->transformCollection($json);
-		$this->assertEquals($expected, $actual);
-	}
-}
\ No newline at end of file
diff --git a/tests/Transformer/MangaListTransformerTest.php b/tests/Transformer/MangaListTransformerTest.php
deleted file mode 100644
index 2524de1d..00000000
--- a/tests/Transformer/MangaListTransformerTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
-use Aviat\Ion\Json;
-
-class MangaListTransformerTest extends AnimeClient_TestCase {
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->start_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
-		$this->res_file = __DIR__ . '/../test_data/manga_list/manga-transformed.json';
-		$this->transformer = new MangaListTransformer();
-	}
-
-
-	public function testTransform()
-	{
-		$orig_json = Json::decodeFile($this->start_file);
-		$expected = Json::decodeFile($this->res_file);
-
-		$actual = $this->transformer->transformCollection($orig_json);
-		$this->assertEquals($expected, $actual);
-	}
-
-	public function dataUntransform()
-	{
-		return [
-			'same_rating' => [
-				'orig' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-					'old_rating' => 7,
-					'new_rating' => 7,
-				],
-				'expected' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-				]
-			],
-			'update_rating' => [
-				'orig' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-					'old_rating' => 7,
-					'new_rating' => 8,
-				],
-				'expected' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-					'rating' => 4,
-				]
-			],
-			'remove_rating' => [
-				'orig' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-					'old_rating' => 7,
-					'new_rating' => 0,
-				],
-				'expected' => [
-					'id' => 401735,
-					'manga_id' => "love-hina",
-					'status' => "Plan to Read",
-					'chapters_read' => 16,
-					'volumes_read' => 2,
-					'rereading' => true,
-					'reread_count' => 1,
-					'notes' => "Some text notes",
-					'rating' => 3.5,
-				]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider dataUntransform
-	 */
-	public function testUntransform($orig, $expected)
-	{
-		$actual = $this->transformer->untransform($orig);
-		$this->assertEquals($expected, $actual);
-	}
-}
\ No newline at end of file
diff --git a/tests/Transformer/MangaListsZipperTest.php b/tests/Transformer/MangaListsZipperTest.php
deleted file mode 100644
index c213fbbd..00000000
--- a/tests/Transformer/MangaListsZipperTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-use Aviat\AnimeClient\Hummingbird\Transformer\MangaListsZipper;
-use Aviat\Ion\Json;
-
-class MangaListsZipperTest extends AnimeClient_TestCase {
-
-	protected $start_file = '';
-	protected $res_file = '';
-
-	public function setUp()
-	{
-		$this->start_file = __DIR__ . '/../test_data/manga_list/manga.json';
-		$this->res_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
-
-		$json = Json::decodeFile($this->start_file);
-		$this->mangaListsZipper = new MangaListsZipper($json);
-	}
-
-	public function testTransform()
-	{
-		$zippered_json = Json::decodeFile($this->res_file);
-		$transformed = $this->mangaListsZipper->transform();
-
-		$this->assertEquals($zippered_json, $transformed);
-	}
-
-}
\ No newline at end of file

From 14181c9c51bf6fbd6ff375bddd1859c47e0f87fd Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 20 Dec 2016 12:55:43 -0500
Subject: [PATCH 49/65] Start of API integration

---
 src/API/AbstractListItem.php                  |  21 +++
 src/API/Kitsu/Auth.php                        | 108 +++++++++++++
 src/API/Kitsu/Enum/AnimeAiringStatus.php      |  29 ++++
 src/API/Kitsu/Enum/AnimeShowType.php          |  32 ++++
 src/API/Kitsu/Enum/AnimeWatchingStatus.php    |  31 ++++
 src/API/Kitsu/Enum/MangaReadingStatus.php     |  31 ++++
 src/API/Kitsu/Model.php                       |  68 ++++++++
 .../Transformer/AnimeListTransformer.php      | 149 ++++++++++++++++++
 .../Transformer/MangaListTransformer.php      | 121 ++++++++++++++
 src/API/ListItemInterface.php                 |  56 +++++++
 src/API/MAL/Auth.php                          | 108 +++++++++++++
 src/API/MAL/Model.php                         |  63 ++++++++
 12 files changed, 817 insertions(+)
 create mode 100644 src/API/AbstractListItem.php
 create mode 100644 src/API/Kitsu/Auth.php
 create mode 100644 src/API/Kitsu/Enum/AnimeAiringStatus.php
 create mode 100644 src/API/Kitsu/Enum/AnimeShowType.php
 create mode 100644 src/API/Kitsu/Enum/AnimeWatchingStatus.php
 create mode 100644 src/API/Kitsu/Enum/MangaReadingStatus.php
 create mode 100644 src/API/Kitsu/Model.php
 create mode 100644 src/API/Kitsu/Transformer/AnimeListTransformer.php
 create mode 100644 src/API/Kitsu/Transformer/MangaListTransformer.php
 create mode 100644 src/API/ListItemInterface.php
 create mode 100644 src/API/MAL/Auth.php
 create mode 100644 src/API/MAL/Model.php

diff --git a/src/API/AbstractListItem.php b/src/API/AbstractListItem.php
new file mode 100644
index 00000000..e5c1e524
--- /dev/null
+++ b/src/API/AbstractListItem.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+abstract class AbstractListItem implements ListItemInterface {
+
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/Auth.php b/src/API/Kitsu/Auth.php
new file mode 100644
index 00000000..90358a10
--- /dev/null
+++ b/src/API/Kitsu/Auth.php
@@ -0,0 +1,108 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+
+/**
+ * Kitsu API Authentication
+ */
+class Auth {
+
+	use ContainerAware;
+
+	/**
+	 * Anime API Model
+	 *
+	 * @var \Aviat\AnimeClient\API\Kitsu\Model
+	 */
+	protected $model;
+
+	/**
+	 * Session object
+	 *
+	 * @var Aura\Session\Segment
+	 */
+	protected $segment;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ContainerInterface $container
+	 */
+	public function __construct(ContainerInterface $container)
+	{
+		$this->setContainer($container);
+		$this->segment = $container->get('session')
+			->getSegment(AnimeClient::SESSION_SEGMENT);
+		$this->model = $container->get('kitsu-model');
+	}
+
+	/**
+	 * Make the appropriate authentication call,
+	 * and save the resulting auth token if successful
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function authenticate($password)
+	{
+		$username = $this->container->get('config')
+			->get('kitsu_username');
+		$auth_token = $this->model->authenticate($username, $password);
+
+		if (FALSE !== $auth_token)
+		{
+			$this->segment->set('auth_token', $auth_token);
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Check whether the current user is authenticated
+	 *
+	 * @return boolean
+	 */
+	public function is_authenticated()
+	{
+		return ($this->get_auth_token() !== FALSE);
+	}
+
+	/**
+	 * Clear authentication values
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->segment->clear();
+	}
+
+	/**
+	 * Retrieve the authentication token from the session
+	 *
+	 * @return string|false
+	 */
+	public function get_auth_token()
+	{
+		return $this->segment->get('auth_token', FALSE);
+	}
+}
+// End of KitsuAuth.php
\ No newline at end of file
diff --git a/src/API/Kitsu/Enum/AnimeAiringStatus.php b/src/API/Kitsu/Enum/AnimeAiringStatus.php
new file mode 100644
index 00000000..a7bf27e9
--- /dev/null
+++ b/src/API/Kitsu/Enum/AnimeAiringStatus.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Enum;
+
+use Aviat\Ion\Enum as BaseEnum;
+
+/**
+ * Status of when anime is being/was/will be aired
+ */
+class AnimeAiringStatus extends BaseEnum {
+	const NOT_YET_AIRED = 'Not Yet Aired';
+	const AIRING = 'Currently Airing';
+	const FINISHED_AIRING = 'Finished Airing';
+}
+// End of AnimeAiringStatus.php
diff --git a/src/API/Kitsu/Enum/AnimeShowType.php b/src/API/Kitsu/Enum/AnimeShowType.php
new file mode 100644
index 00000000..9fb37260
--- /dev/null
+++ b/src/API/Kitsu/Enum/AnimeShowType.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Enum;
+
+use Aviat\Ion\Enum as BaseEnum;
+
+/**
+ * Type of Anime
+ */
+class AnimeShowType extends BaseEnum {
+	const TV = 'TV';
+	const MOVIE = 'Movie';
+	const OVA = 'OVA';
+	const ONA = 'ONA';
+	const SPECIAL = 'Special';
+	const MUSIC = 'Music';
+}
+// End of AnimeShowType.php
diff --git a/src/API/Kitsu/Enum/AnimeWatchingStatus.php b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
new file mode 100644
index 00000000..7cfe3883
--- /dev/null
+++ b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Enum;
+
+use Aviat\Ion\Enum as BaseEnum;
+
+/**
+ * Possible values for watching status for the current anime
+ */
+class AnimeWatchingStatus extends BaseEnum {
+	const WATCHING = 'current';
+	const PLAN_TO_WATCH = 'planned';
+	const COMPLETED = 'completed';
+	const ON_HOLD = 'on_hold';
+	const DROPPED = 'dropped';
+}
+// End of AnimeWatchingStatus.php
diff --git a/src/API/Kitsu/Enum/MangaReadingStatus.php b/src/API/Kitsu/Enum/MangaReadingStatus.php
new file mode 100644
index 00000000..288ffe74
--- /dev/null
+++ b/src/API/Kitsu/Enum/MangaReadingStatus.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Enum;
+
+use Aviat\Ion\Enum as BaseEnum;
+
+/**
+ * Possible values for current reading status of manga
+ */
+class MangaReadingStatus extends BaseEnum {
+	const READING = 'Currently Reading';
+	const PLAN_TO_READ = 'Plan to Read';
+	const DROPPED = 'Dropped';
+	const ON_HOLD = 'On Hold';
+	const COMPLETED = 'Completed';
+}
+// End of MangaReadingStatus.php
diff --git a/src/API/Kitsu/Model.php b/src/API/Kitsu/Model.php
new file mode 100644
index 00000000..99223a74
--- /dev/null
+++ b/src/API/Kitsu/Model.php
@@ -0,0 +1,68 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\Model\API;
+
+/**
+ * Kitsu API Model
+ */
+class Model extends API {
+	
+	const CLIENT_ID = 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd';
+	const CLIENT_SECRET = '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151';
+	
+	/**
+	 * Base url for Kitsu API
+	 */
+	protected $baseUrl = 'https://kitsu.io/api/edge/';
+
+    /**
+     * Default settings for Guzzle
+     * @var array
+     */
+	protected $connectionDefaults = [];
+
+    /**
+     * Get the access token from the Kitsu API
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool|string
+     */
+    public function authenticate(string $username, string $password)
+    {
+        $response = $this->post('https://kitsu.io/api/oauth/token', [
+            'body' => http_build_query([
+                'grant_type' => 'password',
+                'username' => $username,
+                'password' => $password,
+                'client_id' => self::CLIENT_ID,
+                'client_secret' => self::CLIENT_SECRET
+            ])
+        ]);
+
+        $info = $response->getBody();
+
+        if (array_key_exists('access_token', $info)) {
+            // @TODO save token
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
new file mode 100644
index 00000000..e90c42e7
--- /dev/null
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -0,0 +1,149 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Transformer for anime list
+ */
+class AnimeListTransformer extends AbstractTransformer {
+
+	/**
+	 * Convert raw api response to a more
+	 * logical and workable structure
+	 *
+	 * @param  array  $item API library item
+	 * @return array
+	 */
+	public function transform($item)
+	{
+print_r($item);
+die();
+		$anime =& $item['anime'];
+		$genres = $this->linearizeGenres($item['anime']['genres']);
+
+		$rating = NULL;
+		if ($item['rating']['type'] === 'advanced')
+		{
+			$rating = is_numeric($item['rating']['value'])
+				? (int) 2 * $item['rating']['value']
+				: '-';
+		}
+
+		$total_episodes = is_numeric($anime['episode_count'])
+			? $anime['episode_count']
+			: '-';
+
+		$alternate_title = NULL;
+		if (array_key_exists('alternate_title', $anime))
+		{
+			// If the alternate title is very similar, or
+			// a subset of the main title, don't list the
+			// alternate title
+			$not_subset = stripos($anime['title'], $anime['alternate_title']) === FALSE;
+			$diff = levenshtein($anime['title'], $anime['alternate_title'] ?? '');
+			if ($not_subset && $diff >= 5)
+			{
+				$alternate_title = $anime['alternate_title'];
+			}
+		}
+
+		return [
+			'id' => $item['id'],
+			'episodes' => [
+				'watched' => $item['episodes_watched'],
+				'total' => $total_episodes,
+				'length' => $anime['episode_length'],
+			],
+			'airing' => [
+				'status' => $anime['status'],
+				'started' => $anime['started_airing'],
+				'ended' => $anime['finished_airing']
+			],
+			'anime' => [
+				'age_rating' => $anime['age_rating'],
+				'title' => $anime['title'],
+				'alternate_title' => $alternate_title,
+				'slug' => $anime['slug'],
+				'url' => $anime['url'],
+				'type' => $anime['show_type'],
+				'image' => $anime['cover_image'],
+				'genres' => $genres,
+			],
+			'watching_status' => $item['status'],
+			'notes' => $item['notes'],
+			'rewatching' => (bool) $item['rewatching'],
+			'rewatched' => $item['rewatched_times'],
+			'user_rating' => $rating,
+			'private' => (bool) $item['private'],
+		];
+	}
+
+	/**
+	 * Convert transformed data to
+	 * api response format
+	 *
+	 * @param array $item Transformed library item
+	 * @return array API library item
+	 */
+	public function untransform($item)
+	{
+		// Messy mapping of boolean values to their API string equivalents
+		$privacy = 'public';
+		if (array_key_exists('private', $item) && $item['private'])
+		{
+			$privacy = 'private';
+		}
+
+		$rewatching = 'false';
+		if (array_key_exists('rewatching', $item) && $item['rewatching'])
+		{
+			$rewatching = 'true';
+		}
+
+		return [
+			'id' => $item['id'],
+			'status' => $item['watching_status'],
+			'sane_rating_update' => $item['user_rating'] / 2,
+			'rewatching' => $rewatching,
+			'rewatched_times' => $item['rewatched'],
+			'notes' => $item['notes'],
+			'episodes_watched' => $item['episodes_watched'],
+			'privacy' => $privacy
+		];
+	}
+
+	/**
+	 * Simplify structure of genre list
+	 *
+	 * @param  array  $rawGenres
+	 * @return array
+	 */
+	protected function linearizeGenres(array $rawGenres): array
+	{
+		$genres = [];
+
+		foreach ($rawGenres as $genre)
+		{
+			$genres[] = $genre['name'];
+		}
+
+		return $genres;
+	}
+}
+// End of AnimeListTransformer.php
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
new file mode 100644
index 00000000..79d70182
--- /dev/null
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -0,0 +1,121 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Data transformation class for zippered Hummingbird manga
+ */
+class MangaListTransformer extends AbstractTransformer {
+
+	use \Aviat\Ion\StringWrapper;
+
+	/**
+	 * Remap zipped anime data to a more logical form
+	 *
+	 * @param  array  $item manga entry item
+	 * @return array
+	 */
+	public function transform($item)
+	{
+		$manga =& $item['manga'];
+
+		$rating = (is_numeric($item['rating']))
+			? intval(2 * $item['rating'])
+			: '-';
+
+		$total_chapters = ($manga['chapter_count'] > 0)
+			? $manga['chapter_count']
+			: '-';
+
+		$total_volumes = ($manga['volume_count'] > 0)
+			? $manga['volume_count']
+			: '-';
+
+		$map = [
+			'id' => $item['id'],
+			'chapters' => [
+				'read' => $item['chapters_read'],
+				'total' => $total_chapters
+			],
+			'volumes' => [
+				'read' => $item['volumes_read'],
+				'total' => $total_volumes
+			],
+			'manga' => [
+				'title' => $manga['romaji_title'],
+				'alternate_title' => NULL,
+				'slug' => $manga['id'],
+				'url' => 'https://hummingbird.me/manga/' . $manga['id'],
+				'type' => $manga['manga_type'],
+				'image' => $manga['poster_image_thumb'],
+				'genres' => $manga['genres'],
+			],
+			'reading_status' => $item['status'],
+			'notes' => $item['notes'],
+			'rereading' => (bool)$item['rereading'],
+			'reread' => $item['reread_count'],
+			'user_rating' => $rating,
+		];
+
+		if (array_key_exists('english_title', $manga))
+		{
+			$diff = levenshtein($manga['romaji_title'], $manga['english_title']);
+
+			// If the titles are REALLY similar, don't bother showing both
+			if ($diff >= 5)
+			{
+				$map['manga']['alternate_title'] = $manga['english_title'];
+			}
+		}
+
+		return $map;
+	}
+
+	/**
+	 * Untransform data to update the api
+	 *
+	 * @param  array $item
+	 * @return array
+	 */
+	public function untransform($item)
+	{
+		$rereading = (array_key_exists('rereading', $item)) && (bool)$item['rereading'];
+
+		$map = [
+			'id' => $item['id'],
+			'manga_id' => $item['manga_id'],
+			'status' => $item['status'],
+			'chapters_read' => (int)$item['chapters_read'],
+			'volumes_read' => (int)$item['volumes_read'],
+			'rereading' => $rereading,
+			'reread_count' => (int)$item['reread_count'],
+			'notes' => $item['notes'],
+		];
+
+		if ($item['new_rating'] !== $item['old_rating'] && $item['new_rating'] !== "")
+		{
+			$map['rating'] = ($item['new_rating'] > 0)
+				? $item['new_rating'] / 2
+				: $item['old_rating'] / 2;
+		}
+
+		return $map;
+	}
+}
+// End of MangaListTransformer.php
\ No newline at end of file
diff --git a/src/API/ListItemInterface.php b/src/API/ListItemInterface.php
new file mode 100644
index 00000000..776f5c6f
--- /dev/null
+++ b/src/API/ListItemInterface.php
@@ -0,0 +1,56 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+/**
+ * Common interface for anime and manga list item CRUD
+ */
+interface ListItemInterface {
+	
+	/**
+	 * Create a list item
+	 *
+	 * @param array $data - 
+	 * @return bool
+	 */
+	public function create(array $data): bool;
+	
+	/**
+	 * Retrieve a list item
+	 *
+	 * @param string $id - The id of the list item
+	 * @return array 
+	 */
+	public function get(string $id): array;
+	
+	/**
+	 * Update a list item
+	 * 
+	 * @param string $id - The id of the list tiem to update
+	 * @param array $data - The data with which to update the list itme
+	 * @return bool
+	 */
+	public function update(string $id, array $data): bool;
+	
+	/**
+	 * Delete a list item
+	 *
+	 * @param string $id - The id of the list item to delete
+	 * @return bool
+	 */
+	public function delete(string $id): bool;
+}
\ No newline at end of file
diff --git a/src/API/MAL/Auth.php b/src/API/MAL/Auth.php
new file mode 100644
index 00000000..33752ff5
--- /dev/null
+++ b/src/API/MAL/Auth.php
@@ -0,0 +1,108 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\MAL;
+
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+
+/**
+ * MAL API Authentication
+ */
+class Auth {
+
+	use \Aviat\Ion\Di\ContainerAware;
+
+	/**
+	 * Anime API Model
+	 *
+	 * @var \Aviat\AnimeClient\Model\API
+	 */
+	protected $model;
+
+	/**
+	 * Session object
+	 *
+	 * @var Aura\Session\Segment
+	 */
+	protected $segment;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ContainerInterface $container
+	 */
+	public function __construct(ContainerInterface $container)
+	{
+		$this->setContainer($container);
+		$this->segment = $container->get('session')
+			->getSegment(AnimeClient::SESSION_SEGMENT);
+		$this->model = $container->get('api-model');
+	}
+
+	/**
+	 * Make the appropriate authentication call,
+	 * and save the resulting auth token if successful
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function authenticate($password)
+	{
+		$username = $this->container->get('config')
+			->get('hummingbird_username');
+		$auth_token = $this->model->authenticate($username, $password);
+
+		if (FALSE !== $auth_token)
+		{
+			$this->segment->set('auth_token', $auth_token);
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Check whether the current user is authenticated
+	 *
+	 * @return boolean
+	 */
+	public function is_authenticated()
+	{
+		return ($this->get_auth_token() !== FALSE);
+	}
+
+	/**
+	 * Clear authentication values
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->segment->clear();
+	}
+
+	/**
+	 * Retrieve the authentication token from the session
+	 *
+	 * @return string|false
+	 */
+	public function get_auth_token()
+	{
+		return $this->segment->get('auth_token', FALSE);
+	}
+}
+// End of KitsuAuth.php
\ No newline at end of file
diff --git a/src/API/MAL/Model.php b/src/API/MAL/Model.php
new file mode 100644
index 00000000..459b7414
--- /dev/null
+++ b/src/API/MAL/Model.php
@@ -0,0 +1,63 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\Model\API;
+
+/**
+ * MyAnimeList API Model
+ */
+class Model extends API {
+
+    /**
+     * Base url for Kitsu API
+     */
+    protected $baseUrl = 'https://myanimelist.net/api/';
+
+    /**
+     * Default settings for Guzzle
+     * @var array
+     */
+    protected $connectionDefaults = [];
+
+    /**
+     * Get the access token from the Kitsu API
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool|string
+     */
+    public function authenticate(string $username, string $password)
+    {
+        $response = $this->post('account/', [
+            'body' => http_build_query([
+                'grant_type' => 'password',
+                'username' => $username,
+                'password' => $password
+            ])
+        ]);
+
+        $info = $response->getBody();
+
+        if (array_key_exists('access_token', $info)) {
+            // @TODO save token
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file

From a41acb28f634839aa6b1160d0ea5717a67a207ad Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 20 Dec 2016 12:58:37 -0500
Subject: [PATCH 50/65] Ugly progress commit

---
 .gitlab-ci.yml                                |  9 +++
 app/bootstrap.php                             | 26 ++++----
 app/config/routes.php                         |  4 +-
 app/views/main-menu.php                       |  2 +-
 build/header_comment.txt                      |  8 +--
 build/update_header_comments.php              | 22 +++----
 composer.json                                 |  3 +
 console                                       | 20 +-----
 index.php                                     |  7 ++-
 migrations/20150616181750_first_migration.php |  2 +-
 src/AnimeClient.php                           |  7 ++-
 src/Command/BaseCommand.php                   | 10 +--
 src/Command/CacheImages.php                   |  8 +--
 src/Command/ClearCache.php                    |  8 +--
 src/Controller.php                            | 30 ++++-----
 src/Controller/Anime.php                      | 12 ++--
 src/Controller/Collection.php                 |  8 +--
 src/Controller/Manga.php                      | 16 ++---
 src/Dispatcher.php                            | 47 +++++++-------
 src/Helper/Menu.php                           |  8 +--
 src/Model/API.php                             | 61 ++++++++-----------
 src/Model/Anime.php                           | 16 ++---
 src/Model/AnimeCollection.php                 |  8 +--
 src/Model/Collection.php                      |  8 +--
 src/Model/DB.php                              |  8 +--
 src/Model/Manga.php                           | 12 ++--
 src/Util.php                                  |  7 ++-
 tests/DispatcherTest.php                      |  8 +--
 28 files changed, 179 insertions(+), 206 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e294bfa6..2709e948 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,15 @@ test:7:
     image: php:7
     script:
       - phpunit -c build
+      
+test:7.1:
+    before_script:
+      - bash build/docker_install.sh > /dev/null
+      - curl -sS https://getcomposer.org/installer | php
+      - php composer.phar install --no-dev
+    image: php:7.1
+    script:
+      - phpunit -c build
 
 test:hhvm:
     before_script:
diff --git a/app/bootstrap.php b/app/bootstrap.php
index f7d48ae9..fdc8e0da 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
@@ -19,16 +19,14 @@ namespace Aviat\AnimeClient;
 use Aura\Html\HelperLocatorFactory;
 use Aura\Router\RouterContainer;
 use Aura\Session\SessionFactory;
-use Monolog\Logger;
-use Monolog\Handler\RotatingFileHandler;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Response;
-
+use Aviat\AnimeClient\API\Kitsu\Auth as KitsuAuth;
+use Aviat\AnimeClient\Model;
+use Aviat\Ion\Cache\CacheManager;
 use Aviat\Ion\Config;
 use Aviat\Ion\Di\Container;
-use Aviat\Ion\Cache\CacheManager;
-use Aviat\AnimeClient\Auth\HummingbirdAuth;
-use Aviat\AnimeClient\Model;
+use Monolog\Handler\RotatingFileHandler;
+use Monolog\Logger;
+use Zend\Diactoros\{Response, ServerRequestFactory};
 
 // -----------------------------------------------------------------------------
 // Setup DI container
@@ -115,9 +113,9 @@ return function(array $config_array = []) {
 	});
 
 	// Miscellaneous Classes
-	$container->set('auth', function($container) {
+	/* $container->set('auth', function($container) {
 		return new HummingbirdAuth($container);
-	});
+	}); */
 	$container->set('url-generator', function($container) {
 		return new UrlGenerator($container);
 	});
diff --git a/app/config/routes.php b/app/config/routes.php
index ea536ddd..6e272f29 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -147,7 +147,7 @@ return [
 		// ---------------------------------------------------------------------
 		'cache_purge' => [
 			'path' => '/cache_purge',
-			'action' => 'clear_cache',
+			'action' => 'clearCache',
 			'controller' => AnimeClient::DEFAULT_CONTROLLER_NAMESPACE,
 			'verb' => 'get',
 		],
@@ -159,7 +159,7 @@ return [
 		],
 		'login.post' => [
 			'path' => '/login',
-			'action' => 'login_action',
+			'action' => 'loginAction',
 			'controller' => AnimeClient::DEFAULT_CONTROLLER_NAMESPACE,
 			'verb' => 'post',
 		],
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
index 8a852a30..be89435e 100644
--- a/app/views/main-menu.php
+++ b/app/views/main-menu.php
@@ -1,4 +1,4 @@
-<?php namespace Aviat\AnimeClient ?>
+<?php declare(strict_types=1); namespace Aviat\AnimeClient; ?>
 <h1 class="flex flex-align-end flex-wrap">
 	<span class="flex-no-wrap grow-1">
 		<?php if(strpos($route_path, 'collection') === FALSE): ?>
diff --git a/build/header_comment.txt b/build/header_comment.txt
index 24806616..506ee880 100644
--- a/build/header_comment.txt
+++ b/build/header_comment.txt
@@ -1,15 +1,15 @@
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index 7aa9554c..1f6cdaa2 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -1,11 +1,11 @@
 <?php
+declare(strict_types=1);
 
-$animeclient_file_patterns = [
-	'app/config/*.php',
+$file_patterns = [
 	'app/bootstrap.php',
-	'src/functions.php',
-	'src/*.php',
-	'tests/**/*.php'
+	'migrations/*.php',
+	'src/**/*.php',
+	'tests/**/*.php',
 ];
 
 if ( ! function_exists('glob_recursive'))
@@ -80,16 +80,10 @@ function replace_files(array $files, $template)
 	}
 }
 
-foreach ($animeclient_file_patterns as $glob)
+foreach ($file_patterns as $glob)
 {
 	$files = glob_recursive($glob);
-	replace_files($files, '/animeclient_header_comment.txt');
+	replace_files($files, '/header_comment.txt');
 }
-$loose_files = [
-	__DIR__ . '/../index.php',
-	__DIR__ . '/../public/css.php',
-	__DIR__ . '/../public/js.php'
-];
-replace_files($loose_files, '/animeclient_header_comment.txt');
 
-echo "Successfully updated headers \n";
\ No newline at end of file
+echo "Successfully updated headers \n";
diff --git a/composer.json b/composer.json
index 766b979e..844276ec 100644
--- a/composer.json
+++ b/composer.json
@@ -41,5 +41,8 @@
 		"henrikbjorn/lurker": "^1.1.0",
 		"symfony/var-dumper": "^3.1",
 		"squizlabs/php_codesniffer": "^3.0.0@beta"
+	},
+	"scripts": {
+
 	}
 }
diff --git a/console b/console
index 2f87d89d..fb116f0a 100755
--- a/console
+++ b/console
@@ -1,6 +1,5 @@
 #!/usr/bin/env php
-<?php
-use Aviat\AnimeClient\Model;
+<?php declare(strict_types=1);
 
 if ( ! function_exists('_dir'))
 {
@@ -23,23 +22,6 @@ $APP_DIR = __DIR__ . '/app/';
 $SRC_DIR = __DIR__ . '/src/';
 $CONF_DIR = realpath("${APP_DIR}/config/");
 
-/**
- * Set up autoloaders
- *
- * @codeCoverageIgnore
- * @return void
- */
-spl_autoload_register(function($class) use ($SRC_DIR) {
-	$class_parts = explode('\\', $class);
-	$ns_path = $SRC_DIR . '/' . implode('/', $class_parts) . ".php";
-
-	if (file_exists($ns_path))
-	{
-		require_once($ns_path);
-		return;
-	}
-});
-
 // Set up autoloader for third-party dependencies
 require_once realpath(__DIR__ . '/vendor/autoload.php');
 
diff --git a/index.php b/index.php
index 6db078c5..ca589e6f 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,11 @@
  * @version     3.1
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
+namespace Aviat\AnimeClient;
+
 use Aviat\AnimeClient\AnimeClient;
 use Whoops\Handler\PrettyPageHandler;
+use Whoops\Run;
 
 // Work around the silly timezone error
 $timezone = ini_get('date.timezone');
@@ -44,7 +47,7 @@ require _dir(__DIR__, '/vendor/autoload.php');
 // -------------------------------------------------------------------------
 // Setup error handling
 // -------------------------------------------------------------------------
-$whoops = new \Whoops\Run();
+$whoops = new Run();
 
 // Set up default handler for general errors
 $defaultHandler = new PrettyPageHandler();
@@ -63,7 +66,7 @@ $whoops->register();
 require _dir($CONF_DIR, 'base_config.php'); // $base_config
 $di = require _dir($APP_DIR, 'bootstrap.php');
 
-$config = AnimeClient::load_toml($CONF_DIR);
+$config = AnimeClient::loadToml($CONF_DIR);
 $config_array = array_merge($base_config, $config);
 
 $container = $di($config_array);
diff --git a/migrations/20150616181750_first_migration.php b/migrations/20150616181750_first_migration.php
index df1d219d..361941c1 100644
--- a/migrations/20150616181750_first_migration.php
+++ b/migrations/20150616181750_first_migration.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index fda780f8..8eeb22a2 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -26,12 +26,13 @@ define('SRC_DIR', realpath(__DIR__));
 class AnimeClient {
 
 	const HUMMINGBIRD_AUTH_URL = 'https://hummingbird.me/api/v1/users/authenticate';
+	const KITSU_AUTH_URL = 'https://kitsu.io/api/oauth/token';
 	const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
 	const DEFAULT_CONTROLLER_NAMESPACE = 'Aviat\AnimeClient\Controller';
 	const DEFAULT_CONTROLLER = 'Aviat\AnimeClient\Controller\Anime';
 	const DEFAULT_CONTROLLER_METHOD = 'index';
-	const NOT_FOUND_METHOD = 'not_found';
-	const ERROR_MESSAGE_METHOD = 'error_page';
+	const NOT_FOUND_METHOD = 'notFound';
+	const ERROR_MESSAGE_METHOD = 'errorPage';
 	const SRC_DIR = SRC_DIR;
 
 	/**
@@ -40,7 +41,7 @@ class AnimeClient {
 	 * @param string $path - Path to load config
 	 * @return array
 	 */
-	public static function load_toml($path)
+	public static function loadToml(string $path): array
 	{
 		$output = [];
 		$files = glob("{$path}/*.toml");
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index 2b4c05b3..3d0fa2ff 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
@@ -57,7 +57,7 @@ class BaseCommand extends Command {
 		$CONF_DIR = realpath(__DIR__ . '/../../app/config/');
 		require_once $CONF_DIR . '/base_config.php'; // $base_config
 
-		$config = AnimeClient::load_toml($CONF_DIR);
+		$config = AnimeClient::loadToml($CONF_DIR);
 		$config_array = array_merge($base_config, $config);
 
 		$di = function ($config_array) {
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index bdb03683..c3923133 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Command/ClearCache.php b/src/Command/ClearCache.php
index 14c8f2f7..b49ea685 100644
--- a/src/Command/ClearCache.php
+++ b/src/Command/ClearCache.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Controller.php b/src/Controller.php
index f5e27f1f..7abfe2dd 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -16,14 +16,8 @@
 
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\Di\
-{
-	ContainerAware, ContainerInterface
-};
-use Aviat\Ion\View\
-{
-	HtmlView, HttpView, JsonView
-};
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
 use InvalidArgumentException;
 
 /**
@@ -103,7 +97,7 @@ class Controller {
 		$this->response = $container->get('response');
 		$this->base_data['url'] = $auraUrlGenerator;
 		$this->base_data['urlGenerator'] = $urlGenerator;
-		$this->base_data['auth'] = $container->get('auth');
+		// $this->base_data['auth'] = $container->get('auth');
 		$this->base_data['config'] = $this->config;
 		$this->urlGenerator = $urlGenerator;
 
@@ -189,7 +183,7 @@ class Controller {
 		$target = $this->session->get('redirect_url');
 		if (empty($target))
 		{
-			$this->not_found();
+			$this->notFound();
 		}
 		else
 		{
@@ -234,8 +228,8 @@ class Controller {
 			$data = array_merge($this->base_data, $data);
 		}
 
-		$route = $router->get_route();
-		$data['route_path'] = $route ? $router->get_route()->path : '';
+		$route = $router->getRoute();
+		$data['route_path'] = $route ? $router->getRoute()->path : '';
 
 
 		$template_path = _dir($this->config->get('view_path'), "{$template}.php");
@@ -301,7 +295,7 @@ class Controller {
 	 *
 	 * @return void
 	 */
-	public function login_action()
+	public function loginAction()
 	{
 		$auth = $this->container->get('auth');
 		$post = $this->request->getParsedBody();
@@ -331,7 +325,7 @@ class Controller {
 	 *
 	 * @return void
 	 */
-	public function not_found()
+	public function notFound()
 	{
 		$this->outputHTML('404', [
 			'title' => 'Sorry, page not found'
@@ -347,7 +341,7 @@ class Controller {
 	 * @param string $long_message
 	 * @return void
 	 */
-	public function error_page($http_code, $title, $message, $long_message = "")
+	public function errorPage($http_code, $title, $message, $long_message = "")
 	{
 		$this->outputHTML('error', [
 			'title' => $title,
@@ -364,7 +358,7 @@ class Controller {
 	 * @param string $type
 	 * @return void
 	 */
-	public function set_flash_message($message, $type = "info")
+	public function setFlashMessage($message, $type = "info")
 	{
 		$this->session->setFlash('message', [
 			'message_type' => $type,
@@ -377,7 +371,7 @@ class Controller {
 	 *
 	 * @return void
 	 */
-	public function clear_cache()
+	public function clearCache()
 	{
 		$this->cache->purge();
 		$this->outputHTML('blank', [
@@ -394,7 +388,7 @@ class Controller {
 	 * @param string $message
 	 * @return string
 	 */
-	protected function show_message($view, $type, $message)
+	protected function showMessage($view, $type, $message)
 	{
 		return $this->load_partial($view, 'message', [
 			'message_type' => $type,
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 7ebf31a4..03b7712c 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -1,24 +1,24 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\AnimeClient\Controller as BaseController;
-use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
-use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\AnimeClient\Kitsu\Enum\AnimeWatchingStatus;
+use Aviat\AnimeClient\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Di\ContainerInterface;
 
 /**
diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php
index 893e5a80..9bdc30c8 100644
--- a/src/Controller/Collection.php
+++ b/src/Controller/Collection.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index c3027af8..e88152c7 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -1,34 +1,34 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\AnimeClient\Controller;
-use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
-use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
+use Aviat\AnimeClient\API\Kitsu\Enum\MangaReadingStatus;
+use Aviat\AnimeClient\API\Kitsu\Transformer\MangaListTransformer;
 use Aviat\AnimeClient\Model\Manga as MangaModel;
 use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Json;
+use Aviat\Ion\{Json, StringWrapper};
 
 /**
  * Controller for manga list
  */
 class Manga extends Controller {
 
-	use \Aviat\Ion\StringWrapper;
+	use StringWrapper;
 
 	/**
 	 * The manga model
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index a168f745..8a67eff0 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -19,7 +19,6 @@ namespace Aviat\AnimeClient;
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Friend;
 
-
 /**
  * Basic routing/ dispatch
  */
@@ -61,7 +60,7 @@ class Dispatcher extends RoutingBase {
 		$this->matcher = $container->get('aura-router')->getMatcher();
 		$this->request = $container->get('request');
 
-		$this->output_routes = $this->_setup_routes();
+		$this->output_routes = $this->_setupRoutes();
 	}
 
 	/**
@@ -69,7 +68,7 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return object
 	 */
-	public function get_route()
+	public function getRoute()
 	{
 		$logger = $this->container->getLogger('default');
 
@@ -89,7 +88,7 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return array
 	 */
-	public function get_output_routes()
+	public function getOutputRoutes()
 	{
 		return $this->output_routes;
 	}
@@ -107,7 +106,7 @@ class Dispatcher extends RoutingBase {
 
 		if (is_null($route))
 		{
-			$route = $this->get_route();
+			$route = $this->getRoute();
 
 			$logger->debug('Dispatcher - Route invoke arguments');
 			$logger->debug(print_r($route, TRUE));
@@ -115,23 +114,23 @@ class Dispatcher extends RoutingBase {
 
 		if ($route)
 		{
-			$parsed = $this->process_route(new Friend($route));
-			$controller_name = $parsed['controller_name'];
-			$action_method = $parsed['action_method'];
+			$parsed = $this->processRoute(new Friend($route));
+			$controllerName = $parsed['controller_name'];
+			$actionMethod = $parsed['action_method'];
 			$params = $parsed['params'];
 		}
 		else
 		{
 			// If not route was matched, return an appropriate http
 			// error message
-			$error_route = $this->get_error_params();
-			$controller_name = AnimeClient::DEFAULT_CONTROLLER;
-			$action_method = $error_route['action_method'];
+			$error_route = $this->getErrorParams();
+			$controllerName = AnimeClient::DEFAULT_CONTROLLER;
+			$actionMethod = $error_route['action_method'];
 			$params = $error_route['params'];
 		}
 
 		// Actually instantiate the controller
-		$this->call($controller_name, $action_method, $params);
+		$this->call($controllerName, $actionMethod, $params);
 	}
 
 	/**
@@ -142,7 +141,7 @@ class Dispatcher extends RoutingBase {
 	 * @throws \LogicException
 	 * @return array
 	 */
-	protected function process_route($route)
+	protected function processRoute($route)
 	{
 		if (array_key_exists('controller', $route->attributes))
 		{
@@ -156,7 +155,7 @@ class Dispatcher extends RoutingBase {
 		// Get the full namespace for a controller if a short name is given
 		if (strpos($controller_name, '\\') === FALSE)
 		{
-			$map = $this->get_controller_list();
+			$map = $this->getControllerList();
 			$controller_name = $map[$controller_name];
 		}
 
@@ -191,7 +190,7 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return string
 	 */
-	public function get_controller()
+	public function getController()
 	{
 		$route_type = $this->__get('default_list');
 		$request_uri = $this->request->getUri()->getPath();
@@ -213,13 +212,13 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return array
 	 */
-	public function get_controller_list()
+	public function getControllerList()
 	{
 		$default_namespace = AnimeClient::DEFAULT_CONTROLLER_NAMESPACE;
 		$path = str_replace('\\', '/', $default_namespace);
 		$path = str_replace('Aviat/AnimeClient/', '', $path);
 		$path = trim($path, '/');
-		$actual_path = realpath(\_dir(AnimeClient::SRC_DIR, $path));
+		$actual_path = realpath(_dir(AnimeClient::SRC_DIR, $path));
 		$class_files = glob("{$actual_path}/*.php");
 
 		$controllers = [];
@@ -240,16 +239,16 @@ class Dispatcher extends RoutingBase {
 	 * Create the controller object and call the appropriate
 	 * method
 	 *
-	 * @param  string $controller_name - The full namespace of the controller class
+	 * @param  string $controllerName - The full namespace of the controller class
 	 * @param  string $method
 	 * @param  array  $params
 	 * @return void
 	 */
-	protected function call($controller_name, $method, array $params)
+	protected function call($controllerName, $method, array $params)
 	{
 		$logger = $this->container->getLogger('default');
 
-		$controller = new $controller_name($this->container);
+		$controller = new $controllerName($this->container);
 
 		// Run the appropriate controller method
 		$logger->debug('Dispatcher - controller arguments');
@@ -263,7 +262,7 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return array|false
 	 */
-	protected function get_error_params()
+	protected function getErrorParams()
 	{
 		$logger = $this->container->getLogger('default');
 		$failure = $this->matcher->getFailedRoute();
@@ -309,9 +308,9 @@ class Dispatcher extends RoutingBase {
 	 *
 	 * @return array
 	 */
-	protected function _setup_routes()
+	protected function _setupRoutes()
 	{
-		$route_type = $this->get_controller();
+		$route_type = $this->getController();
 
 		// Add routes
 		$routes = [];
@@ -320,7 +319,7 @@ class Dispatcher extends RoutingBase {
 			$path = $route['path'];
 			unset($route['path']);
 
-			$controller_map = $this->get_controller_list();
+			$controller_map = $this->getControllerList();
 			$controller_class = (array_key_exists($route_type, $controller_map))
 				? $controller_map[$route_type]
 				: AnimeClient::DEFAULT_CONTROLLER;
diff --git a/src/Helper/Menu.php b/src/Helper/Menu.php
index ddc623dc..b045d67f 100644
--- a/src/Helper/Menu.php
+++ b/src/Helper/Menu.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Model/API.php b/src/Model/API.php
index bb501e41..ef4bd113 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -1,23 +1,23 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
 
 use Aviat\AnimeClient\AnimeClient;
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
 use Aviat\Ion\Model;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
@@ -36,7 +36,7 @@ use Psr\Http\Message\ResponseInterface;
  */
 class API extends Model {
 
-	use \Aviat\Ion\Di\ContainerAware;
+	use ContainerAware;
 
 	/**
 	 * Config manager
@@ -68,6 +68,12 @@ class API extends Model {
 	 */
 	protected $cache;
 
+    /**
+     * Default settings for Guzzle
+     * @var array
+     */
+	protected $connectionDefaults = [];
+
 	/**
 	 * Constructor
 	 *
@@ -93,15 +99,16 @@ class API extends Model {
 			'base_uri' => $this->base_url,
 			'cookies' => TRUE,
 			'http_errors' => FALSE,
-			'defaults' => [
+			'defaults' => array_merge([
 				'cookies' => $this->cookieJar,
 				'headers' => [
-					'User-Agent' => "Tim's Anime Client/3.0",
-					'Accept-Encoding' => 'application/json'
+					'User-Agent' => "Tim's Anime Client/4.0",
+					'Accept-Encoding' => 'application/vnd.api+json',
+					'Content-Type' => 'application/vnd.api+json'
 				],
 				'timeout' => 25,
 				'connect_timeout' => 25
-			]
+			], $this->connectionDefaults)
 		]);
 	}
 
@@ -116,12 +123,19 @@ class API extends Model {
 	{
 		$valid_methods = [
 			'get',
+			'getAsync',
 			'delete',
+			'deleteAsync',
 			'head',
+			'headAsync',
 			'options',
+			'optionsAsync',
 			'patch',
+			'patchAsync',
 			'post',
-			'put'
+			'postAsync',
+			'put',
+			'putAsync'
 		];
 
 		if ( ! in_array($method, $valid_methods))
@@ -172,31 +186,6 @@ class API extends Model {
 		array_multisort($sort, SORT_ASC, $array);
 	}
 
-	/**
-	 * Attempt login via the api
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $username
-	 * @param string $password
-	 * @return string|false
-	 */
-	public function authenticate(string $username, string $password)
-	{
-		$response = $this->post(AnimeClient::HUMMINGBIRD_AUTH_URL, [
-			'form_params' => [
-				'username' => $username,
-				'password' => $password
-			]
-		]);
-
-		if ($response->getStatusCode() === 201)
-		{
-			return json_decode((string)$response->getBody(), TRUE);
-		}
-
-		return FALSE;
-	}
-
 	/**
 	 * Dummy function that should be abstract. Is not abstract because
 	 * this class is used concretely for authorizing API calls
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 67a21acd..5b3077e7 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -1,23 +1,23 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
-use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
+use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Json;
 
 /**
@@ -36,7 +36,7 @@ class Anime extends API {
 	 * The base url for api requests
 	 * @var string $base_url
 	 */
-	protected $base_url = "https://hummingbird.me/api/v1/";
+	protected $base_url = "https://kitsu.io/api/edge/";
 
 	/**
 	 * Map of API status constants to display constants
@@ -226,7 +226,7 @@ class Anime extends API {
 			$config['query']['auth_token'] = $auth->get_auth_token();
 		}
 
-		$response = $this->get("users/{$username}/library", $config);
+		$response = $this->get("library-entries?filter[media_type]=Anime&filter[user_id]=2644&filter[status]=1,2&include=media", $config);
 		$output = $this->transform($status, $response);
 
 		$util = $this->container->get('util');
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index fc7fe4c1..7449daaa 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index 776f67c8..a712fadc 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Model/DB.php b/src/Model/DB.php
index a75a6cb8..3acd9b77 100644
--- a/src/Model/DB.php
+++ b/src/Model/DB.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 88aa4f3c..75ecb2d8 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -1,23 +1,23 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
- * @package     HummingbirdAnimeClient
+ * @package     AnimeListClient
  * @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     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
-use Aviat\AnimeClient\Hummingbird\Transformer;
+use Aviat\AnimeClient\API\Kitsu\Enum\MangaReadingStatus;
+use Aviat\AnimeClient\API\Kitsu\Transformer;
 use Aviat\Ion\Json;
 use GuzzleHttp\Cookie\SetCookie;
 use RuntimeException;
diff --git a/src/Util.php b/src/Util.php
index 309e981a..9031de31 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -18,14 +18,15 @@ namespace Aviat\AnimeClient;
 
 use abeautifulsite\SimpleImage;
 use Aviat\Ion\ConfigInterface;
-use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+use DomainException;
 
 /**
  * Utility method class
  */
 class Util {
 
-	use \Aviat\Ion\Di\ContainerAware;
+	use ContainerAware;
 
 	/**
 	 * Routes that don't require a second navigation level
@@ -164,7 +165,7 @@ class Util {
 			}
 			else
 			{
-				throw new \DomainException("Couldn't cache images because they couldn't be downloaded.");
+				throw new DomainException("Couldn't cache images because they couldn't be downloaded.");
 			}
 
 			// Resize the image
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
index 142ac98d..cd3abf83 100644
--- a/tests/DispatcherTest.php
+++ b/tests/DispatcherTest.php
@@ -137,7 +137,7 @@ class DispatcherTest extends AnimeClient_TestCase {
 
 		// Check route setup
 		$this->assertEquals($config['routes'], $this->config->get('routes'), "Incorrect route path");
-		$this->assertTrue(is_array($this->router->get_output_routes()));
+		$this->assertTrue(is_array($this->router->getOutputRoutes()));
 
 		// Check environment variables
 		$this->assertEquals($uri, $request->getServerParams()['REQUEST_URI']);
@@ -145,10 +145,10 @@ class DispatcherTest extends AnimeClient_TestCase {
 
 		// Make sure the route is an anime type
 		//$this->assertTrue($matcher->count() > 0, "0 routes");
-		$this->assertEquals($controller, $this->router->get_controller(), "Incorrect Route type");
+		$this->assertEquals($controller, $this->router->getController(), "Incorrect Route type");
 
 		// Make sure the route matches, by checking that it is actually an object
-		$route = $this->router->get_route();
+		$route = $this->router->getRoute();
 		$this->assertInstanceOf('Aura\\Router\\Route', $route, "Route is invalid, not matched");
 	}
 
@@ -252,6 +252,6 @@ class DispatcherTest extends AnimeClient_TestCase {
 	public function testGetControllerList($config, $expected)
 	{
 		$this->_set_up($config, '/', 'localhost');
-		$this->assertEquals($expected, $this->router->get_controller_list());
+		$this->assertEquals($expected, $this->router->getControllerList());
 	}
 }
\ No newline at end of file

From 0c910bff1af137bb74fc5d9777ba14327130fb17 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 21 Dec 2016 12:46:20 -0500
Subject: [PATCH 51/65] Pull stuff from the Kitsu API

---
 app/config/cache.toml.example                 |  20 +++
 app/views/anime/cover.php                     |  19 +--
 app/views/main-menu.php                       |   4 +-
 composer.json                                 |   3 +-
 index.php                                     |   2 +-
 src/API/GuzzleTrait.php                       |  86 +++++++++++++
 src/API/Kitsu/KitsuAnimeListItem.php          |  43 +++++++
 src/API/Kitsu/KitsuModel.php                  | 115 ++++++++++++++++++
 src/API/Kitsu/KitsuTrait.php                  |  56 +++++++++
 src/API/Kitsu/Model.php                       |  68 -----------
 .../Transformer/AnimeListTransformer.php      |  60 +++++----
 src/API/ListInterface.php                     |  29 +++++
 src/API/ListItemInterface.php                 |   4 +-
 src/Controller/Anime.php                      |   7 +-
 src/Model/Anime.php                           |  26 ++--
 15 files changed, 417 insertions(+), 125 deletions(-)
 create mode 100644 app/config/cache.toml.example
 create mode 100644 src/API/GuzzleTrait.php
 create mode 100644 src/API/Kitsu/KitsuAnimeListItem.php
 create mode 100644 src/API/Kitsu/KitsuModel.php
 create mode 100644 src/API/Kitsu/KitsuTrait.php
 delete mode 100644 src/API/Kitsu/Model.php
 create mode 100644 src/API/ListInterface.php

diff --git a/app/config/cache.toml.example b/app/config/cache.toml.example
new file mode 100644
index 00000000..283f45fa
--- /dev/null
+++ b/app/config/cache.toml.example
@@ -0,0 +1,20 @@
+################################################################################
+#                                 Cache Setup                                  #
+################################################################################
+
+driver = "redis"
+
+[connection]
+# Host or socket to connect to
+host = "127.0.0.1"
+
+# Connection port
+#port = 6379
+
+# Connection password
+#password = ""
+
+# Database number
+database = 2
+
+[options]
\ No newline at end of file
diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index fca4694d..5ca19c9d 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -1,20 +1,21 @@
 <main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /*if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
-<?php endif ?>
+<?php endif */ ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
+		<?php /*<pre><?= print_r($items, TRUE) ?></pre> */ ?>
 		<section class="status">
 			<h2><?= $escape->html($name) ?></h2>
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
-				<?php if ($item['private'] && ! $auth->is_authenticated()) continue; ?>
+				<?php if ($item['private']/* && ! $auth->is_authenticated()*/) continue; ?>
 				<article class="media" id="<?= $item['anime']['slug'] ?>">
-					<?php if ($auth->is_authenticated()): ?>
+					<?php /* if ($auth->is_authenticated()): ?>
 					<button title="Increment episode count" class="plus_one" hidden>+1 Episode</button>
-					<?php endif ?>
+					<?php endif */ ?>
 					<?= $helper->img($item['anime']['image']); ?>
 					<div class="name">
 						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]); ?>">
@@ -23,13 +24,13 @@
 						</a>
 					</div>
 					<div class="table">
-						<?php if ($auth->is_authenticated()): ?>
+						<?php /* if ($auth->is_authenticated()): ?>
 						<div class="row">
 							<span class="edit">
 								<a class="bracketed" title="Edit information about this anime" href="<?= $urlGenerator->url("anime/edit/{$item['id']}/{$item['watching_status']}") ?>">Edit</a>
 							</span>
 						</div>
-						<?php endif ?>
+						<?php endif */ ?>
 						<?php if ($item['private'] || $item['rewatching']): ?>
 						<div class="row">
 							<?php foreach(['private', 'rewatching'] as $attr): ?>
@@ -64,6 +65,6 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /* if ($auth->is_authenticated()): ?>
 <script src="<?= $urlGenerator->asset_url('js.php/g/edit') ?>"></script>
-<?php endif ?>
+<?php endif */ ?>
\ No newline at end of file
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
index be89435e..ae0045ea 100644
--- a/app/views/main-menu.php
+++ b/app/views/main-menu.php
@@ -17,7 +17,7 @@
 			[<a href="<?= $urlGenerator->default_url('manga') ?>">Manga List</a>]
 		<?php endif ?>
 	</span>
-	<?php if ($auth->is_authenticated()): ?>
+	<?php /* if ($auth->is_authenticated()): ?>
 		<span class="flex-no-wrap">&nbsp;</span>
 		<span class="flex-no-wrap small-font">
 				<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
@@ -29,7 +29,7 @@
 			<a class="bracketed" href="<?= $url->generate('logout') ?>">Logout</a>
 		<?php else: ?>
 			[<a href="<?= $url->generate('login'); ?>"><?= $config->get('whose_list') ?>'s Login</a>]
-		<?php endif ?>
+		<?php endif */ ?>
 	</span>
 </h1>
 <nav>
diff --git a/composer.json b/composer.json
index 844276ec..f5599fab 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
 		"aura/html": "2.*",
 		"aura/router": "3.*",
 		"aura/session": "2.*",
+		"aviat/banker": "dev-master",
 		"aviat/ion": "dev-master",
 		"filp/whoops": "2.0.*",
 		"guzzlehttp/guzzle": "6.*",
@@ -45,4 +46,4 @@
 	"scripts": {
 
 	}
-}
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index ca589e6f..1aacb66e 100644
--- a/index.php
+++ b/index.php
@@ -58,7 +58,7 @@ $whoops->pushHandler($defaultHandler);
 //$whoops->pushHandler($jsonHandler);
 
 // Register as the error handler
-$whoops->register();
+// $whoops->register();
 
 // -----------------------------------------------------------------------------
 // Dependency Injection setup
diff --git a/src/API/GuzzleTrait.php b/src/API/GuzzleTrait.php
new file mode 100644
index 00000000..f12b5436
--- /dev/null
+++ b/src/API/GuzzleTrait.php
@@ -0,0 +1,86 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Base trait for api interaction
+ *
+ * @method ResponseInterface get(string $uri, array $options);
+ * @method ResponseInterface delete(string $uri, array $options);
+ * @method ResponseInterface head(string $uri, array $options);
+ * @method ResponseInterface options(string $uri, array $options);
+ * @method ResponseInterface patch(string $uri, array $options);
+ * @method ResponseInterface post(string $uri, array $options);
+ * @method ResponseInterface put(string $uri, array $options);
+ */
+trait GuzzleTrait {
+    /**
+     * The Guzzle http client object
+     * @var object
+     */
+    protected $client;
+
+    /**
+     * Cookie jar object for api requests
+     * @var object
+     */
+    protected $cookieJar;
+
+    /**
+     * Set up the class properties
+     *
+     * @return void
+     */
+    abstract protected function init();
+
+    /**
+     * Magic methods to call guzzle api client
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return ResponseInterface|null
+     */
+    public function __call($method, $args)
+    {
+        $valid_methods = [
+            'get',
+            'getAsync',
+            'delete',
+            'deleteAsync',
+            'head',
+            'headAsync',
+            'options',
+            'optionsAsync',
+            'patch',
+            'patchAsync',
+            'post',
+            'postAsync',
+            'put',
+            'putAsync'
+        ];
+
+        if ( ! in_array($method, $valid_methods))
+        {
+            return NULL;
+        }
+
+        array_unshift($args, strtoupper($method));
+        return call_user_func_array([$this->client, 'request'], $args);
+    }
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuAnimeListItem.php b/src/API/Kitsu/KitsuAnimeListItem.php
new file mode 100644
index 00000000..1d7a498a
--- /dev/null
+++ b/src/API/Kitsu/KitsuAnimeListItem.php
@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\API\AbstractListItem;
+
+class KitsuAnimeListItem extends AbstractListItem {
+	use KitsuTrait;
+
+	public function create(array $data): bool
+	{
+		// TODO: Implement create() method.
+	}
+
+	public function delete(string $id): bool
+	{
+		// TODO: Implement delete() method.
+	}
+
+	public function get(string $id): array
+	{
+		// TODO: Implement get() method.
+	}
+
+	public function update(string $id, array $data): bool
+	{
+		// TODO: Implement update() method.
+	}
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
new file mode 100644
index 00000000..3ade0674
--- /dev/null
+++ b/src/API/Kitsu/KitsuModel.php
@@ -0,0 +1,115 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
+use Aviat\Ion\Json;
+
+/**
+ * Kitsu API Model
+ */
+class KitsuModel {
+
+	use KitsuTrait;
+
+	const CLIENT_ID = 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd';
+	const CLIENT_SECRET = '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151';
+
+	/**
+	 * Class to map anime list items
+	 * to a common format used by
+	 * templates
+	 *
+	 * @var AnimeListTransformer
+	 */
+	protected $animeListTransformer;
+
+	public function __construct()
+	{
+		// Set up Guzzle trait
+		$this->init();
+
+		$this->animeListTransformer = new AnimeListTransformer();
+	}
+
+	/**
+	 * Get the access token from the Kitsu API
+	 *
+	 * @param string $username
+	 * @param string $password
+	 * @return bool|string
+	 */
+	public function authenticate(string $username, string $password)
+	{
+		$response = $this->post('https://kitsu.io/api/oauth/token', [
+			'body' => http_build_query([
+				'grant_type' => 'password',
+				'username' => $username,
+				'password' => $password,
+				'client_id' => self::CLIENT_ID,
+				'client_secret' => self::CLIENT_SECRET
+			])
+		]);
+
+		$info = JSON::decode($response->getBody());
+
+		if (array_key_exists('access_token', $info)) {
+			// @TODO save token
+			return true;
+		}
+
+		return false;
+	}
+
+	public function getAnimeMedia($entryId): array {
+		$response = $this->get("library-entries/{$entryId}/media", [
+			'headers' => [
+				'client_id' => self::CLIENT_ID,
+				'client_secret' => self::CLIENT_SECRET
+			]
+		]);
+
+		return JSON::decode($response->getBody(), TRUE);
+	}
+
+	public function getAnimeList(): array {
+		$response = $this->get('library-entries', [
+			'headers' => [
+				'client_id' => self::CLIENT_ID,
+				'client_secret' => self::CLIENT_SECRET
+			],
+			'query' => [
+				'filter' => [
+					'user_id' => 2644,
+					'media_type' => 'Anime'
+				],
+				'include' => 'media'
+			]
+		]);
+
+		$data = JSON::decode($response->getBody(), TRUE);
+
+		foreach($data['data'] as &$item)
+		{
+			$item['anime'] = $this->getAnimeMedia($item['id'])['data']['attributes'];
+		}
+
+		$transformed = $this->animeListTransformer->transformCollection($data['data']);
+
+		return $transformed;
+	}
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
new file mode 100644
index 00000000..569597d0
--- /dev/null
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -0,0 +1,56 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\API\GuzzleTrait;
+use GuzzleHttp\Client;
+use GuzzleHttp\Cookie\CookieJar;
+
+trait KitsuTrait {
+	use GuzzleTrait;
+
+	/**
+	 * The base url for api requests
+	 * @var string $base_url
+	 */
+	protected $baseUrl = "https://kitsu.io/api/edge/";
+
+	/**
+	 * Set up the class properties
+	 *
+	 * @return void
+	 */
+	protected function init()
+	{
+		$this->cookieJar = new CookieJar();
+		$this->client = new Client([
+			'base_uri' => $this->baseUrl,
+			'cookies' => TRUE,
+			'http_errors' => TRUE,
+			'defaults' => [
+				'cookies' => $this->cookieJar,
+				'headers' => [
+					'User-Agent' => "Tim's Anime Client/4.0",
+					'Accept-Encoding' => 'application/vnd.api+json',
+					'Content-Type' => 'application/vnd.api+json'
+				],
+				'timeout' => 25,
+				'connect_timeout' => 25
+			]
+		]);
+	}
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/Model.php b/src/API/Kitsu/Model.php
deleted file mode 100644
index 99223a74..00000000
--- a/src/API/Kitsu/Model.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu;
-
-use Aviat\AnimeClient\Model\API;
-
-/**
- * Kitsu API Model
- */
-class Model extends API {
-	
-	const CLIENT_ID = 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd';
-	const CLIENT_SECRET = '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151';
-	
-	/**
-	 * Base url for Kitsu API
-	 */
-	protected $baseUrl = 'https://kitsu.io/api/edge/';
-
-    /**
-     * Default settings for Guzzle
-     * @var array
-     */
-	protected $connectionDefaults = [];
-
-    /**
-     * Get the access token from the Kitsu API
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool|string
-     */
-    public function authenticate(string $username, string $password)
-    {
-        $response = $this->post('https://kitsu.io/api/oauth/token', [
-            'body' => http_build_query([
-                'grant_type' => 'password',
-                'username' => $username,
-                'password' => $password,
-                'client_id' => self::CLIENT_ID,
-                'client_secret' => self::CLIENT_SECRET
-            ])
-        ]);
-
-        $info = $response->getBody();
-
-        if (array_key_exists('access_token', $info)) {
-            // @TODO save token
-            return true;
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index e90c42e7..ae202f3d 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -32,65 +32,61 @@ class AnimeListTransformer extends AbstractTransformer {
 	 */
 	public function transform($item)
 	{
-print_r($item);
-die();
+/* ?><pre><?= print_r($item, TRUE) ?></pre><?php
+die(); */
+		// $anime = [];
+		$genres = [];
 		$anime =& $item['anime'];
-		$genres = $this->linearizeGenres($item['anime']['genres']);
+		// $genres = $this->linearizeGenres($item['anime']['genres']); */
 
-		$rating = NULL;
-		if ($item['rating']['type'] === 'advanced')
-		{
-			$rating = is_numeric($item['rating']['value'])
-				? (int) 2 * $item['rating']['value']
-				: '-';
-		}
+		$rating = (int) 2 * $item['attributes']['rating'];
 
-		$total_episodes = is_numeric($anime['episode_count'])
-			? $anime['episode_count']
+		$total_episodes = is_numeric($anime['episodeCount'])
+			? $anime['episodeCount']
 			: '-';
 
 		$alternate_title = NULL;
-		if (array_key_exists('alternate_title', $anime))
+		if (array_key_exists('en_jp', $anime['titles']))
 		{
 			// If the alternate title is very similar, or
 			// a subset of the main title, don't list the
 			// alternate title
-			$not_subset = stripos($anime['title'], $anime['alternate_title']) === FALSE;
-			$diff = levenshtein($anime['title'], $anime['alternate_title'] ?? '');
+			$not_subset = stripos($anime['canonicalTitle'], $anime['titles']['en_jp']) === FALSE;
+			$diff = levenshtein($anime['canonicalTitle'], $anime['titles']['en_jp'] ?? '');
 			if ($not_subset && $diff >= 5)
 			{
-				$alternate_title = $anime['alternate_title'];
+				$alternate_title = $anime['titles']['en_jp'];
 			}
 		}
 
 		return [
 			'id' => $item['id'],
 			'episodes' => [
-				'watched' => $item['episodes_watched'],
+				'watched' => $item['attributes']['progress'],
 				'total' => $total_episodes,
-				'length' => $anime['episode_length'],
+				'length' => $anime['episodeLength'],
 			],
 			'airing' => [
-				'status' => $anime['status'],
-				'started' => $anime['started_airing'],
-				'ended' => $anime['finished_airing']
+				'status' => $anime['status'] ?? '',
+				'started' => $anime['startDate'],
+				'ended' => $anime['endDate']
 			],
 			'anime' => [
-				'age_rating' => $anime['age_rating'],
-				'title' => $anime['title'],
+				'age_rating' => $anime['ageRating'],
+				'title' => $anime['canonicalTitle'],
 				'alternate_title' => $alternate_title,
 				'slug' => $anime['slug'],
-				'url' => $anime['url'],
-				'type' => $anime['show_type'],
-				'image' => $anime['cover_image'],
-				'genres' => $genres,
+				'url' => $anime['url'] ?? '',
+				'type' => $anime['showType'],
+				'image' => $anime['posterImage']['small'],
+				'genres' => [],//$genres,
 			],
-			'watching_status' => $item['status'],
-			'notes' => $item['notes'],
-			'rewatching' => (bool) $item['rewatching'],
-			'rewatched' => $item['rewatched_times'],
+			'watching_status' => $item['attributes']['status'],
+			'notes' => $item['attributes']['notes'],
+			'rewatching' => (bool) $item['attributes']['reconsuming'],
+			'rewatched' => (int) $item['attributes']['reconsumeCount'],
 			'user_rating' => $rating,
-			'private' => (bool) $item['private'],
+			'private' => (bool) $item['attributes']['private'] ?? false,
 		];
 	}
 
diff --git a/src/API/ListInterface.php b/src/API/ListInterface.php
new file mode 100644
index 00000000..1e2d739b
--- /dev/null
+++ b/src/API/ListInterface.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+/**
+ * Common interface for anime and manga list item CRUD
+ */
+interface ListInterface {
+    /**
+     * Get the raw list of items
+     *
+     * @return array
+     */
+    public function get(): array;
+}
\ No newline at end of file
diff --git a/src/API/ListItemInterface.php b/src/API/ListItemInterface.php
index 776f5c6f..b0a69551 100644
--- a/src/API/ListItemInterface.php
+++ b/src/API/ListItemInterface.php
@@ -40,8 +40,8 @@ interface ListItemInterface {
 	/**
 	 * Update a list item
 	 * 
-	 * @param string $id - The id of the list tiem to update
-	 * @param array $data - The data with which to update the list itme
+	 * @param string $id - The id of the list item to update
+	 * @param array $data - The data with which to update the list item
 	 * @return bool
 	 */
 	public function update(string $id, array $data): bool;
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 03b7712c..4188e1f4 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -17,16 +17,17 @@
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\AnimeClient\Controller as BaseController;
-use Aviat\AnimeClient\Kitsu\Enum\AnimeWatchingStatus;
-use Aviat\AnimeClient\Kitsu\Transformer\AnimeListTransformer;
+use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
+use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\StringWrapper;
 
 /**
  * Controller for Anime-related pages
  */
 class Anime extends BaseController {
 
-	use \Aviat\Ion\StringWrapper;
+	use StringWrapper;
 
 	/**
 	 * The anime list model
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 5b3077e7..e3b9959f 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -6,20 +6,23 @@
  *
  * PHP version 7
  *
- * @package     AnimeListClient
- * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @package	 AnimeListClient
+ * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license	 http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
 
+use Aviat\AnimeClient\API\Kitsu\KitsuModel;
 use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
+use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Json;
 
+
 /**
  * Model for handling requests dealing with the anime list
  */
@@ -50,6 +53,12 @@ class Anime extends API {
 		AnimeWatchingStatus::COMPLETED => self::COMPLETED,
 	];
 
+	public function __construct(ContainerInterface $container) {
+		parent::__construct($container);
+
+		$this->kitsuModel = new KitsuModel();
+	}
+
 	/**
 	 * Update the selected anime
 	 *
@@ -143,8 +152,11 @@ class Anime extends API {
 	 */
 	public function get_list($status)
 	{
-		$data = $this->_get_list_from_api($status);
-		$this->sort_by_name($data, 'anime');
+		$data = $this->kitsuModel->getAnimeList();
+		//return JSON::decode((string)$stream, TRUE);
+
+		/*$data = $this->_get_list_from_api($status);
+		$this->sort_by_name($data, 'anime');*/
 
 		$output = [];
 		$output[$this->const_map[$status]] = $data;

From a92acd203d70e1ca5dadd242585c303285897de7 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 22 Dec 2016 21:36:23 -0500
Subject: [PATCH 52/65] Another ugly progress commit

Sort of working:
* Get anime list by status
* Get anime description pages
---
 app/bootstrap.php                             | 12 ++-
 app/views/anime/details.php                   | 19 ++--
 app/views/anime/list.php                      | 16 ++--
 index.php                                     |  2 +-
 src/API/GuzzleTrait.php                       | 45 ---------
 src/API/Kitsu/Enum/AnimeWatchingStatus.php    | 12 +--
 src/API/Kitsu/KitsuModel.php                  | 95 ++++++++++++++-----
 src/API/Kitsu/KitsuTrait.php                  | 76 +++++++++++++++
 .../Transformer/AnimeListTransformer.php      | 30 +-----
 .../Kitsu/Transformer/AnimeTransformer.php    | 52 ++++++++++
 src/Controller/Anime.php                      | 22 ++---
 src/Model/Anime.php                           | 78 ++-------------
 12 files changed, 257 insertions(+), 202 deletions(-)
 create mode 100644 src/API/Kitsu/Transformer/AnimeTransformer.php

diff --git a/app/bootstrap.php b/app/bootstrap.php
index fdc8e0da..5229f433 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -20,8 +20,9 @@ use Aura\Html\HelperLocatorFactory;
 use Aura\Router\RouterContainer;
 use Aura\Session\SessionFactory;
 use Aviat\AnimeClient\API\Kitsu\Auth as KitsuAuth;
+use Aviat\AnimeClient\API\Kitsu\KitsuModel;
 use Aviat\AnimeClient\Model;
-use Aviat\Ion\Cache\CacheManager;
+use Aviat\Banker\Pool;
 use Aviat\Ion\Config;
 use Aviat\Ion\Di\Container;
 use Monolog\Handler\RotatingFileHandler;
@@ -54,7 +55,9 @@ return function(array $config_array = []) {
 
 	// Create Cache Object
 	$container->set('cache', function($container) {
-		return new CacheManager($container->get('config'));
+		$logger = $container->getLogger();
+		$config = $container->get('config')->get('cache');
+		return new Pool($config, $logger);
 	});
 
 	// Create Aura Router Object
@@ -99,6 +102,11 @@ return function(array $config_array = []) {
 	});
 
 	// Models
+	$container->set('kitsu-model', function($container) {
+		$model = new KitsuModel();
+		$model->setContainer($container);
+		return $model;
+	});
 	$container->set('api-model', function($container) {
 		return new Model\API($container);
 	});
diff --git a/app/views/anime/details.php b/app/views/anime/details.php
index 6b27c67c..b06eae01 100644
--- a/app/views/anime/details.php
+++ b/app/views/anime/details.php
@@ -5,10 +5,10 @@
 			<br />
 			<br />
 			<table>
-				<tr>
+				<?php /*<tr>
 					<td class="align_right">Airing Status</td>
 					<td><?= $data['status'] ?></td>
-				</tr>
+				</tr>*/ ?>
 				<tr>
 					<td>Show Type</td>
 					<td><?= $data['show_type'] ?></td>
@@ -23,24 +23,23 @@
 				</tr>
 				<tr>
 					<td>Age Rating</td>
-					<td><?= $data['age_rating'] ?></td>
+                    <td><abbr title="<?= $data['age_rating_guide'] ?>"><?= $data['age_rating'] ?></abbr></td>
 				</tr>
 				<tr>
 					<td>Genres</td>
 					<td>
-						<?php
-						$genres = [];
-						foreach($data['genres'] as $g) $genres[] = $g['name'];
-						?>
-						<?= implode(', ', $genres); ?>
+						<?= implode(', ', $data['genres']) ?>
 					</td>
 				</tr>
 			</table>
 		</div>
 		<div>
 			<h2><a rel="external" href="<?= $data['url'] ?>"><?= $data['title'] ?></a></h2>
-			<?php if( ! empty($data['alternate_title'])): ?>
-				<h3><?= $data['alternate_title'] ?></h3>
+			<?php if ( ! empty($data['jp_title'])): ?>
+                <h3><?= $data['jp_title'] ?></h3>
+			<?php endif ?>
+			<?php if( ! empty($data['en_title'] && $data['en_title'] !== $data['title'])): ?>
+				<h3><?= $data['en_title'] ?></h3>
 			<?php endif ?>
 
 			<br />
diff --git a/app/views/anime/list.php b/app/views/anime/list.php
index 52de7a01..488feab3 100644
--- a/app/views/anime/list.php
+++ b/app/views/anime/list.php
@@ -1,7 +1,7 @@
 <main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /*if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
-<?php endif ?>
+<?php endif */ ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
@@ -10,9 +10,9 @@
 	<table>
 		<thead>
 			<tr>
-				<?php if($auth->is_authenticated()): ?>
+				<?php /* if($auth->is_authenticated()): ?>
 				<td class="no_border">&nbsp;</td>
-				<?php endif ?>
+				<?php endif */ ?>
 				<th>Title</th>
 				<th>Airing Status</th>
 				<th>Score</th>
@@ -26,13 +26,13 @@
 		</thead>
 		<tbody>
 			<?php foreach($items as $item): ?>
-			<?php if ($item['private'] && ! $auth->is_authenticated()) continue; ?>
+			<?php if ($item['private']) continue;// && ! $auth->is_authenticated()) continue; ?>
 			<tr id="a-<?= $item['id'] ?>">
-				<?php if ($auth->is_authenticated()): ?>
+				<?php /*if ($auth->is_authenticated()): ?>
 				<td>
 					<a class="bracketed" href="<?= $urlGenerator->url("/anime/edit/{$item['id']}/{$item['watching_status']}") ?>">Edit</a>
 				</td>
-				<?php endif ?>
+				<?php endif*/ ?>
 				<td class="justify">
 					<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
 						<?= $item['anime']['title'] ?>
@@ -73,5 +73,5 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php $group = ($auth->is_authenticated()) ? 'table_edit' : 'table' ?>
+<?php $group = /*($auth->is_authenticated()) ? 'table_edit' :*/ 'table' ?>
 <script src="<?= $urlGenerator->asset_url("js.php/g/{$group}") ?>"></script>
diff --git a/index.php b/index.php
index 1aacb66e..ca589e6f 100644
--- a/index.php
+++ b/index.php
@@ -58,7 +58,7 @@ $whoops->pushHandler($defaultHandler);
 //$whoops->pushHandler($jsonHandler);
 
 // Register as the error handler
-// $whoops->register();
+$whoops->register();
 
 // -----------------------------------------------------------------------------
 // Dependency Injection setup
diff --git a/src/API/GuzzleTrait.php b/src/API/GuzzleTrait.php
index f12b5436..039722ba 100644
--- a/src/API/GuzzleTrait.php
+++ b/src/API/GuzzleTrait.php
@@ -16,18 +16,8 @@
 
 namespace Aviat\AnimeClient\API;
 
-use Psr\Http\Message\ResponseInterface;
-
 /**
  * Base trait for api interaction
- *
- * @method ResponseInterface get(string $uri, array $options);
- * @method ResponseInterface delete(string $uri, array $options);
- * @method ResponseInterface head(string $uri, array $options);
- * @method ResponseInterface options(string $uri, array $options);
- * @method ResponseInterface patch(string $uri, array $options);
- * @method ResponseInterface post(string $uri, array $options);
- * @method ResponseInterface put(string $uri, array $options);
  */
 trait GuzzleTrait {
     /**
@@ -48,39 +38,4 @@ trait GuzzleTrait {
      * @return void
      */
     abstract protected function init();
-
-    /**
-     * Magic methods to call guzzle api client
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return ResponseInterface|null
-     */
-    public function __call($method, $args)
-    {
-        $valid_methods = [
-            'get',
-            'getAsync',
-            'delete',
-            'deleteAsync',
-            'head',
-            'headAsync',
-            'options',
-            'optionsAsync',
-            'patch',
-            'patchAsync',
-            'post',
-            'postAsync',
-            'put',
-            'putAsync'
-        ];
-
-        if ( ! in_array($method, $valid_methods))
-        {
-            return NULL;
-        }
-
-        array_unshift($args, strtoupper($method));
-        return call_user_func_array([$this->client, 'request'], $args);
-    }
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/Enum/AnimeWatchingStatus.php b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
index 7cfe3883..850aece1 100644
--- a/src/API/Kitsu/Enum/AnimeWatchingStatus.php
+++ b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
@@ -22,10 +22,10 @@ use Aviat\Ion\Enum as BaseEnum;
  * Possible values for watching status for the current anime
  */
 class AnimeWatchingStatus extends BaseEnum {
-	const WATCHING = 'current';
-	const PLAN_TO_WATCH = 'planned';
-	const COMPLETED = 'completed';
-	const ON_HOLD = 'on_hold';
-	const DROPPED = 'dropped';
+	const WATCHING = 1;
+	const PLAN_TO_WATCH = 2;
+	const COMPLETED = 3;
+	const ON_HOLD = 4;
+	const DROPPED = 5;
 }
-// End of AnimeWatchingStatus.php
+// End of AnimeWatchingStatus.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 3ade0674..4b08f76a 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -16,8 +16,10 @@
 
 namespace Aviat\AnimeClient\API\Kitsu;
 
-use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\AnimeClient\API\Kitsu\Transformer\{AnimeTransformer, AnimeListTransformer};
 use Aviat\Ion\Json;
+use GuzzleHttp\Exception\ClientException;
 
 /**
  * Kitsu API Model
@@ -38,11 +40,20 @@ class KitsuModel {
 	 */
 	protected $animeListTransformer;
 
+	/**
+	 * @var AnimeTransformer
+	 */
+	protected $animeTransformer;
+
+	/**
+	 * KitsuModel constructor.
+	 */
 	public function __construct()
 	{
 		// Set up Guzzle trait
 		$this->init();
 
+		$this->animeTransformer = new AnimeTransformer();
 		$this->animeListTransformer = new AnimeListTransformer();
 	}
 
@@ -55,7 +66,7 @@ class KitsuModel {
 	 */
 	public function authenticate(string $username, string $password)
 	{
-		$response = $this->post('https://kitsu.io/api/oauth/token', [
+		$data = $this->postRequest(AnimeClient::KITSU_AUTH_URL, [
 			'body' => http_build_query([
 				'grant_type' => 'password',
 				'username' => $username,
@@ -65,9 +76,7 @@ class KitsuModel {
 			])
 		]);
 
-		$info = JSON::decode($response->getBody());
-
-		if (array_key_exists('access_token', $info)) {
+		if (array_key_exists('access_token', $data)) {
 			// @TODO save token
 			return true;
 		}
@@ -75,41 +84,79 @@ class KitsuModel {
 		return false;
 	}
 
-	public function getAnimeMedia($entryId): array {
-		$response = $this->get("library-entries/{$entryId}/media", [
-			'headers' => [
-				'client_id' => self::CLIENT_ID,
-				'client_secret' => self::CLIENT_SECRET
-			]
-		]);
 
-		return JSON::decode($response->getBody(), TRUE);
+
+	public function getAnimeGenres($animeId): array
+	{
+		return $this->getGenres('anime', $animeId);
 	}
 
-	public function getAnimeList(): array {
-		$response = $this->get('library-entries', [
-			'headers' => [
-				'client_id' => self::CLIENT_ID,
-				'client_secret' => self::CLIENT_SECRET
-			],
+	public function getMangaGenres($mangaId): array
+	{
+		return $this->getGenres('manga', $mangaId);
+	}
+
+	public function getAnime(string $animeId): array
+	{
+		$baseData = $this->getRawAnimeData($animeId);
+		return $this->animeTransformer->transform($baseData);
+	}
+
+	public function getRawAnimeData($animeId): array
+	{
+		return $this->getRawMediaData('anime', $animeId);
+	}
+
+	public function getAnimeMedia($entryId): array
+	{
+		return $this->getRequest("library-entries/{$entryId}/media");
+	}
+
+	public function getAnimeList($status): array
+	{
+		$options = [
 			'query' => [
 				'filter' => [
 					'user_id' => 2644,
-					'media_type' => 'Anime'
+					'media_type' => 'Anime',
+					'status' => $status,
 				],
-				'include' => 'media'
+				'include' => 'media,user',
+				'page' => [
+					'offset' => 0,
+					'limit' => 200
+				],
+				'sort' => '-updated_at'
 			]
-		]);
+		];
 
-		$data = JSON::decode($response->getBody(), TRUE);
+		$data = $this->getRequest('library-entries', $options);
 
 		foreach($data['data'] as &$item)
 		{
-			$item['anime'] = $this->getAnimeMedia($item['id'])['data']['attributes'];
+			$item['anime'] = $this->getRawAnimeData($item['relationships']['media']['data']['id']);
 		}
 
 		$transformed = $this->animeListTransformer->transformCollection($data['data']);
 
 		return $transformed;
 	}
+
+	private function getGenres(string $type, string $id): array
+	{
+		$data = $this->getRequest("{$type}/{$id}/genres");
+		$rawGenres = array_pluck($data['data'], 'attributes');
+		$genres = array_pluck($rawGenres, 'name');
+
+		return $genres;
+	}
+
+	private function getRawMediaData(string $type, string $id): array
+	{
+		$data = $this->getRequest("{$type}/{$id}");
+		$baseData = $data['data']['attributes'];
+		$baseData['genres'] = $this->getGenres($type, $id);
+
+		return $baseData;
+	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 569597d0..7ab08b3c 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -17,10 +17,15 @@
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\API\GuzzleTrait;
+use Aviat\Ion\Di\ContainerAware;
+use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
+use InvalidArgumentException;
+use RuntimeException;
 
 trait KitsuTrait {
+	use ContainerAware;
 	use GuzzleTrait;
 
 	/**
@@ -53,4 +58,75 @@ trait KitsuTrait {
 			]
 		]);
 	}
+
+	/**
+	 * Make a request via Guzzle
+	 *
+	 * @param string $type
+	 * @param string $url
+	 * @param array $options
+	 * @return array
+	 */
+	private function request(string $type, string $url, array $options = []): array
+	{
+		$validTypes = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
+
+		if ( ! in_array($type, $validTypes))
+		{
+			throw new InvalidArgumentException('Invalid http request type');
+		}
+
+		$logger = NULL;
+
+		if ($this->getContainer())
+		{
+			$logger = $this->container->getLogger('default');
+		}
+
+		$defaultOptions = [
+			'headers' => [
+				'client_id' => 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd',
+				'client_secret' => '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151'
+			]
+		];
+
+		$options = array_merge($defaultOptions, $options);
+
+		$response = $this->client->request($type, $url, $options);
+
+		if ((int) $response->getStatusCode() !== 200)
+		{
+			if ($logger)
+			{
+				$logger->warning('Non 200 response for api call');
+				$logger->warning($response->getBody());
+			}
+
+			throw new RuntimeException($response);
+		}
+
+		return JSON::decode($response->getBody(), TRUE);
+	}
+
+	/**
+	 * Remove some boilerplate for get requests
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	protected function getRequest(...$args): array
+	{
+		return $this->request('GET', ...$args);
+	}
+
+	/**
+	 * Remove some boilerplate for get requests
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	protected function postRequest(...$args): array
+	{
+		return $this->request('POST', ...$args);
+	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index ae202f3d..d4cb9bf5 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -33,11 +33,9 @@ class AnimeListTransformer extends AbstractTransformer {
 	public function transform($item)
 	{
 /* ?><pre><?= print_r($item, TRUE) ?></pre><?php
-die(); */
-		// $anime = [];
-		$genres = [];
+die();*/
 		$anime =& $item['anime'];
-		// $genres = $this->linearizeGenres($item['anime']['genres']); */
+		$genres = $item['anime']['genres'] ?? [];
 
 		$rating = (int) 2 * $item['attributes']['rating'];
 
@@ -75,17 +73,17 @@ die(); */
 				'age_rating' => $anime['ageRating'],
 				'title' => $anime['canonicalTitle'],
 				'alternate_title' => $alternate_title,
-				'slug' => $anime['slug'],
+				'slug' => $item['relationships']['media']['data']['id'],//$anime['slug'],
 				'url' => $anime['url'] ?? '',
 				'type' => $anime['showType'],
 				'image' => $anime['posterImage']['small'],
-				'genres' => [],//$genres,
+				'genres' => $genres,
 			],
 			'watching_status' => $item['attributes']['status'],
 			'notes' => $item['attributes']['notes'],
 			'rewatching' => (bool) $item['attributes']['reconsuming'],
 			'rewatched' => (int) $item['attributes']['reconsumeCount'],
-			'user_rating' => $rating,
+			'user_rating' => ($rating === 0) ? '-' : $rating,
 			'private' => (bool) $item['attributes']['private'] ?? false,
 		];
 	}
@@ -123,23 +121,5 @@ die(); */
 			'privacy' => $privacy
 		];
 	}
-
-	/**
-	 * Simplify structure of genre list
-	 *
-	 * @param  array  $rawGenres
-	 * @return array
-	 */
-	protected function linearizeGenres(array $rawGenres): array
-	{
-		$genres = [];
-
-		foreach ($rawGenres as $genre)
-		{
-			$genres[] = $genre['name'];
-		}
-
-		return $genres;
-	}
 }
 // End of AnimeListTransformer.php
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeTransformer.php b/src/API/Kitsu/Transformer/AnimeTransformer.php
new file mode 100644
index 00000000..4e08ee8c
--- /dev/null
+++ b/src/API/Kitsu/Transformer/AnimeTransformer.php
@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Transformer for anime description page
+ */
+class AnimeTransformer extends AbstractTransformer {
+
+    /**
+     * Convert raw api response to a more
+     * logical and workable structure
+     *
+     * @param  array  $item API library item
+     * @return array
+     */
+    public function transform($item)
+    {
+    	sort($item['genres']);
+
+        return [
+            'title' => $item['canonicalTitle'],
+			'en_title' => $item['titles']['en_jp'],
+			'jp_title' => $item['titles']['ja_jp'],
+			'cover_image' => $item['posterImage']['small'],
+			'show_type' => $item['showType'],
+			'episode_count' => $item['episodeCount'],
+			'episode_length' => $item['episodeLength'],
+			'synopsis' => $item['synopsis'],
+			'age_rating' => $item['ageRating'],
+			'age_rating_guide' => $item['ageRatingGuide'],
+			'url' => "https://kitsu.io/anime/{$item['slug']}",
+			'genres' => $item['genres'],
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 4188e1f4..1453655f 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -36,7 +36,7 @@ class Anime extends BaseController {
 	protected $model;
 
 	/**
-	 * Data to ve sent to all routes in this controller
+	 * Data to be sent to all routes in this controller
 	 * @var array $base_data
 	 */
 	protected $base_data;
@@ -71,19 +71,19 @@ class Anime extends BaseController {
 	/**
 	 * Show a portion, or all of the anime list
 	 *
-	 * @param string $type - The section of the list
+	 * @param string|int $type - The section of the list
 	 * @param string $view - List or cover view
 	 * @return void
 	 */
-	public function index($type = "watching", $view = '')
+	public function index($type = AnimeWatchingStatus::WATCHING, string $view = NULL)
 	{
 		$type_title_map = [
 			'all' => 'All',
-			'watching' => 'Currently Watching',
-			'plan_to_watch' => 'Plan to Watch',
-			'on_hold' => 'On Hold',
-			'dropped' => 'Dropped',
-			'completed' => 'Completed'
+			AnimeWatchingStatus::WATCHING => 'Currently Watching',
+			AnimeWatchingStatus::PLAN_TO_WATCH => 'Plan to Watch',
+			AnimeWatchingStatus::ON_HOLD => 'On Hold',
+			AnimeWatchingStatus::DROPPED => 'Dropped',
+			AnimeWatchingStatus::COMPLETED => 'Completed'
 		];
 
 		$model_map = [
@@ -106,8 +106,8 @@ class Anime extends BaseController {
 		];
 
 		$data = ($type !== 'all')
-			? $this->cache->get($this->model, 'get_list', ['status' => $model_map[$type]])
-			: $this->cache->get($this->model, 'get_all_lists', []);
+			? $this->model->get_list($model_map[$type])
+			: $this->model->get_all_lists();
 
 		$this->outputHTML('anime/' . $view_map[$view], [
 			'title' => $title,
@@ -161,7 +161,7 @@ class Anime extends BaseController {
 		if (intval($result['statusCode']) === 201)
 		{
 			$this->set_flash_message('Added new anime to list', 'success');
-			$this->cache->purge();
+			// $this->cache->purge();
 		}
 		else
 		{
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index e3b9959f..80de9952 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -15,10 +15,7 @@
  */
 
 namespace Aviat\AnimeClient\Model;
-
-use Aviat\AnimeClient\API\Kitsu\KitsuModel;
 use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
-use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Json;
 
@@ -53,10 +50,14 @@ class Anime extends API {
 		AnimeWatchingStatus::COMPLETED => self::COMPLETED,
 	];
 
+	/**
+	 * Anime constructor.
+	 * @param ContainerInterface $container
+	 */
 	public function __construct(ContainerInterface $container) {
 		parent::__construct($container);
 
-		$this->kitsuModel = new KitsuModel();
+		$this->kitsuModel = $container->get('kitsu-model');
 	}
 
 	/**
@@ -152,11 +153,8 @@ class Anime extends API {
 	 */
 	public function get_list($status)
 	{
-		$data = $this->kitsuModel->getAnimeList();
-		//return JSON::decode((string)$stream, TRUE);
-
-		/*$data = $this->_get_list_from_api($status);
-		$this->sort_by_name($data, 'anime');*/
+		$data = $this->kitsuModel->getAnimeList($status);
+		$this->sort_by_name($data, 'anime');
 
 		$output = [];
 		$output[$this->const_map[$status]] = $data;
@@ -172,15 +170,7 @@ class Anime extends API {
 	 */
 	public function get_anime($anime_id)
 	{
-		$config = [
-			'query' => [
-				'id' => $anime_id
-			]
-		];
-
-		$response = $this->client->get("anime/{$anime_id}", $config);
-
-		return Json::decode($response->getBody(), TRUE);
+        return $this->kitsuModel->getAnime($anime_id);
 	}
 
 	/**
@@ -213,43 +203,6 @@ class Anime extends API {
 		return Json::decode($response->getBody(), TRUE);
 	}
 
-	/**
-	 * Retrieve data from the api
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $status
-	 * @return array
-	 */
-	protected function _get_list_from_api(string $status = "all"): array
-	{
-		$config = [
-			'allow_redirects' => FALSE
-		];
-
-		if ($status !== 'all')
-		{
-			$config['query']['status'] = $status;
-		}
-
-		$username = $this->config->get('hummingbird_username');
-		$auth = $this->container->get('auth');
-		if ($auth->is_authenticated())
-		{
-			$config['query']['auth_token'] = $auth->get_auth_token();
-		}
-
-		$response = $this->get("library-entries?filter[media_type]=Anime&filter[user_id]=2644&filter[status]=1,2&include=media", $config);
-		$output = $this->transform($status, $response);
-
-		$util = $this->container->get('util');
-		foreach ($output as &$row)
-		{
-			$row['anime']['image'] = $util->get_cached_image($row['anime']['image'], $row['anime']['slug'], 'anime');
-		}
-
-		return $output;
-	}
-
 	/**
 	 * Get the full list from the api
 	 *
@@ -266,20 +219,5 @@ class Anime extends API {
 		$response = $this->get("users/{$username}/library", $config);
 		return Json::decode($response->getBody(), TRUE);
 	}
-
-	/**
-	 * Handle transforming of api data
-	 *
-	 * @param string $status
-	 * @param \GuzzleHttp\Message\Response $response
-	 * @return array
-	 */
-	protected function transform($status, $response)
-	{
-		$api_data = Json::decode($response->getBody(), TRUE);
-		$transformer = new AnimeListTransformer();
-		$transformed = $transformer->transformCollection($api_data);
-		return $transformed;
-	}
 }
 // End of AnimeModel.php
\ No newline at end of file

From 9bd5d62ca77cbdc9a4f056ad499ca23045770825 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 3 Jan 2017 20:29:43 -0500
Subject: [PATCH 53/65] Remove some old code to better make way for kitsu/MAL
 api integration

---
 src/API/Kitsu/KitsuModel.php                  |  18 +--
 src/API/Kitsu/KitsuTrait.php                  |  13 +-
 .../Transformer/AnimeListTransformer.php      |  24 +--
 src/Model/API.php                             | 124 ----------------
 src/Model/Anime.php                           | 138 ------------------
 5 files changed, 27 insertions(+), 290 deletions(-)

diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 4b08f76a..ac13e17a 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -84,18 +84,6 @@ class KitsuModel {
 		return false;
 	}
 
-
-
-	public function getAnimeGenres($animeId): array
-	{
-		return $this->getGenres('anime', $animeId);
-	}
-
-	public function getMangaGenres($mangaId): array
-	{
-		return $this->getGenres('manga', $mangaId);
-	}
-
 	public function getAnime(string $animeId): array
 	{
 		$baseData = $this->getRawAnimeData($animeId);
@@ -121,7 +109,7 @@ class KitsuModel {
 					'media_type' => 'Anime',
 					'status' => $status,
 				],
-				'include' => 'media,user',
+				'include' => 'media',
 				'page' => [
 					'offset' => 0,
 					'limit' => 200
@@ -132,9 +120,9 @@ class KitsuModel {
 
 		$data = $this->getRequest('library-entries', $options);
 
-		foreach($data['data'] as &$item)
+		foreach($data['data'] as $i => &$item)
 		{
-			$item['anime'] = $this->getRawAnimeData($item['relationships']['media']['data']['id']);
+			$item['anime'] = $data['included'][$i];
 		}
 
 		$transformed = $this->animeListTransformer->transformCollection($data['data']);
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 7ab08b3c..d911454b 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -120,7 +120,7 @@ trait KitsuTrait {
 	}
 
 	/**
-	 * Remove some boilerplate for get requests
+	 * Remove some boilerplate for post requests
 	 *
 	 * @param array $args
 	 * @return array
@@ -129,4 +129,15 @@ trait KitsuTrait {
 	{
 		return $this->request('POST', ...$args);
 	}
+
+	/**
+	 * Remove some boilerplate for delete requests
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	protected function deleteRequest(...$args): array
+	{
+		return $this->request('DELETE', ...$args);
+	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index d4cb9bf5..15fcaded 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -33,18 +33,18 @@ class AnimeListTransformer extends AbstractTransformer {
 	public function transform($item)
 	{
 /* ?><pre><?= print_r($item, TRUE) ?></pre><?php
-die();*/
+// die(); */
 		$anime =& $item['anime'];
 		$genres = $item['anime']['genres'] ?? [];
 
 		$rating = (int) 2 * $item['attributes']['rating'];
 
-		$total_episodes = is_numeric($anime['episodeCount'])
-			? $anime['episodeCount']
+		$total_episodes = array_key_exists('episodeCount', $item['anime'])
+			? (int) $anime['episodeCount']
 			: '-';
 
 		$alternate_title = NULL;
-		if (array_key_exists('en_jp', $anime['titles']))
+		if (array_key_exists('titles', $item['anime']) && array_key_exists('en_jp', $anime['titles']))
 		{
 			// If the alternate title is very similar, or
 			// a subset of the main title, don't list the
@@ -62,21 +62,21 @@ die();*/
 			'episodes' => [
 				'watched' => $item['attributes']['progress'],
 				'total' => $total_episodes,
-				'length' => $anime['episodeLength'],
+				'length' => $anime['attributes']['episodeLength'],
 			],
 			'airing' => [
 				'status' => $anime['status'] ?? '',
-				'started' => $anime['startDate'],
-				'ended' => $anime['endDate']
+				'started' => $anime['attributes']['startDate'],
+				'ended' => $anime['attributes']['endDate']
 			],
 			'anime' => [
-				'age_rating' => $anime['ageRating'],
-				'title' => $anime['canonicalTitle'],
+				'age_rating' => $anime['attributes']['ageRating'],
+				'title' => $anime['attributes']['canonicalTitle'],
 				'alternate_title' => $alternate_title,
 				'slug' => $item['relationships']['media']['data']['id'],//$anime['slug'],
-				'url' => $anime['url'] ?? '',
-				'type' => $anime['showType'],
-				'image' => $anime['posterImage']['small'],
+				'url' => $anime['attributes']['url'] ?? '',
+				'type' => $anime['attributes']['showType'],
+				'image' => $anime['attributes']['posterImage']['small'],
 				'genres' => $genres,
 			],
 			'watching_status' => $item['attributes']['status'],
diff --git a/src/Model/API.php b/src/Model/API.php
index ef4bd113..6c1bc399 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -16,23 +16,11 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\AnimeClient;
 use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
 use Aviat\Ion\Model;
-use GuzzleHttp\Client;
-use GuzzleHttp\Cookie\CookieJar;
-use Psr\Http\Message\ResponseInterface;
 
 /**
  * Base model for api interaction
- *
- * @method ResponseInterface get(string $uri, array $options);
- * @method ResponseInterface delete(string $uri, array $options);
- * @method ResponseInterface head(string $uri, array $options);
- * @method ResponseInterface options(string $uri, array $options);
- * @method ResponseInterface patch(string $uri, array $options);
- * @method ResponseInterface post(string $uri, array $options);
- * @method ResponseInterface put(string $uri, array $options);
  */
 class API extends Model {
 
@@ -44,24 +32,6 @@ class API extends Model {
 	 */
 	protected $config;
 
-	/**
-	 * Base url for making api requests
-	 * @var string
-	 */
-	protected $base_url = '';
-
-	/**
-	 * The Guzzle http client object
-	 * @var object
-	 */
-	protected $client;
-
-	/**
-	 * Cookie jar object for api requests
-	 * @var object
-	 */
-	protected $cookieJar;
-
 	/**
 	 * Cache manager
 	 * @var \Aviat\Ion\Cache\CacheInterface
@@ -83,87 +53,6 @@ class API extends Model {
 	{
 		$this->container = $container;
 		$this->config = $container->get('config');
-		$this->cache = $container->get('cache');
-		$this->init();
-	}
-
-	/**
-	 * Set up the class properties
-	 *
-	 * @return void
-	 */
-	protected function init()
-	{
-		$this->cookieJar = new CookieJar();
-		$this->client = new Client([
-			'base_uri' => $this->base_url,
-			'cookies' => TRUE,
-			'http_errors' => FALSE,
-			'defaults' => array_merge([
-				'cookies' => $this->cookieJar,
-				'headers' => [
-					'User-Agent' => "Tim's Anime Client/4.0",
-					'Accept-Encoding' => 'application/vnd.api+json',
-					'Content-Type' => 'application/vnd.api+json'
-				],
-				'timeout' => 25,
-				'connect_timeout' => 25
-			], $this->connectionDefaults)
-		]);
-	}
-
-	/**
-	 * Magic methods to call guzzle api client
-	 *
-	 * @param  string $method
-	 * @param  array $args
-	 * @return ResponseInterface|null
-	 */
-	public function __call($method, $args)
-	{
-		$valid_methods = [
-			'get',
-			'getAsync',
-			'delete',
-			'deleteAsync',
-			'head',
-			'headAsync',
-			'options',
-			'optionsAsync',
-			'patch',
-			'patchAsync',
-			'post',
-			'postAsync',
-			'put',
-			'putAsync'
-		];
-
-		if ( ! in_array($method, $valid_methods))
-		{
-			return NULL;
-		}
-
-		array_unshift($args, strtoupper($method));
-		return call_user_func_array([$this->client, 'request'], $args);
-	}
-
-	/**
-	 * Get the data for the specified library entry
-	 *
-	 * @param  string $id
-	 * @param  string $status
-	 * @return array
-	 */
-	public function get_library_item($id, $status)
-	{
-		$data = $this->_get_list_from_api($status);
-		$index_array = array_column($data, 'id');
-
-		$key = array_search($id, $index_array);
-
-		return $key !== FALSE
-			? $data[$key]
-			: [];
 	}
 
 	/**
@@ -185,18 +74,5 @@ class API extends Model {
 
 		array_multisort($sort, SORT_ASC, $array);
 	}
-
-	/**
-	 * Dummy function that should be abstract. Is not abstract because
-	 * this class is used concretely for authorizing API calls
-	 *
-	 * @TODO Refactor, and make this abstract
-	 * @param  string $status
-	 * @return array
-	 */
-	protected function _get_list_from_api(string $status): array
-	{
-		return [];
-	}
 }
 // End of BaseApiModel.php
\ No newline at end of file
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 80de9952..36bc3d99 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -32,12 +32,6 @@ class Anime extends API {
 	const ON_HOLD = 'On Hold';
 	const COMPLETED = 'Completed';
 
-	/**
-	 * The base url for api requests
-	 * @var string $base_url
-	 */
-	protected $base_url = "https://kitsu.io/api/edge/";
-
 	/**
 	 * Map of API status constants to display constants
 	 * @var array
@@ -60,91 +54,6 @@ class Anime extends API {
 		$this->kitsuModel = $container->get('kitsu-model');
 	}
 
-	/**
-	 * Update the selected anime
-	 *
-	 * @param array $data
-	 * @return array|false
-	 */
-	public function update($data)
-	{
-		$auth = $this->container->get('auth');
-		if ( ! $auth->is_authenticated() OR ! array_key_exists('id', $data))
-		{
-			return FALSE;
-		}
-
-		$id = $data['id'];
-		$data['auth_token'] = $auth->get_auth_token();
-
-		$response = $this->client->post("libraries/{$id}", [
-			'form_params' => $data
-		]);
-
-		return [
-			'statusCode' => $response->getStatusCode(),
-			'body' => Json::decode($response->getBody(), TRUE)
-		];
-	}
-
-	/**
-	 * Remove an anime from a list
-	 *
-	 * @param  array $data
-	 * @return array|false
-	 */
-	public function delete($data)
-	{
-		$auth = $this->container->get('auth');
-		if ( ! $auth->is_authenticated() OR ! array_key_exists('id', $data))
-		{
-			return FALSE;
-		}
-
-		$id = $data['id'];
-		$data['auth_token'] = $auth->get_auth_token();
-
-		$response = $this->client->post("libraries/{$id}/remove", [
-			'form_params' => $data
-		]);
-
-		return [
-			'statusCode' => $response->getStatusCode(),
-			'body' => Json::decode($response->getBody(), TRUE)
-		];
-	}
-
-	/**
-	 * Get the full set of anime lists
-	 *
-	 * @return array
-	 */
-	public function get_all_lists()
-	{
-		$output = [
-			self::WATCHING => [],
-			self::PLAN_TO_WATCH => [],
-			self::ON_HOLD => [],
-			self::DROPPED => [],
-			self::COMPLETED => [],
-		];
-
-		$data = $this->_get_list_from_api();
-
-		foreach ($data as $datum)
-		{
-			$output[$this->const_map[$datum['watching_status']]][] = $datum;
-		}
-
-		// Sort anime by name
-		foreach ($output as &$status_list)
-		{
-			$this->sort_by_name($status_list, 'anime');
-		}
-
-		return $output;
-	}
-
 	/**
 	 * Get a category out of the full list
 	 *
@@ -172,52 +81,5 @@ class Anime extends API {
 	{
         return $this->kitsuModel->getAnime($anime_id);
 	}
-
-	/**
-	 * Search for anime by name
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \RuntimeException
-	 */
-	public function search($name)
-	{
-		$logger = $this->container->getLogger('default');
-
-		$config = [
-			'query' => [
-				'query' => $name
-			]
-		];
-
-		$response = $this->get('search/anime', $config);
-
-		if ((int) $response->getStatusCode() !== 200)
-		{
-			$logger->warning("Non 200 response for search api call");
-			$logger->warning($response->getBody());
-
-			throw new \RuntimeException($response->getEffectiveUrl());
-		}
-
-		return Json::decode($response->getBody(), TRUE);
-	}
-
-	/**
-	 * Get the full list from the api
-	 *
-	 * @return array
-	 */
-	public function get_raw_list()
-	{
-		$config = [
-			'allow_redirects' => FALSE
-		];
-
-		$username = $this->config->get('hummingbird_username');
-
-		$response = $this->get("users/{$username}/library", $config);
-		return Json::decode($response->getBody(), TRUE);
-	}
 }
 // End of AnimeModel.php
\ No newline at end of file

From 772aeae20f87db721f4caa80895c893a4ac1a90b Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 3 Jan 2017 21:06:49 -0500
Subject: [PATCH 54/65] Start of changes for Manga list

---
 app/config/menus.php                          |   4 +-
 app/views/manga/cover.php                     |  16 +-
 app/views/manga/list.php                      |  12 +-
 src/API/Kitsu/Enum/MangaReadingStatus.php     |  10 +-
 src/API/Kitsu/KitsuModel.php                  |  40 ++++-
 .../Transformer/MangaListTransformer.php      |  15 +-
 .../Kitsu/Transformer/MangaTransformer.php    |  39 +++++
 src/Model/Manga.php                           | 142 ++----------------
 8 files changed, 121 insertions(+), 157 deletions(-)
 create mode 100644 src/API/Kitsu/Transformer/MangaTransformer.php

diff --git a/app/config/menus.php b/app/config/menus.php
index e9fb72b7..6e349eba 100644
--- a/app/config/menus.php
+++ b/app/config/menus.php
@@ -23,7 +23,7 @@ return [
 			'on_hold' => '/on_hold',
 			'dropped' => '/dropped',
 			'completed' => '/completed',
-			'all' => '/all'
+			//'all' => '/all'
 		]
 	],
 	'manga_list' => [
@@ -34,7 +34,7 @@ return [
 			'on_hold' => '/on_hold',
 			'dropped' => '/dropped',
 			'completed' => '/completed',
-			'all' => '/all'
+			//'all' => '/all'
 		]
 	]
 ];
\ No newline at end of file
diff --git a/app/views/manga/cover.php b/app/views/manga/cover.php
index 2bb8498e..69b7fb63 100644
--- a/app/views/manga/cover.php
+++ b/app/views/manga/cover.php
@@ -1,7 +1,7 @@
 <main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /* if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $urlGenerator->url('manga/add') ?>">Add Item</a>
-<?php endif ?>
+<?php endif */ ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
@@ -11,12 +11,12 @@
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
 				<article class="media" id="manga-<?= $item['id'] ?>">
-					<?php if ($auth->is_authenticated()): ?>
+					<?php /*if ($auth->is_authenticated()): ?>
 					<div class="edit_buttons" hidden>
 						<button class="plus_one_chapter">+1 Chapter</button>
 						<button class="plus_one_volume">+1 Volume</button>
 					</div>
-					<?php endif ?>
+					<?php endif */ ?>
 					<img src="<?= $escape->attr($item['manga']['image']) ?>" />
 					<div class="name">
 						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
@@ -25,13 +25,13 @@
 						</a>
 					</div>
 					<div class="table">
-						<?php if ($auth->is_authenticated()): ?>
+						<?php /*if ($auth->is_authenticated()): ?>
 						<div class="row">
 							<span class="edit">
 								<a class="bracketed" title="Edit information about this manga" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
 							</span>
 						</div>
-						<?php endif ?>
+						<?php endif */ ?>
 						<div class="row">
 							<div class="user_rating">Rating: <?= $item['user_rating'] ?> / 10</div>
 						</div>
@@ -55,6 +55,6 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /*if ($auth->is_authenticated()): ?>
 <script src="<?= $urlGenerator->asset_url('js.php/g/edit') ?>"></script>
-<?php endif ?>
+<?php endif*/ ?>
diff --git a/app/views/manga/list.php b/app/views/manga/list.php
index a0b35bd2..481d85e7 100644
--- a/app/views/manga/list.php
+++ b/app/views/manga/list.php
@@ -1,7 +1,7 @@
 <main>
-<?php if ($auth->is_authenticated()): ?>
+<?php /*if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $urlGenerator->url('manga/add') ?>">Add Item</a>
-<?php endif ?>
+<?php endif*/ ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
@@ -10,9 +10,9 @@
 	<table>
 		<thead>
 			<tr>
-				<?php if ($auth->is_authenticated()): ?>
+				<?php /*if ($auth->is_authenticated()): ?>
 				<th>&nbsp;</th>
-				<?php endif ?>
+				<?php endif*/ ?>
 				<th>Title</th>
 				<th>Rating</th>
 				<th>Chapters</th>
@@ -23,11 +23,11 @@
 		<tbody>
 			<?php foreach($items as $item): ?>
 			<tr id="manga-<?= $item['id'] ?>">
-				<?php if($auth->is_authenticated()): ?>
+				<?php /*if($auth->is_authenticated()): ?>
 				<td>
 					<a class="bracketed" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
 				</td>
-				<?php endif ?>
+				<?php endif*/ ?>
 				<td class="align_left">
 					<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
 						<?= $item['manga']['title'] ?>
diff --git a/src/API/Kitsu/Enum/MangaReadingStatus.php b/src/API/Kitsu/Enum/MangaReadingStatus.php
index 288ffe74..9d7f43e6 100644
--- a/src/API/Kitsu/Enum/MangaReadingStatus.php
+++ b/src/API/Kitsu/Enum/MangaReadingStatus.php
@@ -22,10 +22,10 @@ use Aviat\Ion\Enum as BaseEnum;
  * Possible values for current reading status of manga
  */
 class MangaReadingStatus extends BaseEnum {
-	const READING = 'Currently Reading';
-	const PLAN_TO_READ = 'Plan to Read';
-	const DROPPED = 'Dropped';
-	const ON_HOLD = 'On Hold';
-	const COMPLETED = 'Completed';
+	const READING = 1;
+	const PLAN_TO_READ = 2;
+	const DROPPED = 3;
+	const ON_HOLD = 4;
+	const COMPLETED = 5;
 }
 // End of MangaReadingStatus.php
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index ac13e17a..86c769a5 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -17,7 +17,9 @@
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
-use Aviat\AnimeClient\API\Kitsu\Transformer\{AnimeTransformer, AnimeListTransformer};
+use Aviat\AnimeClient\API\Kitsu\Transformer\{
+    AnimeTransformer, AnimeListTransformer, MangaListTransformer
+};
 use Aviat\Ion\Json;
 use GuzzleHttp\Exception\ClientException;
 
@@ -45,6 +47,11 @@ class KitsuModel {
 	 */
 	protected $animeTransformer;
 
+    /**
+     * @var MangaListTransformer
+     */
+	protected $mangaListTransformer;
+
 	/**
 	 * KitsuModel constructor.
 	 */
@@ -55,6 +62,7 @@ class KitsuModel {
 
 		$this->animeTransformer = new AnimeTransformer();
 		$this->animeListTransformer = new AnimeListTransformer();
+		$this->mangaListTransformer = new MangaListTransformer();
 	}
 
 	/**
@@ -130,6 +138,36 @@ class KitsuModel {
 		return $transformed;
 	}
 
+	public function getMangaList($status): array
+    {
+        $options = [
+            'query' => [
+                'filter' => [
+                    'user_id' => 2644,
+                    'media_type' => 'Manga',
+                    'status' => $status,
+                ],
+                'include' => 'media',
+                'page' => [
+                    'offset' => 0,
+                    'limit' => 200
+                ],
+                'sort' => '-updated_at'
+            ]
+        ];
+
+        $data = $this->getRequest('library-entries', $options);
+        
+        foreach($data['data'] as $i => &$item)
+        {
+            $item['manga'] = $data['included'][$i];
+        }
+
+        $transformed = $this->mangaListTransformer->transformCollection($data['data']);
+
+        return $transformed;
+    }
+
 	private function getGenres(string $type, string $id): array
 	{
 		$data = $this->getRequest("{$type}/{$id}/genres");
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index 79d70182..2a43be63 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
 
+use Aviat\Ion\StringWrapper;
 use Aviat\Ion\Transformer\AbstractTransformer;
 
 /**
@@ -23,7 +24,7 @@ use Aviat\Ion\Transformer\AbstractTransformer;
  */
 class MangaListTransformer extends AbstractTransformer {
 
-	use \Aviat\Ion\StringWrapper;
+	use StringWrapper;
 
 	/**
 	 * Remap zipped anime data to a more logical form
@@ -33,18 +34,20 @@ class MangaListTransformer extends AbstractTransformer {
 	 */
 	public function transform($item)
 	{
+?><pre><?= print_r($item, TRUE) ?></pre><?php
+die();
 		$manga =& $item['manga'];
 
 		$rating = (is_numeric($item['rating']))
 			? intval(2 * $item['rating'])
 			: '-';
 
-		$total_chapters = ($manga['chapter_count'] > 0)
-			? $manga['chapter_count']
-			: '-';
+		$total_chapters = ($manga['attributes']['chapterCount'] > 0)
+			? $manga['attributes']['chapterCount']
+            : '-';
 
-		$total_volumes = ($manga['volume_count'] > 0)
-			? $manga['volume_count']
+		$total_volumes = ($manga['attributes']['volumeCount'] > 0)
+			? $manga['attributes']['volumeCount']
 			: '-';
 
 		$map = [
diff --git a/src/API/Kitsu/Transformer/MangaTransformer.php b/src/API/Kitsu/Transformer/MangaTransformer.php
new file mode 100644
index 00000000..9c7ac517
--- /dev/null
+++ b/src/API/Kitsu/Transformer/MangaTransformer.php
@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Transformer for anime description page
+ */
+class MangaTransformer extends AbstractTransformer {
+
+    /**
+     * Convert raw api response to a more
+     * logical and workable structure
+     *
+     * @param  array  $item API library item
+     * @return array
+     */
+    public function transform($item)
+    {
+        return [
+
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 75ecb2d8..6b9f7f60 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -18,6 +18,7 @@ namespace Aviat\AnimeClient\Model;
 
 use Aviat\AnimeClient\API\Kitsu\Enum\MangaReadingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer;
+use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Json;
 use GuzzleHttp\Cookie\SetCookie;
 use RuntimeException;
@@ -45,11 +46,12 @@ class Manga extends API {
 		MangaReadingStatus::COMPLETED => self::COMPLETED
 	];
 
-	/**
-	 * The base url for api requests
-	 * @var string
-	 */
-	protected $base_url = "https://hummingbird.me/";
+	public function __construct(ContainerInterface $container)
+    {
+        parent::__construct($container);
+
+        $this->kitsuModel = $container->get('kitsu-model');
+    }
 
 	/**
 	 * Make an authenticated manga API call
@@ -91,85 +93,6 @@ class Manga extends API {
 		];
 	}
 
-	/**
-	 * Add a manga to the list
-	 *
-	 * @param array $data
-	 * @return array
-	 */
-	public function add($data)
-	{
-		$object = [
-			'manga_library_entry' => [
-				'status' => $data['status'],
-				'manga_id' => $data['id']
-			]
-		];
-
-		return $this->_manga_api_call('post', 'manga_library_entries', $object);
-	}
-
-	/**
-	 * Update the selected manga
-	 *
-	 * @param array $data
-	 * @return array
-	 */
-	public function update($data)
-	{
-		$id = $data['id'];
-
-		return $this->_manga_api_call(
-			'put',
-			"manga_library_entries/{$id}",
-			['manga_library_entry' => $data]
-		);
-	}
-
-	/**
-	 * Delete a manga entry
-	 *
-	 * @param  array $data
-	 * @return array
-	 */
-	public function delete($data)
-	{
-		$id = $data['id'];
-
-		return $this->_manga_api_call('delete', "manga_library_entries/{$id}");
-	}
-
-	/**
-	 * Search for manga by name
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws RuntimeException
-	 */
-	public function search($name)
-	{
-		$logger = $this->container->getLogger('default');
-
-		$config = [
-			'query' => [
-				'scope' => 'manga',
-				'depth' => 'full',
-				'query' => $name
-			]
-		];
-
-		$response = $this->get('search.json', $config);
-
-		if ((int) $response->getStatusCode() !== 200)
-		{
-			$logger->warning('Non 200 response for search api call');
-			$logger->warning($response->getBody());
-
-			throw new RuntimeException($response->getEffectiveUrl());
-		}
-
-		return Json::decode($response->getBody(), TRUE);
-	}
 
 	/**
 	 * Get a category out of the full list
@@ -179,51 +102,12 @@ class Manga extends API {
 	 */
 	public function get_list($status)
 	{
-		$data = $this->cache->get($this, '_get_list_from_api');
-		return ($status !== 'All') ? $data[$status] : $data;
+	    $data = $this->kitsuModel->getMangaList($status);
+	    return $this->map_by_status($data)[$status];
+		/*$data = $this->cache->get($this, '_get_list_from_api');
+		return ($status !== 'All') ? $data[$status] : $data;*/
 	}
 
-	/**
-	 * Retrieve the list from the hummingbird api
-	 *
-	 * @param  string $status
-	 * @return array
-	 */
-	public function _get_list_from_api(string $status = "All"): array
-	{
-		$config = [
-			'query' => [
-				'user_id' => $this->config->get('hummingbird_username')
-			],
-			'allow_redirects' => FALSE
-		];
-
-		$response = $this->get('manga_library_entries', $config);
-		$data = $this->transform($response);
-		$final = $this->map_by_status($data);
-		return ($status !== 'All') ? $final[$status] : $final;
-	}
-
-	/**
-	 * Transform the response to be more consistent
-	 *
-	 * @param \GuzzleHttp\Message\Response $response
-	 * @codeCoverageIgnore
-	 * @return array
-	 */
-	private function transform($response)
-	{
-		// Bail out early if there isn't any manga data
-		$api_data = Json::decode($response->getBody(), TRUE);
-		if ( ! array_key_exists('manga', $api_data))
-		{
-			return [];
-		}
-
-		$zipperedData = $this->zipperLists($api_data);
-		$transformer = new Transformer\MangaListTransformer();
-		return $transformer->transformCollection($zipperedData);
-	}
 
 	/**
 	 * Get the details of a manga
@@ -257,11 +141,11 @@ class Manga extends API {
 
 		foreach ($data as &$entry)
 		{
-			$entry['manga']['image'] = $util->get_cached_image(
+			/*$entry['manga']['image'] = $util->get_cached_image(
 				$entry['manga']['image'],
 				$entry['manga']['slug'],
 				'manga'
-			);
+			);*/
 			$key = $this->const_map[$entry['reading_status']];
 			$output[$key][] = $entry;
 		}

From 609ba57078f61fc554849f2d7e122c9552701c61 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 4 Jan 2017 13:16:58 -0500
Subject: [PATCH 55/65] Manga lists and detail pages

---
 app/views/manga/cover.php                     |  6 +-
 app/views/manga/details.php                   |  8 +-
 app/views/manga/list.php                      |  6 +-
 src/API/Kitsu/Enum/MangaReadingStatus.php     |  6 +-
 src/API/Kitsu/KitsuModel.php                  | 70 +++++++-------
 .../Transformer/MangaListTransformer.php      | 51 ++++------
 .../Kitsu/Transformer/MangaTransformer.php    | 92 +++++++++++--------
 src/Controller/Manga.php                      |  4 +-
 src/Model/Manga.php                           | 40 ++++----
 9 files changed, 146 insertions(+), 137 deletions(-)

diff --git a/app/views/manga/cover.php b/app/views/manga/cover.php
index 69b7fb63..5bcacab6 100644
--- a/app/views/manga/cover.php
+++ b/app/views/manga/cover.php
@@ -14,7 +14,6 @@
 					<?php /*if ($auth->is_authenticated()): ?>
 					<div class="edit_buttons" hidden>
 						<button class="plus_one_chapter">+1 Chapter</button>
-						<button class="plus_one_volume">+1 Volume</button>
 					</div>
 					<?php endif */ ?>
 					<img src="<?= $escape->attr($item['manga']['image']) ?>" />
@@ -43,8 +42,7 @@
 						</div>
 						<div class="row">
 							<div class="volume_completion">
-								Volumes: <span class="volumes_read"><?= $item['volumes']['read'] ?></span> /
-									<span class="volume_count"><?= $item['volumes']['total'] ?></span>
+								Volumes: <span class="volume_count"><?= $item['volumes']['total'] ?></span>
 							</div>
 						</div>
 					</div>
@@ -57,4 +55,4 @@
 </main>
 <?php /*if ($auth->is_authenticated()): ?>
 <script src="<?= $urlGenerator->asset_url('js.php/g/edit') ?>"></script>
-<?php endif*/ ?>
+<?php endif*/ ?>
\ No newline at end of file
diff --git a/app/views/manga/details.php b/app/views/manga/details.php
index 986fca43..2b204b7b 100644
--- a/app/views/manga/details.php
+++ b/app/views/manga/details.php
@@ -1,7 +1,7 @@
 <main class="details">
 	<section class="flex flex-no-wrap">
 		<div>
-			<img class="cover" src="<?= $data['poster_image'] ?>" alt="<?= $data['title'] ?> cover image" />
+			<img class="cover" src="<?= $data['cover_image'] ?>" alt="<?= $data['title'] ?> cover image" />
 			<br />
 			<br />
 			<table>
@@ -26,9 +26,9 @@
 			</table>
 		</div>
 		<div>
-			<h2><a rel="external" href="https://hummingbird.me/manga/<?= $data['id'] ?>"><?= $data['romaji_title'] ?></a></h2>
-			<?php if( ! empty($data['english_title'])): ?>
-				<h3><?= $data['english_title'] ?></h3>
+			<h2><a rel="external" href="<?= $data['url'] ?>"><?= $data['title'] ?></a></h2>
+			<?php if( ! empty($data['en_title'])): ?>
+				<h3><?= $data['en_title'] ?></h3>
 			<?php endif ?>
 
 			<br />
diff --git a/app/views/manga/list.php b/app/views/manga/list.php
index 481d85e7..dbf00076 100644
--- a/app/views/manga/list.php
+++ b/app/views/manga/list.php
@@ -15,8 +15,8 @@
 				<?php endif*/ ?>
 				<th>Title</th>
 				<th>Rating</th>
-				<th>Chapters</th>
-				<th>Volumes</th>
+				<th>Completed Chapters</th>
+				<th># of Volumes</th>
 				<th>Type</th>
 			</tr>
 		</thead>
@@ -36,7 +36,7 @@
 				</td>
 				<td><?= $item['user_rating'] ?> / 10</td>
 				<td><?= $item['chapters']['read'] ?> / <?= $item['chapters']['total'] ?></td>
-				<td><?= $item['volumes']['read'] ?> / <?= $item['volumes']['total'] ?></td>
+				<td><?= $item['volumes']['total'] ?></td>
 				<td><?= $item['manga']['type'] ?></td>
 			</tr>
 			<?php endforeach ?>
diff --git a/src/API/Kitsu/Enum/MangaReadingStatus.php b/src/API/Kitsu/Enum/MangaReadingStatus.php
index 9d7f43e6..20d00712 100644
--- a/src/API/Kitsu/Enum/MangaReadingStatus.php
+++ b/src/API/Kitsu/Enum/MangaReadingStatus.php
@@ -24,8 +24,8 @@ use Aviat\Ion\Enum as BaseEnum;
 class MangaReadingStatus extends BaseEnum {
 	const READING = 1;
 	const PLAN_TO_READ = 2;
-	const DROPPED = 3;
+	const DROPPED = 5;
 	const ON_HOLD = 4;
-	const COMPLETED = 5;
+	const COMPLETED = 3;
 }
-// End of MangaReadingStatus.php
+// End of MangaReadingStatus.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 86c769a5..845c6488 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -18,7 +18,7 @@ namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\Kitsu\Transformer\{
-    AnimeTransformer, AnimeListTransformer, MangaListTransformer
+	AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
 };
 use Aviat\Ion\Json;
 use GuzzleHttp\Exception\ClientException;
@@ -47,9 +47,9 @@ class KitsuModel {
 	 */
 	protected $animeTransformer;
 
-    /**
-     * @var MangaListTransformer
-     */
+	/**
+	 * @var MangaListTransformer
+	 */
 	protected $mangaListTransformer;
 
 	/**
@@ -62,6 +62,7 @@ class KitsuModel {
 
 		$this->animeTransformer = new AnimeTransformer();
 		$this->animeListTransformer = new AnimeListTransformer();
+		$this->mangaTransformer = new MangaTransformer();
 		$this->mangaListTransformer = new MangaListTransformer();
 	}
 
@@ -98,16 +99,17 @@ class KitsuModel {
 		return $this->animeTransformer->transform($baseData);
 	}
 
+	public function getManga(string $mangaId): array
+	{
+		$baseData = $this->getRawMediaData('manga', $mangaId);
+		return $this->mangaTransformer->transform($baseData);
+	}
+
 	public function getRawAnimeData($animeId): array
 	{
 		return $this->getRawMediaData('anime', $animeId);
 	}
 
-	public function getAnimeMedia($entryId): array
-	{
-		return $this->getRequest("library-entries/{$entryId}/media");
-	}
-
 	public function getAnimeList($status): array
 	{
 		$options = [
@@ -139,34 +141,34 @@ class KitsuModel {
 	}
 
 	public function getMangaList($status): array
-    {
-        $options = [
-            'query' => [
-                'filter' => [
-                    'user_id' => 2644,
-                    'media_type' => 'Manga',
-                    'status' => $status,
-                ],
-                'include' => 'media',
-                'page' => [
-                    'offset' => 0,
-                    'limit' => 200
-                ],
-                'sort' => '-updated_at'
-            ]
-        ];
+	{
+		$options = [
+			'query' => [
+				'filter' => [
+					'user_id' => 2644,
+					'media_type' => 'Manga',
+					'status' => $status,
+				],
+				'include' => 'media',
+				'page' => [
+					'offset' => 0,
+					'limit' => 200
+				],
+				'sort' => '-updated_at'
+			]
+		];
 
-        $data = $this->getRequest('library-entries', $options);
-        
-        foreach($data['data'] as $i => &$item)
-        {
-            $item['manga'] = $data['included'][$i];
-        }
+		$data = $this->getRequest('library-entries', $options);
 
-        $transformed = $this->mangaListTransformer->transformCollection($data['data']);
+		foreach($data['data'] as $i => &$item)
+		{
+			$item['manga'] = $data['included'][$i];
+		}
 
-        return $transformed;
-    }
+		$transformed = $this->mangaListTransformer->transformCollection($data['data']);
+
+		return $transformed;
+	}
 
 	private function getGenres(string $type, string $id): array
 	{
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index 2a43be63..251f745c 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package     AnimeListClient
- * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @package	 AnimeListClient
+ * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license	 http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
@@ -34,17 +34,15 @@ class MangaListTransformer extends AbstractTransformer {
 	 */
 	public function transform($item)
 	{
-?><pre><?= print_r($item, TRUE) ?></pre><?php
-die();
 		$manga =& $item['manga'];
 
-		$rating = (is_numeric($item['rating']))
-			? intval(2 * $item['rating'])
+		$rating = (is_numeric($item['attributes']['rating']))
+			? intval(2 * $item['attributes']['rating'])
 			: '-';
 
 		$total_chapters = ($manga['attributes']['chapterCount'] > 0)
 			? $manga['attributes']['chapterCount']
-            : '-';
+			: '-';
 
 		$total_volumes = ($manga['attributes']['volumeCount'] > 0)
 			? $manga['attributes']['volumeCount']
@@ -53,40 +51,29 @@ die();
 		$map = [
 			'id' => $item['id'],
 			'chapters' => [
-				'read' => $item['chapters_read'],
+				'read' => $item['attributes']['progress'],
 				'total' => $total_chapters
 			],
 			'volumes' => [
-				'read' => $item['volumes_read'],
+				'read' => '-', //$item['attributes']['volumes_read'],
 				'total' => $total_volumes
 			],
 			'manga' => [
-				'title' => $manga['romaji_title'],
+				'title' => $manga['attributes']['canonicalTitle'],
 				'alternate_title' => NULL,
 				'slug' => $manga['id'],
-				'url' => 'https://hummingbird.me/manga/' . $manga['id'],
-				'type' => $manga['manga_type'],
-				'image' => $manga['poster_image_thumb'],
-				'genres' => $manga['genres'],
+				'url' => 'https://kitsu.io/manga/' . $manga['id'],
+				'type' => $manga['attributes']['mangaType'],
+				'image' => $manga['attributes']['posterImage']['small'],
+				'genres' => [], //$manga['genres'],
 			],
-			'reading_status' => $item['status'],
-			'notes' => $item['notes'],
-			'rereading' => (bool)$item['rereading'],
-			'reread' => $item['reread_count'],
+			'reading_status' => $item['attributes']['status'],
+			'notes' => $item['attributes']['notes'],
+			'rereading' => (bool)$item['attributes']['reconsuming'],
+			'reread' => $item['attributes']['reconsumeCount'],
 			'user_rating' => $rating,
 		];
 
-		if (array_key_exists('english_title', $manga))
-		{
-			$diff = levenshtein($manga['romaji_title'], $manga['english_title']);
-
-			// If the titles are REALLY similar, don't bother showing both
-			if ($diff >= 5)
-			{
-				$map['manga']['alternate_title'] = $manga['english_title'];
-			}
-		}
-
 		return $map;
 	}
 
diff --git a/src/API/Kitsu/Transformer/MangaTransformer.php b/src/API/Kitsu/Transformer/MangaTransformer.php
index 9c7ac517..fa5013c8 100644
--- a/src/API/Kitsu/Transformer/MangaTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaTransformer.php
@@ -1,39 +1,55 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu\Transformer;
-
-use Aviat\Ion\Transformer\AbstractTransformer;
-
-/**
- * Transformer for anime description page
- */
-class MangaTransformer extends AbstractTransformer {
-
-    /**
-     * Convert raw api response to a more
-     * logical and workable structure
-     *
-     * @param  array  $item API library item
-     * @return array
-     */
-    public function transform($item)
-    {
-        return [
-
-        ];
-    }
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Transformer for anime description page
+ */
+class MangaTransformer extends AbstractTransformer {
+
+	/**
+	 * Convert raw api response to a more
+	 * logical and workable structure
+	 *
+	 * @param  array  $item API library item
+	 * @return array
+	 */
+	public function transform($item)
+	{
+		return [
+			'title' => $item['canonicalTitle'],
+			'en_title' => $item['titles']['en'],
+			'jp_title' => $item['titles']['en_jp'],
+			'cover_image' => $item['posterImage']['small'],
+			'manga_type' => $item['mangaType'],
+			'chapter_count' => $this->count($item['chapterCount']),
+			'volume_count' => $this->count($item['volumeCount']),
+			'synopsis' => $item['synopsis'],
+			'url' => "https://kitsu.io/manga/{$item['slug']}",
+			'genres' => $item['genres'],
+		];
+	}
+
+	private function count(int $value = null)
+	{
+		return ((int)$value === 0)
+			? '-'
+			: $value;
+	}
 }
\ No newline at end of file
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index e88152c7..0626b85c 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -264,8 +264,8 @@ class Manga extends Controller {
 		$data = $this->model->get_manga($manga_id);
 
 		$this->outputHTML('manga/details', [
-			'title' => 'Manga &middot; ' . $data['manga']['romaji_title'],
-			'data' => $data['manga'],
+			'title' => 'Manga &middot; ' . $data['title'],
+			'data' => $data,
 		]);
 	}
 }
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 6b9f7f60..0b7f7af4 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package     AnimeListClient
- * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @package	 AnimeListClient
+ * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license	 http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
@@ -46,12 +46,20 @@ class Manga extends API {
 		MangaReadingStatus::COMPLETED => self::COMPLETED
 	];
 
-	public function __construct(ContainerInterface $container)
-    {
-        parent::__construct($container);
+	protected $status_map = [
+		'current' => self::READING,
+		'planned' => self::PLAN_TO_READ,
+		'completed' => self::COMPLETED,
+		'on_hold' => self::ON_HOLD,
+		'dropped' => self::DROPPED
+	];
 
-        $this->kitsuModel = $container->get('kitsu-model');
-    }
+	public function __construct(ContainerInterface $container)
+	{
+		parent::__construct($container);
+
+		$this->kitsuModel = $container->get('kitsu-model');
+	}
 
 	/**
 	 * Make an authenticated manga API call
@@ -102,10 +110,9 @@ class Manga extends API {
 	 */
 	public function get_list($status)
 	{
-	    $data = $this->kitsuModel->getMangaList($status);
-	    return $this->map_by_status($data)[$status];
-		/*$data = $this->cache->get($this, '_get_list_from_api');
-		return ($status !== 'All') ? $data[$status] : $data;*/
+		$APIstatus = array_flip($this->const_map)[$status];
+		$data = $this->kitsuModel->getMangaList($APIstatus);
+		return $this->map_by_status($data)[$status];
 	}
 
 
@@ -117,8 +124,7 @@ class Manga extends API {
 	 */
 	public function get_manga($manga_id)
 	{
-		$raw = $this->_manga_api_call('get', "manga/{$manga_id}.json");
-		return Json::decode($raw['body'], TRUE);
+		return $this->kitsuModel->getManga($manga_id);
 	}
 
 	/**
@@ -146,7 +152,7 @@ class Manga extends API {
 				$entry['manga']['slug'],
 				'manga'
 			);*/
-			$key = $this->const_map[$entry['reading_status']];
+			$key = $this->status_map[$entry['reading_status']];
 			$output[$key][] = $entry;
 		}
 

From 9c8df03c362cc766d579ab7ea7ad4fdb8297e9b9 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 4 Jan 2017 13:40:46 -0500
Subject: [PATCH 56/65] Update css to fit blocks within poster images

---
 public/css/base.css      | 813 +++++++++++++++------------------
 public/css/base.myth.css |   5 +-
 public/css/marx.css      | 957 +++++++++++++++++++--------------------
 public/package.json      |  26 +-
 4 files changed, 842 insertions(+), 959 deletions(-)

diff --git a/public/css/base.css b/public/css/base.css
index 95f19e2a..d0610647 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1,45 +1,49 @@
-template,
-[hidden="hidden"],
-.media[hidden] {
-  display: none;
+:root {
+	--link-shadow: 1px 1px 1px #000;
+	--shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);
+	--title-overlay: rgba(0, 0, 0, 0.45);
+	--text-color: #ffffff;
+	--normal-padding: 0.25em 0.125em;
+	--link-hover-color: #7d12db;
+	--edit-link-hover-color: #db7d12;
+	--edit-link-color: #12db18;
+	--radius: 5px;
 }
 
-body {
-  margin: 0.5em;
-}
+template, [hidden="hidden"], .media[hidden] {display:none}
+
+body {margin: 0.5em;}
 
 button {
-  background: rgba(255,255,255,0.65);
-  margin: 0;
+	background:rgba(255,255,255,0.65);
+	margin: 0;
 }
 
 table {
-  min-width: 85%;
-  margin: 0 auto;
+	min-width:85%;
+	margin: 0 auto;
 }
 
 td {
-  padding: 1em;
-  padding: 1rem;
+	padding:1em;
+	padding:1rem;
 }
 
-thead td,
-thead th {
-  padding: 0.5em;
-  padding: 0.5rem;
+thead td, thead th {
+	padding:0.5em;
+	padding:0.5rem;
 }
 
 input[type=number] {
-  width: 4em;
+	width: 4em;
 }
 
 tbody > tr:nth-child(odd) {
-  background: #ddd;
+	background: #ddd;
 }
 
-a:hover,
-a:active {
-  color: #7d12db;
+a:hover, a:active {
+	color: var(--link-hover-color)
 }
 
 /* -----------------------------------------------------------------------------
@@ -47,136 +51,66 @@ a:active {
 ------------------------------------------------------------------------------*/
 
 .bracketed {
-  color: #12db18;
+	color:  var(--edit-link-color);
+}
+.bracketed, h1 a {
+	text-shadow: var(--link-shadow);
+}
+.bracketed:before {content: '[\00a0'}
+.bracketed:after {content: '\00a0]'}
+.bracketed:hover, .bracketed:active {
+	color: var(--edit-link-hover-color)
 }
 
-.bracketed,
-h1 a {
-  text-shadow: 1px 1px 1px #000;
-}
-
-.bracketed:before {
-  content: '[\00a0';
-}
-
-.bracketed:after {
-  content: '\00a0]';
-}
-
-.bracketed:hover,
-.bracketed:active {
-  color: #db7d12;
-}
-
-.grow-1 {
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.flex-wrap {
-  -webkit-flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-}
-
-.flex-no-wrap {
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-}
-
-.flex-align-end {
-  -webkit-box-align: end;
-  -webkit-align-items: flex-end;
-  -ms-flex-align: end;
-  align-items: flex-end;
-}
-
-.flex-align-space-around {
-  -webkit-align-content: space-around;
-  -ms-flex-line-pack: distribute;
-  align-content: space-around;
-}
-
-.flex-justify-space-around {
-  -webkit-justify-content: space-around;
-  -ms-flex-pack: distribute;
-  justify-content: space-around;
-}
-
-.flex-self-center {
-  -webkit-align-self: center;
-  -ms-flex-item-align: center;
-  align-self: center;
-}
-
-.flex {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
+.grow-1 {-webkit-box-flex: 1;flex-grow: 1}
+.flex-wrap {flex-wrap: wrap}
+.flex-no-wrap {flex-wrap: nowrap}
+.flex-align-end {-webkit-box-align: end;align-items: flex-end}
+.flex-align-space-around {align-content: space-around}
+.flex-justify-space-around {justify-content: space-around}
+.flex-self-center {align-self:center}
+.flex {display: -webkit-box;display: flex}
 
 .small-font {
-  font-size: 1.6rem;
+	font-size:1.6rem;
 }
 
-.justify {
-  text-align: justify;
-}
+.justify {text-align:justify}
+.align_center {text-align:center}
+.align_left {text-align:left}
+.align_right {text-align:right}
 
-.align_center {
-  text-align: center;
-}
+.valign_top {vertical-align:top}
 
-.align_left {
-  text-align: left;
-}
-
-.align_right {
-  text-align: right;
-}
-
-.valign_top {
-  vertical-align: top;
-}
-
-.no_border {
-  border: none;
-}
+.no_border {border:none}
 
 .media-wrap {
-  text-align: center;
-  margin: 0 auto;
+	text-align:center;
+	margin:0 auto;
 }
 
 .danger {
-  background-color: #ff4136;
-  border-color: #924949;
-  color: #fff;
+	background-color: #ff4136;
+	border-color: #924949;
+	color:#fff;
 }
 
-.danger:hover,
-.danger:active {
-  background-color: #924949;
-  border-color: #ff4136;
-  color: #fff;
+.danger:hover, .danger:active {
+	background-color: #924949;
+	border-color: #ff4136;
+	color:#fff;
 }
 
 .user-btn {
-  border-color: #12db18;
-  color: #12db18;
-  text-shadow: 1px 1px 1px #000;
-  padding: 0 0.5em;
-  padding: 0 0.5rem;
+	border-color: var(--edit-link-color);
+	color: var(--edit-link-color);
+	text-shadow: var(--link-shadow);
+	padding:0 0.5em;
+	padding:0 0.5rem;
 }
-
-.user-btn:hover,
-.user-btn:active {
-  border-color: #db7d12;
-  background-color: #db7d12;
+.user-btn:hover, .user-btn:active {
+	border-color: var(--edit-link-hover-color);
+	background-color: var(--edit-link-hover-color);
 }
 
 /* -----------------------------------------------------------------------------
@@ -184,317 +118,300 @@ h1 a {
 ------------------------------------------------------------------------------*/
 
 .cssload-loader {
-  position: relative;
-  left: calc(50% - 31px);
-  width: 62px;
-  height: 62px;
-  border-radius: 50%;
-  -webkit-perspective: 780px;
-  perspective: 780px;
+	position: relative;
+	left: calc(50% - 31px);
+	width: 62px;
+	height: 62px;
+	border-radius: 50%;
+	-webkit-perspective: 780px;
+	        perspective: 780px;
 }
 
 .cssload-inner {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  border-radius: 50%;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	border-radius: 50%;
 }
 
 .cssload-inner.cssload-one {
-  left: 0%;
-  top: 0%;
-  -webkit-animation: cssload-rotate-one 1.15s linear infinite;
-  animation: cssload-rotate-one 1.15s linear infinite;
-  border-bottom: 3px solid rgb(0,0,0);
+	left: 0%;
+	top: 0%;
+	-webkit-animation: cssload-rotate-one 1.15s linear infinite;
+	        animation: cssload-rotate-one 1.15s linear infinite;
+	border-bottom: 3px solid rgb(0,0,0);
 }
 
 .cssload-inner.cssload-two {
-  right: 0%;
-  top: 0%;
-  -webkit-animation: cssload-rotate-two 1.15s linear infinite;
-  animation: cssload-rotate-two 1.15s linear infinite;
-  border-right: 3px solid rgb(0,0,0);
+	right: 0%;
+	top: 0%;
+	-webkit-animation: cssload-rotate-two 1.15s linear infinite;
+	        animation: cssload-rotate-two 1.15s linear infinite;
+	border-right: 3px solid rgb(0,0,0);
 }
 
 .cssload-inner.cssload-three {
-  right: 0%;
-  bottom: 0%;
-  -webkit-animation: cssload-rotate-three 1.15s linear infinite;
-  animation: cssload-rotate-three 1.15s linear infinite;
-  border-top: 3px solid rgb(0,0,0);
+	right: 0%;
+	bottom: 0%;
+	-webkit-animation: cssload-rotate-three 1.15s linear infinite;
+	        animation: cssload-rotate-three 1.15s linear infinite;
+	border-top: 3px solid rgb(0,0,0);
 }
 
 @-webkit-keyframes cssload-rotate-one {
-  0% {
-    -webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
-    transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
-    transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
+		        transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
+		        transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
+	}
 }
 
 @keyframes cssload-rotate-one {
-  0% {
-    -webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
-    transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
-    transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
+		        transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
+		        transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg);
+	}
 }
 
 @-webkit-keyframes cssload-rotate-two {
-  0% {
-    -webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
-    transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
-    transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
+		        transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
+		        transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
+	}
 }
 
 @keyframes cssload-rotate-two {
-  0% {
-    -webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
-    transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
-    transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
+		        transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
+		        transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg);
+	}
 }
 
 @-webkit-keyframes cssload-rotate-three {
-  0% {
-    -webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
-    transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
-    transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
+		        transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
+		        transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
+	}
 }
 
 @keyframes cssload-rotate-three {
-  0% {
-    -webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
-    transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
-    transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
-  }
+	0% {
+		-webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
+		        transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg);
+	}
+	100% {
+		-webkit-transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
+		        transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg);
+	}
 }
 
 /* -----------------------------------------------------------------------------
 	Table sorting and form styles
 ------------------------------------------------------------------------------*/
-
 .sorting,
 .sorting_asc,
 .sorting_desc {
-  vertical-align: text-bottom;
+	vertical-align:text-bottom;
 }
-
 .sorting::before {
-  content: " ↕\00a0";
+	content: " ↕\00a0";
 }
-
 .sorting_asc::before {
-  content: " ↑\00a0";
+	content: " ↑\00a0";
 }
-
 .sorting_desc::before {
-  content: " ↓\00a0";
+	content: " ↓\00a0";
 }
 
-.form {
-  width: 100%;
-}
+.form { width:100%; }
 
-.form thead th,
-.form thead tr {
-  background: inherit;
-  border: 0;
+.form thead th, .form thead tr {
+	background: inherit;
+	border:0;
 }
 
 .form tr > td:nth-child(odd) {
-  text-align: right;
-  min-width: 25px;
-  max-width: 30%;
+	text-align:right;
+	min-width:25px;
+	max-width:30%;
 }
-
 .form tr > td:nth-child(even) {
-  text-align: left;
-  width: 70%;
+	text-align:left;
+	width:70%;
 }
 
 .invisible tbody > tr:nth-child(odd) {
-  background: inherit;
+	background: inherit;
 }
-
-.invisible tr,
-.invisible td,
-.invisible th {
-  border: 0;
+.invisible tr, .invisible td, .invisible th {
+	border:0;
 }
 
 /* -----------------------------------------------------------------------------
 	Message boxes
 ------------------------------------------------------------------------------*/
 
-.message {
-  position: relative;
-  margin: 0.5em auto;
-  padding: 0.5em;
-  width: 95%;
+.message{
+	position:relative;
+	margin:0.5em auto;
+	padding:0.5em;
+	width:95%;
 }
 
-.message .close {
-  width: 1em;
-  height: 1em;
-  position: absolute;
-  right: 0.5em;
-  top: 0.5em;
-  text-align: center;
-  vertical-align: middle;
-  line-height: 1em;
+.message .close{
+	width:1em;
+	height:1em;
+	position:absolute;
+	right:0.5em;
+	top:0.5em;
+	text-align:center;
+	vertical-align:middle;
+	line-height:1em;
 }
 
 .message:hover .close:after {
-  content: '☒';
+	content: '☒';
 }
 
 .message:hover {
-  cursor: pointer;
+	cursor:pointer;
 }
 
-.message .icon {
-  left: 0.5em;
-  top: 0.5em;
-  margin-right: 1em;
+.message .icon{
+	left:0.5em;
+	top:0.5em;
+	margin-right:1em;
 }
 
-.message.error {
-  border: 1px solid #924949;
-  background: #f3e6e6;
+.message.error{
+	border:1px solid #924949;
+	background: #f3e6e6;
 }
 
-.message.error .icon::after {
-  content: '✘';
+	.message.error .icon::after {
+		content: '✘';
+	}
+
+.message.success{
+	border:1px solid #1f8454;
+	background: #70dda9;
+}
+	.message.success .icon::after {
+		content: '✔'
+	}
+
+.message.info{
+	border:1px solid #bfbe3a;
+	background: #FFFFCC;
 }
 
-.message.success {
-  border: 1px solid #1f8454;
-  background: #70dda9;
-}
-
-.message.success .icon::after {
-  content: '✔';
-}
-
-.message.info {
-  border: 1px solid #bfbe3a;
-  background: #FFFFCC;
-}
-
-.message.info .icon::after {
-  content: '⚠';
-}
+	.message.info .icon::after {
+		content: '⚠';
+	}
 
 /* -----------------------------------------------------------------------------
 	Base list styles
 ------------------------------------------------------------------------------*/
 
 .media {
-  position: relative;
-  vertical-align: top;
-  display: inline-block;
-  text-align: center;
-  width: 220px;
-  height: 319px;
-  margin: 0.25em 0.125em;
+	position:relative;
+	vertical-align:top;
+	display:inline-block;
+	text-align:center;
+	width:220px;
+	height:311px;
+	margin: var(--normal-padding);
 }
 
 .media .edit_buttons > button {
-  margin: 0.5em auto;
+	margin:0.5em auto;
 }
 
-.name,
-.media_metadata > div,
-.medium_metadata > div,
-.row {
-  text-shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);
-  background: rgba(0, 0, 0, 0.45);
-  color: #ffffff;
-  padding: 0.25em 0.125em;
-  text-align: right;
-}
+	.name,
+	.media_metadata > div,
+	.medium_metadata > div,
+	.row {
+		text-shadow: var(--shadow);
+		background: var(--title-overlay);
+		color: var(--text-color);
+		padding: var(--normal-padding);
+		text-align:right;
+	}
 
-.media_type,
-.age_rating {
-  text-align: left;
-}
+	.media_type, .age_rating {
+		text-align:left;
+	}
 
-.media > .media_metadata {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-}
+	.media > .media_metadata {
+		position:absolute;
+		bottom:0;
+		right:0;
+	}
 
-.media > .medium_metadata {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-}
+	.media > .medium_metadata {
+		position:absolute;
+		bottom: 0;
+		left:0;
+	}
 
-.media > .name {
-  position: absolute;
-  top: 0;
-}
+	.media > .name {
+		position:absolute;
+		top: 0;
+	}
 
-.media:hover > .name,
-.media:hover > .media_metadata > div,
-.media:hover > .medium_metadata > div,
-.media:hover > .table .row {
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
-  background: rgba(0,0,0,0.75);
-}
+		.media:hover > .name,
+		.media:hover > .media_metadata > div,
+		.media:hover > .medium_metadata > div,
+		.media:hover > .table .row
+		{
+			-webkit-transition: .25s ease;
+			transition: .25s ease;
+			background:rgba(0,0,0,0.75);
+		}
+
+		.media:hover > button[hidden],
+		.media:hover > .edit_buttons[hidden]
+		{
+			-webkit-transition: .25s ease;
+			transition: .25s ease;
+			display:block;
+		}
+
+		.media > .name > a {
+			background:none;
+			color:#fff;
+			text-shadow: var(--shadow);
+		}
 
-.media:hover > button[hidden],
-.media:hover > .edit_buttons[hidden] {
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
-  display: block;
-}
 
-.media > .name > a {
-  background: none;
-  color: #fff;
-  text-shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);
-}
 
 /* -----------------------------------------------------------------------------
 	Anime-list-specific styles
 ------------------------------------------------------------------------------*/
-
-.anime .name,
-.manga .name {
-  text-align: center;
-  width: 100%;
-  padding: 0.5em 0.25em;
+.anime .name, .manga .name {
+	text-align:center;
+	width:100%;
+	padding:0.5em 0.25em;
 }
 
 .anime .media_type,
@@ -504,176 +421,158 @@ h1 a {
 .anime .age_rating,
 .anime .edit,
 .anime .delete {
-  background: none;
-  text-align: center;
+	background: none;
+	text-align:center;
 }
 
-.anime .table,
-.manga .table {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
+
+.anime .table, .manga .table {
+	position:absolute;
+	bottom:0;
+	left:0;
+	width:100%;
 }
 
-.anime .row,
-.manga .row {
-  width: 100%;
-  background: rgba(0, 0, 0, 0.45);
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-content: space-around;
-  -ms-flex-line-pack: distribute;
-  align-content: space-around;
-  -webkit-justify-content: space-around;
-  -ms-flex-pack: distribute;
-  justify-content: space-around;
-  text-align: center;
-  padding: 0 inherit;
+.anime .row, .manga .row {
+	width:100%;
+	background: var(--title-overlay);
+	display: -webkit-box;
+	display: flex;
+	align-content: space-around;
+	justify-content: space-around;
+	text-align:center;
+	padding:0 inherit;
 }
 
-.anime .row > span,
-.manga .row > span {
-  text-align: left;
+.anime .row > span, .manga .row > span {
+	text-align:left;
 }
 
-.anime .row > div,
-.manga .row > div {
-  font-size: 0.8em;
-  display: flex-item;
-  -webkit-align-self: center;
-  -ms-flex-item-align: center;
-  align-self: center;
-  text-align: center;
-  vertical-align: middle;
+.anime .row > div, .manga .row > div {
+	font-size:0.8em;
+	display:flex-item;
+	align-self:center;
+	text-align:center;
+	vertical-align:middle;
 }
 
 .anime .media > button.plus_one {
-  position: absolute;
-  top: 138px;
-  top: calc(50% - 21.5px);
-  left: 44px;
-  left: calc(50% - 66.5px);
+	position:absolute;
+	top: 138px;
+	top: calc(50% - 21.5px);
+	left: 44px;
+	left: calc(50% - 66.5px);
 }
 
 /* -----------------------------------------------------------------------------
 	Manga-list-specific styles
 ------------------------------------------------------------------------------*/
-
 .manga .row {
-  padding: 1px;
+	padding:1px;
 }
 
 .manga .media {
-  border: 1px solid #ddd;
-  width: 200px;
-  height: 290px;
-  margin: 0.25em;
+	border:1px solid #ddd;
+	height:310px;
+	margin:0.25em;
 }
 
 .manga .media > .edit_buttons {
-  position: absolute;
-  top: 86px;
-  top: calc(50% - 58.5px);
-  left: 5px;
-  left: calc(50% - 95px);
+	position:absolute;
+	top: 86px;
+	top: calc(50% - 58.5px);
+	left: 5px;
+	left: calc(50% - 95px);
 }
 
+
 /* -----------------------------------------------------------------------------
 	Search page styles
 ------------------------------------------------------------------------------*/
-
 .media.search > .name {
-  background-color: #555;
-  background-color: rgba(000,000,000,0.35);
-  background-size: cover;
-  background-size: contain;
-  background-repeat: no-repeat;
+	background-color:#555;
+	background-color: rgba(000,000,000,0.35);
+	background-size: cover;
+	background-size: contain;
+	background-repeat: no-repeat;
 }
 
 .big-check {
-  display: none;
+	display:none;
 }
 
 .big-check:checked + label {
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
-  background: rgba(0,0,0,0.75);
+	-webkit-transition: .25s ease;
+	transition: .25s ease;
+	background:rgba(0,0,0,0.75);
 }
 
 .big-check:checked + label:after {
-  content: '✓';
-  font-size: 15em;
-  font-size: 15rem;
-  text-align: center;
-  color: greenyellow;
-  position: absolute;
-  top: 5px;
-  left: 0;
-  height: 100%;
-  width: 100%;
+	content: '✓';
+	font-size: 15em;
+	font-size: 15rem;
+	text-align:center;
+	color: greenyellow;
+	position:absolute;
+	top:5px;
+	left:0;
+	height:100%;
+	width:100%;
 }
 
 #series_list article.media {
-  position: relative;
+	position:relative;
 }
-
-#series_list .name,
-#series_list .name label {
-  position: absolute;
-  display: block;
-  top: 0;
-  height: 100%;
-  width: 100%;
-  vertical-align: middle;
+#series_list .name, #series_list .name label {
+	position:absolute;
+	display:block;
+	top:0;
+	height:100%;
+	width:100%;
+	vertical-align:middle;
 }
 
 /* ----------------------------------------------------------------------------
 	Details page styles
 -----------------------------------------------------------------------------*/
-
 .details {
-  margin: 1.5rem auto 0 auto;
-  max-width: 93rem;
-  padding: 1rem;
-  font-size: inherit;
+	margin: 1.5rem auto 0 auto;
+	max-width:93rem;
+	padding:1rem;
+	font-size:inherit;
 }
 
 .details .cover {
-  max-width: 300px;
-  max-height: 435px;
+	max-width: 300px;
+	max-height: 435px;
 }
 
 .details h2 {
-  margin-top: 0;
+	margin-top: 0;
 }
 
 .details .flex > div {
-  margin: 1rem;
+	margin: 1rem;
 }
 
 .details table {
-  max-width: 300px;
-}
-
-.details td {
-  padding: 0 1.5rem;
+	max-width:300px;
 }
+	.details td {
+		padding:0 1.5rem;
+	}
 
 .details p {
-  text-align: justify;
+	text-align:justify;
 }
 
 .details td:nth-child(odd) {
-  width: 1%;
-  white-space: nowrap;
-  text-align: right;
+	width:1%;
+	white-space:nowrap;
+	text-align:right;
 }
-
 .details td:nth-child(even) {
-  text-align: left;
+	text-align:left;
 }
 
 /* ----------------------------------------------------------------------------
@@ -681,17 +580,17 @@ h1 a {
 -----------------------------------------------------------------------------*/
 
 @media screen and (max-width: 40em) {
-  nav a {
-    line-height: 4em;
-    line-height: 4rem;
-  }
+	nav a {
+		line-height:4em;
+		line-height:4rem;
+	}
 
-  .media {
-    margin: 2px 0;
-  }
+	.media {
+		margin:2px 0;
+	}
 
-  main {
-    padding: 0 0,5em 0.5em;
-    padding: 0 0.5rem 0.5rem;
-  }
+	main {
+		padding:0 0,5em 0.5em;
+		padding:0 0.5rem 0.5rem;
+	}
 }
\ No newline at end of file
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index 1cdfc5b5..56cf4a91 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -296,7 +296,7 @@ a:hover, a:active {
 	display:inline-block;
 	text-align:center;
 	width:220px;
-	height:319px;
+	height:311px;
 	margin: var(--normal-padding);
 }
 
@@ -427,8 +427,7 @@ a:hover, a:active {
 
 .manga .media {
 	border:1px solid #ddd;
-	width:200px;
-	height:290px;
+	height:310px;
 	margin:0.25em;
 }
 
diff --git a/public/css/marx.css b/public/css/marx.css
index cc192a04..8e25ba1b 100644
--- a/public/css/marx.css
+++ b/public/css/marx.css
@@ -1,629 +1,608 @@
-:root {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  box-sizing: border-box;
-  cursor: default;
-  font-family: 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-  line-height: 1.4;
-  overflow-y: scroll;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-  text-size-adjust: 100%;
+:root
+{
+	--default-font-list:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
+	-ms-text-size-adjust:100%;
+	-webkit-text-size-adjust:100%;
+	box-sizing:border-box;
+	cursor:default;
+	font-family:var(--default-font-list);
+	line-height:1.4;
+	overflow-y:scroll;
+	text-size-adjust:100%;
+	scroll-behavior: smooth;
 }
 
-audio:not([controls]) {
-  display: none;
+audio:not([controls])
+{
+	display:none;
 }
 
-details {
-  display: block;
+details
+{
+	display:block;
 }
 
-input[type=search] {
-  -webkit-appearance: textfield;
+input[type=search]
+{
+	-webkit-appearance:textfield;
 }
 
-input[type=search]::-webkit-search-cancel-button,
-input[type=search]::-webkit-search-decoration {
-  -webkit-appearance: none;
+input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration
+{
+	-webkit-appearance:none;
 }
 
-main {
-  display: block;
-  margin: 0 auto;
-  padding: 0 1.6em 1.6em;
-  padding: 0 1.6rem 1.6rem;
+main
+{
+	display:block;
+	margin:0 auto;
+	padding:0 1.6em 1.6em;
+	padding:0 1.6rem 1.6rem;
 }
 
-summary {
-  display: block;
+summary
+{
+	display:block;
 }
 
-pre {
-  background: #efefef;
-  color: #444;
-  display: block;
-  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
-  font-size: 1.4em;
-  font-size: 1.4rem;
-  margin: 1.6em 0;
-  margin: 1.6rem 0;
-  overflow: auto;
-  padding: 1.6em;
-  padding: 1.6rem;
-  word-break: break-all;
-  word-wrap: break-word;
+pre
+{
+	background:#efefef;
+	color:#444;
+	display:block;
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
+	font-size:1.4em;
+	font-size:1.4rem;
+	margin:1.6em 0;
+	margin:1.6rem 0;
+	overflow:auto;
+	padding:1.6em;
+	padding:1.6rem;
+	word-break:break-all;
+	word-wrap:break-word;
 }
 
-progress {
-  display: inline-block;
+progress
+{
+	display:inline-block;
 }
 
-small {
-  color: #777;
-  font-size: 75%;
+small
+{
+	color:#777;
+	font-size:75%;
 }
 
-big {
-  font-size: 125%;
+big
+{
+	font-size:125%;
 }
 
-template {
-  display: none;
+template
+{
+	display:none;
 }
 
-textarea {
-  border: .1rem solid #ccc;
-  border-radius: 0;
-  display: block;
-  margin-bottom: .8rem;
-  overflow: auto;
-  padding: .8rem;
-  resize: vertical;
-  vertical-align: middle;
+textarea
+{
+	border:.1rem solid #ccc;
+	border-radius:0;
+	display:block;
+	margin-bottom:.8rem;
+	overflow:auto;
+	padding:.8rem;
+	resize:vertical;
+	vertical-align:middle;
 }
 
-[hidden] {
-  display: none;
+[hidden]
+{
+	display:none;
 }
 
-[unselectable] {
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
+[unselectable]
+{
+	-webkit-user-select:none;
+	user-select:none;
 }
 
-*,
-::before,
-::after {
-  border-style: solid;
-  border-width: 0;
-  box-sizing: inherit;
+*,::before,::after
+{
+	border-style:solid;
+	border-width:0;
+	box-sizing:inherit;
 }
 
-* {
-  font-size: inherit;
-  line-height: inherit;
-  margin: 0;
-  padding: 0;
+*
+{
+	font-size:inherit;
+	line-height:inherit;
+	margin:0;
+	padding:0;
 }
 
-::before,
-::after {
-  text-decoration: inherit;
-  vertical-align: inherit;
+::before,::after
+{
+	text-decoration:inherit;
+	vertical-align:inherit;
 }
 
-a {
-  -webkit-transition: .25s ease;
-  color: #1271db;
-  text-decoration: none;
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
+a
+{
+	-webkit-transition:.25s ease;
+	color:#1271db;
+	text-decoration:none;
+	transition:.25s ease;
 }
 
-audio,
-canvas,
-iframe,
-img,
-svg,
-video {
-  vertical-align: middle;
+audio,canvas,iframe,img,svg,video
+{
+	vertical-align:middle;
 }
 
-button,
-input,
-select,
-textarea {
-  border: .1rem solid #ccc;
-  color: inherit;
-  font-family: inherit;
-  font-style: inherit;
-  font-weight: inherit;
-  min-height: 1.4em;
+button,input,select,textarea
+{
+	border:.1rem solid #ccc;
+	color:inherit;
+	font-family:inherit;
+	font-style:inherit;
+	font-weight:inherit;
+	min-height:1.4em;
 }
 
-code,
-kbd,
-pre,
-samp {
-  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace, monospace;
+code,kbd,pre,samp
+{
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace, monospace;
 }
 
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  margin-bottom: 1.6rem;
+table
+{
+	border-collapse:collapse;
+	border-spacing:0;
+	margin-bottom:1.6rem;
 }
 
-::-moz-selection {
-  background-color: #b3d4fc;
-  text-shadow: none;
+::selection
+{
+	background-color:#b3d4fc;
+	text-shadow:none;
 }
 
-::selection {
-  background-color: #b3d4fc;
-  text-shadow: none;
+button::-moz-focus-inner
+{
+	border:0;
 }
 
-button::-moz-focus-inner {
-  border: 0;
+body
+{
+	color:#444;
+	font-family:var(--default-font-list);
+	font-size:1.6rem;
+	font-style:normal;
+	font-weight:400;
+	padding:0;
 }
 
-body {
-  color: #444;
-  font-family: 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-  font-size: 1.6rem;
-  font-style: normal;
-  font-weight: 400;
-  padding: 0;
+p
+{
+	margin:0 0 1.6rem;
 }
 
-p {
-  margin: 0 0 1.6rem;
+h1,h2,h3,h4,h5,h6
+{
+	font-family:Lato, var(--default-font-list);
+	margin:2em 0 1.6em;
+	margin:2rem 0 1.6rem;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: Lato, 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-  margin: 2em 0 1.6em;
-  margin: 2rem 0 1.6rem;
+h1
+{
+	border-bottom:.1rem solid rgba(0,0,0,0.2);
+	font-size:3.6em;
+	font-size:3.6rem;
+	font-style:normal;
+	font-weight:500;
 }
 
-h1 {
-  border-bottom: .1rem solid rgba(0,0,0,0.2);
-  font-size: 3.6em;
-  font-size: 3.6rem;
-  font-style: normal;
-  font-weight: 500;
+h2
+{
+	font-size:3em;
+	font-size:3rem;
+	font-style:normal;
+	font-weight:500;
 }
 
-h2 {
-  font-size: 3em;
-  font-size: 3rem;
-  font-style: normal;
-  font-weight: 500;
+h3
+{
+	font-size:2.4em;
+	font-size:2.4rem;
+	font-style:normal;
+	font-weight:500;
+	margin:1.6rem 0 .4rem;
 }
 
-h3 {
-  font-size: 2.4em;
-  font-size: 2.4rem;
-  font-style: normal;
-  font-weight: 500;
-  margin: 1.6rem 0 .4rem;
+h4
+{
+	font-size:1.8em;
+	font-size:1.8rem;
+	font-style:normal;
+	font-weight:600;
+	margin:1.6rem 0 .4rem;
 }
 
-h4 {
-  font-size: 1.8em;
-  font-size: 1.8rem;
-  font-style: normal;
-  font-weight: 600;
-  margin: 1.6rem 0 .4rem;
+h5
+{
+	font-size:1.6em;
+	font-size:1.6rem;
+	font-style:normal;
+	font-weight:600;
+	margin:1.6rem 0 .4rem;
 }
 
-h5 {
-  font-size: 1.6em;
-  font-size: 1.6rem;
-  font-style: normal;
-  font-weight: 600;
-  margin: 1.6rem 0 .4rem;
+h6
+{
+	color:#777;
+	font-size:1.4em;
+	font-size:1.4rem;
+	font-style:normal;
+	font-weight:600;
+	margin:1.6rem 0 .4rem;
 }
 
-h6 {
-  color: #777;
-  font-size: 1.4em;
-  font-size: 1.4rem;
-  font-style: normal;
-  font-weight: 600;
-  margin: 1.6rem 0 .4rem;
+code
+{
+	background:#efefef;
+	color:#444;
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
+	font-size:1.4rem;
+	word-break:break-all;
+	word-wrap:break-word;
 }
 
-code {
-  background: #efefef;
-  color: #444;
-  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
-  font-size: 1.4rem;
-  word-break: break-all;
-  word-wrap: break-word;
+a:hover,a:focus
+{
+	text-decoration:none;
 }
 
-a:hover,
-a:focus {
-  text-decoration: none;
+dl
+{
+	margin-bottom:1.6rem;
 }
 
-dl {
-  margin-bottom: 1.6rem;
+dd
+{
+	margin-left:4rem;
 }
 
-dd {
-  margin-left: 4rem;
+ul,ol
+{
+	margin-bottom:.8rem;
+	padding-left:2rem;
 }
 
-ul,
-ol {
-  margin-bottom: .8rem;
-  padding-left: 2rem;
+blockquote
+{
+	border-left:.2rem solid #1271db;
+	font-family:Georgia, Times, 'Times New Roman', serif;
+	font-style:italic;
+	margin:1.6rem 0;
+	padding-left:1.6rem;
 }
-
-blockquote {
-  border-left: .2rem solid #1271db;
-  font-family: Georgia, Times, 'Times New Roman', serif;
-  font-style: italic;
-  margin: 1.6rem 0;
-  padding-left: 1.6rem;
-}
-
-figcaption {
-  font-family: Georgia, Times, 'Times New Roman', serif;
-}
-
-html {
-  font-size: 62.5%;
-}
-
-main,
-header,
-footer,
-article,
-section,
-aside,
-details,
-summary {
-  display: block;
-  height: auto;
-  margin: 0 auto;
-  width: 100%;
+
+figcaption
+{
+	font-family:Georgia, Times, 'Times New Roman', serif;
+}
+
+html
+{
+	font-size:62.5%;
+}
+
+main,header,footer,article,section,aside,details,summary
+{
+	display:block;
+	height:auto;
+	margin:0 auto;
+	width:100%;
+}
+
+footer
+{
+	border-top:.1rem solid rgba(0,0,0,0.2);
+	clear:both;
+	display:inline-block;
+	float:left;
+	max-width:100%;
+	padding:1rem 0;
+	text-align:center;
+}
+
+hr
+{
+	border-top:.1rem solid rgba(0,0,0,0.2);
+	display:block;
+	margin-bottom:1.6rem;
+	width:100%;
+}
+
+img
+{
+	height:auto;
+	max-width:100%;
+	vertical-align:baseline;
+}
+
+input[type=text],input[type=password],input[type=email],input[type=url],input[type=date],input[type=month],input[type=time],input[type=datetime],input[type=datetime-local],input[type=week],input[type=number],input[type=search],input[type=tel],input[type=color],select
+{
+	border:.1rem solid #ccc;
+	border-radius:0;
+	display:inline-block;
+	padding:.8rem;
+	vertical-align:middle;
+}
+
+input:not([type])
+{
+	-webkit-appearance:none;
+	background-clip:padding-box;
+	background-color:#fff;
+	border:.1rem solid #ccc;
+	border-radius:0;
+	color:#444;
+	display:inline-block;
+	padding:.8rem;
+	text-align:left;
+}
+
+input[type=color]
+{
+	padding:.8rem 1.6rem;
+}
+
+input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,input[type=date]:focus,input[type=month]:focus,input[type=time]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=week]:focus,input[type=number]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=color]:focus,select:focus,textarea:focus
+{
+	border-color:#b3d4fc;
+}
+
+input:not([type]):focus
+{
+	border-color:#b3d4fc;
+}
+
+input[type=radio],input[type=checkbox]
+{
+	vertical-align:middle;
+}
+
+input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus
+{
+	outline:.1rem solid thin #444;
+}
+
+input[type=text][disabled],input[type=password][disabled],input[type=email][disabled],input[type=url][disabled],input[type=date][disabled],input[type=month][disabled],input[type=time][disabled],input[type=datetime][disabled],input[type=datetime-local][disabled],input[type=week][disabled],input[type=number][disabled],input[type=search][disabled],input[type=tel][disabled],input[type=color][disabled],select[disabled],textarea[disabled]
+{
+	background-color:#efefef;
+	color:#777;
+	cursor:not-allowed;
+}
+
+input:not([type])[disabled]
+{
+	background-color:#efefef;
+	color:#777;
+	cursor:not-allowed;
+}
+
+input[readonly],select[readonly],textarea[readonly]
+{
+	background-color:#efefef;
+	border-color:#ccc;
+	color:#777;
 }
 
-footer {
-  border-top: .1rem solid rgba(0,0,0,0.2);
-  clear: both;
-  display: inline-block;
-  float: left;
-  max-width: 100%;
-  padding: 1rem 0;
-  text-align: center;
-}
-
-hr {
-  border-top: .1rem solid rgba(0,0,0,0.2);
-  display: block;
-  margin-bottom: 1.6rem;
-  width: 100%;
-}
-
-img {
-  height: auto;
-  max-width: 100%;
-  vertical-align: baseline;
-}
-
-input[type=text],
-input[type=password],
-input[type=email],
-input[type=url],
-input[type=date],
-input[type=month],
-input[type=time],
-input[type=datetime],
-input[type=datetime-local],
-input[type=week],
-input[type=number],
-input[type=search],
-input[type=tel],
-input[type=color],
-select {
-  border: .1rem solid #ccc;
-  border-radius: 0;
-  display: inline-block;
-  padding: .8rem;
-  vertical-align: middle;
-}
-
-input:not([type]) {
-  -webkit-appearance: none;
-  background-clip: padding-box;
-  background-color: #fff;
-  border: .1rem solid #ccc;
-  border-radius: 0;
-  color: #444;
-  display: inline-block;
-  padding: .8rem;
-  text-align: left;
+input:focus:invalid,textarea:focus:invalid,select:focus:invalid
+{
+	border-color:#e9322d;
+	color:#b94a48;
 }
 
-input[type=color] {
-  padding: .8rem 1.6rem;
-}
-
-input[type=text]:focus,
-input[type=password]:focus,
-input[type=email]:focus,
-input[type=url]:focus,
-input[type=date]:focus,
-input[type=month]:focus,
-input[type=time]:focus,
-input[type=datetime]:focus,
-input[type=datetime-local]:focus,
-input[type=week]:focus,
-input[type=number]:focus,
-input[type=search]:focus,
-input[type=tel]:focus,
-input[type=color]:focus,
-select:focus,
-textarea:focus {
-  border-color: #b3d4fc;
-}
-
-input:not([type]):focus {
-  border-color: #b3d4fc;
-}
-
-input[type=radio],
-input[type=checkbox] {
-  vertical-align: middle;
-}
-
-input[type=file]:focus,
-input[type=radio]:focus,
-input[type=checkbox]:focus {
-  outline: .1rem solid thin #444;
-}
-
-input[type=text][disabled],
-input[type=password][disabled],
-input[type=email][disabled],
-input[type=url][disabled],
-input[type=date][disabled],
-input[type=month][disabled],
-input[type=time][disabled],
-input[type=datetime][disabled],
-input[type=datetime-local][disabled],
-input[type=week][disabled],
-input[type=number][disabled],
-input[type=search][disabled],
-input[type=tel][disabled],
-input[type=color][disabled],
-select[disabled],
-textarea[disabled] {
-  background-color: #efefef;
-  color: #777;
-  cursor: not-allowed;
-}
-
-input:not([type])[disabled] {
-  background-color: #efefef;
-  color: #777;
-  cursor: not-allowed;
-}
-
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  background-color: #efefef;
-  border-color: #ccc;
-  color: #777;
-}
-
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  border-color: #e9322d;
-  color: #b94a48;
-}
-
-input[type=file]:focus:invalid:focus,
-input[type=radio]:focus:invalid:focus,
-input[type=checkbox]:focus:invalid:focus {
-  outline-color: #ff4136;
+input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus,input[type=checkbox]:focus:invalid:focus
+{
+	outline-color:#ff4136;
 }
 
-select {
-  background-color: #fff;
-  border: .1rem solid #ccc;
+select
+{
+	background-color:#fff;
+	border:.1rem solid #ccc;
 }
 
-select[multiple] {
-  height: auto;
+select[multiple]
+{
+	height:auto;
 }
 
-label {
-  line-height: 2;
+label
+{
+	line-height:2;
 }
 
-fieldset {
-  border: 0;
-  margin: 0;
-  padding: .8rem 0;
+fieldset
+{
+	border:0;
+	margin:0;
+	padding:.8rem 0;
 }
 
-legend {
-  border-bottom: .1rem solid #ccc;
-  color: #444;
-  display: block;
-  margin-bottom: .8rem;
-  padding: .8rem 0;
-  width: 100%;
+legend
+{
+	border-bottom:.1rem solid #ccc;
+	color:#444;
+	display:block;
+	margin-bottom:.8rem;
+	padding:.8rem 0;
+	width:100%;
 }
 
-input[type=submit],
-button {
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -webkit-transition: .25s ease;
-  -webkit-user-drag: none;
-  -webkit-user-select: none;
-  border: .2rem solid #444;
-  border-radius: 0;
-  color: #444;
-  cursor: pointer;
-  display: inline-block;
-  margin-bottom: .8rem;
-  margin-right: .4rem;
-  padding: .8rem 1.6rem;
-  text-align: center;
-  text-decoration: none;
-  text-transform: uppercase;
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  vertical-align: baseline;
+input[type=submit],button
+{
+	-moz-user-select:none;
+	-ms-user-select:none;
+	-webkit-transition:.25s ease;
+	-webkit-user-drag:none;
+	-webkit-user-select:none;
+	border:.2rem solid #444;
+	border-radius:0;
+	color:#444;
+	cursor:pointer;
+	display:inline-block;
+	margin-bottom:.8rem;
+	margin-right:.4rem;
+	padding:.8rem 1.6rem;
+	text-align:center;
+	text-decoration:none;
+	text-transform:uppercase;
+	transition:.25s ease;
+	user-select:none;
+	vertical-align:baseline;
 }
 
-input[type=submit] a,
-button a {
-  color: #444;
+input[type=submit] a,button a
+{
+	color:#444;
 }
 
-input[type=submit]::-moz-focus-inner,
-button::-moz-focus-inner {
-  padding: 0;
+input[type=submit]::-moz-focus-inner,button::-moz-focus-inner
+{
+	padding:0;
 }
 
-input[type=submit]:hover,
-button:hover {
-  background: #444;
-  border-color: #444;
-  color: #fff;
+input[type=submit]:hover,button:hover
+{
+	background:#444;
+	border-color:#444;
+	color:#fff;
 }
 
-input[type=submit]:hover a,
-button:hover a {
-  color: #fff;
+input[type=submit]:hover a,button:hover a
+{
+	color:#fff;
 }
 
-input[type=submit]:active,
-button:active {
-  background: #6a6a6a;
-  border-color: #6a6a6a;
-  color: #fff;
+input[type=submit]:active,button:active
+{
+	background:#6a6a6a;
+	border-color:#6a6a6a;
+	color:#fff;
 }
 
-input[type=submit]:active a,
-button:active a {
-  color: #fff;
+input[type=submit]:active a,button:active a
+{
+	color:#fff;
 }
 
-input[type=submit]:disabled,
-button:disabled {
-  box-shadow: none;
-  cursor: not-allowed;
-  opacity: .40;
+input[type=submit]:disabled,button:disabled
+{
+	box-shadow:none;
+	cursor:not-allowed;
+	opacity:.40;
 }
 
-nav ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  text-align: center;
+nav ul
+{
+	list-style:none;
+	margin:0;
+	padding:0;
+	text-align:center;
 }
 
-nav ul li {
-  display: inline;
+nav ul li
+{
+	display:inline;
 }
 
-nav a {
-  -webkit-transition: .25s ease;
-  border-bottom: .2rem solid transparent;
-  color: #444;
-  padding: .8rem 1.6rem;
-  text-decoration: none;
-  -webkit-transition: .25s ease;
-  transition: .25s ease;
+nav a
+{
+	-webkit-transition:.25s ease;
+	border-bottom:.2rem solid transparent;
+	color:#444;
+	padding:.8rem 1.6rem;
+	text-decoration:none;
+	transition:.25s ease;
 }
 
-nav a:hover,
-nav li.selected a {
-  border-color: rgba(0,0,0,0.2);
+nav a:hover,nav li.selected a
+{
+	border-color:rgba(0,0,0,0.2);
 }
 
-nav a:active {
-  border-color: rgba(0,0,0,0.56);
+nav a:active
+{
+	border-color:rgba(0,0,0,0.56);
 }
 
-caption {
-  padding: .8rem 0;
+caption
+{
+	padding:.8rem 0;
 }
 
-thead th {
-  background: #efefef;
-  color: #444;
+thead th
+{
+	background:#efefef;
+	color:#444;
 }
 
-tr {
-  background: #fff;
-  margin-bottom: .8rem;
+tr
+{
+	background:#fff;
+	margin-bottom:.8rem;
 }
 
-th,
-td {
-  border: .1rem solid #ccc;
-  padding: .8rem 1.6rem;
-  text-align: center;
-  vertical-align: inherit;
+th,td
+{
+	border:.1rem solid #ccc;
+	padding:.8rem 1.6rem;
+	text-align:center;
+	vertical-align:inherit;
 }
 
-tfoot tr {
-  background: none;
+tfoot tr
+{
+	background:none;
 }
 
-tfoot td {
-  color: #efefef;
-  font-size: .8rem;
-  font-style: italic;
-  padding: 1.6rem .4rem;
+tfoot td
+{
+	color:#efefef;
+	font-size:.8rem;
+	font-style:italic;
+	padding:1.6rem .4rem;
 }
 
 @media screen {
-  [hidden~=screen] {
-    display: inherit;
-  }
+	[hidden~=screen]
+	{
+		display:inherit;
+	}
 
-  [hidden~=screen]:not(:active):not(:focus):not(:target) {
-    clip: rect(0000)!important;
-    position: absolute!important;
-  }
+	[hidden~=screen]:not(:active):not(:focus):not(:target)
+	{
+		clip:rect(0000)!important;
+		position:absolute!important;
+	}
 }
 
 @media screen and max-width 40rem {
-  article,
-  section,
-  aside {
-    clear: both;
-    display: block;
-    max-width: 100%;
-  }
+	article,section,aside
+	{
+		clear:both;
+		display:block;
+		max-width:100%;
+	}
 
-  img {
-    margin-right: 1.6rem;
-  }
+	img
+	{
+		margin-right:1.6rem;
+	}
 }
\ No newline at end of file
diff --git a/public/package.json b/public/package.json
index 6d6d0940..17f500c7 100644
--- a/public/package.json
+++ b/public/package.json
@@ -1,11 +1,17 @@
 {
-  "scripts": {
-    "watch": "npm-run-all --parallel watch:base watch:marx",
-    "watch:base": "myth -w css/base.myth.css css/base.css",
-    "watch:marx": "myth -w css/marx.myth.css css/marx.css"
-  },
-  "devDependencies": {
-    "myth": "^1.5.0",
-    "npm-run-all": "^1.7.0"
-  }
-}
+	"scripts": {
+		"build": "npm-run-all --parallel build:base build:marx",
+		"build:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/base.css css/base.myth.css",
+		"build:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/marx.css css/marx.myth.css",
+		"watch": "npm-run-all --parallel watch:base watch:marx",
+		"watch:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/base.css css/base.myth.css",
+		"watch:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/marx.css css/marx.myth.css"
+	},
+	"devDependencies": {
+		"autoprefixer": "^6.6.1",
+		"npm-run-all": "^4.0.0",
+		"postcss-cachify": "^1.3.1",
+		"postcss-cli": "^2.6.0",
+		"postcss-cssnext": "^2.9.0"
+	}
+}
\ No newline at end of file

From e6c96bed215db102e7f26a48c8c459b3eb52ba39 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 4 Jan 2017 13:51:04 -0500
Subject: [PATCH 57/65] Update postcss to actually output compatible css

---
 public/css/base.css | 100 ++++++++++++++++++++++----------------------
 public/css/marx.css |  83 ++++++++++++++++++++++++++++++++----
 public/package.json |   8 ++--
 3 files changed, 129 insertions(+), 62 deletions(-)

diff --git a/public/css/base.css b/public/css/base.css
index d0610647..ced08d25 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1,21 +1,9 @@
-:root {
-	--link-shadow: 1px 1px 1px #000;
-	--shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);
-	--title-overlay: rgba(0, 0, 0, 0.45);
-	--text-color: #ffffff;
-	--normal-padding: 0.25em 0.125em;
-	--link-hover-color: #7d12db;
-	--edit-link-hover-color: #db7d12;
-	--edit-link-color: #12db18;
-	--radius: 5px;
-}
-
 template, [hidden="hidden"], .media[hidden] {display:none}
 
 body {margin: 0.5em;}
 
 button {
-	background:rgba(255,255,255,0.65);
+	background:rgba(255, 255, 255, .65);
 	margin: 0;
 }
 
@@ -26,11 +14,13 @@ table {
 
 td {
 	padding:1em;
+	padding:16px;
 	padding:1rem;
 }
 
 thead td, thead th {
 	padding:0.5em;
+	padding:8px;
 	padding:0.5rem;
 }
 
@@ -43,7 +33,7 @@ tbody > tr:nth-child(odd) {
 }
 
 a:hover, a:active {
-	color: var(--link-hover-color)
+	color:#7d12db
 }
 
 /* -----------------------------------------------------------------------------
@@ -51,27 +41,28 @@ a:hover, a:active {
 ------------------------------------------------------------------------------*/
 
 .bracketed {
-	color:  var(--edit-link-color);
+	color:#12db18;
 }
 .bracketed, h1 a {
-	text-shadow: var(--link-shadow);
+	text-shadow:1px 1px 1px #000;
 }
 .bracketed:before {content: '[\00a0'}
 .bracketed:after {content: '\00a0]'}
 .bracketed:hover, .bracketed:active {
-	color: var(--edit-link-hover-color)
+	color:#db7d12
 }
 
-.grow-1 {-webkit-box-flex: 1;flex-grow: 1}
-.flex-wrap {flex-wrap: wrap}
-.flex-no-wrap {flex-wrap: nowrap}
-.flex-align-end {-webkit-box-align: end;align-items: flex-end}
-.flex-align-space-around {align-content: space-around}
-.flex-justify-space-around {justify-content: space-around}
-.flex-self-center {align-self:center}
-.flex {display: -webkit-box;display: flex}
+.grow-1 {-webkit-box-flex: 1;-ms-flex-positive: 1;flex-grow: 1}
+.flex-wrap {-ms-flex-wrap: wrap;flex-wrap: wrap}
+.flex-no-wrap {-ms-flex-wrap: nowrap;flex-wrap: nowrap}
+.flex-align-end {-webkit-box-align: end;-ms-flex-align: end;align-items: flex-end}
+.flex-align-space-around {-ms-flex-line-pack: distribute;align-content: space-around}
+.flex-justify-space-around {-ms-flex-pack: distribute;justify-content: space-around}
+.flex-self-center {-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center}
+.flex {display: -webkit-box;display: -ms-flexbox;display: flex}
 
 .small-font {
+	font-size:25.6px;
 	font-size:1.6rem;
 }
 
@@ -102,15 +93,16 @@ a:hover, a:active {
 }
 
 .user-btn {
-	border-color: var(--edit-link-color);
-	color: var(--edit-link-color);
-	text-shadow: var(--link-shadow);
+	border-color:#12db18;
+	color:#12db18;
+	text-shadow:1px 1px 1px #000;
 	padding:0 0.5em;
+	padding:0 8px;
 	padding:0 0.5rem;
 }
 .user-btn:hover, .user-btn:active {
-	border-color: var(--edit-link-hover-color);
-	background-color: var(--edit-link-hover-color);
+	border-color:#db7d12;
+	background-color:#db7d12;
 }
 
 /* -----------------------------------------------------------------------------
@@ -140,7 +132,7 @@ a:hover, a:active {
 	top: 0%;
 	-webkit-animation: cssload-rotate-one 1.15s linear infinite;
 	        animation: cssload-rotate-one 1.15s linear infinite;
-	border-bottom: 3px solid rgb(0,0,0);
+	border-bottom: 3px solid rgb(0, 0, 0);
 }
 
 .cssload-inner.cssload-two {
@@ -148,7 +140,7 @@ a:hover, a:active {
 	top: 0%;
 	-webkit-animation: cssload-rotate-two 1.15s linear infinite;
 	        animation: cssload-rotate-two 1.15s linear infinite;
-	border-right: 3px solid rgb(0,0,0);
+	border-right: 3px solid rgb(0, 0, 0);
 }
 
 .cssload-inner.cssload-three {
@@ -156,7 +148,7 @@ a:hover, a:active {
 	bottom: 0%;
 	-webkit-animation: cssload-rotate-three 1.15s linear infinite;
 	        animation: cssload-rotate-three 1.15s linear infinite;
-	border-top: 3px solid rgb(0,0,0);
+	border-top: 3px solid rgb(0, 0, 0);
 }
 
 @-webkit-keyframes cssload-rotate-one {
@@ -340,7 +332,7 @@ a:hover, a:active {
 	text-align:center;
 	width:220px;
 	height:311px;
-	margin: var(--normal-padding);
+	margin:0.25em 0.125em;
 }
 
 .media .edit_buttons > button {
@@ -351,10 +343,10 @@ a:hover, a:active {
 	.media_metadata > div,
 	.medium_metadata > div,
 	.row {
-		text-shadow: var(--shadow);
-		background: var(--title-overlay);
-		color: var(--text-color);
-		padding: var(--normal-padding);
+		text-shadow:1px 2px 1px rgba(0, 0, 0, .85);
+		background:rgba(0, 0, 0, .45);
+		color:#ffffff;
+		padding:0.25em 0.125em;
 		text-align:right;
 	}
 
@@ -384,15 +376,15 @@ a:hover, a:active {
 		.media:hover > .medium_metadata > div,
 		.media:hover > .table .row
 		{
-			-webkit-transition: .25s ease;
+			-webkit-transition:.25s ease;
 			transition: .25s ease;
-			background:rgba(0,0,0,0.75);
+			background:rgba(0, 0, 0, .75);
 		}
 
 		.media:hover > button[hidden],
 		.media:hover > .edit_buttons[hidden]
 		{
-			-webkit-transition: .25s ease;
+			-webkit-transition:.25s ease;
 			transition: .25s ease;
 			display:block;
 		}
@@ -400,7 +392,7 @@ a:hover, a:active {
 		.media > .name > a {
 			background:none;
 			color:#fff;
-			text-shadow: var(--shadow);
+			text-shadow:1px 2px 1px rgba(0, 0, 0, .85);
 		}
 
 
@@ -435,11 +427,14 @@ a:hover, a:active {
 
 .anime .row, .manga .row {
 	width:100%;
-	background: var(--title-overlay);
+	background:rgba(0, 0, 0, .45);
 	display: -webkit-box;
+	display: -ms-flexbox;
 	display: flex;
-	align-content: space-around;
-	justify-content: space-around;
+	-ms-flex-line-pack: distribute;
+	    align-content: space-around;
+	-ms-flex-pack: distribute;
+	    justify-content: space-around;
 	text-align:center;
 	padding:0 inherit;
 }
@@ -451,7 +446,8 @@ a:hover, a:active {
 .anime .row > div, .manga .row > div {
 	font-size:0.8em;
 	display:flex-item;
-	align-self:center;
+	-ms-flex-item-align:center;
+	    align-self:center;
 	text-align:center;
 	vertical-align:middle;
 }
@@ -491,7 +487,7 @@ a:hover, a:active {
 ------------------------------------------------------------------------------*/
 .media.search > .name {
 	background-color:#555;
-	background-color: rgba(000,000,000,0.35);
+	background-color: rgba(0, 0, 0, .35);
 	background-size: cover;
 	background-size: contain;
 	background-repeat: no-repeat;
@@ -502,14 +498,15 @@ a:hover, a:active {
 }
 
 .big-check:checked + label {
-	-webkit-transition: .25s ease;
+	-webkit-transition:.25s ease;
 	transition: .25s ease;
-	background:rgba(0,0,0,0.75);
+	background:rgba(0, 0, 0, .75);
 }
 
 .big-check:checked + label:after {
 	content: '✓';
 	font-size: 15em;
+	font-size:240px;
 	font-size: 15rem;
 	text-align:center;
 	color: greenyellow;
@@ -536,8 +533,11 @@ a:hover, a:active {
 	Details page styles
 -----------------------------------------------------------------------------*/
 .details {
+	margin:24px auto 0 auto;
 	margin: 1.5rem auto 0 auto;
+	max-width:1488px;
 	max-width:93rem;
+	padding:16px;
 	padding:1rem;
 	font-size:inherit;
 }
@@ -552,6 +552,7 @@ a:hover, a:active {
 }
 
 .details .flex > div {
+	margin:16px;
 	margin: 1rem;
 }
 
@@ -559,6 +560,7 @@ a:hover, a:active {
 	max-width:300px;
 }
 	.details td {
+		padding:0 24px;
 		padding:0 1.5rem;
 	}
 
diff --git a/public/css/marx.css b/public/css/marx.css
index 8e25ba1b..c4be9282 100644
--- a/public/css/marx.css
+++ b/public/css/marx.css
@@ -1,11 +1,10 @@
 :root
 {
-	--default-font-list:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
 	-ms-text-size-adjust:100%;
 	-webkit-text-size-adjust:100%;
 	box-sizing:border-box;
 	cursor:default;
-	font-family:var(--default-font-list);
+	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
 	line-height:1.4;
 	overflow-y:scroll;
 	text-size-adjust:100%;
@@ -37,6 +36,7 @@ main
 	display:block;
 	margin:0 auto;
 	padding:0 1.6em 1.6em;
+	padding:0 16px 16px;
 	padding:0 1.6rem 1.6rem;
 }
 
@@ -52,11 +52,14 @@ pre
 	display:block;
 	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
 	font-size:1.4em;
+	font-size:14px;
 	font-size:1.4rem;
 	margin:1.6em 0;
+	margin:16px 0;
 	margin:1.6rem 0;
 	overflow:auto;
 	padding:1.6em;
+	padding:16px;
 	padding:1.6rem;
 	word-break:break-all;
 	word-wrap:break-word;
@@ -85,11 +88,14 @@ template
 
 textarea
 {
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
 	border-radius:0;
 	display:block;
+	margin-bottom:8px;
 	margin-bottom:.8rem;
 	overflow:auto;
+	padding:8px;
 	padding:.8rem;
 	resize:vertical;
 	vertical-align:middle;
@@ -102,6 +108,8 @@ textarea
 
 [unselectable]
 {
+	-moz-user-select:none;
+	-ms-user-select:none;
 	-webkit-user-select:none;
 	user-select:none;
 }
@@ -142,6 +150,7 @@ audio,canvas,iframe,img,svg,video
 
 button,input,select,textarea
 {
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
 	color:inherit;
 	font-family:inherit;
@@ -159,9 +168,16 @@ table
 {
 	border-collapse:collapse;
 	border-spacing:0;
+	margin-bottom:16px;
 	margin-bottom:1.6rem;
 }
 
+::-moz-selection
+{
+	background-color:#b3d4fc;
+	text-shadow:none;
+}
+
 ::selection
 {
 	background-color:#b3d4fc;
@@ -176,7 +192,8 @@ button::-moz-focus-inner
 body
 {
 	color:#444;
-	font-family:var(--default-font-list);
+	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
+	font-size:16px;
 	font-size:1.6rem;
 	font-style:normal;
 	font-weight:400;
@@ -185,20 +202,24 @@ body
 
 p
 {
+	margin:0 0 16px;
 	margin:0 0 1.6rem;
 }
 
 h1,h2,h3,h4,h5,h6
 {
-	font-family:Lato, var(--default-font-list);
+	font-family:Lato, 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
 	margin:2em 0 1.6em;
+	margin:20px 0 16px;
 	margin:2rem 0 1.6rem;
 }
 
 h1
 {
-	border-bottom:.1rem solid rgba(0,0,0,0.2);
+	border-bottom:1px solid rgba(0, 0, 0, .2);
+	border-bottom:.1rem solid rgba(0, 0, 0, .2);
 	font-size:3.6em;
+	font-size:36px;
 	font-size:3.6rem;
 	font-style:normal;
 	font-weight:500;
@@ -207,6 +228,7 @@ h1
 h2
 {
 	font-size:3em;
+	font-size:30px;
 	font-size:3rem;
 	font-style:normal;
 	font-weight:500;
@@ -215,27 +237,33 @@ h2
 h3
 {
 	font-size:2.4em;
+	font-size:24px;
 	font-size:2.4rem;
 	font-style:normal;
 	font-weight:500;
+	margin:16px 0 4px;
 	margin:1.6rem 0 .4rem;
 }
 
 h4
 {
 	font-size:1.8em;
+	font-size:18px;
 	font-size:1.8rem;
 	font-style:normal;
 	font-weight:600;
+	margin:16px 0 4px;
 	margin:1.6rem 0 .4rem;
 }
 
 h5
 {
 	font-size:1.6em;
+	font-size:16px;
 	font-size:1.6rem;
 	font-style:normal;
 	font-weight:600;
+	margin:16px 0 4px;
 	margin:1.6rem 0 .4rem;
 }
 
@@ -243,9 +271,11 @@ h6
 {
 	color:#777;
 	font-size:1.4em;
+	font-size:14px;
 	font-size:1.4rem;
 	font-style:normal;
 	font-weight:600;
+	margin:16px 0 4px;
 	margin:1.6rem 0 .4rem;
 }
 
@@ -254,6 +284,7 @@ code
 	background:#efefef;
 	color:#444;
 	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
+	font-size:14px;
 	font-size:1.4rem;
 	word-break:break-all;
 	word-wrap:break-word;
@@ -266,26 +297,33 @@ a:hover,a:focus
 
 dl
 {
+	margin-bottom:16px;
 	margin-bottom:1.6rem;
 }
 
 dd
 {
+	margin-left:40px;
 	margin-left:4rem;
 }
 
 ul,ol
 {
+	margin-bottom:8px;
 	margin-bottom:.8rem;
+	padding-left:20px;
 	padding-left:2rem;
 }
 
 blockquote
 {
+	border-left:2px solid #1271db;
 	border-left:.2rem solid #1271db;
 	font-family:Georgia, Times, 'Times New Roman', serif;
 	font-style:italic;
+	margin:16px 0;
 	margin:1.6rem 0;
+	padding-left:16px;
 	padding-left:1.6rem;
 }
 
@@ -309,19 +347,23 @@ main,header,footer,article,section,aside,details,summary
 
 footer
 {
-	border-top:.1rem solid rgba(0,0,0,0.2);
+	border-top:1px solid rgba(0, 0, 0, .2);
+	border-top:.1rem solid rgba(0, 0, 0, .2);
 	clear:both;
 	display:inline-block;
 	float:left;
 	max-width:100%;
+	padding:10px 0;
 	padding:1rem 0;
 	text-align:center;
 }
 
 hr
 {
-	border-top:.1rem solid rgba(0,0,0,0.2);
+	border-top:1px solid rgba(0, 0, 0, .2);
+	border-top:.1rem solid rgba(0, 0, 0, .2);
 	display:block;
+	margin-bottom:16px;
 	margin-bottom:1.6rem;
 	width:100%;
 }
@@ -335,9 +377,11 @@ img
 
 input[type=text],input[type=password],input[type=email],input[type=url],input[type=date],input[type=month],input[type=time],input[type=datetime],input[type=datetime-local],input[type=week],input[type=number],input[type=search],input[type=tel],input[type=color],select
 {
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
 	border-radius:0;
 	display:inline-block;
+	padding:8px;
 	padding:.8rem;
 	vertical-align:middle;
 }
@@ -347,16 +391,19 @@ input:not([type])
 	-webkit-appearance:none;
 	background-clip:padding-box;
 	background-color:#fff;
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
 	border-radius:0;
 	color:#444;
 	display:inline-block;
+	padding:8px;
 	padding:.8rem;
 	text-align:left;
 }
 
 input[type=color]
 {
+	padding:8px 16px;
 	padding:.8rem 1.6rem;
 }
 
@@ -377,6 +424,7 @@ input[type=radio],input[type=checkbox]
 
 input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus
 {
+	outline:1px solid thin #444;
 	outline:.1rem solid thin #444;
 }
 
@@ -415,6 +463,7 @@ input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus,input
 select
 {
 	background-color:#fff;
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
 }
 
@@ -432,15 +481,19 @@ fieldset
 {
 	border:0;
 	margin:0;
+	padding:8px 0;
 	padding:.8rem 0;
 }
 
 legend
 {
+	border-bottom:1px solid #ccc;
 	border-bottom:.1rem solid #ccc;
 	color:#444;
 	display:block;
+	margin-bottom:8px;
 	margin-bottom:.8rem;
+	padding:8px 0;
 	padding:.8rem 0;
 	width:100%;
 }
@@ -452,13 +505,17 @@ input[type=submit],button
 	-webkit-transition:.25s ease;
 	-webkit-user-drag:none;
 	-webkit-user-select:none;
+	border:2px solid #444;
 	border:.2rem solid #444;
 	border-radius:0;
 	color:#444;
 	cursor:pointer;
 	display:inline-block;
+	margin-bottom:8px;
 	margin-bottom:.8rem;
+	margin-right:4px;
 	margin-right:.4rem;
+	padding:8px 16px;
 	padding:.8rem 1.6rem;
 	text-align:center;
 	text-decoration:none;
@@ -525,8 +582,10 @@ nav ul li
 nav a
 {
 	-webkit-transition:.25s ease;
+	border-bottom:2px solid transparent;
 	border-bottom:.2rem solid transparent;
 	color:#444;
+	padding:8px 16px;
 	padding:.8rem 1.6rem;
 	text-decoration:none;
 	transition:.25s ease;
@@ -534,16 +593,17 @@ nav a
 
 nav a:hover,nav li.selected a
 {
-	border-color:rgba(0,0,0,0.2);
+	border-color:rgba(0, 0, 0, .2);
 }
 
 nav a:active
 {
-	border-color:rgba(0,0,0,0.56);
+	border-color:rgba(0, 0, 0, .56);
 }
 
 caption
 {
+	padding:8px 0;
 	padding:.8rem 0;
 }
 
@@ -556,12 +616,15 @@ thead th
 tr
 {
 	background:#fff;
+	margin-bottom:8px;
 	margin-bottom:.8rem;
 }
 
 th,td
 {
+	border:1px solid #ccc;
 	border:.1rem solid #ccc;
+	padding:8px 16px;
 	padding:.8rem 1.6rem;
 	text-align:center;
 	vertical-align:inherit;
@@ -575,8 +638,10 @@ tfoot tr
 tfoot td
 {
 	color:#efefef;
+	font-size:8px;
 	font-size:.8rem;
 	font-style:italic;
+	padding:16px 4px;
 	padding:1.6rem .4rem;
 }
 
diff --git a/public/package.json b/public/package.json
index 17f500c7..039b7384 100644
--- a/public/package.json
+++ b/public/package.json
@@ -1,11 +1,11 @@
 {
 	"scripts": {
 		"build": "npm-run-all --parallel build:base build:marx",
-		"build:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/base.css css/base.myth.css",
-		"build:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -o css/marx.css css/marx.myth.css",
+		"build:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/base.css css/base.myth.css",
+		"build:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/marx.css css/marx.myth.css",
 		"watch": "npm-run-all --parallel watch:base watch:marx",
-		"watch:base": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/base.css css/base.myth.css",
-		"watch:marx": "postcss --use autoprefixer --autoprefixer.browsers \"> 5%\" -w -o css/marx.css css/marx.myth.css"
+		"watch:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/base.css css/base.myth.css",
+		"watch:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/marx.css css/marx.myth.css"
 	},
 	"devDependencies": {
 		"autoprefixer": "^6.6.1",

From 9eda00539911b015a78a6e1f25e4a47f898dc67e Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 5 Jan 2017 13:41:32 -0500
Subject: [PATCH 58/65] Authentication, show edit forms for Anime

---
 app/bootstrap.php                             |   6 +-
 app/config/minify_css_groups.php              |   1 -
 app/views/anime/cover.php                     |  19 +-
 app/views/anime/list.php                      |  18 +-
 app/views/header.php                          |   2 +-
 app/views/main-menu.php                       |   4 +-
 public/css/base.css                           | 751 +++++++++++++++++-
 public/css/base.myth.css                      |   2 +
 public/css/marx.css                           | 673 ----------------
 public/js.php                                 |   4 +-
 public/js/anime_collection.js                 |   2 +-
 public/package.json                           |  11 +-
 .../templates/anime-ajax-search-results.html  |  17 +-
 src/API/Kitsu.php                             |  36 +
 src/API/Kitsu/Auth.php                        |  36 +-
 src/API/Kitsu/Enum/AnimeWatchingStatus.php    |  10 +-
 src/API/Kitsu/KitsuModel.php                  | 122 ++-
 src/API/Kitsu/KitsuTrait.php                  |  43 +-
 .../Transformer/AnimeListTransformer.php      |   7 +-
 .../Kitsu/Transformer/AnimeTransformer.php    | 105 +--
 src/AnimeClient.php                           |   1 -
 src/Controller.php                            |   2 +-
 src/Controller/Anime.php                      |  27 +-
 src/Controller/Manga.php                      |   6 +-
 src/Model/API.php                             |   2 +-
 src/Model/Anime.php                           |  33 +-
 src/Model/AnimeCollection.php                 |  13 +-
 src/Model/Collection.php                      |   5 +-
 src/Model/Manga.php                           |  81 +-
 29 files changed, 1074 insertions(+), 965 deletions(-)
 delete mode 100644 public/css/marx.css
 mode change 100755 => 100644 public/js/anime_collection.js
 create mode 100644 src/API/Kitsu.php

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 5229f433..53848110 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -121,9 +121,9 @@ return function(array $config_array = []) {
 	});
 
 	// Miscellaneous Classes
-	/* $container->set('auth', function($container) {
-		return new HummingbirdAuth($container);
-	}); */
+	$container->set('auth', function($container) {
+		return new KitsuAuth($container);
+	});
 	$container->set('url-generator', function($container) {
 		return new UrlGenerator($container);
 	});
diff --git a/app/config/minify_css_groups.php b/app/config/minify_css_groups.php
index ee678a2d..1242b592 100644
--- a/app/config/minify_css_groups.php
+++ b/app/config/minify_css_groups.php
@@ -33,7 +33,6 @@ return [
 		),
 	*/
 	'base' => [
-		'marx.css',
 		'base.css'
 	]
 ];
diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index 5ca19c9d..c0fa5869 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -1,21 +1,20 @@
 <main>
-<?php /*if ($auth->is_authenticated()): ?>
+<?php if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
-<?php endif */ ?>
+<?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
-		<?php /*<pre><?= print_r($items, TRUE) ?></pre> */ ?>
 		<section class="status">
 			<h2><?= $escape->html($name) ?></h2>
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
-				<?php if ($item['private']/* && ! $auth->is_authenticated()*/) continue; ?>
+				<?php if ($item['private'] && ! $auth->is_authenticated()) continue; ?>
 				<article class="media" id="<?= $item['anime']['slug'] ?>">
-					<?php /* if ($auth->is_authenticated()): ?>
+					<?php if ($auth->is_authenticated()): ?>
 					<button title="Increment episode count" class="plus_one" hidden>+1 Episode</button>
-					<?php endif */ ?>
+					<?php endif ?>
 					<?= $helper->img($item['anime']['image']); ?>
 					<div class="name">
 						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]); ?>">
@@ -24,13 +23,13 @@
 						</a>
 					</div>
 					<div class="table">
-						<?php /* if ($auth->is_authenticated()): ?>
+						<?php if ($auth->is_authenticated()): ?>
 						<div class="row">
 							<span class="edit">
 								<a class="bracketed" title="Edit information about this anime" href="<?= $urlGenerator->url("anime/edit/{$item['id']}/{$item['watching_status']}") ?>">Edit</a>
 							</span>
 						</div>
-						<?php endif */ ?>
+						<?php endif ?>
 						<?php if ($item['private'] || $item['rewatching']): ?>
 						<div class="row">
 							<?php foreach(['private', 'rewatching'] as $attr): ?>
@@ -65,6 +64,6 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php /* if ($auth->is_authenticated()): ?>
+<?php if ($auth->is_authenticated()): ?>
 <script src="<?= $urlGenerator->asset_url('js.php/g/edit') ?>"></script>
-<?php endif */ ?>
\ No newline at end of file
+<?php endif ?>
\ No newline at end of file
diff --git a/app/views/anime/list.php b/app/views/anime/list.php
index 488feab3..cafeb586 100644
--- a/app/views/anime/list.php
+++ b/app/views/anime/list.php
@@ -1,7 +1,7 @@
 <main>
-<?php /*if ($auth->is_authenticated()): ?>
+<?php if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $url->generate('anime.add.get') ?>">Add Item</a>
-<?php endif */ ?>
+<?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
@@ -10,9 +10,9 @@
 	<table>
 		<thead>
 			<tr>
-				<?php /* if($auth->is_authenticated()): ?>
+				<?php if($auth->is_authenticated()): ?>
 				<td class="no_border">&nbsp;</td>
-				<?php endif */ ?>
+				<?php endif ?>
 				<th>Title</th>
 				<th>Airing Status</th>
 				<th>Score</th>
@@ -26,13 +26,13 @@
 		</thead>
 		<tbody>
 			<?php foreach($items as $item): ?>
-			<?php if ($item['private']) continue;// && ! $auth->is_authenticated()) continue; ?>
+			<?php if ($item['private'])  && ! $auth->is_authenticated()) continue; ?>
 			<tr id="a-<?= $item['id'] ?>">
-				<?php /*if ($auth->is_authenticated()): ?>
+				<?php if ($auth->is_authenticated()): ?>
 				<td>
 					<a class="bracketed" href="<?= $urlGenerator->url("/anime/edit/{$item['id']}/{$item['watching_status']}") ?>">Edit</a>
 				</td>
-				<?php endif*/ ?>
+				<?php endif ?>
 				<td class="justify">
 					<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
 						<?= $item['anime']['title'] ?>
@@ -73,5 +73,5 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php $group = /*($auth->is_authenticated()) ? 'table_edit' :*/ 'table' ?>
-<script src="<?= $urlGenerator->asset_url("js.php/g/{$group}") ?>"></script>
+<?php $group = ($auth->is_authenticated()) ? 'table_edit' : 'table' ?>
+<script src="<?= $urlGenerator->asset_url("js.php/g/{$group}") ?>"></script>
\ No newline at end of file
diff --git a/app/views/header.php b/app/views/header.php
index d5dd4835..4326beb3 100644
--- a/app/views/header.php
+++ b/app/views/header.php
@@ -6,7 +6,7 @@
 	<meta http-equiv="cache-control" content="no-store" />
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self'" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0" />
-	<link rel="stylesheet" href="<?= $urlGenerator->asset_url('css.php/g/base/debug') ?>" />
+	<link rel="stylesheet" href="<?= $urlGenerator->asset_url('css.php/g/base') ?>" />
 	<script src="<?= $urlGenerator->asset_url('js.php/g/base') ?>"></script>
 </head>
 <body class="<?= $escape->attr($url_type) ?> list">
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
index ae0045ea..be89435e 100644
--- a/app/views/main-menu.php
+++ b/app/views/main-menu.php
@@ -17,7 +17,7 @@
 			[<a href="<?= $urlGenerator->default_url('manga') ?>">Manga List</a>]
 		<?php endif ?>
 	</span>
-	<?php /* if ($auth->is_authenticated()): ?>
+	<?php if ($auth->is_authenticated()): ?>
 		<span class="flex-no-wrap">&nbsp;</span>
 		<span class="flex-no-wrap small-font">
 				<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
@@ -29,7 +29,7 @@
 			<a class="bracketed" href="<?= $url->generate('logout') ?>">Logout</a>
 		<?php else: ?>
 			[<a href="<?= $url->generate('login'); ?>"><?= $config->get('whose_list') ?>'s Login</a>]
-		<?php endif */ ?>
+		<?php endif ?>
 	</span>
 </h1>
 <nav>
diff --git a/public/css/base.css b/public/css/base.css
index ced08d25..cd393a9b 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1,3 +1,677 @@
+:root
+{
+	-ms-text-size-adjust:100%;
+	-webkit-text-size-adjust:100%;
+	box-sizing:border-box;
+	cursor:default;
+	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
+	line-height:1.4;
+	overflow-y:scroll;
+	text-size-adjust:100%;
+	scroll-behavior: smooth;
+}
+
+audio:not([controls])
+{
+	display:none;
+}
+
+details
+{
+	display:block;
+}
+
+input[type=search]
+{
+	-webkit-appearance:textfield;
+}
+
+input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration
+{
+	-webkit-appearance:none;
+}
+
+main
+{
+	display:block;
+	margin:0 auto;
+	padding:0 1.6em 1.6em;
+	padding:0 16px 16px;
+	padding:0 1.6rem 1.6rem;
+}
+
+summary
+{
+	display:block;
+}
+
+pre
+{
+	background:#efefef;
+	color:#444;
+	display:block;
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
+	font-size:1.4em;
+	font-size:14px;
+	font-size:1.4rem;
+	margin:1.6em 0;
+	margin:16px 0;
+	margin:1.6rem 0;
+	overflow:auto;
+	padding:1.6em;
+	padding:16px;
+	padding:1.6rem;
+	word-break:break-all;
+	word-wrap:break-word;
+}
+
+progress
+{
+	display:inline-block;
+}
+
+small
+{
+	color:#777;
+	font-size:75%;
+}
+
+big
+{
+	font-size:125%;
+}
+
+template
+{
+	display:none;
+}
+
+textarea
+{
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+	border-radius:0;
+	display:block;
+	margin-bottom:8px;
+	margin-bottom:.8rem;
+	overflow:auto;
+	padding:8px;
+	padding:.8rem;
+	resize:vertical;
+	vertical-align:middle;
+}
+
+[hidden]
+{
+	display:none;
+}
+
+[unselectable]
+{
+	-moz-user-select:none;
+	-ms-user-select:none;
+	-webkit-user-select:none;
+	user-select:none;
+}
+
+*,::before,::after
+{
+	border-style:solid;
+	border-width:0;
+	box-sizing:inherit;
+}
+
+*
+{
+	font-size:inherit;
+	line-height:inherit;
+	margin:0;
+	padding:0;
+}
+
+::before,::after
+{
+	text-decoration:inherit;
+	vertical-align:inherit;
+}
+
+a
+{
+	-webkit-transition:.25s ease;
+	color:#1271db;
+	text-decoration:none;
+	transition:.25s ease;
+}
+
+audio,canvas,iframe,img,svg,video
+{
+	vertical-align:middle;
+}
+
+button,input,select,textarea
+{
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+	color:inherit;
+	font-family:inherit;
+	font-style:inherit;
+	font-weight:inherit;
+	min-height:1.4em;
+}
+
+code,kbd,pre,samp
+{
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace, monospace;
+}
+
+table
+{
+	border-collapse:collapse;
+	border-spacing:0;
+	margin-bottom:16px;
+	margin-bottom:1.6rem;
+}
+
+::-moz-selection
+{
+	background-color:#b3d4fc;
+	text-shadow:none;
+}
+
+::selection
+{
+	background-color:#b3d4fc;
+	text-shadow:none;
+}
+
+button::-moz-focus-inner
+{
+	border:0;
+}
+
+body
+{
+	color:#444;
+	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
+	font-size:16px;
+	font-size:1.6rem;
+	font-style:normal;
+	font-weight:400;
+	padding:0;
+}
+
+p
+{
+	margin:0 0 16px;
+	margin:0 0 1.6rem;
+}
+
+h1,h2,h3,h4,h5,h6
+{
+	font-family:Lato, 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
+	margin:2em 0 1.6em;
+	margin:20px 0 16px;
+	margin:2rem 0 1.6rem;
+}
+
+h1
+{
+	border-bottom:1px solid rgba(0, 0, 0, .2);
+	border-bottom:.1rem solid rgba(0, 0, 0, .2);
+	font-size:3.6em;
+	font-size:36px;
+	font-size:3.6rem;
+	font-style:normal;
+	font-weight:500;
+}
+
+h2
+{
+	font-size:3em;
+	font-size:30px;
+	font-size:3rem;
+	font-style:normal;
+	font-weight:500;
+}
+
+h3
+{
+	font-size:2.4em;
+	font-size:24px;
+	font-size:2.4rem;
+	font-style:normal;
+	font-weight:500;
+	margin:16px 0 4px;
+	margin:1.6rem 0 .4rem;
+}
+
+h4
+{
+	font-size:1.8em;
+	font-size:18px;
+	font-size:1.8rem;
+	font-style:normal;
+	font-weight:600;
+	margin:16px 0 4px;
+	margin:1.6rem 0 .4rem;
+}
+
+h5
+{
+	font-size:1.6em;
+	font-size:16px;
+	font-size:1.6rem;
+	font-style:normal;
+	font-weight:600;
+	margin:16px 0 4px;
+	margin:1.6rem 0 .4rem;
+}
+
+h6
+{
+	color:#777;
+	font-size:1.4em;
+	font-size:14px;
+	font-size:1.4rem;
+	font-style:normal;
+	font-weight:600;
+	margin:16px 0 4px;
+	margin:1.6rem 0 .4rem;
+}
+
+code
+{
+	background:#efefef;
+	color:#444;
+	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
+	font-size:14px;
+	font-size:1.4rem;
+	word-break:break-all;
+	word-wrap:break-word;
+}
+
+a:hover,a:focus
+{
+	text-decoration:none;
+}
+
+dl
+{
+	margin-bottom:16px;
+	margin-bottom:1.6rem;
+}
+
+dd
+{
+	margin-left:40px;
+	margin-left:4rem;
+}
+
+ul,ol
+{
+	margin-bottom:8px;
+	margin-bottom:.8rem;
+	padding-left:20px;
+	padding-left:2rem;
+}
+
+blockquote
+{
+	border-left:2px solid #1271db;
+	border-left:.2rem solid #1271db;
+	font-family:Georgia, Times, 'Times New Roman', serif;
+	font-style:italic;
+	margin:16px 0;
+	margin:1.6rem 0;
+	padding-left:16px;
+	padding-left:1.6rem;
+}
+
+figcaption
+{
+	font-family:Georgia, Times, 'Times New Roman', serif;
+}
+
+html
+{
+	font-size:62.5%;
+}
+
+main,header,footer,article,section,aside,details,summary
+{
+	display:block;
+	height:auto;
+	margin:0 auto;
+	width:100%;
+}
+
+footer
+{
+	border-top:1px solid rgba(0, 0, 0, .2);
+	border-top:.1rem solid rgba(0, 0, 0, .2);
+	clear:both;
+	display:inline-block;
+	float:left;
+	max-width:100%;
+	padding:10px 0;
+	padding:1rem 0;
+	text-align:center;
+}
+
+hr
+{
+	border-top:1px solid rgba(0, 0, 0, .2);
+	border-top:.1rem solid rgba(0, 0, 0, .2);
+	display:block;
+	margin-bottom:16px;
+	margin-bottom:1.6rem;
+	width:100%;
+}
+
+img
+{
+	height:auto;
+	max-width:100%;
+	vertical-align:baseline;
+}
+
+input[type=text],input[type=password],input[type=email],input[type=url],input[type=date],input[type=month],input[type=time],input[type=datetime],input[type=datetime-local],input[type=week],input[type=number],input[type=search],input[type=tel],input[type=color],select
+{
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+	border-radius:0;
+	display:inline-block;
+	padding:8px;
+	padding:.8rem;
+	vertical-align:middle;
+}
+
+input:not([type])
+{
+	-webkit-appearance:none;
+	background-clip:padding-box;
+	background-color:#fff;
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+	border-radius:0;
+	color:#444;
+	display:inline-block;
+	padding:8px;
+	padding:.8rem;
+	text-align:left;
+}
+
+input[type=color]
+{
+	padding:8px 16px;
+	padding:.8rem 1.6rem;
+}
+
+input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,input[type=date]:focus,input[type=month]:focus,input[type=time]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=week]:focus,input[type=number]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=color]:focus,select:focus,textarea:focus
+{
+	border-color:#b3d4fc;
+}
+
+input:not([type]):focus
+{
+	border-color:#b3d4fc;
+}
+
+input[type=radio],input[type=checkbox]
+{
+	vertical-align:middle;
+}
+
+input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus
+{
+	outline:1px solid thin #444;
+	outline:.1rem solid thin #444;
+}
+
+input[type=text][disabled],input[type=password][disabled],input[type=email][disabled],input[type=url][disabled],input[type=date][disabled],input[type=month][disabled],input[type=time][disabled],input[type=datetime][disabled],input[type=datetime-local][disabled],input[type=week][disabled],input[type=number][disabled],input[type=search][disabled],input[type=tel][disabled],input[type=color][disabled],select[disabled],textarea[disabled]
+{
+	background-color:#efefef;
+	color:#777;
+	cursor:not-allowed;
+}
+
+input:not([type])[disabled]
+{
+	background-color:#efefef;
+	color:#777;
+	cursor:not-allowed;
+}
+
+input[readonly],select[readonly],textarea[readonly]
+{
+	background-color:#efefef;
+	border-color:#ccc;
+	color:#777;
+}
+
+input:focus:invalid,textarea:focus:invalid,select:focus:invalid
+{
+	border-color:#e9322d;
+	color:#b94a48;
+}
+
+input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus,input[type=checkbox]:focus:invalid:focus
+{
+	outline-color:#ff4136;
+}
+
+select
+{
+	background-color:#fff;
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+}
+
+select[multiple]
+{
+	height:auto;
+}
+
+label
+{
+	line-height:2;
+}
+
+fieldset
+{
+	border:0;
+	margin:0;
+	padding:8px 0;
+	padding:.8rem 0;
+}
+
+legend
+{
+	border-bottom:1px solid #ccc;
+	border-bottom:.1rem solid #ccc;
+	color:#444;
+	display:block;
+	margin-bottom:8px;
+	margin-bottom:.8rem;
+	padding:8px 0;
+	padding:.8rem 0;
+	width:100%;
+}
+
+input[type=submit],button
+{
+	-moz-user-select:none;
+	-ms-user-select:none;
+	-webkit-transition:.25s ease;
+	-webkit-user-drag:none;
+	-webkit-user-select:none;
+	border:2px solid #444;
+	border:.2rem solid #444;
+	border-radius:0;
+	color:#444;
+	cursor:pointer;
+	display:inline-block;
+	margin-bottom:8px;
+	margin-bottom:.8rem;
+	margin-right:4px;
+	margin-right:.4rem;
+	padding:8px 16px;
+	padding:.8rem 1.6rem;
+	text-align:center;
+	text-decoration:none;
+	text-transform:uppercase;
+	transition:.25s ease;
+	user-select:none;
+	vertical-align:baseline;
+}
+
+input[type=submit] a,button a
+{
+	color:#444;
+}
+
+input[type=submit]::-moz-focus-inner,button::-moz-focus-inner
+{
+	padding:0;
+}
+
+input[type=submit]:hover,button:hover
+{
+	background:#444;
+	border-color:#444;
+	color:#fff;
+}
+
+input[type=submit]:hover a,button:hover a
+{
+	color:#fff;
+}
+
+input[type=submit]:active,button:active
+{
+	background:#6a6a6a;
+	border-color:#6a6a6a;
+	color:#fff;
+}
+
+input[type=submit]:active a,button:active a
+{
+	color:#fff;
+}
+
+input[type=submit]:disabled,button:disabled
+{
+	box-shadow:none;
+	cursor:not-allowed;
+	opacity:.40;
+}
+
+nav ul
+{
+	list-style:none;
+	margin:0;
+	padding:0;
+	text-align:center;
+}
+
+nav ul li
+{
+	display:inline;
+}
+
+nav a
+{
+	-webkit-transition:.25s ease;
+	border-bottom:2px solid transparent;
+	border-bottom:.2rem solid transparent;
+	color:#444;
+	padding:8px 16px;
+	padding:.8rem 1.6rem;
+	text-decoration:none;
+	transition:.25s ease;
+}
+
+nav a:hover,nav li.selected a
+{
+	border-color:rgba(0, 0, 0, .2);
+}
+
+nav a:active
+{
+	border-color:rgba(0, 0, 0, .56);
+}
+
+caption
+{
+	padding:8px 0;
+	padding:.8rem 0;
+}
+
+thead th
+{
+	background:#efefef;
+	color:#444;
+}
+
+tr
+{
+	background:#fff;
+	margin-bottom:8px;
+	margin-bottom:.8rem;
+}
+
+th,td
+{
+	border:1px solid #ccc;
+	border:.1rem solid #ccc;
+	padding:8px 16px;
+	padding:.8rem 1.6rem;
+	text-align:center;
+	vertical-align:inherit;
+}
+
+tfoot tr
+{
+	background:none;
+}
+
+tfoot td
+{
+	color:#efefef;
+	font-size:8px;
+	font-size:.8rem;
+	font-style:italic;
+	padding:16px 4px;
+	padding:1.6rem .4rem;
+}
+
+@media screen {
+	[hidden~=screen]
+	{
+		display:inherit;
+	}
+
+	[hidden~=screen]:not(:active):not(:focus):not(:target)
+	{
+		clip:rect(0000)!important;
+		position:absolute!important;
+	}
+}
+
+@media screen and max-width 40rem {
+	article,section,aside
+	{
+		clear:both;
+		display:block;
+		max-width:100%;
+	}
+
+	img
+	{
+		margin-right:1.6rem;
+	}
+}
+
 template, [hidden="hidden"], .media[hidden] {display:none}
 
 body {margin: 0.5em;}
@@ -14,13 +688,13 @@ table {
 
 td {
 	padding:1em;
-	padding:16px;
+	padding:10px;
 	padding:1rem;
 }
 
 thead td, thead th {
 	padding:0.5em;
-	padding:8px;
+	padding:5px;
 	padding:0.5rem;
 }
 
@@ -43,32 +717,46 @@ a:hover, a:active {
 .bracketed {
 	color:#12db18;
 }
+
 .bracketed, h1 a {
 	text-shadow:1px 1px 1px #000;
 }
+
 .bracketed:before {content: '[\00a0'}
+
 .bracketed:after {content: '\00a0]'}
+
 .bracketed:hover, .bracketed:active {
 	color:#db7d12
 }
 
 .grow-1 {-webkit-box-flex: 1;-ms-flex-positive: 1;flex-grow: 1}
+
 .flex-wrap {-ms-flex-wrap: wrap;flex-wrap: wrap}
+
 .flex-no-wrap {-ms-flex-wrap: nowrap;flex-wrap: nowrap}
+
 .flex-align-end {-webkit-box-align: end;-ms-flex-align: end;align-items: flex-end}
+
 .flex-align-space-around {-ms-flex-line-pack: distribute;align-content: space-around}
+
 .flex-justify-space-around {-ms-flex-pack: distribute;justify-content: space-around}
+
 .flex-self-center {-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center}
+
 .flex {display: -webkit-box;display: -ms-flexbox;display: flex}
 
 .small-font {
-	font-size:25.6px;
+	font-size:16px;
 	font-size:1.6rem;
 }
 
 .justify {text-align:justify}
+
 .align_center {text-align:center}
+
 .align_left {text-align:left}
+
 .align_right {text-align:right}
 
 .valign_top {vertical-align:top}
@@ -97,9 +785,10 @@ a:hover, a:active {
 	color:#12db18;
 	text-shadow:1px 1px 1px #000;
 	padding:0 0.5em;
-	padding:0 8px;
+	padding:0 5px;
 	padding:0 0.5rem;
 }
+
 .user-btn:hover, .user-btn:active {
 	border-color:#db7d12;
 	background-color:#db7d12;
@@ -220,17 +909,21 @@ a:hover, a:active {
 /* -----------------------------------------------------------------------------
 	Table sorting and form styles
 ------------------------------------------------------------------------------*/
+
 .sorting,
 .sorting_asc,
 .sorting_desc {
 	vertical-align:text-bottom;
 }
+
 .sorting::before {
 	content: " ↕\00a0";
 }
+
 .sorting_asc::before {
 	content: " ↑\00a0";
 }
+
 .sorting_desc::before {
 	content: " ↓\00a0";
 }
@@ -247,6 +940,7 @@ a:hover, a:active {
 	min-width:25px;
 	max-width:30%;
 }
+
 .form tr > td:nth-child(even) {
 	text-align:left;
 	width:70%;
@@ -255,6 +949,7 @@ a:hover, a:active {
 .invisible tbody > tr:nth-child(odd) {
 	background: inherit;
 }
+
 .invisible tr, .invisible td, .invisible th {
 	border:0;
 }
@@ -300,7 +995,7 @@ a:hover, a:active {
 	background: #f3e6e6;
 }
 
-	.message.error .icon::after {
+.message.error .icon::after {
 		content: '✘';
 	}
 
@@ -308,7 +1003,8 @@ a:hover, a:active {
 	border:1px solid #1f8454;
 	background: #70dda9;
 }
-	.message.success .icon::after {
+
+.message.success .icon::after {
 		content: '✔'
 	}
 
@@ -317,7 +1013,7 @@ a:hover, a:active {
 	background: #FFFFCC;
 }
 
-	.message.info .icon::after {
+.message.info .icon::after {
 		content: '⚠';
 	}
 
@@ -339,7 +1035,7 @@ a:hover, a:active {
 	margin:0.5em auto;
 }
 
-	.name,
+.name,
 	.media_metadata > div,
 	.medium_metadata > div,
 	.row {
@@ -350,28 +1046,28 @@ a:hover, a:active {
 		text-align:right;
 	}
 
-	.media_type, .age_rating {
+.media_type, .age_rating {
 		text-align:left;
 	}
 
-	.media > .media_metadata {
+.media > .media_metadata {
 		position:absolute;
 		bottom:0;
 		right:0;
 	}
 
-	.media > .medium_metadata {
+.media > .medium_metadata {
 		position:absolute;
 		bottom: 0;
 		left:0;
 	}
 
-	.media > .name {
+.media > .name {
 		position:absolute;
 		top: 0;
 	}
 
-		.media:hover > .name,
+.media:hover > .name,
 		.media:hover > .media_metadata > div,
 		.media:hover > .medium_metadata > div,
 		.media:hover > .table .row
@@ -381,7 +1077,7 @@ a:hover, a:active {
 			background:rgba(0, 0, 0, .75);
 		}
 
-		.media:hover > button[hidden],
+.media:hover > button[hidden],
 		.media:hover > .edit_buttons[hidden]
 		{
 			-webkit-transition:.25s ease;
@@ -389,17 +1085,16 @@ a:hover, a:active {
 			display:block;
 		}
 
-		.media > .name > a {
+.media > .name > a {
 			background:none;
 			color:#fff;
 			text-shadow:1px 2px 1px rgba(0, 0, 0, .85);
 		}
 
-
-
 /* -----------------------------------------------------------------------------
 	Anime-list-specific styles
 ------------------------------------------------------------------------------*/
+
 .anime .name, .manga .name {
 	text-align:center;
 	width:100%;
@@ -417,7 +1112,6 @@ a:hover, a:active {
 	text-align:center;
 }
 
-
 .anime .table, .manga .table {
 	position:absolute;
 	bottom:0;
@@ -463,6 +1157,7 @@ a:hover, a:active {
 /* -----------------------------------------------------------------------------
 	Manga-list-specific styles
 ------------------------------------------------------------------------------*/
+
 .manga .row {
 	padding:1px;
 }
@@ -481,10 +1176,10 @@ a:hover, a:active {
 	left: calc(50% - 95px);
 }
 
-
 /* -----------------------------------------------------------------------------
 	Search page styles
 ------------------------------------------------------------------------------*/
+
 .media.search > .name {
 	background-color:#555;
 	background-color: rgba(0, 0, 0, .35);
@@ -506,7 +1201,7 @@ a:hover, a:active {
 .big-check:checked + label:after {
 	content: '✓';
 	font-size: 15em;
-	font-size:240px;
+	font-size:150px;
 	font-size: 15rem;
 	text-align:center;
 	color: greenyellow;
@@ -520,6 +1215,7 @@ a:hover, a:active {
 #series_list article.media {
 	position:relative;
 }
+
 #series_list .name, #series_list .name label {
 	position:absolute;
 	display:block;
@@ -532,12 +1228,13 @@ a:hover, a:active {
 /* ----------------------------------------------------------------------------
 	Details page styles
 -----------------------------------------------------------------------------*/
+
 .details {
-	margin:24px auto 0 auto;
+	margin:15px auto 0 auto;
 	margin: 1.5rem auto 0 auto;
-	max-width:1488px;
+	max-width:930px;
 	max-width:93rem;
-	padding:16px;
+	padding:10px;
 	padding:1rem;
 	font-size:inherit;
 }
@@ -552,15 +1249,16 @@ a:hover, a:active {
 }
 
 .details .flex > div {
-	margin:16px;
+	margin:10px;
 	margin: 1rem;
 }
 
 .details table {
 	max-width:300px;
 }
-	.details td {
-		padding:0 24px;
+
+.details td {
+		padding:0 15px;
 		padding:0 1.5rem;
 	}
 
@@ -573,6 +1271,7 @@ a:hover, a:active {
 	white-space:nowrap;
 	text-align:right;
 }
+
 .details td:nth-child(even) {
 	text-align:left;
 }
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index 56cf4a91..5c89e603 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -1,3 +1,5 @@
+@import "./marx.myth.css";
+
 :root {
 	--link-shadow: 1px 1px 1px #000;
 	--shadow: 1px 2px 1px rgba(0, 0, 0, 0.85);
diff --git a/public/css/marx.css b/public/css/marx.css
deleted file mode 100644
index c4be9282..00000000
--- a/public/css/marx.css
+++ /dev/null
@@ -1,673 +0,0 @@
-:root
-{
-	-ms-text-size-adjust:100%;
-	-webkit-text-size-adjust:100%;
-	box-sizing:border-box;
-	cursor:default;
-	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-	line-height:1.4;
-	overflow-y:scroll;
-	text-size-adjust:100%;
-	scroll-behavior: smooth;
-}
-
-audio:not([controls])
-{
-	display:none;
-}
-
-details
-{
-	display:block;
-}
-
-input[type=search]
-{
-	-webkit-appearance:textfield;
-}
-
-input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration
-{
-	-webkit-appearance:none;
-}
-
-main
-{
-	display:block;
-	margin:0 auto;
-	padding:0 1.6em 1.6em;
-	padding:0 16px 16px;
-	padding:0 1.6rem 1.6rem;
-}
-
-summary
-{
-	display:block;
-}
-
-pre
-{
-	background:#efefef;
-	color:#444;
-	display:block;
-	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
-	font-size:1.4em;
-	font-size:14px;
-	font-size:1.4rem;
-	margin:1.6em 0;
-	margin:16px 0;
-	margin:1.6rem 0;
-	overflow:auto;
-	padding:1.6em;
-	padding:16px;
-	padding:1.6rem;
-	word-break:break-all;
-	word-wrap:break-word;
-}
-
-progress
-{
-	display:inline-block;
-}
-
-small
-{
-	color:#777;
-	font-size:75%;
-}
-
-big
-{
-	font-size:125%;
-}
-
-template
-{
-	display:none;
-}
-
-textarea
-{
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-	border-radius:0;
-	display:block;
-	margin-bottom:8px;
-	margin-bottom:.8rem;
-	overflow:auto;
-	padding:8px;
-	padding:.8rem;
-	resize:vertical;
-	vertical-align:middle;
-}
-
-[hidden]
-{
-	display:none;
-}
-
-[unselectable]
-{
-	-moz-user-select:none;
-	-ms-user-select:none;
-	-webkit-user-select:none;
-	user-select:none;
-}
-
-*,::before,::after
-{
-	border-style:solid;
-	border-width:0;
-	box-sizing:inherit;
-}
-
-*
-{
-	font-size:inherit;
-	line-height:inherit;
-	margin:0;
-	padding:0;
-}
-
-::before,::after
-{
-	text-decoration:inherit;
-	vertical-align:inherit;
-}
-
-a
-{
-	-webkit-transition:.25s ease;
-	color:#1271db;
-	text-decoration:none;
-	transition:.25s ease;
-}
-
-audio,canvas,iframe,img,svg,video
-{
-	vertical-align:middle;
-}
-
-button,input,select,textarea
-{
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-	color:inherit;
-	font-family:inherit;
-	font-style:inherit;
-	font-weight:inherit;
-	min-height:1.4em;
-}
-
-code,kbd,pre,samp
-{
-	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace, monospace;
-}
-
-table
-{
-	border-collapse:collapse;
-	border-spacing:0;
-	margin-bottom:16px;
-	margin-bottom:1.6rem;
-}
-
-::-moz-selection
-{
-	background-color:#b3d4fc;
-	text-shadow:none;
-}
-
-::selection
-{
-	background-color:#b3d4fc;
-	text-shadow:none;
-}
-
-button::-moz-focus-inner
-{
-	border:0;
-}
-
-body
-{
-	color:#444;
-	font-family:'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-	font-size:16px;
-	font-size:1.6rem;
-	font-style:normal;
-	font-weight:400;
-	padding:0;
-}
-
-p
-{
-	margin:0 0 16px;
-	margin:0 0 1.6rem;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-family:Lato, 'Open Sans', 'Nimbus Sans L', 'Helvetica Neue', Helvetica, 'Lucida Grande', sans-serif;
-	margin:2em 0 1.6em;
-	margin:20px 0 16px;
-	margin:2rem 0 1.6rem;
-}
-
-h1
-{
-	border-bottom:1px solid rgba(0, 0, 0, .2);
-	border-bottom:.1rem solid rgba(0, 0, 0, .2);
-	font-size:3.6em;
-	font-size:36px;
-	font-size:3.6rem;
-	font-style:normal;
-	font-weight:500;
-}
-
-h2
-{
-	font-size:3em;
-	font-size:30px;
-	font-size:3rem;
-	font-style:normal;
-	font-weight:500;
-}
-
-h3
-{
-	font-size:2.4em;
-	font-size:24px;
-	font-size:2.4rem;
-	font-style:normal;
-	font-weight:500;
-	margin:16px 0 4px;
-	margin:1.6rem 0 .4rem;
-}
-
-h4
-{
-	font-size:1.8em;
-	font-size:18px;
-	font-size:1.8rem;
-	font-style:normal;
-	font-weight:600;
-	margin:16px 0 4px;
-	margin:1.6rem 0 .4rem;
-}
-
-h5
-{
-	font-size:1.6em;
-	font-size:16px;
-	font-size:1.6rem;
-	font-style:normal;
-	font-weight:600;
-	margin:16px 0 4px;
-	margin:1.6rem 0 .4rem;
-}
-
-h6
-{
-	color:#777;
-	font-size:1.4em;
-	font-size:14px;
-	font-size:1.4rem;
-	font-style:normal;
-	font-weight:600;
-	margin:16px 0 4px;
-	margin:1.6rem 0 .4rem;
-}
-
-code
-{
-	background:#efefef;
-	color:#444;
-	font-family:Menlo, Monaco, Consolas, 'Courier New', monospace;
-	font-size:14px;
-	font-size:1.4rem;
-	word-break:break-all;
-	word-wrap:break-word;
-}
-
-a:hover,a:focus
-{
-	text-decoration:none;
-}
-
-dl
-{
-	margin-bottom:16px;
-	margin-bottom:1.6rem;
-}
-
-dd
-{
-	margin-left:40px;
-	margin-left:4rem;
-}
-
-ul,ol
-{
-	margin-bottom:8px;
-	margin-bottom:.8rem;
-	padding-left:20px;
-	padding-left:2rem;
-}
-
-blockquote
-{
-	border-left:2px solid #1271db;
-	border-left:.2rem solid #1271db;
-	font-family:Georgia, Times, 'Times New Roman', serif;
-	font-style:italic;
-	margin:16px 0;
-	margin:1.6rem 0;
-	padding-left:16px;
-	padding-left:1.6rem;
-}
-
-figcaption
-{
-	font-family:Georgia, Times, 'Times New Roman', serif;
-}
-
-html
-{
-	font-size:62.5%;
-}
-
-main,header,footer,article,section,aside,details,summary
-{
-	display:block;
-	height:auto;
-	margin:0 auto;
-	width:100%;
-}
-
-footer
-{
-	border-top:1px solid rgba(0, 0, 0, .2);
-	border-top:.1rem solid rgba(0, 0, 0, .2);
-	clear:both;
-	display:inline-block;
-	float:left;
-	max-width:100%;
-	padding:10px 0;
-	padding:1rem 0;
-	text-align:center;
-}
-
-hr
-{
-	border-top:1px solid rgba(0, 0, 0, .2);
-	border-top:.1rem solid rgba(0, 0, 0, .2);
-	display:block;
-	margin-bottom:16px;
-	margin-bottom:1.6rem;
-	width:100%;
-}
-
-img
-{
-	height:auto;
-	max-width:100%;
-	vertical-align:baseline;
-}
-
-input[type=text],input[type=password],input[type=email],input[type=url],input[type=date],input[type=month],input[type=time],input[type=datetime],input[type=datetime-local],input[type=week],input[type=number],input[type=search],input[type=tel],input[type=color],select
-{
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-	border-radius:0;
-	display:inline-block;
-	padding:8px;
-	padding:.8rem;
-	vertical-align:middle;
-}
-
-input:not([type])
-{
-	-webkit-appearance:none;
-	background-clip:padding-box;
-	background-color:#fff;
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-	border-radius:0;
-	color:#444;
-	display:inline-block;
-	padding:8px;
-	padding:.8rem;
-	text-align:left;
-}
-
-input[type=color]
-{
-	padding:8px 16px;
-	padding:.8rem 1.6rem;
-}
-
-input[type=text]:focus,input[type=password]:focus,input[type=email]:focus,input[type=url]:focus,input[type=date]:focus,input[type=month]:focus,input[type=time]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=week]:focus,input[type=number]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=color]:focus,select:focus,textarea:focus
-{
-	border-color:#b3d4fc;
-}
-
-input:not([type]):focus
-{
-	border-color:#b3d4fc;
-}
-
-input[type=radio],input[type=checkbox]
-{
-	vertical-align:middle;
-}
-
-input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus
-{
-	outline:1px solid thin #444;
-	outline:.1rem solid thin #444;
-}
-
-input[type=text][disabled],input[type=password][disabled],input[type=email][disabled],input[type=url][disabled],input[type=date][disabled],input[type=month][disabled],input[type=time][disabled],input[type=datetime][disabled],input[type=datetime-local][disabled],input[type=week][disabled],input[type=number][disabled],input[type=search][disabled],input[type=tel][disabled],input[type=color][disabled],select[disabled],textarea[disabled]
-{
-	background-color:#efefef;
-	color:#777;
-	cursor:not-allowed;
-}
-
-input:not([type])[disabled]
-{
-	background-color:#efefef;
-	color:#777;
-	cursor:not-allowed;
-}
-
-input[readonly],select[readonly],textarea[readonly]
-{
-	background-color:#efefef;
-	border-color:#ccc;
-	color:#777;
-}
-
-input:focus:invalid,textarea:focus:invalid,select:focus:invalid
-{
-	border-color:#e9322d;
-	color:#b94a48;
-}
-
-input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus,input[type=checkbox]:focus:invalid:focus
-{
-	outline-color:#ff4136;
-}
-
-select
-{
-	background-color:#fff;
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-}
-
-select[multiple]
-{
-	height:auto;
-}
-
-label
-{
-	line-height:2;
-}
-
-fieldset
-{
-	border:0;
-	margin:0;
-	padding:8px 0;
-	padding:.8rem 0;
-}
-
-legend
-{
-	border-bottom:1px solid #ccc;
-	border-bottom:.1rem solid #ccc;
-	color:#444;
-	display:block;
-	margin-bottom:8px;
-	margin-bottom:.8rem;
-	padding:8px 0;
-	padding:.8rem 0;
-	width:100%;
-}
-
-input[type=submit],button
-{
-	-moz-user-select:none;
-	-ms-user-select:none;
-	-webkit-transition:.25s ease;
-	-webkit-user-drag:none;
-	-webkit-user-select:none;
-	border:2px solid #444;
-	border:.2rem solid #444;
-	border-radius:0;
-	color:#444;
-	cursor:pointer;
-	display:inline-block;
-	margin-bottom:8px;
-	margin-bottom:.8rem;
-	margin-right:4px;
-	margin-right:.4rem;
-	padding:8px 16px;
-	padding:.8rem 1.6rem;
-	text-align:center;
-	text-decoration:none;
-	text-transform:uppercase;
-	transition:.25s ease;
-	user-select:none;
-	vertical-align:baseline;
-}
-
-input[type=submit] a,button a
-{
-	color:#444;
-}
-
-input[type=submit]::-moz-focus-inner,button::-moz-focus-inner
-{
-	padding:0;
-}
-
-input[type=submit]:hover,button:hover
-{
-	background:#444;
-	border-color:#444;
-	color:#fff;
-}
-
-input[type=submit]:hover a,button:hover a
-{
-	color:#fff;
-}
-
-input[type=submit]:active,button:active
-{
-	background:#6a6a6a;
-	border-color:#6a6a6a;
-	color:#fff;
-}
-
-input[type=submit]:active a,button:active a
-{
-	color:#fff;
-}
-
-input[type=submit]:disabled,button:disabled
-{
-	box-shadow:none;
-	cursor:not-allowed;
-	opacity:.40;
-}
-
-nav ul
-{
-	list-style:none;
-	margin:0;
-	padding:0;
-	text-align:center;
-}
-
-nav ul li
-{
-	display:inline;
-}
-
-nav a
-{
-	-webkit-transition:.25s ease;
-	border-bottom:2px solid transparent;
-	border-bottom:.2rem solid transparent;
-	color:#444;
-	padding:8px 16px;
-	padding:.8rem 1.6rem;
-	text-decoration:none;
-	transition:.25s ease;
-}
-
-nav a:hover,nav li.selected a
-{
-	border-color:rgba(0, 0, 0, .2);
-}
-
-nav a:active
-{
-	border-color:rgba(0, 0, 0, .56);
-}
-
-caption
-{
-	padding:8px 0;
-	padding:.8rem 0;
-}
-
-thead th
-{
-	background:#efefef;
-	color:#444;
-}
-
-tr
-{
-	background:#fff;
-	margin-bottom:8px;
-	margin-bottom:.8rem;
-}
-
-th,td
-{
-	border:1px solid #ccc;
-	border:.1rem solid #ccc;
-	padding:8px 16px;
-	padding:.8rem 1.6rem;
-	text-align:center;
-	vertical-align:inherit;
-}
-
-tfoot tr
-{
-	background:none;
-}
-
-tfoot td
-{
-	color:#efefef;
-	font-size:8px;
-	font-size:.8rem;
-	font-style:italic;
-	padding:16px 4px;
-	padding:1.6rem .4rem;
-}
-
-@media screen {
-	[hidden~=screen]
-	{
-		display:inherit;
-	}
-
-	[hidden~=screen]:not(:active):not(:focus):not(:target)
-	{
-		clip:rect(0000)!important;
-		position:absolute!important;
-	}
-}
-
-@media screen and max-width 40rem {
-	article,section,aside
-	{
-		clear:both;
-		display:block;
-		max-width:100%;
-	}
-
-	img
-	{
-		margin-right:1.6rem;
-	}
-}
\ No newline at end of file
diff --git a/public/js.php b/public/js.php
index 07f5a30a..22bc1718 100644
--- a/public/js.php
+++ b/public/js.php
@@ -118,7 +118,7 @@ class JSMin extends BaseMin {
 	protected function check_minify_errors($options)
 	{
 		$error_res = $this->closure_call($options);
-		$error_json = $error_res->getBody();
+		$error_json = (string)$error_res->getBody();
 		$error_obj = json_decode($error_json) ?: (object)[];
 
 		// Show error if exists
@@ -201,7 +201,7 @@ class JSMin extends BaseMin {
 		// Now actually retrieve the compiled code
 		$options['output_info'] = 'compiled_code';
 		$res = $this->closure_call($options);
-		$json = $res->getBody();
+		$json = (string)$res->getBody();
 		$obj = json_decode($json);
 
 		return $obj->compiledCode;
diff --git a/public/js/anime_collection.js b/public/js/anime_collection.js
old mode 100755
new mode 100644
index 7132b136..d0e51155
--- a/public/js/anime_collection.js
+++ b/public/js/anime_collection.js
@@ -10,7 +10,7 @@
 
 			// Give mustache a key to iterate over
 			searchResults = {
-				anime: searchResults
+				data: searchResults.data
 			};
 
 			Mustache.parse(tempHtml);
diff --git a/public/package.json b/public/package.json
index 039b7384..ded887c8 100644
--- a/public/package.json
+++ b/public/package.json
@@ -1,17 +1,14 @@
 {
 	"scripts": {
-		"build": "npm-run-all --parallel build:base build:marx",
-		"build:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/base.css css/base.myth.css",
-		"build:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -o css/marx.css css/marx.myth.css",
-		"watch": "npm-run-all --parallel watch:base watch:marx",
-		"watch:base": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/base.css css/base.myth.css",
-		"watch:marx": "postcss --autoprefixer.browsers \"> 5%\" --use postcss-cssnext -w -o css/marx.css css/marx.myth.css"
+		"build": "postcss -u postcss-import --autoprefixer.browsers \"> 5%\" -u postcss-cssnext  -o css/base.css css/base.myth.css",
+		"watch": "postcss -u postcss-import --autoprefixer.browsers \"> 5%\" -u postcss-cssnext -w -o css/base.css css/base.myth.css"
 	},
 	"devDependencies": {
 		"autoprefixer": "^6.6.1",
 		"npm-run-all": "^4.0.0",
 		"postcss-cachify": "^1.3.1",
 		"postcss-cli": "^2.6.0",
-		"postcss-cssnext": "^2.9.0"
+		"postcss-cssnext": "^2.9.0",
+		"postcss-import": "^9.0.0"
 	}
 }
\ No newline at end of file
diff --git a/public/templates/anime-ajax-search-results.html b/public/templates/anime-ajax-search-results.html
index 5fdf13b3..a28371f7 100644
--- a/public/templates/anime-ajax-search-results.html
+++ b/public/templates/anime-ajax-search-results.html
@@ -1,10 +1,15 @@
-{{#anime}}
+{{#data}}
 <article class="media search">
-	<div class="name" style="background-image:url({{cover_image}})">
-		<input type="radio" class="big-check" id="{{slug}}" name="id" value="{{id}}" />
-		<label for="{{slug}}">
-			<span>{{title}}<br />{{alternate_title}}</span>
+	<div class="name" style="background-image:url({{attributes.posterImage.small}})">
+		<input type="radio" class="big-check" id="{{attributes.slug}}" name="id" value="{{id}}" />
+		<label for="{{attributes.slug}}">
+			<span class="name">
+				{{attributes.canonicalTitle}}<br />
+				{{attributes.titles.en}}<br />
+				{{attributes.titles.en_jp}}<br />
+				{{attributes.titles.ja_jp}}
+			</span>
 		</label>
 	</div>
 </article>
-{{/anime}}
\ No newline at end of file
+{{/data}}
\ No newline at end of file
diff --git a/src/API/Kitsu.php b/src/API/Kitsu.php
new file mode 100644
index 00000000..9753e993
--- /dev/null
+++ b/src/API/Kitsu.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
+
+/**
+ * Constants and mappings for the Kitsu API
+ */
+class Kitsu {
+
+	public static function getStatusToSelectMap()
+	{
+		return [
+			AnimeWatchingStatus::WATCHING => 'Currently Watching',
+			AnimeWatchingStatus::PLAN_TO_WATCH => 'Plan to Watch',
+			AnimeWatchingStatus::COMPLETED => 'Completed',
+			AnimeWatchingStatus::ON_HOLD => 'On Hold',
+			AnimeWatchingStatus::DROPPED => 'Dropped'
+		];
+	}
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/Auth.php b/src/API/Kitsu/Auth.php
index 90358a10..e940d878 100644
--- a/src/API/Kitsu/Auth.php
+++ b/src/API/Kitsu/Auth.php
@@ -1,19 +1,19 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
@@ -62,8 +62,8 @@ class Auth {
 	 */
 	public function authenticate($password)
 	{
-		$username = $this->container->get('config')
-			->get('kitsu_username');
+		$config = $this->container->get('config');
+		$username = $config->get(['kitsu_username']);
 		$auth_token = $this->model->authenticate($username, $password);
 
 		if (FALSE !== $auth_token)
diff --git a/src/API/Kitsu/Enum/AnimeWatchingStatus.php b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
index 850aece1..74ecc682 100644
--- a/src/API/Kitsu/Enum/AnimeWatchingStatus.php
+++ b/src/API/Kitsu/Enum/AnimeWatchingStatus.php
@@ -22,10 +22,10 @@ use Aviat\Ion\Enum as BaseEnum;
  * Possible values for watching status for the current anime
  */
 class AnimeWatchingStatus extends BaseEnum {
-	const WATCHING = 1;
-	const PLAN_TO_WATCH = 2;
-	const COMPLETED = 3;
-	const ON_HOLD = 4;
-	const DROPPED = 5;
+	const WATCHING = 'current';
+	const PLAN_TO_WATCH = 'planned';
+	const COMPLETED = 'completed';
+	const ON_HOLD = 'on_hold';
+	const DROPPED = 'dropped';
 }
 // End of AnimeWatchingStatus.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 845c6488..f3a9f85f 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -20,14 +20,13 @@ use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\Kitsu\Transformer\{
 	AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
 };
-use Aviat\Ion\Json;
-use GuzzleHttp\Exception\ClientException;
+use Aviat\Ion\Di\ContainerAware;
 
 /**
  * Kitsu API Model
  */
 class KitsuModel {
-
+	use ContainerAware;
 	use KitsuTrait;
 
 	const CLIENT_ID = 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd';
@@ -47,6 +46,11 @@ class KitsuModel {
 	 */
 	protected $animeTransformer;
 
+	/**
+	 * @var MangaTransformer
+	 */
+	protected $mangaTransformer;
+
 	/**
 	 * @var MangaListTransformer
 	 */
@@ -66,6 +70,19 @@ class KitsuModel {
 		$this->mangaListTransformer = new MangaListTransformer();
 	}
 
+	public function getUserIdByUsername(string $username)
+	{
+		$data = $this->getRequest('users', [
+			'query' => [
+				'filter' => [
+					'name' => $username
+				]
+			]
+		]);
+
+		return $data['data'][0]['id'];
+	}
+
 	/**
 	 * Get the access token from the Kitsu API
 	 *
@@ -76,38 +93,66 @@ class KitsuModel {
 	public function authenticate(string $username, string $password)
 	{
 		$data = $this->postRequest(AnimeClient::KITSU_AUTH_URL, [
-			'body' => http_build_query([
+			'form_params' => [
 				'grant_type' => 'password',
 				'username' => $username,
-				'password' => $password,
-				'client_id' => self::CLIENT_ID,
-				'client_secret' => self::CLIENT_SECRET
-			])
+				'password' => $password
+			]
 		]);
 
-		if (array_key_exists('access_token', $data)) {
-			// @TODO save token
-			return true;
+		if (array_key_exists('access_token', $data))
+		{
+			return $data['access_token'];
 		}
 
 		return false;
 	}
 
+	/**
+	 * Get information about a particular anime
+	 *
+	 * @param string $animeId
+	 * @return array
+	 */
 	public function getAnime(string $animeId): array
 	{
-		$baseData = $this->getRawAnimeData($animeId);
+		$baseData = $this->getRawMediaData('anime', $animeId);
 		return $this->animeTransformer->transform($baseData);
 	}
 
+	/**
+	 * Get information about a particular manga
+	 *
+	 * @param string $animeId
+	 * @return array
+	 */
 	public function getManga(string $mangaId): array
 	{
 		$baseData = $this->getRawMediaData('manga', $mangaId);
 		return $this->mangaTransformer->transform($baseData);
 	}
 
-	public function getRawAnimeData($animeId): array
+	public function getListItem(string $listId): array
 	{
-		return $this->getRawMediaData('anime', $animeId);
+		$baseData = $this->getRequest("library-entries/{$listId}", [
+			'query' => [
+				'include' => 'media'
+			]
+		]);
+
+		switch ($baseData['included'][0]['type'])
+		{
+			case 'anime':
+				$baseData['data']['anime'] = $baseData['included'][0];
+				return $this->animeListTransformer->transform($baseData['data']);
+
+			case 'manga':
+				$baseData['data']['manga'] = $baseData['included'][0];
+				return $this->mangaListTransformer->transform($baseData['data']);
+
+			default:
+				return $baseData['data']['attributes'];
+		}
 	}
 
 	public function getAnimeList($status): array
@@ -115,7 +160,7 @@ class KitsuModel {
 		$options = [
 			'query' => [
 				'filter' => [
-					'user_id' => 2644,
+					'user_id' => $this->getUserIdByUsername($this->getUsername()),
 					'media_type' => 'Anime',
 					'status' => $status,
 				],
@@ -145,7 +190,7 @@ class KitsuModel {
 		$options = [
 			'query' => [
 				'filter' => [
-					'user_id' => 2644,
+					'user_id' => $this->getUserIdByUsername($this->getUsername()),
 					'media_type' => 'Manga',
 					'status' => $status,
 				],
@@ -170,21 +215,48 @@ class KitsuModel {
 		return $transformed;
 	}
 
-	private function getGenres(string $type, string $id): array
+	public function search(string $type, string $query): array
 	{
-		$data = $this->getRequest("{$type}/{$id}/genres");
-		$rawGenres = array_pluck($data['data'], 'attributes');
-		$genres = array_pluck($rawGenres, 'name');
+		$options = [
+			'query' => [
+				'filter' => [
+					'text' => $query
+				]
+			],
+			'include' => 'media'
+		];
 
-		return $genres;
+		$data = $this->getRequest($type, $options);
+
+		// @TODO implement search api call
+		return $data;
 	}
 
-	private function getRawMediaData(string $type, string $id): array
+	private function getUsername(): string
 	{
-		$data = $this->getRequest("{$type}/{$id}");
-		$baseData = $data['data']['attributes'];
-		$baseData['genres'] = $this->getGenres($type, $id);
+		return $this->getContainer()
+			->get('config')
+			->get(['kitsu_username']);
+	}
 
+	private function getRawMediaData(string $type, string $slug): array
+	{
+		$options = [
+			'query' => [
+				'filter' => [
+					'slug' => $slug
+				],
+				'include' => 'genres,mappings,streamingLinks',
+			]
+		];
+
+		$data = $this->getRequest($type, $options);
+
+		$baseData = $data['data'][0]['attributes'];
+		$rawGenres = array_pluck($data['included'], 'attributes');
+		$genres = array_pluck($rawGenres, 'name');
+		$baseData['genres'] = $genres;
+		$baseData['included'] = $data['included'];
 		return $baseData;
 	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index d911454b..204e7516 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient\API\Kitsu;
 
+use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\GuzzleTrait;
 use Aviat\Ion\Di\ContainerAware;
 use Aviat\Ion\Json;
@@ -25,7 +26,6 @@ use InvalidArgumentException;
 use RuntimeException;
 
 trait KitsuTrait {
-	use ContainerAware;
 	use GuzzleTrait;
 
 	/**
@@ -41,21 +41,23 @@ trait KitsuTrait {
 	 */
 	protected function init()
 	{
+		$defaults = [
+			'cookies' => $this->cookieJar,
+			'headers' => [
+				'User-Agent' => "Tim's Anime Client/4.0",
+				'Accept-Encoding' => 'application/vnd.api+json',
+				'Content-Type' => 'application/vnd.api+json'
+			],
+			'timeout' => 25,
+			'connect_timeout' => 25
+		];
+
 		$this->cookieJar = new CookieJar();
 		$this->client = new Client([
 			'base_uri' => $this->baseUrl,
 			'cookies' => TRUE,
 			'http_errors' => TRUE,
-			'defaults' => [
-				'cookies' => $this->cookieJar,
-				'headers' => [
-					'User-Agent' => "Tim's Anime Client/4.0",
-					'Accept-Encoding' => 'application/vnd.api+json',
-					'Content-Type' => 'application/vnd.api+json'
-				],
-				'timeout' => 25,
-				'connect_timeout' => 25
-			]
+			'defaults' => $defaults
 		]);
 	}
 
@@ -78,11 +80,6 @@ trait KitsuTrait {
 
 		$logger = NULL;
 
-		if ($this->getContainer())
-		{
-			$logger = $this->container->getLogger('default');
-		}
-
 		$defaultOptions = [
 			'headers' => [
 				'client_id' => 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd',
@@ -90,6 +87,20 @@ trait KitsuTrait {
 			]
 		];
 
+		if ($this->getContainer())
+		{
+			$logger = $this->container->getLogger('default');
+			$sessionSegment = $this->getContainer()
+				->get('session')
+				->getSegment(AnimeClient::SESSION_SEGMENT);
+
+			if ($sessionSegment->get('auth_token') !== null)
+			{
+				$token = $sessionSegment->get('auth_token');
+				$defaultOptions['headers']['Authorization'] = "bearer {$token}";
+			}
+		}
+
 		$options = array_merge($defaultOptions, $options);
 
 		$response = $this->client->request($type, $url, $options);
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index 15fcaded..29f358b3 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -39,8 +39,8 @@ class AnimeListTransformer extends AbstractTransformer {
 
 		$rating = (int) 2 * $item['attributes']['rating'];
 
-		$total_episodes = array_key_exists('episodeCount', $item['anime'])
-			? (int) $anime['episodeCount']
+		$total_episodes = array_key_exists('episodeCount', $item['anime']['attributes'])
+			? (int) $anime['attributes']['episodeCount']
 			: '-';
 
 		$alternate_title = NULL;
@@ -73,7 +73,7 @@ class AnimeListTransformer extends AbstractTransformer {
 				'age_rating' => $anime['attributes']['ageRating'],
 				'title' => $anime['attributes']['canonicalTitle'],
 				'alternate_title' => $alternate_title,
-				'slug' => $item['relationships']['media']['data']['id'],//$anime['slug'],
+				'slug' => $anime['attributes']['slug'],
 				'url' => $anime['attributes']['url'] ?? '',
 				'type' => $anime['attributes']['showType'],
 				'image' => $anime['attributes']['posterImage']['small'],
@@ -94,6 +94,7 @@ class AnimeListTransformer extends AbstractTransformer {
 	 *
 	 * @param array $item Transformed library item
 	 * @return array API library item
+     * @TODO reimplement
 	 */
 	public function untransform($item)
 	{
diff --git a/src/API/Kitsu/Transformer/AnimeTransformer.php b/src/API/Kitsu/Transformer/AnimeTransformer.php
index 4e08ee8c..4fa22b6c 100644
--- a/src/API/Kitsu/Transformer/AnimeTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeTransformer.php
@@ -1,52 +1,55 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu\Transformer;
-
-use Aviat\Ion\Transformer\AbstractTransformer;
-
-/**
- * Transformer for anime description page
- */
-class AnimeTransformer extends AbstractTransformer {
-
-    /**
-     * Convert raw api response to a more
-     * logical and workable structure
-     *
-     * @param  array  $item API library item
-     * @return array
-     */
-    public function transform($item)
-    {
-    	sort($item['genres']);
-
-        return [
-            'title' => $item['canonicalTitle'],
-			'en_title' => $item['titles']['en_jp'],
-			'jp_title' => $item['titles']['ja_jp'],
-			'cover_image' => $item['posterImage']['small'],
-			'show_type' => $item['showType'],
-			'episode_count' => $item['episodeCount'],
-			'episode_length' => $item['episodeLength'],
-			'synopsis' => $item['synopsis'],
-			'age_rating' => $item['ageRating'],
-			'age_rating_guide' => $item['ageRatingGuide'],
-			'url' => "https://kitsu.io/anime/{$item['slug']}",
-			'genres' => $item['genres'],
-        ];
-    }
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package	 AnimeListClient
+ * @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	 4.0
+ * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu\Transformer;
+
+use Aviat\Ion\Transformer\AbstractTransformer;
+
+/**
+ * Transformer for anime description page
+ */
+class AnimeTransformer extends AbstractTransformer {
+
+	/**
+	 * Convert raw api response to a more
+	 * logical and workable structure
+	 *
+	 * @param  array  $item API library item
+	 * @return array
+	 */
+	public function transform($item)
+	{
+		?><pre><?= print_r($item, TRUE) ?></pre><?php
+
+		$item['genres'] = $item['genres'] ?? [];
+		sort($item['genres']);
+
+		return [
+			'title' => $item['canonicalTitle'],
+			'en_title' => $item['titles']['en_jp'],
+			'jp_title' => $item['titles']['ja_jp'],
+			'cover_image' => $item['posterImage']['small'],
+			'show_type' => $item['showType'],
+			'episode_count' => $item['episodeCount'],
+			'episode_length' => $item['episodeLength'],
+			'synopsis' => $item['synopsis'],
+			'age_rating' => $item['ageRating'],
+			'age_rating_guide' => $item['ageRatingGuide'],
+			'url' => "https://kitsu.io/anime/{$item['slug']}",
+			'genres' => $item['genres'],
+		];
+	}
 }
\ No newline at end of file
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index 8eeb22a2..4eac8c43 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -25,7 +25,6 @@ define('SRC_DIR', realpath(__DIR__));
  */
 class AnimeClient {
 
-	const HUMMINGBIRD_AUTH_URL = 'https://hummingbird.me/api/v1/users/authenticate';
 	const KITSU_AUTH_URL = 'https://kitsu.io/api/oauth/token';
 	const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
 	const DEFAULT_CONTROLLER_NAMESPACE = 'Aviat\AnimeClient\Controller';
diff --git a/src/Controller.php b/src/Controller.php
index 7abfe2dd..d6c0170c 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -97,7 +97,7 @@ class Controller {
 		$this->response = $container->get('response');
 		$this->base_data['url'] = $auraUrlGenerator;
 		$this->base_data['urlGenerator'] = $urlGenerator;
-		// $this->base_data['auth'] = $container->get('auth');
+		$this->base_data['auth'] = $container->get('auth');
 		$this->base_data['config'] = $this->config;
 		$this->urlGenerator = $urlGenerator;
 
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 1453655f..3113402e 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -17,6 +17,7 @@
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\AnimeClient\Controller as BaseController;
+use Aviat\AnimeClient\API\Kitsu;
 use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Di\ContainerInterface;
@@ -106,7 +107,7 @@ class Anime extends BaseController {
 		];
 
 		$data = ($type !== 'all')
-			? $this->model->get_list($model_map[$type])
+			? $this->model->getList($model_map[$type])
 			: $this->model->get_all_lists();
 
 		$this->outputHTML('anime/' . $view_map[$view], [
@@ -122,17 +123,13 @@ class Anime extends BaseController {
 	 */
 	public function add_form()
 	{
-		$raw_status_list = AnimeWatchingStatus::getConstList();
-
-		$statuses = [];
-
-		foreach ($raw_status_list as $status_item)
-		{
-			$statuses[$status_item] = (string) $this->string($status_item)
-				->underscored()
-				->humanize()
-				->titleize();
-		}
+		$statuses = [
+			AnimeWatchingStatus::WATCHING => 'Currently Watching',
+			AnimeWatchingStatus::PLAN_TO_WATCH => 'Plan to Watch',
+			AnimeWatchingStatus::ON_HOLD => 'On Hold',
+			AnimeWatchingStatus::DROPPED => 'Dropped',
+			AnimeWatchingStatus::COMPLETED => 'Completed'
+		];
 
 		$this->set_session_redirect();
 		$this->outputHTML('anime/add', [
@@ -180,7 +177,7 @@ class Anime extends BaseController {
 	 */
 	public function edit($id, $status = "all")
 	{
-		$item = $this->model->get_library_item($id, $status);
+		$item = $this->model->getLibraryItem($id, $status);
 		$raw_status_list = AnimeWatchingStatus::getConstList();
 
 		$statuses = [];
@@ -199,7 +196,7 @@ class Anime extends BaseController {
 			'title' => $this->config->get('whose_list') .
 				"'s Anime List &middot; Edit",
 			'item' => $item,
-			'statuses' => $statuses,
+			'statuses' => Kitsu::getStatusToSelectMap(),
 			'action' => $this->container->get('url-generator')
 				->url('/anime/update_form'),
 		]);
@@ -293,7 +290,7 @@ class Anime extends BaseController {
 	 */
 	public function details($anime_id)
 	{
-		$data = $this->model->get_anime($anime_id);
+		$data = $this->model->getAnime($anime_id);
 
 		$this->outputHTML('anime/details', [
 			'title' => 'Anime &middot ' . $data['title'],
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 0626b85c..72e99c9b 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -86,8 +86,8 @@ class Manga extends Controller {
 		];
 
 		$data = ($status !== 'all')
-			? [$map[$status] => $this->model->get_list($map[$status]) ]
-			: $this->model->get_list('All');
+			? [$map[$status] => $this->model->getList($map[$status]) ]
+			: $this->model->getList('All');
 
 		$this->outputHTML('manga/' . $view_map[$view], [
 			'title' => $title,
@@ -261,7 +261,7 @@ class Manga extends Controller {
 	 */
 	public function details($manga_id)
 	{
-		$data = $this->model->get_manga($manga_id);
+		$data = $this->model->getManga($manga_id);
 
 		$this->outputHTML('manga/details', [
 			'title' => 'Manga &middot; ' . $data['title'],
diff --git a/src/Model/API.php b/src/Model/API.php
index 6c1bc399..6d523d8d 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -63,7 +63,7 @@ class API extends Model {
 	 * @param string $sort_key
 	 * @return void
 	 */
-	protected function sort_by_name(array &$array, string $sort_key)
+	protected function sortByName(array &$array, string $sort_key)
 	{
 		$sort = [];
 
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 36bc3d99..b3fcd0bf 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -19,7 +19,6 @@ use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Json;
 
-
 /**
  * Model for handling requests dealing with the anime list
  */
@@ -60,10 +59,10 @@ class Anime extends API {
 	 * @param string $status
 	 * @return array
 	 */
-	public function get_list($status)
+	public function getList($status)
 	{
 		$data = $this->kitsuModel->getAnimeList($status);
-		$this->sort_by_name($data, 'anime');
+		$this->sortByName($data, 'anime');
 
 		$output = [];
 		$output[$this->const_map[$status]] = $data;
@@ -77,9 +76,33 @@ class Anime extends API {
 	 * @param string $anime_id
 	 * @return array
 	 */
-	public function get_anime($anime_id)
+	public function getAnime($anime_id)
 	{
-        return $this->kitsuModel->getAnime($anime_id);
+		return $this->kitsuModel->getAnime($anime_id);
+	}
+
+	/**
+	 * Get information about a specific list item
+	 * for editing/updating that item
+	 *
+	 * @param string $itemId
+	 * @return array
+	 */
+	public function getLibraryItem(string $itemId): array
+	{
+		return $this->kitsuModel->getListItem($itemId);
+	}
+
+	/**
+	 * Search for anime by name
+	 *
+	 * @param string $name
+	 * @return array
+	 */
+	public function search($name)
+	{
+		$raw = $this->kitsuModel->search('anime', $name);
+		return $this->kitsuModel->search('anime', $name);
 	}
 }
 // End of AnimeModel.php
\ No newline at end of file
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index 7449daaa..a779a0fc 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -18,6 +18,7 @@ namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Json;
+use PDO;
 
 /**
  * Model for getting anime collection data
@@ -76,7 +77,7 @@ class AnimeCollection extends Collection {
 			->from('media')
 			->get();
 
-		foreach ($query->fetchAll(\PDO::FETCH_ASSOC) as $row)
+		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row)
 		{
 			$output[$row['id']] = $row['type'];
 		}
@@ -96,7 +97,7 @@ class AnimeCollection extends Collection {
 			->where('hummingbird_id', (int)$id)
 			->get();
 
-		return $query->fetch(\PDO::FETCH_ASSOC);
+		return $query->fetch(PDO::FETCH_ASSOC);
 	}
 
 	/**
@@ -119,7 +120,7 @@ class AnimeCollection extends Collection {
 			->order_by('title')
 			->get();
 
-		return $query->fetchAll(\PDO::FETCH_ASSOC);
+		return $query->fetchAll(PDO::FETCH_ASSOC);
 	}
 
 	/**
@@ -208,7 +209,7 @@ class AnimeCollection extends Collection {
 			->where('hummingbird_id', $hummingbird_id)
 			->get();
 
-		return $query->fetch(\PDO::FETCH_ASSOC);
+		return $query->fetch(PDO::FETCH_ASSOC);
 	}
 
 	/**
@@ -313,7 +314,7 @@ class AnimeCollection extends Collection {
 		$query = $this->db->select('id, genre')
 			->from('genres')
 			->get();
-		foreach ($query->fetchAll(\PDO::FETCH_ASSOC) as $genre)
+		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $genre)
 		{
 			$genres[$genre['id']] = $genre['genre'];
 		}
@@ -322,7 +323,7 @@ class AnimeCollection extends Collection {
 		$query = $this->db->select('hummingbird_id, genre_id')
 			->from('genre_anime_set_link')
 			->get();
-		foreach ($query->fetchAll(\PDO::FETCH_ASSOC) as $link)
+		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $link)
 		{
 			if (array_key_exists($link['hummingbird_id'], $links))
 			{
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index a712fadc..327bde04 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -18,6 +18,7 @@ namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Model\DB;
+use PDOException;
 
 /**
  * Base model for anime and manga collections
@@ -49,7 +50,7 @@ class Collection extends DB {
 		{
 			$this->db = \Query($this->db_config['collection']);
 		}
-		catch (\PDOException $e)
+		catch (PDOException $e)
 		{
 			$this->valid_database = FALSE;
 			return FALSE;
@@ -102,7 +103,7 @@ class Collection extends DB {
 
 		$output = [];
 
-		foreach ($query->fetchAll(\PDO::FETCH_ASSOC) as $row)
+		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row)
 		{
 			$id = $row['hummingbird_id'];
 			$genre = $row['genre'];
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 0b7f7af4..736d6ea2 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -19,14 +19,12 @@ namespace Aviat\AnimeClient\Model;
 use Aviat\AnimeClient\API\Kitsu\Enum\MangaReadingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer;
 use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Json;
-use GuzzleHttp\Cookie\SetCookie;
-use RuntimeException;
 
 /**
  * Model for handling requests dealing with the manga list
  */
-class Manga extends API {
+class Manga extends API
+{
 
 	const READING = 'Reading';
 	const PLAN_TO_READ = 'Plan to Read';
@@ -61,68 +59,26 @@ class Manga extends API {
 		$this->kitsuModel = $container->get('kitsu-model');
 	}
 
-	/**
-	 * Make an authenticated manga API call
-	 *
-	 * @param string $type - the HTTP verb
-	 * @param string $url
-	 * @param string|null $json
-	 * @return array
-	 */
-	protected function _manga_api_call(string $type, string $url, $json = NULL): array
-	{
-		$token = $this->container->get('auth')
-			->get_auth_token();
-
-		// Set the token cookie, with the authentication token
-		// from the auth class.
-		$cookieJar = $this->cookieJar;
-		$cookie_data = new SetCookie([
-			'Name' => 'token',
-			'Value' => $token,
-			'Domain' => 'hummingbird.me'
-		]);
-		$cookieJar->setCookie($cookie_data);
-
-		$config = [
-			'cookies' => $cookieJar
-		];
-
-		if ( ! is_null($json))
-		{
-			$config['json'] = $json;
-		}
-
-		$result = $this->client->request(strtoupper($type), $url, $config);
-
-		return [
-			'statusCode' => $result->getStatusCode(),
-			'body' => $result->getBody()
-		];
-	}
-
-
 	/**
 	 * Get a category out of the full list
 	 *
 	 * @param string $status
 	 * @return array
 	 */
-	public function get_list($status)
+	public function getList($status)
 	{
 		$APIstatus = array_flip($this->const_map)[$status];
 		$data = $this->kitsuModel->getMangaList($APIstatus);
-		return $this->map_by_status($data)[$status];
+		return $this->mapByStatus($data)[$status];
 	}
 
-
 	/**
 	 * Get the details of a manga
 	 *
 	 * @param string $manga_id
 	 * @return array
 	 */
-	public function get_manga($manga_id)
+	public function getManga($manga_id)
 	{
 		return $this->kitsuModel->getManga($manga_id);
 	}
@@ -133,7 +89,7 @@ class Manga extends API {
 	 * @param array $data
 	 * @return array
 	 */
-	private function map_by_status($data)
+	private function mapByStatus($data)
 	{
 		$output = [
 			self::READING => [],
@@ -143,35 +99,16 @@ class Manga extends API {
 			self::COMPLETED => [],
 		];
 
-		$util = $this->container->get('util');
-
-		foreach ($data as &$entry)
-		{
-			/*$entry['manga']['image'] = $util->get_cached_image(
-				$entry['manga']['image'],
-				$entry['manga']['slug'],
-				'manga'
-			);*/
+		foreach ($data as &$entry) {
 			$key = $this->status_map[$entry['reading_status']];
 			$output[$key][] = $entry;
 		}
 
-		foreach($output as &$val)
-		{
-			$this->sort_by_name($val, 'manga');
+		foreach ($output as &$val) {
+			$this->sortByName($val, 'manga');
 		}
 
 		return $output;
 	}
-
-	/**
-	 * Combine the two manga lists into one
-	 * @param  array $raw_data
-	 * @return array
-	 */
-	private function zipperLists($raw_data)
-	{
-		return (new Transformer\MangaListsZipper($raw_data))->transform();
-	}
 }
 // End of MangaModel.php
\ No newline at end of file

From 4c75701c0de4a511af87c00de09b095301a4fa12 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 5 Jan 2017 22:24:45 -0500
Subject: [PATCH 59/65] Better handling of alternate titles, Airing Status and
 genres for anime list views

---
 app/views/anime/cover.php                     |   6 +-
 app/views/anime/details.php                   |  16 +-
 app/views/anime/edit.php                      |   8 +-
 app/views/anime/list.php                      |  22 +-
 app/views/manga/cover.php                     |  22 +-
 app/views/manga/edit.php                      |  19 +-
 app/views/manga/list.php                      |  14 +-
 index.php                                     |   9 +-
 public/css/base.css                           |   4 +-
 public/css/base.myth.css                      |   4 +-
 src/API/Kitsu.php                             | 152 ++++++++++++-
 src/API/Kitsu/Auth.php                        | 214 +++++++++---------
 src/API/Kitsu/KitsuModel.php                  |  22 +-
 src/API/Kitsu/KitsuTrait.php                  |   1 -
 .../Transformer/AnimeListTransformer.php      |  44 ++--
 .../Kitsu/Transformer/AnimeTransformer.php    |   8 +-
 .../Transformer/MangaListTransformer.php      |   8 +-
 src/AnimeClient.php                           |   1 -
 src/Controller/Anime.php                      |   2 +-
 src/Controller/Manga.php                      |   2 +-
 src/Model/API.php                             |   2 +-
 src/Model/Manga.php                           |  12 +
 22 files changed, 379 insertions(+), 213 deletions(-)

diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index c0fa5869..70443f36 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -18,8 +18,10 @@
 					<?= $helper->img($item['anime']['image']); ?>
 					<div class="name">
 						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]); ?>">
-						<?= $escape->html($item['anime']['title']) ?>
-						<?= ($item['anime']['alternate_title'] != "") ? "<br />({$item['anime']['alternate_title']})" : ""; ?>
+                            <?= array_shift($item['anime']['titles']) ?>
+                            <?php foreach ($item['anime']['titles'] as $title): ?>
+                                <br /><small><?= $title ?></small>
+                            <?php endforeach ?>
 						</a>
 					</div>
 					<div class="table">
diff --git a/app/views/anime/details.php b/app/views/anime/details.php
index b06eae01..0995fb65 100644
--- a/app/views/anime/details.php
+++ b/app/views/anime/details.php
@@ -5,10 +5,10 @@
 			<br />
 			<br />
 			<table>
-				<?php /*<tr>
+				<tr>
 					<td class="align_right">Airing Status</td>
 					<td><?= $data['status'] ?></td>
-				</tr>*/ ?>
+				</tr>
 				<tr>
 					<td>Show Type</td>
 					<td><?= $data['show_type'] ?></td>
@@ -34,14 +34,10 @@
 			</table>
 		</div>
 		<div>
-			<h2><a rel="external" href="<?= $data['url'] ?>"><?= $data['title'] ?></a></h2>
-			<?php if ( ! empty($data['jp_title'])): ?>
-                <h3><?= $data['jp_title'] ?></h3>
-			<?php endif ?>
-			<?php if( ! empty($data['en_title'] && $data['en_title'] !== $data['title'])): ?>
-				<h3><?= $data['en_title'] ?></h3>
-			<?php endif ?>
-
+			<h2><a rel="external" href="<?= $data['url'] ?>"><?= array_shift($data['titles']) ?></a></h2>
+            <?php foreach ($data['titles'] as $title): ?>
+                <h3><?= $title ?></h3>
+            <?php endforeach ?>
 			<br />
 			<p><?= nl2br($data['synopsis']) ?></p>
 		</div>
diff --git a/app/views/anime/edit.php b/app/views/anime/edit.php
index d8d959bd..2e758bd4 100644
--- a/app/views/anime/edit.php
+++ b/app/views/anime/edit.php
@@ -6,10 +6,10 @@
 				<thead>
 					<tr>
 						<th>
-							<h3><?= $escape->html($item['anime']['title']) ?></h3>
-							<?php if($item['anime']['alternate_title'] != ""): ?>
-							<h4><?= $escape->html($item['anime']['alternate_title']) ?></h4>
-							<?php endif ?>
+							<h3><?= $escape->html(array_shift($item['anime']['titles'])) ?></h3>
+							<?php foreach($item['anime']['titles'] as $title): ?>
+							<h4><?= $escape->html($title) ?></h4>
+							<?php endforeach ?>
 						</th>
 						<th>
 							<article class="media">
diff --git a/app/views/anime/list.php b/app/views/anime/list.php
index cafeb586..3f2471af 100644
--- a/app/views/anime/list.php
+++ b/app/views/anime/list.php
@@ -26,7 +26,7 @@
 		</thead>
 		<tbody>
 			<?php foreach($items as $item): ?>
-			<?php if ($item['private'])  && ! $auth->is_authenticated()) continue; ?>
+			<?php if ($item['private'] && ! $auth->is_authenticated()) continue; ?>
 			<tr id="a-<?= $item['id'] ?>">
 				<?php if ($auth->is_authenticated()): ?>
 				<td>
@@ -35,36 +35,38 @@
 				<?php endif ?>
 				<td class="justify">
 					<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
-						<?= $item['anime']['title'] ?>
+						<?= array_shift($item['anime']['titles']) ?>
 					</a>
-					<?= ( ! empty($item['anime']['alternate_title'])) ? " <br /> " . $item['anime']['alternate_title'] : "" ?>
+                    <?php foreach($item['anime']['titles'] as $title): ?>
+                        <br /><?= $title ?>
+                    <?php endforeach ?>
 				</td>
-				<td class="align_left"><?= $item['airing']['status'] ?></td>
+				<td><?= $item['airing']['status'] ?></td>
 				<td><?= $item['user_rating'] ?> / 10 </td>
 				<td><?= $item['anime']['type'] ?></td>
-				<td class="align_left" id="<?= $item['anime']['slug'] ?>">
+				<td id="<?= $item['anime']['slug'] ?>">
 					Episodes: <br />
 					<span class="completed_number"><?= $item['episodes']['watched'] ?></span>&nbsp;/&nbsp;<span class="total_number"><?= $item['episodes']['total'] ?></span>
 				</td>
 				<td><?= $item['anime']['age_rating'] ?></td>
 				<td>
+                    <ul>
 					<?php if ($item['rewatched'] > 0): ?>
-						Rewatched <?= $item['rewatched'] ?> time(s)<br />
+                        <li>Rewatched <?= $item['rewatched'] ?> time(s)</li>
 					<?php endif ?>
-					<?php $attr_list = []; ?>
 					<?php foreach(['private','rewatching'] as $attr): ?>
 						<?php if($item[$attr]): ?>
-						<?php $attr_list[] = ucfirst($attr); ?>
+                            <li><?= ucfirst($attr); ?></li>
 						<?php endif ?>
 					<?php endforeach ?>
-					<?= implode(', ', $attr_list); ?>
+                    </ul>
 				</td>
 				<td>
 					<p><?= $escape->html($item['notes']) ?></p>
 				</td>
 				<td class="align_left">
 					<?php sort($item['anime']['genres']) ?>
-					<?= join(', ', $item['anime']['genres']) ?>
+					<?= implode(', ', $item['anime']['genres']) ?>
 				</td>
 			</tr>
 			<?php endforeach ?>
diff --git a/app/views/manga/cover.php b/app/views/manga/cover.php
index 5bcacab6..496aa564 100644
--- a/app/views/manga/cover.php
+++ b/app/views/manga/cover.php
@@ -1,7 +1,7 @@
 <main>
-<?php /* if ($auth->is_authenticated()): ?>
+<?php if ($auth->is_authenticated()): ?>
 <a class="bracketed" href="<?= $urlGenerator->url('manga/add') ?>">Add Item</a>
-<?php endif */ ?>
+<?php endif ?>
 <?php if (empty($sections)): ?>
 <h3>There's nothing here!</h3>
 <?php else: ?>
@@ -11,26 +11,28 @@
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
 				<article class="media" id="manga-<?= $item['id'] ?>">
-					<?php /*if ($auth->is_authenticated()): ?>
+					<?php if ($auth->is_authenticated()): ?>
 					<div class="edit_buttons" hidden>
 						<button class="plus_one_chapter">+1 Chapter</button>
 					</div>
-					<?php endif */ ?>
+					<?php endif ?>
 					<img src="<?= $escape->attr($item['manga']['image']) ?>" />
 					<div class="name">
 						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
-						<?= $escape->html($item['manga']['title']) ?>
-						<?= (isset($item['manga']['alternate_title'])) ? "<br />({$item['manga']['alternate_title']})" : ""; ?>
+						<?= $escape->html(array_shift($item['manga']['titles'])) ?>
+                        <?php foreach($item['manga']['titles'] as $title): ?>
+                            <br /><small><?= $title ?></small>
+                        <?php endforeach ?>
 						</a>
 					</div>
 					<div class="table">
-						<?php /*if ($auth->is_authenticated()): ?>
+						<?php if ($auth->is_authenticated()): ?>
 						<div class="row">
 							<span class="edit">
 								<a class="bracketed" title="Edit information about this manga" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
 							</span>
 						</div>
-						<?php endif */ ?>
+						<?php endif ?>
 						<div class="row">
 							<div class="user_rating">Rating: <?= $item['user_rating'] ?> / 10</div>
 						</div>
@@ -53,6 +55,6 @@
 	<?php endforeach ?>
 <?php endif ?>
 </main>
-<?php /*if ($auth->is_authenticated()): ?>
+<?php if ($auth->is_authenticated()): ?>
 <script src="<?= $urlGenerator->asset_url('js.php/g/edit') ?>"></script>
-<?php endif*/ ?>
\ No newline at end of file
+<?php endif ?>
\ No newline at end of file
diff --git a/app/views/manga/edit.php b/app/views/manga/edit.php
index 7aabf1a9..a6eefb27 100644
--- a/app/views/manga/edit.php
+++ b/app/views/manga/edit.php
@@ -1,19 +1,18 @@
 <?php if ($auth->is_authenticated()): ?>
 	<main>
 		<h1>
-			Edit <?= $item['manga']['title'] ?>
-			<?= ($item['manga']['alternate_title'] != "") ? "({$item['manga']['alternate_title']})" : ""; ?>
+			Edit <?= $item['manga']['titles'][0] ?>
 		</h1>
 		<form action="<?= $action ?>" method="post">
 		<table class="form">
 			<thead>
 				<tr>
-					<th>
-						<h3><?= $escape->html($item['manga']['title']) ?></h3>
-						<?php if($item['manga']['alternate_title'] != ""): ?>
-						<h4><?= $escape->html($item['manga']['alternate_title']) ?></h4>
-						<?php endif ?>
-					</th>
+                    <th>
+                        <h3><?= $escape->html(array_shift($item['manga']['titles'])) ?></h3>
+						<?php foreach($item['manga']['titles'] as $title): ?>
+                            <h4><?= $escape->html($title) ?></h4>
+						<?php endforeach ?>
+                    </th>
 					<th>
 						<article class="media">
 							<?= $helper->img($item['manga']['image']); ?>
@@ -45,12 +44,12 @@
 						<input type="number" min="0" name="chapters_read" id="chapters_read" value="<?= $item['chapters']['read'] ?>" /> / <?= $item['chapters']['total'] ?>
 					</td>
 				</tr>
-				<tr>
+				<? /*<tr>
 					<td><label for="volumes_read">Volumes Read</label></td>
 					<td>
 						<input type="number" min="0" name="volumes_read" id="volumes_read" value="<?= $item['volumes']['read'] ?>" /> / <?= $item['volumes']['total'] ?>
 					</td>
-				</tr>
+				</tr> */ ?>
 				<tr>
 					<td><label for="rereading_flag">Rereading?</label></td>
 					<td>
diff --git a/app/views/manga/list.php b/app/views/manga/list.php
index dbf00076..7a44d851 100644
--- a/app/views/manga/list.php
+++ b/app/views/manga/list.php
@@ -10,9 +10,9 @@
 	<table>
 		<thead>
 			<tr>
-				<?php /*if ($auth->is_authenticated()): ?>
+				<?php if ($auth->is_authenticated()): ?>
 				<th>&nbsp;</th>
-				<?php endif*/ ?>
+				<?php endif ?>
 				<th>Title</th>
 				<th>Rating</th>
 				<th>Completed Chapters</th>
@@ -23,16 +23,18 @@
 		<tbody>
 			<?php foreach($items as $item): ?>
 			<tr id="manga-<?= $item['id'] ?>">
-				<?php /*if($auth->is_authenticated()): ?>
+				<?php if($auth->is_authenticated()): ?>
 				<td>
 					<a class="bracketed" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
 				</td>
-				<?php endif*/ ?>
+				<?php endif ?>
 				<td class="align_left">
 					<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
-						<?= $item['manga']['title'] ?>
+						<?= array_shift($item['manga']['titles']) ?>
 					</a>
-					<?= ( ! is_null($item['manga']['alternate_title'])) ? " &middot; " . $item['manga']['alternate_title'] : "" ?>
+					<?php foreach($item['manga']['titles'] as $title): ?>
+                        <br /><?= $title ?>
+					<?php endforeach ?>
 				</td>
 				<td><?= $item['user_rating'] ?> / 10</td>
 				<td><?= $item['chapters']['read'] ?> / <?= $item['chapters']['total'] ?></td>
diff --git a/index.php b/index.php
index ca589e6f..fff3616a 100644
--- a/index.php
+++ b/index.php
@@ -53,12 +53,11 @@ $whoops = new Run();
 $defaultHandler = new PrettyPageHandler();
 $whoops->pushHandler($defaultHandler);
 
-// Set up json handler for ajax errors
-//$jsonHandler = new JsonResponseHandler();
-//$whoops->pushHandler($jsonHandler);
-
 // Register as the error handler
-$whoops->register();
+if (array_key_exists('whoops', $_GET))
+{
+	$whoops->register();
+}
 
 // -----------------------------------------------------------------------------
 // Dependency Injection setup
diff --git a/public/css/base.css b/public/css/base.css
index cd393a9b..b80a42b1 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1085,7 +1085,9 @@ a:hover, a:active {
 			display:block;
 		}
 
-.media > .name > a {
+.media > .name a,
+		.media > .name a small
+		{
 			background:none;
 			color:#fff;
 			text-shadow:1px 2px 1px rgba(0, 0, 0, .85);
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index 5c89e603..b91f8be5 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -354,7 +354,9 @@ a:hover, a:active {
 			display:block;
 		}
 
-		.media > .name > a {
+		.media > .name a,
+		.media > .name a small
+		{
 			background:none;
 			color:#fff;
 			text-shadow: var(--shadow);
diff --git a/src/API/Kitsu.php b/src/API/Kitsu.php
index 9753e993..e89357c6 100644
--- a/src/API/Kitsu.php
+++ b/src/API/Kitsu.php
@@ -16,13 +16,20 @@
 
 namespace Aviat\AnimeClient\API;
 
-use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
+use Aviat\AnimeClient\API\Kitsu\Enum\{AnimeAiringStatus, AnimeWatchingStatus};
+use DateTimeImmutable;
 
 /**
  * Constants and mappings for the Kitsu API
  */
 class Kitsu {
+	const AUTH_URL = 'https://kitsu.io/api/oauth/token';
 
+	/**
+	 * Map of Kitsu status to label for select menus
+	 *
+	 * @return array
+	 */
 	public static function getStatusToSelectMap()
 	{
 		return [
@@ -33,4 +40,147 @@ class Kitsu {
 			AnimeWatchingStatus::DROPPED => 'Dropped'
 		];
 	}
+
+	/**
+	 * Determine whether an anime is airing, finished airing, or has not yet aired
+	 *
+	 * @param string $startDate
+	 * @param string $endDate
+	 * @return string
+	 */
+	public static function getAiringStatus(string $startDate = null, string $endDate = null): string
+	{
+		$startAirDate = new DateTimeImmutable($startDate ?? 'tomorrow');
+		$endAirDate = new DateTimeImmutable($endDate ?? 'tomorrow');
+		$now = new DateTimeImmutable();
+
+		$isDoneAiring = $now > $endAirDate;
+		$isCurrentlyAiring = ($now > $startAirDate) && ! $isDoneAiring;
+
+		switch (true)
+		{
+			case $isCurrentlyAiring:
+				return AnimeAiringStatus::AIRING;
+
+			case $isDoneAiring:
+				return AnimeAiringStatus::FINISHED_AIRING;
+
+			default:
+				return AnimeAiringStatus::NOT_YET_AIRED;
+		}
+	}
+
+	/**
+	 * Filter out duplicate and very similar names from
+	 *
+	 * @param array $data The 'attributes' section of the api data response
+	 * @return array List of alternate titles
+	 */
+	public static function filterTitles(array $data): array
+	{
+		// The 'canonical' title is always returned
+		$valid = [$data['canonicalTitle']];
+
+		if (array_key_exists('titles', $data))
+		{
+			foreach($data['titles'] as $alternateTitle)
+			{
+				if (self::titleIsUnique($alternateTitle, $valid))
+				{
+					$valid[] = $alternateTitle;
+				}
+			}
+		}
+
+		return $valid;
+	}
+
+	/**
+	 * Reorganizes 'included' data to be keyed by
+	 * 	type => [
+	 * 		id => data/attributes,
+	 * 	]
+	 *
+	 * @param array $includes
+	 * @return array
+	 */
+	public static function organizeIncludes(array $includes): array
+	{
+		$organized = [];
+
+		foreach ($includes as $item)
+		{
+			$type = $item['type'];
+			$id = $item['id'];
+			$organized[$type] = $organized[$type] ?? [];
+			$organized[$type][$id] = $item['attributes'];
+
+			if (array_key_exists('relationships', $item))
+			{
+				$organized[$type][$id]['relationships'] = self::organizeRelationships($item['relationships']);
+			}
+		}
+
+		return $organized;
+	}
+
+	/**
+	 * Reorganize relationship mappings to make them simpler to use
+	 *
+	 * Remove verbose structure, and just map:
+	 * 	type => [ idArray ]
+	 *
+	 * @param array $relationships
+	 * @return array
+	 */
+	public static function organizeRelationships(array $relationships): array
+	{
+		$organized = [];
+
+		foreach($relationships as $key => $data)
+		{
+			if ( ! array_key_exists('data', $data))
+			{
+				continue;
+			}
+
+			$organized[$key] = $organized[$key] ?? [];
+
+			foreach ($data['data'] as $item)
+			{
+				$organized[$key][] = $item['id'];
+			}
+		}
+
+		return $organized;
+	}
+
+	/**
+	 * Determine if an alternate title is unique enough to list
+	 *
+	 * @param string $title
+	 * @param array $existingTitles
+	 * @return bool
+	 */
+	private static function titleIsUnique(string $title = null, array $existingTitles): bool
+	{
+		if (empty($title))
+		{
+			return false;
+		}
+
+		foreach($existingTitles as $existing)
+		{
+			$isSubset = stripos($existing, $title) !== FALSE;
+			$diff = levenshtein($existing, $title);
+			$onlydifferentCase = (mb_strtolower($existing) === mb_strtolower($title));
+
+			if ($diff < 3 || $isSubset || $onlydifferentCase)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/Auth.php b/src/API/Kitsu/Auth.php
index e940d878..113d5fd8 100644
--- a/src/API/Kitsu/Auth.php
+++ b/src/API/Kitsu/Auth.php
@@ -1,108 +1,108 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu;
-
-use Aviat\AnimeClient\AnimeClient;
-use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
-
-/**
- * Kitsu API Authentication
- */
-class Auth {
-
-	use ContainerAware;
-
-	/**
-	 * Anime API Model
-	 *
-	 * @var \Aviat\AnimeClient\API\Kitsu\Model
-	 */
-	protected $model;
-
-	/**
-	 * Session object
-	 *
-	 * @var Aura\Session\Segment
-	 */
-	protected $segment;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ContainerInterface $container
-	 */
-	public function __construct(ContainerInterface $container)
-	{
-		$this->setContainer($container);
-		$this->segment = $container->get('session')
-			->getSegment(AnimeClient::SESSION_SEGMENT);
-		$this->model = $container->get('kitsu-model');
-	}
-
-	/**
-	 * Make the appropriate authentication call,
-	 * and save the resulting auth token if successful
-	 *
-	 * @param  string $password
-	 * @return boolean
-	 */
-	public function authenticate($password)
-	{
-		$config = $this->container->get('config');
-		$username = $config->get(['kitsu_username']);
-		$auth_token = $this->model->authenticate($username, $password);
-
-		if (FALSE !== $auth_token)
-		{
-			$this->segment->set('auth_token', $auth_token);
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 * Check whether the current user is authenticated
-	 *
-	 * @return boolean
-	 */
-	public function is_authenticated()
-	{
-		return ($this->get_auth_token() !== FALSE);
-	}
-
-	/**
-	 * Clear authentication values
-	 *
-	 * @return void
-	 */
-	public function logout()
-	{
-		$this->segment->clear();
-	}
-
-	/**
-	 * Retrieve the authentication token from the session
-	 *
-	 * @return string|false
-	 */
-	public function get_auth_token()
-	{
-		return $this->segment->get('auth_token', FALSE);
-	}
-}
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API\Kitsu;
+
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
+
+/**
+ * Kitsu API Authentication
+ */
+class Auth {
+
+	use ContainerAware;
+
+	/**
+	 * Anime API Model
+	 *
+	 * @var \Aviat\AnimeClient\API\Kitsu\Model
+	 */
+	protected $model;
+
+	/**
+	 * Session object
+	 *
+	 * @var Aura\Session\Segment
+	 */
+	protected $segment;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ContainerInterface $container
+	 */
+	public function __construct(ContainerInterface $container)
+	{
+		$this->setContainer($container);
+		$this->segment = $container->get('session')
+			->getSegment(AnimeClient::SESSION_SEGMENT);
+		$this->model = $container->get('kitsu-model');
+	}
+
+	/**
+	 * Make the appropriate authentication call,
+	 * and save the resulting auth token if successful
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function authenticate($password)
+	{
+		$config = $this->container->get('config');
+		$username = $config->get(['kitsu_username']);
+		$auth_token = $this->model->authenticate($username, $password);
+
+		if (FALSE !== $auth_token)
+		{
+			$this->segment->set('auth_token', $auth_token);
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Check whether the current user is authenticated
+	 *
+	 * @return boolean
+	 */
+	public function is_authenticated()
+	{
+		return ($this->get_auth_token() !== FALSE);
+	}
+
+	/**
+	 * Clear authentication values
+	 *
+	 * @return void
+	 */
+	public function logout()
+	{
+		$this->segment->clear();
+	}
+
+	/**
+	 * Retrieve the authentication token from the session
+	 *
+	 * @return string|false
+	 */
+	public function get_auth_token()
+	{
+		return $this->segment->get('auth_token', FALSE);
+	}
+}
 // End of KitsuAuth.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index f3a9f85f..2d8124f4 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -17,6 +17,7 @@
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
+use Aviat\AnimeClient\API\Kitsu as K;
 use Aviat\AnimeClient\API\Kitsu\Transformer\{
 	AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
 };
@@ -92,7 +93,7 @@ class KitsuModel {
 	 */
 	public function authenticate(string $username, string $password)
 	{
-		$data = $this->postRequest(AnimeClient::KITSU_AUTH_URL, [
+		$data = $this->postRequest(K::AUTH_URL, [
 			'form_params' => [
 				'grant_type' => 'password',
 				'username' => $username,
@@ -164,7 +165,7 @@ class KitsuModel {
 					'media_type' => 'Anime',
 					'status' => $status,
 				],
-				'include' => 'media',
+				'include' => 'media,media.genres',
 				'page' => [
 					'offset' => 0,
 					'limit' => 200
@@ -174,10 +175,21 @@ class KitsuModel {
 		];
 
 		$data = $this->getRequest('library-entries', $options);
+		$included = K::organizeIncludes($data['included']);
+/*?><pre><?= print_r($included, TRUE) ?></pre><?php*/
 
 		foreach($data['data'] as $i => &$item)
 		{
-			$item['anime'] = $data['included'][$i];
+			$item['anime'] = $included['anime'][$item['relationships']['media']['data']['id']];
+
+			$animeGenres = $item['anime']['relationships']['genres'];
+
+			foreach($animeGenres as $id)
+            {
+                $item['genres'][] = $included['genres'][$id]['name'];
+            }
+
+			// $item['genres'] = array_pluck($genres, 'name');
 		}
 
 		$transformed = $this->animeListTransformer->transformCollection($data['data']);
@@ -246,7 +258,9 @@ class KitsuModel {
 				'filter' => [
 					'slug' => $slug
 				],
-				'include' => 'genres,mappings,streamingLinks',
+				'include' => ($type === 'anime')
+					? 'genres,mappings,streamingLinks'
+					: 'genres,mappings',
 			]
 		];
 
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 204e7516..85397f4a 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -18,7 +18,6 @@ namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\GuzzleTrait;
-use Aviat\Ion\Di\ContainerAware;
 use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index 29f358b3..deb01987 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
 
+use Aviat\AnimeClient\API\Kitsu;
 use Aviat\Ion\Transformer\AbstractTransformer;
 
 /**
@@ -34,49 +35,34 @@ class AnimeListTransformer extends AbstractTransformer {
 	{
 /* ?><pre><?= print_r($item, TRUE) ?></pre><?php
 // die(); */
-		$anime =& $item['anime'];
-		$genres = $item['anime']['genres'] ?? [];
+		$anime = $item['anime']['attributes'] ?? $item['anime'];
+		$genres = $item['genres'] ?? [];
 
 		$rating = (int) 2 * $item['attributes']['rating'];
 
-		$total_episodes = array_key_exists('episodeCount', $item['anime']['attributes'])
-			? (int) $anime['attributes']['episodeCount']
+		$total_episodes = array_key_exists('episodeCount', $anime)
+			? (int) $anime['episodeCount']
 			: '-';
 
-		$alternate_title = NULL;
-		if (array_key_exists('titles', $item['anime']) && array_key_exists('en_jp', $anime['titles']))
-		{
-			// If the alternate title is very similar, or
-			// a subset of the main title, don't list the
-			// alternate title
-			$not_subset = stripos($anime['canonicalTitle'], $anime['titles']['en_jp']) === FALSE;
-			$diff = levenshtein($anime['canonicalTitle'], $anime['titles']['en_jp'] ?? '');
-			if ($not_subset && $diff >= 5)
-			{
-				$alternate_title = $anime['titles']['en_jp'];
-			}
-		}
-
 		return [
 			'id' => $item['id'],
 			'episodes' => [
 				'watched' => $item['attributes']['progress'],
 				'total' => $total_episodes,
-				'length' => $anime['attributes']['episodeLength'],
+				'length' => $anime['episodeLength'],
 			],
 			'airing' => [
-				'status' => $anime['status'] ?? '',
-				'started' => $anime['attributes']['startDate'],
-				'ended' => $anime['attributes']['endDate']
+				'status' => Kitsu::getAiringStatus($anime['startDate'], $anime['endDate']), 
+				'started' => $anime['startDate'],
+				'ended' => $anime['endDate']
 			],
 			'anime' => [
-				'age_rating' => $anime['attributes']['ageRating'],
-				'title' => $anime['attributes']['canonicalTitle'],
-				'alternate_title' => $alternate_title,
-				'slug' => $anime['attributes']['slug'],
-				'url' => $anime['attributes']['url'] ?? '',
-				'type' => $anime['attributes']['showType'],
-				'image' => $anime['attributes']['posterImage']['small'],
+				'age_rating' => $anime['ageRating'],
+				'titles' => Kitsu::filterTitles($anime),
+				'slug' => $anime['slug'],
+				'url' => $anime['url'] ?? '',
+				'type' => $this->string($anime['showType'])->upperCaseFirst()->__toString(),
+				'image' => $anime['posterImage']['small'],
 				'genres' => $genres,
 			],
 			'watching_status' => $item['attributes']['status'],
diff --git a/src/API/Kitsu/Transformer/AnimeTransformer.php b/src/API/Kitsu/Transformer/AnimeTransformer.php
index 4fa22b6c..a4351857 100644
--- a/src/API/Kitsu/Transformer/AnimeTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeTransformer.php
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
 
+use Aviat\AnimeClient\API\Kitsu;
 use Aviat\Ion\Transformer\AbstractTransformer;
 
 /**
@@ -32,15 +33,12 @@ class AnimeTransformer extends AbstractTransformer {
 	 */
 	public function transform($item)
 	{
-		?><pre><?= print_r($item, TRUE) ?></pre><?php
-
 		$item['genres'] = $item['genres'] ?? [];
 		sort($item['genres']);
 
 		return [
-			'title' => $item['canonicalTitle'],
-			'en_title' => $item['titles']['en_jp'],
-			'jp_title' => $item['titles']['ja_jp'],
+			'titles' => Kitsu::filterTitles($item),
+			'status' => Kitsu::getAiringStatus($item['startDate'], $item['endDate']),
 			'cover_image' => $item['posterImage']['small'],
 			'show_type' => $item['showType'],
 			'episode_count' => $item['episodeCount'],
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index 251f745c..0e648fe1 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -16,6 +16,7 @@
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
 
+use Aviat\AnimeClient\API\Kitsu;
 use Aviat\Ion\StringWrapper;
 use Aviat\Ion\Transformer\AbstractTransformer;
 
@@ -34,6 +35,7 @@ class MangaListTransformer extends AbstractTransformer {
 	 */
 	public function transform($item)
 	{
+/*?><pre><?= print_r($item, TRUE) ?></pre><?php*/
 		$manga =& $item['manga'];
 
 		$rating = (is_numeric($item['attributes']['rating']))
@@ -59,10 +61,10 @@ class MangaListTransformer extends AbstractTransformer {
 				'total' => $total_volumes
 			],
 			'manga' => [
-				'title' => $manga['attributes']['canonicalTitle'],
+				'titles' => Kitsu::filterTitles($manga['attributes']),
 				'alternate_title' => NULL,
-				'slug' => $manga['id'],
-				'url' => 'https://kitsu.io/manga/' . $manga['id'],
+				'slug' => $manga['attributes']['slug'],
+				'url' => 'https://kitsu.io/manga/' . $manga['attributes']['slug'],
 				'type' => $manga['attributes']['mangaType'],
 				'image' => $manga['attributes']['posterImage']['small'],
 				'genres' => [], //$manga['genres'],
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index 4eac8c43..0ffaca69 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -25,7 +25,6 @@ define('SRC_DIR', realpath(__DIR__));
  */
 class AnimeClient {
 
-	const KITSU_AUTH_URL = 'https://kitsu.io/api/oauth/token';
 	const SESSION_SEGMENT = 'Aviat\AnimeClient\Auth';
 	const DEFAULT_CONTROLLER_NAMESPACE = 'Aviat\AnimeClient\Controller';
 	const DEFAULT_CONTROLLER = 'Aviat\AnimeClient\Controller\Anime';
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 3113402e..238a9c1e 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -293,7 +293,7 @@ class Anime extends BaseController {
 		$data = $this->model->getAnime($anime_id);
 
 		$this->outputHTML('anime/details', [
-			'title' => 'Anime &middot ' . $data['title'],
+			'title' => 'Anime &middot ' . $data['titles'][0],
 			'data' => $data,
 		]);
 	}
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 72e99c9b..d8149885 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -161,7 +161,7 @@ class Manga extends Controller {
 	public function edit($id, $status = "All")
 	{
 		$this->set_session_redirect();
-		$item = $this->model->get_library_item($id, $status);
+		$item = $this->model->getLibraryItem($id);
 		$title = $this->config->get('whose_list') . "'s Manga List &middot; Edit";
 
 		$this->outputHTML('manga/edit', [
diff --git a/src/Model/API.php b/src/Model/API.php
index 6d523d8d..a0ff29db 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -69,7 +69,7 @@ class API extends Model {
 
 		foreach ($array as $key => $item)
 		{
-			$sort[$key] = $item[$sort_key]['title'];
+			$sort[$key] = $item[$sort_key]['titles'][0];
 		}
 
 		array_multisort($sort, SORT_ASC, $array);
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 736d6ea2..6d62ac3e 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -83,6 +83,18 @@ class Manga extends API
 		return $this->kitsuModel->getManga($manga_id);
 	}
 
+	/**
+	 * Get information about a specific list item
+	 * for editing/updating that item
+	 *
+	 * @param string $itemId
+	 * @return array
+	 */
+	public function getLibraryItem(string $itemId): array
+	{
+		return $this->kitsuModel->getListItem($itemId);
+	}
+
 	/**
 	 * Map transformed anime data to be organized by reading status
 	 *

From 8412588940ce9f45ef59eb9f5ed4f1866c54491e Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 6 Jan 2017 21:39:01 -0500
Subject: [PATCH 60/65] Episode incrementing and update work for anime

---
 app/bootstrap.php                             |   8 +-
 app/config/routes.php                         |   2 +-
 app/views/anime/cover.php                     |  10 +-
 app/views/anime/edit.php                      |   4 +-
 public/js/anime_edit.js                       |  12 +--
 public/js/base/AnimeClient.js                 |  15 ++-
 src/API/Kitsu/KitsuModel.php                  |  82 ++++++++------
 src/API/Kitsu/KitsuTrait.php                  | 101 ++++++++++++++----
 .../{KitsuAnimeListItem.php => ListItem.php}  |  40 ++++++-
 .../Transformer/AnimeListTransformer.php      |  32 +++---
 src/API/ListInterface.php                     |  29 -----
 src/API/ListItemInterface.php                 |  20 ++--
 src/Controller.php                            |  15 +--
 src/Controller/Anime.php                      |  31 +++---
 src/Dispatcher.php                            |   8 +-
 src/Model/Anime.php                           |  21 +++-
 16 files changed, 278 insertions(+), 152 deletions(-)
 mode change 100755 => 100644 public/js/anime_edit.js
 rename src/API/Kitsu/{KitsuAnimeListItem.php => ListItem.php} (50%)
 delete mode 100644 src/API/ListInterface.php

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 53848110..5c2bfd76 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -20,6 +20,7 @@ use Aura\Html\HelperLocatorFactory;
 use Aura\Router\RouterContainer;
 use Aura\Session\SessionFactory;
 use Aviat\AnimeClient\API\Kitsu\Auth as KitsuAuth;
+use Aviat\AnimeClient\API\Kitsu\ListItem as KitsuListItem;
 use Aviat\AnimeClient\API\Kitsu\KitsuModel;
 use Aviat\AnimeClient\Model;
 use Aviat\Banker\Pool;
@@ -41,7 +42,10 @@ return function(array $config_array = []) {
 
 	$app_logger = new Logger('animeclient');
 	$app_logger->pushHandler(new RotatingFileHandler(__DIR__ . '/logs/app.log', Logger::NOTICE));
+	$request_logger = new Logger('request');
+	$request_logger->pushHandler(new RotatingFileHandler(__DIR__ . '/logs/request.log', Logger::NOTICE));
 	$container->setLogger($app_logger, 'default');
+	$container->setLogger($request_logger, 'request');
 
 	// -------------------------------------------------------------------------
 	// Injected Objects
@@ -103,7 +107,9 @@ return function(array $config_array = []) {
 
 	// Models
 	$container->set('kitsu-model', function($container) {
-		$model = new KitsuModel();
+		$listItem = new KitsuListItem();
+		$listItem->setContainer($container);
+		$model = new KitsuModel($listItem);
 		$model->setContainer($container);
 		return $model;
 	});
diff --git a/app/config/routes.php b/app/config/routes.php
index 6e272f29..df9329ad 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -203,7 +203,7 @@ return [
 		'index_redirect' => [
 			'path' => '/',
 			'controller' => AnimeClient::DEFAULT_CONTROLLER_NAMESPACE,
-			'action' => 'redirect_to_default',
+			'action' => 'redirectToDefaultRoute',
 		],
 	],
 ];
\ No newline at end of file
diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index 70443f36..c30ea8c3 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -11,17 +11,17 @@
 			<section class="media-wrap">
 				<?php foreach($items as $item): ?>
 				<?php if ($item['private'] && ! $auth->is_authenticated()) continue; ?>
-				<article class="media" id="<?= $item['anime']['slug'] ?>">
+				<article class="media" id="<?= $item['id'] ?>">
 					<?php if ($auth->is_authenticated()): ?>
 					<button title="Increment episode count" class="plus_one" hidden>+1 Episode</button>
 					<?php endif ?>
 					<?= $helper->img($item['anime']['image']); ?>
 					<div class="name">
 						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]); ?>">
-                            <?= array_shift($item['anime']['titles']) ?>
-                            <?php foreach ($item['anime']['titles'] as $title): ?>
-                                <br /><small><?= $title ?></small>
-                            <?php endforeach ?>
+							<?= array_shift($item['anime']['titles']) ?>
+							<?php foreach ($item['anime']['titles'] as $title): ?>
+								<br /><small><?= $title ?></small>
+							<?php endforeach ?>
 						</a>
 					</div>
 					<div class="table">
diff --git a/app/views/anime/edit.php b/app/views/anime/edit.php
index 2e758bd4..e96c6d25 100644
--- a/app/views/anime/edit.php
+++ b/app/views/anime/edit.php
@@ -76,7 +76,7 @@
 					<tr>
 						<td>&nbsp;</td>
 						<td>
-							<input type="hidden" value="<?= $item['anime']['slug'] ?>" name="id" />
+							<input type="hidden" value="<?= $item['id'] ?>" name="id" />
 							<input type="hidden" value="true" name="edit" />
 							<button type="submit">Submit</button>
 						</td>
@@ -92,7 +92,7 @@
 						<tr>
 							<td>&nbsp;</td>
 							<td>
-								<input type="hidden" value="<?= $item['anime']['slug'] ?>" name="id" />
+								<input type="hidden" value="<?= $item['id'] ?>" name="id" />
 								<button type="submit" class="danger">Delete Entry</button>
 							</td>
 						</tr>
diff --git a/public/js/anime_edit.js b/public/js/anime_edit.js
old mode 100755
new mode 100644
index 8ce99863..e1312970
--- a/public/js/anime_edit.js
+++ b/public/js/anime_edit.js
@@ -15,19 +15,20 @@
 		// Setup the update data
 		let data = {
 			id: parent_sel.id,
-			increment_episodes: true
+			data: {
+				progress: watched_count + 1
+			}
 		};
 
 		// If the episode count is 0, and incremented,
 		// change status to currently watching
 		if (isNaN(watched_count) || watched_count === 0) {
-			data.status = 'currently-watching';
+			data.data.status = 'current';
 		}
 
 		// If you increment at the last episode, mark as completed
 		if (( ! isNaN(watched_count)) && (watched_count + 1) == total_count) {
-			delete data.increment_episodes;
-			data.status = 'completed';
+			data.data.status = 'completed';
 		}
 
 		// okay, lets actually make some changes!
@@ -35,7 +36,6 @@
 			data: data,
 			dataType: 'json',
 			type: 'POST',
-			mimeType: 'application/json',
 			success: (res) => {
 				if (data.status == 'completed') {
 					_.hide(parent_sel);
@@ -47,7 +47,7 @@
 			},
 			error: (xhr, errorType, error) => {
 				console.error(error);
-				_.showMessage('error', `Failed to updated ${title}. `);
+				_.showMessage('error', `Failed to update ${title}. `);
 				_.scrollToTop();
 			}
 		});
diff --git a/public/js/base/AnimeClient.js b/public/js/base/AnimeClient.js
index 11fac8aa..e07ea9cb 100644
--- a/public/js/base/AnimeClient.js
+++ b/public/js/base/AnimeClient.js
@@ -235,7 +235,7 @@ var AnimeClient = (function(w) {
 	 * 	data: // data to send with the request
 	 * 	type: // http verb of the request, defaults to GET
 	 * 	success: // success callback
-	 * 	error: // error callback  
+	 * 	error: // error callback
 	 * }
 	 *
 	 * @param  {string} url - the url to request
@@ -249,6 +249,7 @@ var AnimeClient = (function(w) {
 		config.type = config.type || 'GET';
 		config.dataType = config.dataType || '';
 		config.success = config.success || _.noop;
+		config.mimeType = config.mimeType || 'application/x-www-form-urlencoded';
 		config.error = config.error || _.noop;
 
 		let request = new XMLHttpRequest();
@@ -280,14 +281,22 @@ var AnimeClient = (function(w) {
 			}
 		};
 
+		if (config.dataType === 'json') {
+			config.data = JSON.stringify(config.data);
+			config.mimeType = 'application/json';
+		} else {
+			config.data = ajaxSerialize(config.data);
+		}
+
+		request.setRequestHeader('Content-Type', config.mimeType);
+
 		switch (method) {
 			case "GET":
 				request.send(null);
 			break;
 
 			default:
-				request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-				request.send(ajaxSerialize(config.data));
+				request.send(config.data);
 			break;
 		}
 	};
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 2d8124f4..7ad2976e 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -22,6 +22,8 @@ use Aviat\AnimeClient\API\Kitsu\Transformer\{
 	AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
 };
 use Aviat\Ion\Di\ContainerAware;
+use Aviat\Ion\Json;
+use GuzzleHttp\Exception\ClientException;
 
 /**
  * Kitsu API Model
@@ -47,6 +49,11 @@ class KitsuModel {
 	 */
 	protected $animeTransformer;
 
+	/**
+	 * @var ListItem
+	 */
+	protected $listItem;
+
 	/**
 	 * @var MangaTransformer
 	 */
@@ -60,13 +67,14 @@ class KitsuModel {
 	/**
 	 * KitsuModel constructor.
 	 */
-	public function __construct()
+	public function __construct(ListItem $listItem)
 	{
 		// Set up Guzzle trait
 		$this->init();
 
 		$this->animeTransformer = new AnimeTransformer();
 		$this->animeListTransformer = new AnimeListTransformer();
+		$this->listItem = $listItem;
 		$this->mangaTransformer = new MangaTransformer();
 		$this->mangaListTransformer = new MangaListTransformer();
 	}
@@ -124,7 +132,7 @@ class KitsuModel {
 	/**
 	 * Get information about a particular manga
 	 *
-	 * @param string $animeId
+	 * @param string $mangaId
 	 * @return array
 	 */
 	public function getManga(string $mangaId): array
@@ -133,29 +141,6 @@ class KitsuModel {
 		return $this->mangaTransformer->transform($baseData);
 	}
 
-	public function getListItem(string $listId): array
-	{
-		$baseData = $this->getRequest("library-entries/{$listId}", [
-			'query' => [
-				'include' => 'media'
-			]
-		]);
-
-		switch ($baseData['included'][0]['type'])
-		{
-			case 'anime':
-				$baseData['data']['anime'] = $baseData['included'][0];
-				return $this->animeListTransformer->transform($baseData['data']);
-
-			case 'manga':
-				$baseData['data']['manga'] = $baseData['included'][0];
-				return $this->mangaListTransformer->transform($baseData['data']);
-
-			default:
-				return $baseData['data']['attributes'];
-		}
-	}
-
 	public function getAnimeList($status): array
 	{
 		$options = [
@@ -185,9 +170,9 @@ class KitsuModel {
 			$animeGenres = $item['anime']['relationships']['genres'];
 
 			foreach($animeGenres as $id)
-            {
-                $item['genres'][] = $included['genres'][$id]['name'];
-            }
+			{
+				$item['genres'][] = $included['genres'][$id]['name'];
+			}
 
 			// $item['genres'] = array_pluck($genres, 'name');
 		}
@@ -238,10 +223,45 @@ class KitsuModel {
 			'include' => 'media'
 		];
 
-		$data = $this->getRequest($type, $options);
+		return $this->getRequest($type, $options);
+	}
 
-		// @TODO implement search api call
-		return $data;
+	public function getListItem(string $listId): array
+	{
+		$baseData = $this->listItem->get($listId);
+
+		switch ($baseData['included'][0]['type'])
+		{
+			case 'anime':
+				$baseData['data']['anime'] = $baseData['included'][0];
+				return $this->animeListTransformer->transform($baseData['data']);
+
+			case 'manga':
+				$baseData['data']['manga'] = $baseData['included'][0];
+				return $this->mangaListTransformer->transform($baseData['data']);
+
+			default:
+				return $baseData['data']['attributes'];
+		}
+	}
+
+	public function updateListItem(array $data)
+	{
+		try
+		{
+			$response = $this->listItem->update($data['id'], $data['data']);
+			return [
+				'statusCode' => $response->getStatusCode(),
+				'body' => $response->getBody(),
+			];
+		}
+		catch(ClientException $e)
+		{
+			return [
+				'statusCode' => $e->getResponse()->getStatusCode(),
+				'body' => Json::decode((string)$e->getResponse()->getBody())
+			];
+		}
 	}
 
 	private function getUsername(): string
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 85397f4a..4f2a0234 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -21,7 +21,9 @@ use Aviat\AnimeClient\API\GuzzleTrait;
 use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Psr7\Response;
 use InvalidArgumentException;
+use PHP_CodeSniffer\Tokenizers\JS;
 use RuntimeException;
 
 trait KitsuTrait {
@@ -33,6 +35,19 @@ trait KitsuTrait {
 	 */
 	protected $baseUrl = "https://kitsu.io/api/edge/";
 
+	/**
+	 * HTTP headers to send with every request
+	 *
+	 * @var array
+	 */
+	protected $defaultHeaders = [
+		'User-Agent' => "Tim's Anime Client/4.0",
+		'Accept-Encoding' => 'application/vnd.api+json',
+		'Content-Type' => 'application/vnd.api+json; charset=utf-8',
+		'client_id' => 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd',
+		'client_secret' => '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151',
+	];
+
 	/**
 	 * Set up the class properties
 	 *
@@ -42,11 +57,7 @@ trait KitsuTrait {
 	{
 		$defaults = [
 			'cookies' => $this->cookieJar,
-			'headers' => [
-				'User-Agent' => "Tim's Anime Client/4.0",
-				'Accept-Encoding' => 'application/vnd.api+json',
-				'Content-Type' => 'application/vnd.api+json'
-			],
+			'headers' => $this->defaultHeaders,
 			'timeout' => 25,
 			'connect_timeout' => 25
 		];
@@ -66,10 +77,11 @@ trait KitsuTrait {
 	 * @param string $type
 	 * @param string $url
 	 * @param array $options
-	 * @return array
+	 * @return Response
 	 */
-	private function request(string $type, string $url, array $options = []): array
+	private function getResponse(string $type, string $url, array $options = [])
 	{
+		$logger = null;
 		$validTypes = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
 
 		if ( ! in_array($type, $validTypes))
@@ -77,18 +89,13 @@ trait KitsuTrait {
 			throw new InvalidArgumentException('Invalid http request type');
 		}
 
-		$logger = NULL;
-
 		$defaultOptions = [
-			'headers' => [
-				'client_id' => 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd',
-				'client_secret' => '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151'
-			]
+			'headers' => $this->defaultHeaders
 		];
 
-		if ($this->getContainer())
+		if ($this->getContainer());
 		{
-			$logger = $this->container->getLogger('default');
+			$logger = $this->container->getLogger('request');
 			$sessionSegment = $this->getContainer()
 				->get('session')
 				->getSegment(AnimeClient::SESSION_SEGMENT);
@@ -98,11 +105,31 @@ trait KitsuTrait {
 				$token = $sessionSegment->get('auth_token');
 				$defaultOptions['headers']['Authorization'] = "bearer {$token}";
 			}
+			$logger->debug(Json::encode(func_get_args()));
 		}
 
 		$options = array_merge($defaultOptions, $options);
 
-		$response = $this->client->request($type, $url, $options);
+		return $this->client->request($type, $url, $options);
+	}
+
+	/**
+	 * Make a request via Guzzle
+	 *
+	 * @param string $type
+	 * @param string $url
+	 * @param array $options
+	 * @return array
+	 */
+	private function request(string $type, string $url, array $options = []): array
+	{
+		$logger = null;
+		if ($this->getContainer())
+		{
+			$logger = $this->container->getLogger('request');
+		}
+
+		$response = $this->getResponse($type, $url, $options);
 
 		if ((int) $response->getStatusCode() !== 200)
 		{
@@ -112,7 +139,7 @@ trait KitsuTrait {
 				$logger->warning($response->getBody());
 			}
 
-			throw new RuntimeException($response);
+			// throw new RuntimeException($response->getBody());
 		}
 
 		return JSON::decode($response->getBody(), TRUE);
@@ -129,6 +156,17 @@ trait KitsuTrait {
 		return $this->request('GET', ...$args);
 	}
 
+	/**
+	 * Remove some boilerplate for patch requests
+	 *
+	 * @param array $args
+	 * @return array
+	 */
+	protected function patchRequest(...$args): array
+	{
+		return $this->request('PATCH', ...$args);
+	}
+
 	/**
 	 * Remove some boilerplate for post requests
 	 *
@@ -137,17 +175,38 @@ trait KitsuTrait {
 	 */
 	protected function postRequest(...$args): array
 	{
-		return $this->request('POST', ...$args);
+		$logger = null;
+		if ($this->getContainer())
+		{
+			$logger = $this->container->getLogger('request');
+		}
+
+		$response = $this->getResponse('POST', ...$args);
+		$validResponseCodes = [200, 201];
+
+		if ( ! in_array((int) $response->getStatusCode(), $validResponseCodes))
+		{
+			if ($logger)
+			{
+				$logger->warning('Non 201 response for POST api call');
+				$logger->warning($response->getBody());
+			}
+
+			throw new RuntimeException($response->getBody());
+		}
+
+		return JSON::decode($response->getBody(), TRUE);
 	}
 
 	/**
 	 * Remove some boilerplate for delete requests
 	 *
 	 * @param array $args
-	 * @return array
+	 * @return bool
 	 */
-	protected function deleteRequest(...$args): array
+	protected function deleteRequest(...$args): bool
 	{
-		return $this->request('DELETE', ...$args);
+		$response = $this->getResponse('DELETE', ...$args);
+		return ((int) $response->getStatusCode() === 204);
 	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuAnimeListItem.php b/src/API/Kitsu/ListItem.php
similarity index 50%
rename from src/API/Kitsu/KitsuAnimeListItem.php
rename to src/API/Kitsu/ListItem.php
index 1d7a498a..884dec76 100644
--- a/src/API/Kitsu/KitsuAnimeListItem.php
+++ b/src/API/Kitsu/ListItem.php
@@ -17,27 +17,59 @@
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\API\AbstractListItem;
+use Aviat\Ion\Di\ContainerAware;
+use Aviat\Ion\Json;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Psr7\Response;
+use RuntimeException;
 
-class KitsuAnimeListItem extends AbstractListItem {
+/**
+ * CRUD operations for Kitsu list items
+ */
+class ListItem extends AbstractListItem {
+	use ContainerAware;
 	use KitsuTrait;
 
+	public function __construct()
+	{
+		$this->init();
+	}
+
 	public function create(array $data): bool
 	{
 		// TODO: Implement create() method.
+		return false;
 	}
 
 	public function delete(string $id): bool
 	{
 		// TODO: Implement delete() method.
+		return false;
 	}
 
 	public function get(string $id): array
 	{
-		// TODO: Implement get() method.
+		return $this->getRequest("library-entries/{$id}", [
+			'query' => [
+				'include' => 'media'
+			]
+		]);
 	}
 
-	public function update(string $id, array $data): bool
+	public function update(string $id, array $data): Response
 	{
-		// TODO: Implement update() method.
+		$requestData = [
+			'data' => [
+				'id' => $id,
+				'type' => 'libraryEntries',
+				'attributes' => $data
+			]
+		];
+
+		$response = $this->getResponse('PATCH', "library-entries/{$id}", [
+			'body' => JSON::encode($requestData)
+		]);
+
+		return $response;
 	}
 }
\ No newline at end of file
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index deb01987..2143378b 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -52,7 +52,7 @@ class AnimeListTransformer extends AbstractTransformer {
 				'length' => $anime['episodeLength'],
 			],
 			'airing' => [
-				'status' => Kitsu::getAiringStatus($anime['startDate'], $anime['endDate']), 
+				'status' => Kitsu::getAiringStatus($anime['startDate'], $anime['endDate']),
 				'started' => $anime['startDate'],
 				'ended' => $anime['endDate']
 			],
@@ -80,15 +80,14 @@ class AnimeListTransformer extends AbstractTransformer {
 	 *
 	 * @param array $item Transformed library item
 	 * @return array API library item
-     * @TODO reimplement
 	 */
 	public function untransform($item)
 	{
 		// Messy mapping of boolean values to their API string equivalents
-		$privacy = 'public';
+		$privacy = 'false';
 		if (array_key_exists('private', $item) && $item['private'])
 		{
-			$privacy = 'private';
+			$privacy = 'true';
 		}
 
 		$rewatching = 'false';
@@ -97,16 +96,25 @@ class AnimeListTransformer extends AbstractTransformer {
 			$rewatching = 'true';
 		}
 
-		return [
+		$untransformed = [
 			'id' => $item['id'],
-			'status' => $item['watching_status'],
-			'sane_rating_update' => $item['user_rating'] / 2,
-			'rewatching' => $rewatching,
-			'rewatched_times' => $item['rewatched'],
-			'notes' => $item['notes'],
-			'episodes_watched' => $item['episodes_watched'],
-			'privacy' => $privacy
+			'data' => [
+				'status' => $item['watching_status'],
+				'rating' => $item['user_rating'] / 2,
+				'reconsuming' => $rewatching,
+				'reconsumeCount' => $item['rewatched'],
+				'notes' => $item['notes'],
+				'progress' => $item['episodes_watched'],
+				'private' => $privacy
+			]
 		];
+
+		if ((int) $untransformed['data']['rating'] === 0)
+		{
+			unset($untransformed['data']['rating']);
+		}
+
+		return $untransformed;
 	}
 }
 // End of AnimeListTransformer.php
\ No newline at end of file
diff --git a/src/API/ListInterface.php b/src/API/ListInterface.php
deleted file mode 100644
index 1e2d739b..00000000
--- a/src/API/ListInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API;
-
-/**
- * Common interface for anime and manga list item CRUD
- */
-interface ListInterface {
-    /**
-     * Get the raw list of items
-     *
-     * @return array
-     */
-    public function get(): array;
-}
\ No newline at end of file
diff --git a/src/API/ListItemInterface.php b/src/API/ListItemInterface.php
index b0a69551..2767bd4c 100644
--- a/src/API/ListItemInterface.php
+++ b/src/API/ListItemInterface.php
@@ -16,36 +16,38 @@
 
 namespace Aviat\AnimeClient\API;
 
+use GuzzleHttp\Psr7\Response;
+
 /**
  * Common interface for anime and manga list item CRUD
  */
 interface ListItemInterface {
-	
+
 	/**
 	 * Create a list item
 	 *
-	 * @param array $data - 
+	 * @param array $data -
 	 * @return bool
 	 */
 	public function create(array $data): bool;
-	
+
 	/**
 	 * Retrieve a list item
 	 *
 	 * @param string $id - The id of the list item
-	 * @return array 
+	 * @return array
 	 */
 	public function get(string $id): array;
-	
+
 	/**
 	 * Update a list item
-	 * 
+	 *
 	 * @param string $id - The id of the list item to update
 	 * @param array $data - The data with which to update the list item
-	 * @return bool
+	 * @return Response
 	 */
-	public function update(string $id, array $data): bool;
-	
+	public function update(string $id, array $data): Response;
+
 	/**
 	 * Delete a list item
 	 *
diff --git a/src/Controller.php b/src/Controller.php
index d6c0170c..d776873f 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -120,7 +120,7 @@ class Controller {
 	 *
 	 * @return void
 	 */
-	public function redirect_to_default()
+	public function redirectToDefaultRoute()
 	{
 		$default_type = $this->config->get(['routes', 'route_config', 'default_list']);
 		$this->redirect($this->urlGenerator->default_url($default_type), 303);
@@ -317,7 +317,7 @@ class Controller {
 		$auth = $this->container->get('auth');
 		$auth->logout();
 
-		$this->redirect_to_default();
+		$this->redirectToDefaultRoute();
 	}
 
 	/**
@@ -358,7 +358,7 @@ class Controller {
 	 * @param string $type
 	 * @return void
 	 */
-	public function setFlashMessage($message, $type = "info")
+	public function set_flash_message($message, $type = "info")
 	{
 		$this->session->setFlash('message', [
 			'message_type' => $type,
@@ -423,11 +423,12 @@ class Controller {
 	 * @param int $code - the http status code
 	 * @return void
 	 */
-	protected function outputJSON($data = [], $code = 200)
+	protected function outputJSON($data = 'Empty response', int $code = 200)
 	{
-		$view = new JsonView($this->container);
-		$view->setStatusCode($code);
-		$view->setOutput($data);
+		(new JsonView($this->container))
+			->setStatusCode($code)
+			->setOutput($data)
+			->send();
 	}
 
 	/**
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 238a9c1e..1c108a97 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -21,6 +21,7 @@ use Aviat\AnimeClient\API\Kitsu;
 use Aviat\AnimeClient\API\Kitsu\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer;
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Json;
 use Aviat\Ion\StringWrapper;
 
 /**
@@ -227,18 +228,12 @@ class Anime extends BaseController {
 		// large form-based updates
 		$transformer = new AnimeListTransformer();
 		$post_data = $transformer->untransform($data);
+		$full_result = $this->model->updateLibraryItem($post_data);
 
-		$full_result = $this->model->update($post_data);
-		$result = $full_result['body'];
-
-		if (array_key_exists('anime', $result))
+		if ($full_result['statusCode'] === 200)
 		{
-			$title = ( ! empty($result['anime']['alternate_title']))
-				? "{$result['anime']['title']} ({$result['anime']['alternate_title']})"
-				: "{$result['anime']['title']}";
-
-			$this->set_flash_message("Successfully updated {$title}.", 'success');
-			$this->cache->purge();
+			$this->set_flash_message("Successfully updated.", 'success');
+			// $this->cache->purge();
 		}
 		else
 		{
@@ -255,8 +250,20 @@ class Anime extends BaseController {
 	 */
 	public function update()
 	{
-		$response = $this->model->update($this->request->getParsedBody());
-		$this->cache->purge();
+		if ($this->request->getHeader('content-type')[0] === 'application/json')
+		{
+			$data = JSON::decode((string)$this->request->getBody());
+		}
+		else
+		{
+			$data = $this->request->getParsedBody();
+		}
+
+		$response = $this->model->updateLibraryItem($data);
+//echo JSON::encode($response);
+//die();
+
+		// $this->cache->purge();
 		$this->outputJSON($response['body'], $response['statusCode']);
 	}
 
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 8a67eff0..6857e1ff 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -75,8 +75,8 @@ class Dispatcher extends RoutingBase {
 		$raw_route = $this->request->getUri()->getPath();
 		$route_path = "/" . trim($raw_route, '/');
 
-		$logger->debug('Dispatcher - Routing data from get_route method');
-		$logger->debug(print_r([
+		$logger->info('Dispatcher - Routing data from get_route method');
+		$logger->info(print_r([
 			'route_path' => $route_path
 		], TRUE));
 
@@ -108,8 +108,8 @@ class Dispatcher extends RoutingBase {
 		{
 			$route = $this->getRoute();
 
-			$logger->debug('Dispatcher - Route invoke arguments');
-			$logger->debug(print_r($route, TRUE));
+			$logger->info('Dispatcher - Route invoke arguments');
+			$logger->info(print_r($route, TRUE));
 		}
 
 		if ($route)
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index b3fcd0bf..4b2681d6 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -81,6 +81,18 @@ class Anime extends API {
 		return $this->kitsuModel->getAnime($anime_id);
 	}
 
+	/**
+	 * Search for anime by name
+	 *
+	 * @param string $name
+	 * @return array
+	 */
+	public function search($name)
+	{
+		// $raw = $this->kitsuModel->search('anime', $name);
+		return $this->kitsuModel->search('anime', $name);
+	}
+
 	/**
 	 * Get information about a specific list item
 	 * for editing/updating that item
@@ -94,15 +106,14 @@ class Anime extends API {
 	}
 
 	/**
-	 * Search for anime by name
+	 * Update a list entry
 	 *
-	 * @param string $name
+	 * @param array $data
 	 * @return array
 	 */
-	public function search($name)
+	public function updateLibraryItem(array $data): array
 	{
-		$raw = $this->kitsuModel->search('anime', $name);
-		return $this->kitsuModel->search('anime', $name);
+		return $this->kitsuModel->updateListItem($data);
 	}
 }
 // End of AnimeModel.php
\ No newline at end of file

From 187812576c644852ff2123e15826a73566eea242 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 6 Jan 2017 23:34:56 -0500
Subject: [PATCH 61/65] Update header comments

---
 src/API/GuzzleTrait.php                       | 32 +++++++++----------
 src/API/Kitsu.php                             | 10 +++---
 src/API/Kitsu/KitsuModel.php                  | 10 +++---
 src/API/Kitsu/KitsuTrait.php                  | 10 +++---
 src/API/Kitsu/ListItem.php                    | 10 +++---
 .../Kitsu/Transformer/AnimeTransformer.php    | 10 +++---
 .../Transformer/MangaListTransformer.php      | 10 +++---
 .../Kitsu/Transformer/MangaTransformer.php    | 10 +++---
 src/API/MAL/Model.php                         | 32 +++++++++----------
 src/Model/Anime.php                           | 10 +++---
 src/Model/Manga.php                           | 10 +++---
 11 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/API/GuzzleTrait.php b/src/API/GuzzleTrait.php
index 039722ba..9fdb1998 100644
--- a/src/API/GuzzleTrait.php
+++ b/src/API/GuzzleTrait.php
@@ -1,19 +1,19 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
 namespace Aviat\AnimeClient\API;
 
 /**
diff --git a/src/API/Kitsu.php b/src/API/Kitsu.php
index e89357c6..9bee9b22 100644
--- a/src/API/Kitsu.php
+++ b/src/API/Kitsu.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API;
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 7ad2976e..4aa4081e 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu;
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 4f2a0234..32940231 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu;
diff --git a/src/API/Kitsu/ListItem.php b/src/API/Kitsu/ListItem.php
index 884dec76..b59c74c6 100644
--- a/src/API/Kitsu/ListItem.php
+++ b/src/API/Kitsu/ListItem.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu;
diff --git a/src/API/Kitsu/Transformer/AnimeTransformer.php b/src/API/Kitsu/Transformer/AnimeTransformer.php
index a4351857..3dbfc8cc 100644
--- a/src/API/Kitsu/Transformer/AnimeTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeTransformer.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index 0e648fe1..e826d3b5 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
diff --git a/src/API/Kitsu/Transformer/MangaTransformer.php b/src/API/Kitsu/Transformer/MangaTransformer.php
index fa5013c8..df6bfead 100644
--- a/src/API/Kitsu/Transformer/MangaTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaTransformer.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\API\Kitsu\Transformer;
diff --git a/src/API/MAL/Model.php b/src/API/MAL/Model.php
index 459b7414..2de5339b 100644
--- a/src/API/MAL/Model.php
+++ b/src/API/MAL/Model.php
@@ -1,19 +1,19 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
 namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\Model\API;
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 4b2681d6..288157d3 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 6d62ac3e..bb61cb12 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -6,12 +6,12 @@
  *
  * PHP version 7
  *
- * @package	 AnimeListClient
- * @author	  Timothy J. Warren <tim@timshomepage.net>
+ * @package     AnimeListClient
+ * @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	 4.0
- * @link		https://github.com/timw4mail/HummingBirdAnimeClient
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
 namespace Aviat\AnimeClient\Model;

From 08b4227b34342cc58273dc20d3eac297659eb03f Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 9 Jan 2017 20:36:48 -0500
Subject: [PATCH 62/65] Anime and Manga editing, incrementing, and deletion

---
 app/views/manga/edit.php                      |  6 +-
 public/css/base.css                           |  9 +-
 public/css/base.myth.css                      |  8 +-
 public/js/manga_edit.js                       |  8 +-
 .../templates/anime-ajax-search-results.html  | 11 ++-
 .../templates/manga-ajax-search-results.html  | 20 ++--
 src/API/Kitsu.php                             | 17 +++-
 src/API/Kitsu/Enum/MangaReadingStatus.php     | 10 +-
 src/API/Kitsu/KitsuModel.php                  | 27 ++++--
 src/API/Kitsu/KitsuTrait.php                  | 31 +++---
 src/API/Kitsu/ListItem.php                    | 27 +++++-
 .../Transformer/MangaListTransformer.php      | 16 ++--
 src/Controller/Anime.php                      |  9 +-
 src/Controller/Manga.php                      | 45 +++++----
 src/Model/API.php                             | 10 +-
 src/Model/Anime.php                           |  5 +
 src/Model/Collection.php                      |  1 +
 src/Model/Manga.php                           | 22 +++++
 src/Util.php                                  | 94 +------------------
 19 files changed, 192 insertions(+), 184 deletions(-)
 mode change 100755 => 100644 public/js/manga_edit.js

diff --git a/app/views/manga/edit.php b/app/views/manga/edit.php
index a6eefb27..024dce2b 100644
--- a/app/views/manga/edit.php
+++ b/app/views/manga/edit.php
@@ -25,9 +25,9 @@
 					<td><label for="status">Reading Status</label></td>
 					<td>
 						<select name="status" id="status">
-						<?php foreach($status_list as $status): ?>
-							<option <?php if($item['reading_status'] === $status): ?>selected="selected"<?php endif ?>
-								value="<?= $status ?>"><?= $status ?></option>
+						<?php foreach($status_list as $val => $status): ?>
+							<option <?php if($item['reading_status'] === $val): ?>selected="selected"<?php endif ?>
+								value="<?= $val ?>"><?= $status ?></option>
 						<?php endforeach ?>
 						</select>
 					</td>
diff --git a/public/css/base.css b/public/css/base.css
index b80a42b1..a2483688 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1174,8 +1174,8 @@ a:hover, a:active {
 	position:absolute;
 	top: 86px;
 	top: calc(50% - 58.5px);
-	left: 5px;
-	left: calc(50% - 95px);
+	left: 43.5px;
+	left: calc(50% - 66.5px);
 }
 
 /* -----------------------------------------------------------------------------
@@ -1222,11 +1222,16 @@ a:hover, a:active {
 	position:absolute;
 	display:block;
 	top:0;
+	left:0;
 	height:100%;
 	width:100%;
 	vertical-align:middle;
 }
 
+#series_list .name small {
+	color: #fff;
+}
+
 /* ----------------------------------------------------------------------------
 	Details page styles
 -----------------------------------------------------------------------------*/
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index b91f8be5..6e243f99 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -439,8 +439,8 @@ a:hover, a:active {
 	position:absolute;
 	top: 86px;
 	top: calc(50% - 58.5px);
-	left: 5px;
-	left: calc(50% - 95px);
+	left: 43.5px;
+	left: calc(50% - 66.5px);
 }
 
 
@@ -484,10 +484,14 @@ a:hover, a:active {
 	position:absolute;
 	display:block;
 	top:0;
+	left:0;
 	height:100%;
 	width:100%;
 	vertical-align:middle;
 }
+#series_list .name small {
+	color: #fff;
+}
 
 /* ----------------------------------------------------------------------------
 	Details page styles
diff --git a/public/js/manga_edit.js b/public/js/manga_edit.js
old mode 100755
new mode 100644
index d59a9587..a97fb35f
--- a/public/js/manga_edit.js
+++ b/public/js/manga_edit.js
@@ -18,12 +18,16 @@
 			completed = 0;
 		}
 
+		// Setup the update data
 		let data = {
-			id: manga_id
+			id: manga_id,
+			data: {
+				progress: completed
+			}
 		};
 
 		// Update the total count
-		data[type + "s_read"] = ++completed;
+		data['data']['progress'] = ++completed;
 
 		_.ajax(_.url('/manga/update'), {
 			data: data,
diff --git a/public/templates/anime-ajax-search-results.html b/public/templates/anime-ajax-search-results.html
index a28371f7..c5a64562 100644
--- a/public/templates/anime-ajax-search-results.html
+++ b/public/templates/anime-ajax-search-results.html
@@ -4,10 +4,13 @@
 		<input type="radio" class="big-check" id="{{attributes.slug}}" name="id" value="{{id}}" />
 		<label for="{{attributes.slug}}">
 			<span class="name">
-				{{attributes.canonicalTitle}}<br />
-				{{attributes.titles.en}}<br />
-				{{attributes.titles.en_jp}}<br />
-				{{attributes.titles.ja_jp}}
+				{{attributes.canonicalTitle}}
+				<br />
+				<small>
+				{{#attributes.titles}}
+					{{.}}<br />
+				{{/attributes.titles}}
+				</small>
 			</span>
 		</label>
 	</div>
diff --git a/public/templates/manga-ajax-search-results.html b/public/templates/manga-ajax-search-results.html
index 25594c2b..c5a64562 100644
--- a/public/templates/manga-ajax-search-results.html
+++ b/public/templates/manga-ajax-search-results.html
@@ -1,10 +1,18 @@
-{{#search}}
+{{#data}}
 <article class="media search">
-	<div class="name" style="background-image:url({{image}})">
-		<input type="radio" class="big-check" id="{{link}}" name="id" value="{{link}}" />
-		<label for="{{link}}">
-			<span>{{title}}</span>
+	<div class="name" style="background-image:url({{attributes.posterImage.small}})">
+		<input type="radio" class="big-check" id="{{attributes.slug}}" name="id" value="{{id}}" />
+		<label for="{{attributes.slug}}">
+			<span class="name">
+				{{attributes.canonicalTitle}}
+				<br />
+				<small>
+				{{#attributes.titles}}
+					{{.}}<br />
+				{{/attributes.titles}}
+				</small>
+			</span>
 		</label>
 	</div>
 </article>
-{{/search}}
\ No newline at end of file
+{{/data}}
\ No newline at end of file
diff --git a/src/API/Kitsu.php b/src/API/Kitsu.php
index 9bee9b22..30bd94c6 100644
--- a/src/API/Kitsu.php
+++ b/src/API/Kitsu.php
@@ -16,7 +16,11 @@
 
 namespace Aviat\AnimeClient\API;
 
-use Aviat\AnimeClient\API\Kitsu\Enum\{AnimeAiringStatus, AnimeWatchingStatus};
+use Aviat\AnimeClient\API\Kitsu\Enum\{
+	AnimeAiringStatus,
+	AnimeWatchingStatus,
+	MangaReadingStatus
+};
 use DateTimeImmutable;
 
 /**
@@ -41,6 +45,17 @@ class Kitsu {
 		];
 	}
 
+	public static function getStatusToMangaSelectMap()
+	{
+		return [
+			MangaReadingStatus::READING => 'Currently Reading',
+			MangaReadingStatus::PLAN_TO_READ => 'Plan to Read',
+			MangaReadingStatus::COMPLETED => 'Completed',
+			MangaReadingStatus::ON_HOLD => 'On Hold',
+			MangaReadingStatus::DROPPED => 'Dropped'
+		];
+	}
+
 	/**
 	 * Determine whether an anime is airing, finished airing, or has not yet aired
 	 *
diff --git a/src/API/Kitsu/Enum/MangaReadingStatus.php b/src/API/Kitsu/Enum/MangaReadingStatus.php
index 20d00712..15351824 100644
--- a/src/API/Kitsu/Enum/MangaReadingStatus.php
+++ b/src/API/Kitsu/Enum/MangaReadingStatus.php
@@ -22,10 +22,10 @@ use Aviat\Ion\Enum as BaseEnum;
  * Possible values for current reading status of manga
  */
 class MangaReadingStatus extends BaseEnum {
-	const READING = 1;
-	const PLAN_TO_READ = 2;
-	const DROPPED = 5;
-	const ON_HOLD = 4;
-	const COMPLETED = 3;
+	const READING = 'current';
+	const PLAN_TO_READ = 'planned';
+	const DROPPED = 'dropped';
+	const ON_HOLD = 'on_hold';
+	const COMPLETED = 'completed';
 }
 // End of MangaReadingStatus.php
\ No newline at end of file
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index 4aa4081e..ef5890f1 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -24,6 +24,7 @@ use Aviat\AnimeClient\API\Kitsu\Transformer\{
 use Aviat\Ion\Di\ContainerAware;
 use Aviat\Ion\Json;
 use GuzzleHttp\Exception\ClientException;
+use PHP_CodeSniffer\Tokenizers\JS;
 
 /**
  * Kitsu API Model
@@ -32,9 +33,6 @@ class KitsuModel {
 	use ContainerAware;
 	use KitsuTrait;
 
-	const CLIENT_ID = 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd';
-	const CLIENT_SECRET = '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151';
-
 	/**
 	 * Class to map anime list items
 	 * to a common format used by
@@ -101,7 +99,8 @@ class KitsuModel {
 	 */
 	public function authenticate(string $username, string $password)
 	{
-		$data = $this->postRequest(K::AUTH_URL, [
+		$response = $this->getResponse('POST', K::AUTH_URL, [
+			'headers' => [],
 			'form_params' => [
 				'grant_type' => 'password',
 				'username' => $username,
@@ -109,6 +108,8 @@ class KitsuModel {
 			]
 		]);
 
+		$data = Json::decode((string)$response->getBody());
+
 		if (array_key_exists('access_token', $data))
 		{
 			return $data['access_token'];
@@ -161,7 +162,6 @@ class KitsuModel {
 
 		$data = $this->getRequest('library-entries', $options);
 		$included = K::organizeIncludes($data['included']);
-/*?><pre><?= print_r($included, TRUE) ?></pre><?php*/
 
 		foreach($data['data'] as $i => &$item)
 		{
@@ -173,8 +173,6 @@ class KitsuModel {
 			{
 				$item['genres'][] = $included['genres'][$id]['name'];
 			}
-
-			// $item['genres'] = array_pluck($genres, 'name');
 		}
 
 		$transformed = $this->animeListTransformer->transformCollection($data['data']);
@@ -223,7 +221,15 @@ class KitsuModel {
 			'include' => 'media'
 		];
 
-		return $this->getRequest($type, $options);
+		$raw = $this->getRequest($type, $options);
+
+		foreach ($raw['data'] as &$item)
+		{
+			$item['attributes']['titles'] = K::filterTitles($item['attributes']);
+			array_shift($item['attributes']['titles']);
+		}
+
+		return $raw;
 	}
 
 	public function getListItem(string $listId): array
@@ -264,6 +270,11 @@ class KitsuModel {
 		}
 	}
 
+	public function deleteListItem(string $id): bool
+	{
+		return $this->listItem->delete($id);
+	}
+
 	private function getUsername(): string
 	{
 		return $this->getContainer()
diff --git a/src/API/Kitsu/KitsuTrait.php b/src/API/Kitsu/KitsuTrait.php
index 32940231..4b483ef7 100644
--- a/src/API/Kitsu/KitsuTrait.php
+++ b/src/API/Kitsu/KitsuTrait.php
@@ -18,12 +18,12 @@ namespace Aviat\AnimeClient\API\Kitsu;
 
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\GuzzleTrait;
+use Aviat\AnimeClient\API\Kitsu as K;
 use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Psr7\Response;
 use InvalidArgumentException;
-use PHP_CodeSniffer\Tokenizers\JS;
 use RuntimeException;
 
 trait KitsuTrait {
@@ -43,7 +43,7 @@ trait KitsuTrait {
 	protected $defaultHeaders = [
 		'User-Agent' => "Tim's Anime Client/4.0",
 		'Accept-Encoding' => 'application/vnd.api+json',
-		'Content-Type' => 'application/vnd.api+json; charset=utf-8',
+		'Content-Type' => 'application/vnd.api+json',
 		'client_id' => 'dd031b32d2f56c990b1425efe6c42ad847e7fe3ab46bf1299f05ecd856bdb7dd',
 		'client_secret' => '54d7307928f63414defd96399fc31ba847961ceaecef3a5fd93144e960c0e151',
 	];
@@ -93,23 +93,22 @@ trait KitsuTrait {
 			'headers' => $this->defaultHeaders
 		];
 
-		if ($this->getContainer());
-		{
-			$logger = $this->container->getLogger('request');
-			$sessionSegment = $this->getContainer()
-				->get('session')
-				->getSegment(AnimeClient::SESSION_SEGMENT);
+		$logger = $this->container->getLogger('request');
+		$sessionSegment = $this->getContainer()
+			->get('session')
+			->getSegment(AnimeClient::SESSION_SEGMENT);
 
-			if ($sessionSegment->get('auth_token') !== null)
-			{
-				$token = $sessionSegment->get('auth_token');
-				$defaultOptions['headers']['Authorization'] = "bearer {$token}";
-			}
-			$logger->debug(Json::encode(func_get_args()));
+		if ($sessionSegment->get('auth_token') !== null && $url !== K::AUTH_URL)
+		{
+			$token = $sessionSegment->get('auth_token');
+			$defaultOptions['headers']['Authorization'] = "bearer {$token}";
 		}
 
 		$options = array_merge($defaultOptions, $options);
 
+		$logger->debug(Json::encode([$type, $url]));
+		$logger->debug(Json::encode($options));
+
 		return $this->client->request($type, $url, $options);
 	}
 
@@ -131,7 +130,7 @@ trait KitsuTrait {
 
 		$response = $this->getResponse($type, $url, $options);
 
-		if ((int) $response->getStatusCode() !== 200)
+		if ((int) $response->getStatusCode() > 299 || (int) $response->getStatusCode() < 200)
 		{
 			if ($logger)
 			{
@@ -192,7 +191,7 @@ trait KitsuTrait {
 				$logger->warning($response->getBody());
 			}
 
-			throw new RuntimeException($response->getBody());
+			// throw new RuntimeException($response->getBody());
 		}
 
 		return JSON::decode($response->getBody(), TRUE);
diff --git a/src/API/Kitsu/ListItem.php b/src/API/Kitsu/ListItem.php
index b59c74c6..67c8c566 100644
--- a/src/API/Kitsu/ListItem.php
+++ b/src/API/Kitsu/ListItem.php
@@ -37,14 +37,33 @@ class ListItem extends AbstractListItem {
 
 	public function create(array $data): bool
 	{
-		// TODO: Implement create() method.
-		return false;
+		$response = $this->getResponse('post', 'library-entries', [
+			'body' => [
+				'type' => 'libraryEntries',
+				'attributes' => [
+					'status' => $data['status'],
+					'progress' => $data['progress'] ?? 0
+				],
+				'relationships' => [
+					'user' => [
+						'id' => $data['user_id'],
+						'type' => 'users'
+					],
+					'media' => [
+						'id' => $data['id'],
+						'type' => $data['type']
+					]
+				]
+			]
+		]);
+
+		return ($response->getStatusCode() === 201);
 	}
 
 	public function delete(string $id): bool
 	{
-		// TODO: Implement delete() method.
-		return false;
+		$response = $this->getResponse('DELETE', "library-entries/{$id}");
+		return ($response->getStatusCode() === 204);
 	}
 
 	public function get(string $id): array
diff --git a/src/API/Kitsu/Transformer/MangaListTransformer.php b/src/API/Kitsu/Transformer/MangaListTransformer.php
index e826d3b5..7e5e0645 100644
--- a/src/API/Kitsu/Transformer/MangaListTransformer.php
+++ b/src/API/Kitsu/Transformer/MangaListTransformer.php
@@ -91,18 +91,18 @@ class MangaListTransformer extends AbstractTransformer {
 
 		$map = [
 			'id' => $item['id'],
-			'manga_id' => $item['manga_id'],
-			'status' => $item['status'],
-			'chapters_read' => (int)$item['chapters_read'],
-			'volumes_read' => (int)$item['volumes_read'],
-			'rereading' => $rereading,
-			'reread_count' => (int)$item['reread_count'],
-			'notes' => $item['notes'],
+			'data' => [
+				'status' => $item['status'],
+				'progress' => (int)$item['chapters_read'],
+				'reconsuming' => $rereading,
+				'reconsumeCount' => (int)$item['reread_count'],
+				'notes' => $item['notes'],
+			],
 		];
 
 		if ($item['new_rating'] !== $item['old_rating'] && $item['new_rating'] !== "")
 		{
-			$map['rating'] = ($item['new_rating'] > 0)
+			$map['data']['rating'] = ($item['new_rating'] > 0)
 				? $item['new_rating'] / 2
 				: $item['old_rating'] / 2;
 		}
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 1c108a97..4809e21e 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -260,8 +260,6 @@ class Anime extends BaseController {
 		}
 
 		$response = $this->model->updateLibraryItem($data);
-//echo JSON::encode($response);
-//die();
 
 		// $this->cache->purge();
 		$this->outputJSON($response['body'], $response['statusCode']);
@@ -274,12 +272,13 @@ class Anime extends BaseController {
 	 */
 	public function delete()
 	{
-		$response = $this->model->delete($this->request->getParsedBody());
+		$body = $this->request->getParsedBody();
+		$response = $this->model->deleteLibraryItem($body['id']);
 
-		if ((bool)$response['body'] === TRUE)
+		if ((bool)$response === TRUE)
 		{
 			$this->set_flash_message("Successfully deleted anime.", 'success');
-			$this->cache->purge();
+			// $this->cache->purge();
 		}
 		else
 		{
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index d8149885..a0113207 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -17,6 +17,7 @@
 namespace Aviat\AnimeClient\Controller;
 
 use Aviat\AnimeClient\Controller;
+use Aviat\AnimeClient\API\Kitsu;
 use Aviat\AnimeClient\API\Kitsu\Enum\MangaReadingStatus;
 use Aviat\AnimeClient\API\Kitsu\Transformer\MangaListTransformer;
 use Aviat\AnimeClient\Model\Manga as MangaModel;
@@ -166,7 +167,7 @@ class Manga extends Controller {
 
 		$this->outputHTML('manga/edit', [
 			'title' => $title,
-			'status_list' => MangaReadingStatus::getConstList(),
+			'status_list' => Kitsu::getStatusToMangaSelectMap(),
 			'item' => $item,
 			'action' => $this->container->get('url-generator')
 				->url('/manga/update_form'),
@@ -185,50 +186,54 @@ class Manga extends Controller {
 	}
 
 	/**
-	 * Update an anime item via a form submission
+	 * Update an manga item via a form submission
 	 *
 	 * @return void
 	 */
 	public function form_update()
 	{
-		$post_data = $this->request->getParsedBody();
+		$data = $this->request->getParsedBody();
 
 		// Do some minor data manipulation for
 		// large form-based updates
 		$transformer = new MangaListTransformer();
-		$post_data = $transformer->untransform($post_data);
-		$full_result = $this->model->update($post_data);
+		$post_data = $transformer->untransform($data);
+		$full_result = $this->model->updateLibraryItem($post_data);
 
-		$result = Json::decode((string)$full_result['body']);
-
-		if ((int)$full_result['statusCode'] === 200)
+		if ($full_result['statusCode'] === 200)
 		{
-			$m =& $result['manga'][0];
-			$title = ( ! empty($m['english_title']))
-				? "{$m['romaji_title']} ({$m['english_title']})"
-				: "{$m['romaji_title']}";
-
-			$this->set_flash_message("Successfully updated {$title}.", 'success');
-			$this->cache->purge();
+			$this->set_flash_message("Successfully updated manga.", 'success');
+			// $this->cache->purge();
 		}
 		else
 		{
 			$this->set_flash_message('Failed to update manga.', 'error');
+
 		}
 
 		$this->session_redirect();
 	}
 
 	/**
-	 * Update an anime item
+	 * Update a manga item
 	 *
-	 * @return boolean|null
+	 * @return void
 	 */
 	public function update()
 	{
-		$result = $this->model->update($this->request->getParsedBody());
-		$this->cache->purge();
-		$this->outputJSON($result['body'], $result['statusCode']);
+		if ($this->request->getHeader('content-type')[0] === 'application/json')
+		{
+			$data = JSON::decode((string)$this->request->getBody());
+		}
+		else
+		{
+			$data = $this->request->getParsedBody();
+		}
+
+		$response = $this->model->updateLibraryItem($data);
+
+		// $this->cache->purge();
+		$this->outputJSON($response['body'], $response['statusCode']);
 	}
 
 	/**
diff --git a/src/Model/API.php b/src/Model/API.php
index a0ff29db..158639ae 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -38,10 +38,10 @@ class API extends Model {
 	 */
 	protected $cache;
 
-    /**
-     * Default settings for Guzzle
-     * @var array
-     */
+	/**
+	 * Default settings for Guzzle
+	 * @var array
+	 */
 	protected $connectionDefaults = [];
 
 	/**
@@ -75,4 +75,4 @@ class API extends Model {
 		array_multisort($sort, SORT_ASC, $array);
 	}
 }
-// End of BaseApiModel.php
\ No newline at end of file
+// End of BaseApiModel.php
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 288157d3..553d18e8 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -115,5 +115,10 @@ class Anime extends API {
 	{
 		return $this->kitsuModel->updateListItem($data);
 	}
+
+	public function deleteLibraryItem($id): bool
+	{
+		return $this->kitsuModel->deleteListItem($id);
+	}
 }
 // End of AnimeModel.php
\ No newline at end of file
diff --git a/src/Model/Collection.php b/src/Model/Collection.php
index 327bde04..12184c7d 100644
--- a/src/Model/Collection.php
+++ b/src/Model/Collection.php
@@ -18,6 +18,7 @@ namespace Aviat\AnimeClient\Model;
 
 use Aviat\Ion\Di\ContainerInterface;
 use Aviat\Ion\Model\DB;
+use PDO;
 use PDOException;
 
 /**
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index bb61cb12..7df7a4c3 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -95,6 +95,28 @@ class Manga extends API
 		return $this->kitsuModel->getListItem($itemId);
 	}
 
+	/**
+	 * Update a list entry
+	 *
+	 * @param array $data
+	 * @return array
+	 */
+	public function updateLibraryItem(array $data): array
+	{
+		return $this->kitsuModel->updateListItem($data);
+	}
+
+	/**
+	 * Search for anime by name
+	 *
+	 * @param string $name
+	 * @return array
+	 */
+	public function search($name)
+	{
+		return $this->kitsuModel->search('manga', $name);
+	}
+
 	/**
 	 * Map transformed anime data to be organized by reading status
 	 *
diff --git a/src/Util.php b/src/Util.php
index 9031de31..e4743034 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -109,97 +109,5 @@ class Util {
 	{
 		return ! $this->is_view_page();
 	}
+}
 
-	/**
-	 * Get the path of the cached version of the image. Create the cached image
-	 * if the file does not already exist
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $api_path - The original image url
-	 * @param string $series_slug - The part of the url with the series name, becomes the image name
-	 * @param string $type - Anime or Manga, controls cache path
-	 * @return string - the frontend path for the cached image
-	 * @throws \DomainException
-	 */
-	public function get_cached_image($api_path, $series_slug, $type = "anime")
-	{
-		$path_parts = explode('?', basename($api_path));
-		$path = current($path_parts);
-		$ext_parts = explode('.', $path);
-		$ext = end($ext_parts);
-
-		// Workaround for some broken file extensions
-		if ($ext === "jjpg")
-		{
-			$ext = "jpg";
-		}
-
-		// Failsafe for weird urls
-		if (strlen($ext) > 3)
-		{
-			return $api_path;
-		}
-
-		$img_cache_path = $this->config->get('img_cache_path');
-		$cached_image = "{$series_slug}.{$ext}";
-		$cached_path = "{$img_cache_path}/{$type}/{$cached_image}";
-
-		// Cache the file if it doesn't already exist
-		if ( ! file_exists($cached_path))
-		{
-			if (function_exists('curl_init'))
-			{
-				$ch = curl_init($api_path);
-				$fp = fopen($cached_path, 'wb');
-				curl_setopt_array($ch, [
-					CURLOPT_FILE => $fp,
-					CURLOPT_HEADER => 0
-				]);
-				curl_exec($ch);
-				curl_close($ch);
-				fclose($fp);
-			}
-			else if (ini_get('allow_url_fopen'))
-			{
-				copy($api_path, $cached_path);
-			}
-			else
-			{
-				throw new DomainException("Couldn't cache images because they couldn't be downloaded.");
-			}
-
-			// Resize the image
-			if ($type === 'anime')
-			{
-				$resize_width = 220;
-				$resize_height = 319;
-				$this->_resize($cached_path, $resize_width, $resize_height);
-			}
-		}
-
-		return "/public/images/{$type}/{$cached_image}";
-	}
-
-	/**
-	 * Resize an image
-	 *
-	 * @codeCoverageIgnore
-	 * @param string $path
-	 * @param string $width
-	 * @param string $height
-	 * @return void
-	 */
-	private function _resize($path, $width, $height)
-	{
-		try
-		{
-			$img = new SimpleImage($path);
-			$img->resize($width, $height)->save();
-		}
-		catch (Exception $e)
-		{
-			// Catch image errors, since they don't otherwise affect
-			// functionality
-		}
-	}
-}
\ No newline at end of file

From 5fc70bb4fe7d0712fa53d4918577c67a60631b59 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Mon, 9 Jan 2017 21:38:42 -0500
Subject: [PATCH 63/65] Fix some javascript issues

---
 app/config/minify_js_groups.php |  2 +-
 public/js/anime_edit.js         |  6 +++---
 public/js/manga_edit.js         | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/config/minify_js_groups.php b/app/config/minify_js_groups.php
index 236f7828..c50086d8 100644
--- a/app/config/minify_js_groups.php
+++ b/app/config/minify_js_groups.php
@@ -31,7 +31,7 @@ return [
 		'base/sort_tables.js',
 	],
 	'table_edit' => [
-		'sort_tables.js',
+		'base/sort_tables.js',
 		'anime_edit.js',
 		'manga_edit.js',
 	],
diff --git a/public/js/anime_edit.js b/public/js/anime_edit.js
index e1312970..c4e53e15 100644
--- a/public/js/anime_edit.js
+++ b/public/js/anime_edit.js
@@ -6,7 +6,7 @@
 	'use strict';
 
 	// Action to increment episode count
-	_.on('body.anime.list', 'click', '.plus_one', function(e) {
+	_.on('body.anime.list', 'click', '.plus_one', function() {
 		let parent_sel = _.closestParent(this, 'article');
 		let watched_count = parseInt(_.$('.completed_number', parent_sel)[0].textContent, 10);
 		let total_count = parseInt(_.$('.total_number', parent_sel)[0].textContent, 10);
@@ -36,8 +36,8 @@
 			data: data,
 			dataType: 'json',
 			type: 'POST',
-			success: (res) => {
-				if (data.status == 'completed') {
+			success: () => {
+				if (data.data.status == 'completed') {
 					_.hide(parent_sel);
 				}
 
diff --git a/public/js/manga_edit.js b/public/js/manga_edit.js
index a97fb35f..7e13973d 100644
--- a/public/js/manga_edit.js
+++ b/public/js/manga_edit.js
@@ -5,7 +5,7 @@
 
 	'use strict';
 
-	_.on('.manga.list', 'click', '.edit_buttons button', function(e) {
+	_.on('.manga.list', 'click', '.edit_buttons button', function() {
 		let this_sel = this;
 		let parent_sel = _.closestParent(this, 'article');
 		let manga_id = parent_sel.id.replace("manga-", "");
@@ -26,6 +26,17 @@
 			}
 		};
 
+		// If the episode count is 0, and incremented,
+		// change status to currently reading
+		if (isNaN(completed) || completed === 0) {
+			data.data.status = 'current';
+		}
+
+		// If you increment at the last chapter, mark as completed
+		if (( ! isNaN(completed)) && (completed + 1) == total) {
+			data.data.status = 'completed';
+		}
+
 		// Update the total count
 		data['data']['progress'] = ++completed;
 
@@ -34,7 +45,11 @@
 			dataType: 'json',
 			type: 'POST',
 			mimeType: 'application/json',
-			success: (res) => {
+			success: () => {
+				if (data.data.status == 'completed') {
+					_.hide(parent_sel);
+				}
+
 				_.$(`.${type}s_read`, parent_sel)[0].textContent = completed;
 				_.showMessage('success', `Sucessfully updated ${manga_name}`);
 				_.scrollToTop();

From a5dd9f06505a778ffa685f1b43ee48eef4fbc9a6 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 10 Jan 2017 12:35:46 -0500
Subject: [PATCH 64/65] All basic API functionality:

* Anime List Item:
	* Creation
	* Updating
	* Retreiving
	* Deletion

* Manga List Item:
	* Creation
	* Updating
	* Retreiving
	* Deletion

* Anime detail page
* Manga detail page
---
 app/views/anime/add.php      |  1 +
 app/views/main-menu.php      |  6 +++---
 app/views/manga/add.php      |  1 +
 public/js/base/events.js     |  2 +-
 public/js/manga_edit.js      |  2 +-
 src/API/Kitsu/KitsuModel.php | 16 +++++++++++++---
 src/API/Kitsu/ListItem.php   | 37 +++++++++++++++++++++---------------
 src/Controller/Anime.php     |  4 ++--
 src/Controller/Manga.php     | 14 ++++++++------
 src/Model/Anime.php          |  5 +++++
 src/Model/Manga.php          | 27 ++++++++++++++++++++++++++
 11 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/app/views/anime/add.php b/app/views/anime/add.php
index 9224905d..fac82700 100644
--- a/app/views/anime/add.php
+++ b/app/views/anime/add.php
@@ -28,6 +28,7 @@
 				<tr>
 					<td>&nbsp;</td>
 					<td>
+						<input type="hidden" name="type" value="anime" />
 						<button type="submit">Save</button>
 					</td>
 				</tr>
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
index be89435e..6f3b99f9 100644
--- a/app/views/main-menu.php
+++ b/app/views/main-menu.php
@@ -17,13 +17,13 @@
 			[<a href="<?= $urlGenerator->default_url('manga') ?>">Manga List</a>]
 		<?php endif ?>
 	</span>
-	<?php if ($auth->is_authenticated()): ?>
+	<?php /* if ($auth->is_authenticated()): ?>
 		<span class="flex-no-wrap">&nbsp;</span>
 		<span class="flex-no-wrap small-font">
 				<button type="button" class="js-clear-cache user-btn">Clear API Cache</button>
 			</span>
 		<span class="flex-no-wrap">&nbsp;</span>
-	<?php endif ?>
+	<?php endif */ ?>
 	<span class="flex-no-wrap small-font">
 		<?php if ($auth->is_authenticated()): ?>
 			<a class="bracketed" href="<?= $url->generate('logout') ?>">Logout</a>
@@ -41,4 +41,4 @@
 			<li class="<?= Util::is_selected('list', $urlGenerator->last_segment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
 		</ul>
 	<?php endif ?>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/app/views/manga/add.php b/app/views/manga/add.php
index 33609c55..d0a3efd3 100644
--- a/app/views/manga/add.php
+++ b/app/views/manga/add.php
@@ -28,6 +28,7 @@
 				<tr>
 					<td>&nbsp;</td>
 					<td>
+						<input type="hidden" name="type" value="manga" />
 						<button type="submit">Save</button>
 					</td>
 				</tr>
diff --git a/public/js/base/events.js b/public/js/base/events.js
index 8178d7bd..9ec6e1ab 100644
--- a/public/js/base/events.js
+++ b/public/js/base/events.js
@@ -21,7 +21,7 @@
 	});
 
 	// Clear the api cache
-	ac.on('.js-clear-cache', 'click', function (event) {
+	ac.on('.js-clear-cache', 'click', function () {
 		ac.get('/cache_purge', () => {
 			ac.showMessage('success', `Sucessfully purged api cache`);
 		});
diff --git a/public/js/manga_edit.js b/public/js/manga_edit.js
index 7e13973d..afe712ce 100644
--- a/public/js/manga_edit.js
+++ b/public/js/manga_edit.js
@@ -38,7 +38,7 @@
 		}
 
 		// Update the total count
-		data['data']['progress'] = ++completed;
+		data.data.progress = ++completed;
 
 		_.ajax(_.url('/manga/update'), {
 			data: data,
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index ef5890f1..ea624b42 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -16,7 +16,6 @@
 
 namespace Aviat\AnimeClient\API\Kitsu;
 
-use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\API\Kitsu as K;
 use Aviat\AnimeClient\API\Kitsu\Transformer\{
 	AnimeTransformer, AnimeListTransformer, MangaTransformer, MangaListTransformer
@@ -24,7 +23,6 @@ use Aviat\AnimeClient\API\Kitsu\Transformer\{
 use Aviat\Ion\Di\ContainerAware;
 use Aviat\Ion\Json;
 use GuzzleHttp\Exception\ClientException;
-use PHP_CodeSniffer\Tokenizers\JS;
 
 /**
  * Kitsu API Model
@@ -77,6 +75,12 @@ class KitsuModel {
 		$this->mangaListTransformer = new MangaListTransformer();
 	}
 
+	/**
+	 * Get the userid for a username from Kitsu
+	 *
+	 * @param string $username
+	 * @return string
+	 */
 	public function getUserIdByUsername(string $username)
 	{
 		$data = $this->getRequest('users', [
@@ -154,7 +158,7 @@ class KitsuModel {
 				'include' => 'media,media.genres',
 				'page' => [
 					'offset' => 0,
-					'limit' => 200
+					'limit' => 1000
 				],
 				'sort' => '-updated_at'
 			]
@@ -251,6 +255,12 @@ class KitsuModel {
 		}
 	}
 
+	public function createListItem(array $data): bool
+	{
+		$data['user_id'] = $this->getUserIdByUsername($this->getUsername());
+		return $this->listItem->create($data);
+	}
+
 	public function updateListItem(array $data)
 	{
 		try
diff --git a/src/API/Kitsu/ListItem.php b/src/API/Kitsu/ListItem.php
index 67c8c566..757df26f 100644
--- a/src/API/Kitsu/ListItem.php
+++ b/src/API/Kitsu/ListItem.php
@@ -37,24 +37,31 @@ class ListItem extends AbstractListItem {
 
 	public function create(array $data): bool
 	{
-		$response = $this->getResponse('post', 'library-entries', [
-			'body' => [
-				'type' => 'libraryEntries',
-				'attributes' => [
-					'status' => $data['status'],
-					'progress' => $data['progress'] ?? 0
-				],
-				'relationships' => [
-					'user' => [
-						'id' => $data['user_id'],
-						'type' => 'users'
+/*?><pre><?= print_r($data, TRUE) ?></pre><?php */
+		$response = $this->getResponse('POST', 'library-entries', [
+			'body' => Json::encode([
+				'data' => [
+					'type' => 'libraryEntries',
+					'attributes' => [
+						'status' => $data['status'],
+						'progress' => $data['progress'] ?? 0
 					],
-					'media' => [
-						'id' => $data['id'],
-						'type' => $data['type']
+					'relationships' => [
+						'user' => [
+							'data' => [
+								'id' => $data['user_id'],
+								'type' => 'users'
+							]
+						],
+						'media' => [
+							'data' => [
+								'id' => $data['id'],
+								'type' => $data['type']
+							]
+						]
 					]
 				]
-			]
+			])
 		]);
 
 		return ($response->getStatusCode() === 201);
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 4809e21e..a9746973 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -154,9 +154,9 @@ class Anime extends BaseController {
 			$this->redirect("anime/add", 303);
 		}
 
-		$result = $this->model->update($data);
+		$result = $this->model->createLibraryItem($data);
 
-		if (intval($result['statusCode']) === 201)
+		if ($result)
 		{
 			$this->set_flash_message('Added new anime to list', 'success');
 			// $this->cache->purge();
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index a0113207..d2b47ee4 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -137,12 +137,12 @@ class Manga extends Controller {
 			$this->redirect("manga/add", 303);
 		}
 
-		$result = $this->model->add($data);
+		$result = $this->model->createLibraryItem($data);
 
-		if ($result['statusCode'] >= 200 && $result['statusCode'] < 300)
+		if ($result)
 		{
 			$this->set_flash_message('Added new manga to list', 'success');
-			$this->cache->purge();
+			// $this->cache->purge();
 		}
 		else
 		{
@@ -243,12 +243,14 @@ class Manga extends Controller {
 	 */
 	public function delete()
 	{
-		$response = $this->model->delete($this->request->getParsedBody());
+		$body = $this->request->getParsedBody();
+		$id = $body['id'];
+		$response = $this->model->deleteLibraryItem($id);
 
-		if ((bool)$response['body'] === TRUE)
+		if ($response)
 		{
 			$this->set_flash_message("Successfully deleted manga.", 'success');
-			$this->cache->purge();
+			//$this->cache->purge();
 		}
 		else
 		{
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 553d18e8..6b5453d4 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -105,6 +105,11 @@ class Anime extends API {
 		return $this->kitsuModel->getListItem($itemId);
 	}
 
+	public function createLibraryItem(array $data): bool
+	{
+		return $this->kitsuModel->createListItem($data);
+	}
+
 	/**
 	 * Update a list entry
 	 *
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 7df7a4c3..420948a2 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -52,6 +52,11 @@ class Manga extends API
 		'dropped' => self::DROPPED
 	];
 
+	/**
+	 * @var Aviat\AnimeClient\API\Kitsu\KitsuModel
+	 */
+	protected $kitsuModel;
+
 	public function __construct(ContainerInterface $container)
 	{
 		parent::__construct($container);
@@ -83,6 +88,17 @@ class Manga extends API
 		return $this->kitsuModel->getManga($manga_id);
 	}
 
+	/**
+	 * Create a new manga list item
+	 *
+	 * @param array $data
+	 * @return bool
+	 */
+	public function createLibraryItem(array $data): bool
+	{
+		return $this->kitsuModel->createListItem($data);
+	}
+
 	/**
 	 * Get information about a specific list item
 	 * for editing/updating that item
@@ -106,6 +122,17 @@ class Manga extends API
 		return $this->kitsuModel->updateListItem($data);
 	}
 
+	/**
+	 * Remove a list entry
+	 *
+	 * @param string $itemId
+	 * @return bool
+	 */
+	public function deleteLibraryItem(string $itemId): bool
+	{
+		return $this->kitsuModel->deleteListItem($itemId);
+	}
+
 	/**
 	 * Search for anime by name
 	 *

From 8d559dc664d89fdf68816433ab53fb8955b12e8f Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 10 Jan 2017 21:13:44 -0500
Subject: [PATCH 65/65] Fix unit tests

---
 composer.json                                 |  4 +-
 public/css/base.css                           |  1 +
 public/css/base.myth.css                      |  1 +
 src/API/JsonAPI.php                           | 66 +++++++++++++++++++
 src/API/Kitsu/Enum/AnimeShowType.php          | 32 ---------
 src/API/Kitsu/KitsuModel.php                  | 21 +++---
 .../Transformer/AnimeListTransformer.php      |  2 +-
 tests/AnimeClient_TestCase.php                |  4 ++
 8 files changed, 87 insertions(+), 44 deletions(-)
 create mode 100644 src/API/JsonAPI.php
 delete mode 100644 src/API/Kitsu/Enum/AnimeShowType.php

diff --git a/composer.json b/composer.json
index f5599fab..5381e2d1 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"aura/router": "3.*",
 		"aura/session": "2.*",
 		"aviat/banker": "dev-master",
-		"aviat/ion": "dev-master",
+		"aviat/ion": "1.0.*",
 		"filp/whoops": "2.0.*",
 		"guzzlehttp/guzzle": "6.*",
 		"monolog/monolog": "1.*",
@@ -44,6 +44,6 @@
 		"squizlabs/php_codesniffer": "^3.0.0@beta"
 	},
 	"scripts": {
-
+		"build:css": "cd public && npm run build && cd .."
 	}
 }
\ No newline at end of file
diff --git a/public/css/base.css b/public/css/base.css
index a2483688..13befd89 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1226,6 +1226,7 @@ a:hover, a:active {
 	height:100%;
 	width:100%;
 	vertical-align:middle;
+	line-height: 1.25em;
 }
 
 #series_list .name small {
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index 6e243f99..80b0902f 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -488,6 +488,7 @@ a:hover, a:active {
 	height:100%;
 	width:100%;
 	vertical-align:middle;
+	line-height: 1.25em;
 }
 #series_list .name small {
 	color: #fff;
diff --git a/src/API/JsonAPI.php b/src/API/JsonAPI.php
new file mode 100644
index 00000000..5e727f4f
--- /dev/null
+++ b/src/API/JsonAPI.php
@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/**
+ * Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     AnimeListClient
+ * @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     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
+
+namespace Aviat\AnimeClient\API;
+
+/**
+ * Class encapsulating Json API data structure for a request or response
+ */
+class JsonAPI {
+
+	/**
+	 * The full data array
+	 *
+	 * Basic structure is generally like so:
+	 * @example [
+	 * 	'id' => '12016665',
+	 * 	'type' => 'libraryEntries',
+	 * 	'links' => [
+	 * 		'self' => 'https://kitsu.io/api/edge/library-entries/13016665'
+	 * 	],
+	 * 	'attributes' => [
+	 *
+	 * 	]
+	 * ]
+	 *
+	 * @var array
+	 */
+	protected $data = [];
+
+	/**
+	 * Related objects included with the request
+	 *
+	 * @var array
+	 */
+	protected $included = [];
+
+	/**
+	 * Pagination links
+	 *
+	 * @var array
+	 */
+	protected $links = [];
+
+	/**
+	 * Parse a JsonAPI response into its components
+	 *
+	 * @param array $data
+	 */
+	public function parse(array $data)
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/src/API/Kitsu/Enum/AnimeShowType.php b/src/API/Kitsu/Enum/AnimeShowType.php
deleted file mode 100644
index 9fb37260..00000000
--- a/src/API/Kitsu/Enum/AnimeShowType.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Anime List Client
- *
- * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
- *
- * PHP version 7
- *
- * @package     AnimeListClient
- * @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     4.0
- * @link        https://github.com/timw4mail/HummingBirdAnimeClient
- */
-
-namespace Aviat\AnimeClient\API\Kitsu\Enum;
-
-use Aviat\Ion\Enum as BaseEnum;
-
-/**
- * Type of Anime
- */
-class AnimeShowType extends BaseEnum {
-	const TV = 'TV';
-	const MOVIE = 'Movie';
-	const OVA = 'OVA';
-	const ONA = 'ONA';
-	const SPECIAL = 'Special';
-	const MUSIC = 'Music';
-}
-// End of AnimeShowType.php
diff --git a/src/API/Kitsu/KitsuModel.php b/src/API/Kitsu/KitsuModel.php
index ea624b42..d87899fa 100644
--- a/src/API/Kitsu/KitsuModel.php
+++ b/src/API/Kitsu/KitsuModel.php
@@ -220,9 +220,12 @@ class KitsuModel {
 			'query' => [
 				'filter' => [
 					'text' => $query
-				]
-			],
-			'include' => 'media'
+				],
+				'page' => [
+					'offset' => 0,
+					'limit' => 20
+				],
+			]
 		];
 
 		$raw = $this->getRequest($type, $options);
@@ -236,6 +239,12 @@ class KitsuModel {
 		return $raw;
 	}
 
+	public function createListItem(array $data): bool
+	{
+		$data['user_id'] = $this->getUserIdByUsername($this->getUsername());
+		return $this->listItem->create($data);
+	}
+
 	public function getListItem(string $listId): array
 	{
 		$baseData = $this->listItem->get($listId);
@@ -255,12 +264,6 @@ class KitsuModel {
 		}
 	}
 
-	public function createListItem(array $data): bool
-	{
-		$data['user_id'] = $this->getUserIdByUsername($this->getUsername());
-		return $this->listItem->create($data);
-	}
-
 	public function updateListItem(array $data)
 	{
 		try
diff --git a/src/API/Kitsu/Transformer/AnimeListTransformer.php b/src/API/Kitsu/Transformer/AnimeListTransformer.php
index 2143378b..7103e3ba 100644
--- a/src/API/Kitsu/Transformer/AnimeListTransformer.php
+++ b/src/API/Kitsu/Transformer/AnimeListTransformer.php
@@ -40,7 +40,7 @@ class AnimeListTransformer extends AbstractTransformer {
 
 		$rating = (int) 2 * $item['attributes']['rating'];
 
-		$total_episodes = array_key_exists('episodeCount', $anime)
+		$total_episodes = array_key_exists('episodeCount', $anime) && (int) $anime['episodeCount'] !== 0
 			? (int) $anime['episodeCount']
 			: '-';
 
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 2b7311bd..d565c738 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -51,6 +51,10 @@ class AnimeClient_TestCase extends PHPUnit_Framework_TestCase {
 			'asset_path' => '//localhost/assets/',
 			'img_cache_path' => _dir(ROOT_DIR, 'public/images'),
 			'data_cache_path' => _dir(TEST_DATA_DIR, 'cache'),
+			'cache' => [
+				'driver' => 'null',
+				'connection' => []
+			],
 			'database' => [
 				'collection' => [
 					'type' => 'sqlite',