From f099f8470ecba225f8280b31cdb9f23d337aa9c6 Mon Sep 17 00:00:00 2001
From: Hunter Perrin <hperrin@gmail.com>
Date: Mon, 16 Feb 2015 14:54:20 -0800
Subject: [PATCH] Fixed testing scripts.

---
 src/autoload.php                | 33 ---------------------------------
 testing/bootstrapMySQL.php      |  4 +---
 testing/bootstrapPostgreSQL.php |  4 +---
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 src/autoload.php

diff --git a/src/autoload.php b/src/autoload.php
deleted file mode 100644
index 9d4543d..0000000
--- a/src/autoload.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php namespace Nymph;
-/**
- * Autoload Nymph classes.
- *
- * @package Nymph
- * @license http://www.gnu.org/licenses/lgpl.html
- * @author Hunter Perrin <hperrin@gmail.com>
- * @copyright SciActive.com
- * @link http://sciactive.com/
- */
-
-spl_autoload_register(function ($class) {
-    $prefix = 'Nymph\\';
-    $base_dir = __DIR__.'/';
-    // Does the class use the namespace prefix?
-    $len = strlen($prefix);
-    if (strncmp($prefix, $class, $len) !== 0) {
-        // No, move to the next registered autoloader.
-        return;
-    }
-    // Get the relative class name.
-    $relative_class = substr($class, $len);
-
-    // Replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php.
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
-
-    // If the file exists, require it.
-    if (file_exists($file)) {
-        require $file;
-    }
-});
\ No newline at end of file
diff --git a/testing/bootstrapMySQL.php b/testing/bootstrapMySQL.php
index eae5495..c504f02 100644
--- a/testing/bootstrapMySQL.php
+++ b/testing/bootstrapMySQL.php
@@ -1,12 +1,10 @@
 <?php
-require_once '../lib/require.php';
+require_once '../vendor/autoload.php';
 use SciActive\R as R;
 
 R::undef('NymphConfig');
 R::undef('Nymph');
 
-include '../src/autoload.php';
-
 R::_('NymphConfig', [], function(){
 	// Nymph's configuration.
 
diff --git a/testing/bootstrapPostgreSQL.php b/testing/bootstrapPostgreSQL.php
index b189799..ad44682 100644
--- a/testing/bootstrapPostgreSQL.php
+++ b/testing/bootstrapPostgreSQL.php
@@ -1,12 +1,10 @@
 <?php
-require_once '../lib/require.php';
+require_once '../vendor/autoload.php';
 use SciActive\R as R;
 
 R::undef('NymphConfig');
 R::undef('Nymph');
 
-include '../src/autoload.php';
-
 R::_('NymphConfig', [], function(){
 	// Nymph's configuration.