app/config/database.toml.example

@@ -8,4 +8,4 @@ user = ""
 pass = ""
 port = ""
 database = ""
-file = "anime_collection.sqlite3"
+file = "anime_collection.sqlite"

phinx.yml

@@ -1,9 +1,9 @@
 paths:
-    migrations: '%%PHINX_CONFIG_DIR%%/migrations'
+    migrations: %%PHINX_CONFIG_DIR%%/migrations
 
 environments:
     default_migration_table: phinxlog
     default_database: development
     development:
         adapter: sqlite
-        name: ./anime_collection # Phinx will add a .sqlite3 suffix
+        name: ./anime_collection.sqlite

src/Model/Collection.php

@@ -25,12 +25,6 @@ use PDOException;
  */
 class Collection extends DB {
 
-	/**
-	 * The query builder object
-	 * @var \Query\Query_Builder_Interface
-	 */
-	protected $db;
-
 	/**
 	 * Whether the database is valid for querying
 	 * @var boolean
@@ -49,7 +43,6 @@ class Collection extends DB {
 		try
 		{
 			$this->db = \Query($this->dbConfig);
-			$this->validDatabase = TRUE;
 		}
 		catch (PDOException $e) {}
 
@@ -69,9 +62,9 @@ class Collection extends DB {
 				$this->validDatabase = FALSE;
 			}
 		}
-		else if ($this->db === NULL)
+		else
 		{
-			$this->validDatabase = FALSE;
+			$this->validDatabase = TRUE;
 		}
 	}
 

src/Model/DB.php

@@ -24,6 +24,12 @@ use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
 class DB {
 	use ContainerAware;
 
+	/**
+	 * The query builder object
+	 * @var \Query\Query_Builder_Interface
+	 */
+	protected $db;
+
 	/**
 	 * The database connection information array
 	 * @var array $dbConfig