Removes customer autoloader

Author: willy68

.gitignore

@@ -7,3 +7,37 @@
 vendor/*
 composer.lock
 phpunit.xml
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+.editorconfig
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+#
+*~

ActiveRecord.php

@@ -4,9 +4,6 @@
 
 define('PHP_ACTIVERECORD_VERSION_ID','1.0');
 
-if (!defined('PHP_ACTIVERECORD_AUTOLOAD_PREPEND'))
-	define('PHP_ACTIVERECORD_AUTOLOAD_PREPEND',true);
-
 require __DIR__.'/lib/Singleton.php';
 require __DIR__.'/lib/Config.php';
 require __DIR__.'/lib/Utils.php';
@@ -23,28 +20,3 @@
 require __DIR__.'/lib/CallBack.php';
 require __DIR__.'/lib/Exceptions.php';
 require __DIR__.'/lib/Cache.php';
-
-if (!defined('PHP_ACTIVERECORD_AUTOLOAD_DISABLE'))
-	spl_autoload_register('activerecord_autoload',false,PHP_ACTIVERECORD_AUTOLOAD_PREPEND);
-
-function activerecord_autoload($class_name)
-{
-	$path = ActiveRecord\Config::instance()->get_model_directory();
-	$root = realpath(isset($path) ? $path : '.');
-
-	if (($namespaces = ActiveRecord\get_namespaces($class_name)))
-	{
-		$class_name = array_pop($namespaces);
-		$directories = array();
-
-		foreach ($namespaces as $directory)
-			$directories[] = $directory;
-
-		$root .= DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $directories);
-	}
-
-	$file = "$root/$class_name.php";
-
-	if (file_exists($file))
-		require_once $file;
-}

README.md

@@ -52,18 +52,16 @@ Of course, there are some differences which will be obvious to the user if they
 
 ## Installation ##
 
-Setup is very easy and straight-forward. There are essentially only three configuration points you must concern yourself with:
+Setup is very easy and straight-forward. There are essentially only two configuration points you must concern yourself with:
 
-1. Setting the model autoload directory.
-2. Configuring your database connections.
-3. Setting the database connection to use for your environment.
+1. Configuring your database connections.
+2. Setting the database connection to use for your environment.
 
 Example:
 
 ```php
 ActiveRecord\Config::initialize(function($cfg)
 {
-   $cfg->set_model_directory('/path/to/your/model_directory');
    $cfg->set_connections(
      array(
        'development' => 'mysql://username:password@localhost/development_database_name',
@@ -78,7 +76,6 @@ Alternatively (w/o the 5.3 closure):
 
 ```php
 $cfg = ActiveRecord\Config::instance();
-$cfg->set_model_directory('/path/to/your/model_directory');
 $cfg->set_connections(
   array(
     'development' => 'mysql://username:password@localhost/development_database_name',

examples/orders/orders.php

@@ -4,7 +4,6 @@
 // initialize ActiveRecord
 ActiveRecord\Config::initialize(function($cfg)
 {
-    $cfg->set_model_directory(__DIR__ . '/models');
     $cfg->set_connections(array('development' => 'mysql://test:[email protected]/orders_test'));
 
 	// you can change the default connection with the below

examples/simple/simple.php

@@ -9,7 +9,6 @@ class Book extends ActiveRecord\Model { }
 // change the connection settings to whatever is appropriate for your mysql server 
 ActiveRecord\Config::initialize(function($cfg)
 {
-    $cfg->set_model_directory('.');
     $cfg->set_connections(array('development' => 'mysql://test:[email protected]/test'));
 });
 

examples/simple/simple_with_options.php

@@ -24,7 +24,6 @@ class Book extends ActiveRecord\Model
 // initialize ActiveRecord
 ActiveRecord\Config::initialize(function($cfg) use ($connections)
 {
-    $cfg->set_model_directory('.');
     $cfg->set_connections($connections);
 });
 

lib/Config.php

@@ -26,7 +26,6 @@ class Config extends Singleton
 	 *
 	 * <code>
 	 * ActiveRecord\Config::initialize(function($cfg) {
-	 *   $cfg->set_model_directory('/your/app/models');
 	 *   $cfg->set_connections(array(
 	 *     'development' => 'mysql://user:[email protected]/awesome_development',
 	 *     'production' => 'mysql://user:[email protected]/awesome_production'));
@@ -50,14 +49,6 @@ class Config extends Singleton
 	 */
 	private $connections = array();
 
