autoloading, moving files around

salebab · Sep 15, 2013 · a3b9ab2 · a3b9ab2
1 parent 2893f7d
commit a3b9ab2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -157,4 +157,4 @@ Automatic determination of INSERT or UPDATE. If $data['user_id'] exits it will b
 	/* @var User[] $users Collection of User objects */
 	$users = $db->executeQuery("SELECT * FROM users")->fetchCollection(new User);
 
-[See more examples for Sakila database](https://github.com/salebab/database/tree/master/sakila-examples)
+[See more examples for Sakila database](https://github.com/salebab/database/tree/master/examples/sakila)
diff --git a/composer.json b/composer.json
@@ -16,6 +16,6 @@
     },
 
     "autoload": {
-        "psr-0": {"database": "database/"}
+        "psr-0": {"database\\": "src/"}
     }
 }
diff --git a/database/database.php b/database/database.php
diff --git a/sakila-examples/_config.php → examples/sakila/_config.php b/sakila-examples/_config.php → examples/sakila/_config.php
diff --git a/sakila-examples/customers.php → examples/sakila/customers.php b/sakila-examples/customers.php → examples/sakila/customers.php
@@ -1,6 +1,8 @@
 <?php
 include_once "_config.php";
-include_once "../database/database.php";
+include_once "../../src/database/DB.php";
+include_once "../../src/database/Statement.php";
+include_once "../../src/database/Query.php";
 
 class Customer {}
 class City {}

diff --git a/sakila-examples/films_by_category.php → examples/sakila/films_by_category.php b/sakila-examples/films_by_category.php → examples/sakila/films_by_category.php
@@ -1,6 +1,9 @@
 <?php
 include_once "_config.php";
-include_once "../database/database.php";
+include_once "../../src/database/DB.php";
+include_once "../../src/database/Statement.php";
+include_once "../../src/database/Query.php";
+
 $db = new database\DB(DB_DSN, DB_USER, DB_PASS);
 
 class Film {

diff --git a/database/DB.php → src/database/DB.php b/database/DB.php → src/database/DB.php
@@ -319,7 +319,6 @@ function buildWhere($where, $operand = "AND")
      */
     function createQuery()
     {
-        include_once 'Query.php';
         return new Query($this);
     }
 

diff --git a/database/Query.php → src/database/Query.php b/database/Query.php → src/database/Query.php
diff --git a/database/Statement.php → src/database/Statement.php b/database/Statement.php → src/database/Statement.php