Cleaned up test includes a bit

Probably want to include an autoloader at some point. Also added PHP 5.3 and 5.4 to the test list, 5.3 outta fail, unsure about 5.4
This commit is contained in:
Joshua Sherman 2013-12-29 13:16:21 -05:00
parent 19a211cf6a
commit 7f37abc527
6 changed files with 16 additions and 17 deletions

View file

@ -1,6 +1,8 @@
language: php
php:
- "5.3"
- "5.4"
- "5.5"
install:

View file

@ -23,7 +23,7 @@
* module asks for it, and loads the viewer that the module requested. Default
* values are present to make things easier on the user.
*
* @usage <code>new Controller($config);</code>
* @usage <code>new Controller();</code>
*/
class Controller extends Object
{
@ -83,7 +83,7 @@ class Controller extends Object
$module_filename = SITE_MODULE_PATH . $request . '.php';
$module_exists = file_exists($module_filename);
// Instantiates the requested module or a generic object
// Attempts to instantiate the requested module
if ($module_exists)
{
// @todo Is this redundant because of our autoloader?
@ -93,12 +93,10 @@ class Controller extends Object
{
$module = new $module_class;
}
else
{
$module = new Module();
}
}
else
// No module instantiated, load up a generic Module
if (!isset($module))
{
$module = new Module();
}

View file

@ -7,10 +7,19 @@ require_once '.composer/autoload.php';
$root = org\bovigo\vfs\vfsStream::setup('site');
define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/'));
require_once 'classes/Convert.php';
require_once 'classes/Date.php';
require_once 'classes/Time.php';
require_once 'classes/String.php';
require_once 'classes/Object.php';
require_once 'classes/Config.php';
require_once 'classes/Display.php';
require_once 'classes/File.php';
require_once 'classes/API/Common.php';
require_once 'classes/API/Gravatar.php';
require_once 'pickles.php';
?>

View file

@ -1,7 +1,5 @@
<?php
require_once 'classes/Convert.php';
class ConvertTest extends PHPUnit_Framework_TestCase
{
/**

View file

@ -1,8 +1,5 @@
<?php
require_once 'classes/Date.php';
require_once 'classes/Time.php';
class DateTest extends PHPUnit_Framework_TestCase
{
/**

View file

@ -1,10 +1,5 @@
<?php
require_once 'classes/String.php';
require_once 'classes/Object.php';
require_once 'classes/API/Common.php';
require_once 'classes/API/Gravatar.php';
class StringTest extends PHPUnit_Framework_TestCase
{
/**