-	/**
-	 * Directory for the auto_loading of model classes.
-	 *
-	 * @see activerecord_autoload
-	 * @var string
-	 */
-	private $model_directory;
-
 	/**
 	 * Switch for logging.
 	 *
@@ -94,7 +85,6 @@ class Config extends Singleton
 	 *
 	 * <code>
 	 * ActiveRecord\Config::initialize(function($cfg) {
-	 *   $cfg->set_model_directory('/path/to/your/model_directory');
 	 *   $cfg->set_connections(array(
 	 *     'development' => 'mysql://username:[email protected]/database_name'));
 	 * });
@@ -197,31 +187,6 @@ public function set_default_connection($name)
 		$this->default_connection = $name;
 	}
 
-	/**
-	 * Sets the directory where models are located.
-	 *
-	 * @param string $dir Directory path containing your models
-	 * @return void
-	 */
-	public function set_model_directory($dir)
-	{
-		$this->model_directory = $dir;
-	}
-
-	/**
-	 * Returns the model directory.
-	 *
-	 * @return string
-	 * @throws ConfigException if specified directory was not found
-	 */
-	public function get_model_directory()
-	{
-		if ($this->model_directory && !file_exists($this->model_directory))
-			throw new ConfigException('Invalid or non-existent directory: '.$this->model_directory);
-
-		return $this->model_directory;
-	}
-
 	/**
 	 * Turn on/off logging
 	 *

test/ActiveRecordTest.php

@@ -164,20 +164,6 @@ public function test_reload_protected_attribute()
 		$this->assert_not_equals("Should not stay", $book->name);
 	}
 
-	public function test_active_record_model_home_not_set()
-	{
-		$home = ActiveRecord\Config::instance()->get_model_directory();
-		ActiveRecord\Config::instance()->set_model_directory(__FILE__);
-		$this->assert_equals(false,class_exists('TestAutoload'));
-
-		ActiveRecord\Config::instance()->set_model_directory($home);
-	}
-
-	public function test_auto_load_with_namespaced_model()
-	{
-		$this->assert_true(class_exists('NamespaceTest\Book'));
-	}
-
 	public function test_namespace_gets_stripped_from_table_name()
 	{
 		$model = new NamespaceTest\Book();

test/helpers/config.php

@@ -18,6 +18,7 @@
  **/
 
 require_once 'vendor/autoload.php';
+require_once __DIR__ .'/model_autoloader.php';
 
 require_once 'SnakeCase_PHPUnit_Framework_TestCase.php';
 
@@ -38,7 +39,6 @@
 
 ActiveRecord\Config::initialize(function($cfg)
 {
-	$cfg->set_model_directory(realpath(__DIR__ . '/../models'));
 	$cfg->set_connections(array(
 		'mysql'  => getenv('PHPAR_MYSQL')  ?: 'mysql://test:[email protected]/test',
 		'pgsql'  => getenv('PHPAR_PGSQL')  ?: 'pgsql://test:[email protected]/test',

test/helpers/test/helpers/model_autoloader.php

@@ -0,0 +1,28 @@
+<?php
+/*
+ * We currently run our own autoloader because our model files cannot be readily loaded by Composer.
+ * Eventually, we will want our models to be loaded via Composer and will achieve this by "moving"
+ * them to the namespaces corresponding to their locations on disk.
+ *
+ * However, changing the namespace of all our models is a large and risky refactoring. Rather than
+ * perform this refactoring all at once, this autoloader allows us to refactor models one at a time.
+ */
+
+// Register our autoloader to run after Composer's by using prepend = false
+spl_autoload_register("phparTestAutoloaderTemporary", true, false);
+
+function phparTestAutoloaderTemporary($className) {
+  // Look in these directories for the class that is to be autoloader
+  $root = __DIR__ . "/..";
+  $modelDirectories = ["models"];
+
+	// Replace namespace seperators with directory separators
+	$modelPath = str_replace("\\", "/", $className);
+
+	foreach ($modelDirectories as $modelDirectory) {
+		if (file_exists("$root/$modelDirectory/$modelPath.php")) {
+			require_once "$root/$modelDirectory/$modelPath.php";
+			break;
+		}
+	}
+}