Merge branch 'dev' of github.com:infinitas/infinitas into dev

infinitas · Jun 23, 2012 · babca76 · babca76
2 parents 7720573 + ab92189
commit babca76
Show file tree

Hide file tree

Showing 50 changed files with 2,282 additions and 7,702 deletions.
diff --git a/Config/bootstrap.php b/Config/bootstrap.php
@@ -113,7 +113,7 @@
 
 	configureCache(EventCore::trigger(new StdClass(), 'setupCache'));
 
-	if (getenv('TRAVIS_PHP_VERSION')) {
+	if(in_array('test', (array)env('argv'))) {
 		InfinitasPlugin::load(InfinitasPlugin::listPlugins('nonCore'));
 	} else {
 		InfinitasPlugin::loadInstalled();
@@ -284,7 +284,7 @@ function debugRoute($route, $return = true) {
 		foreach($route['Route']['regex'] as $k => $v) {
 			$parts[] = "'$k' => '$v'";
 		}
-		
+
 		if(!empty($parts)) {
 			$out .= ', array(';
 			$out .= implode(', ', $parts);

diff --git a/Core/Comments/Test/Case/Controller/InfinitasCommentsControllerTest.php b/Core/Comments/Test/Case/Controller/InfinitasCommentsControllerTest.php
diff --git a/Core/Configs/Test/Case/Controller/ConfigsControllerTest.php b/Core/Configs/Test/Case/Controller/ConfigsControllerTest.php
diff --git a/Core/Contact/Test/Case/Controller/BranchesControllerTest.php b/Core/Contact/Test/Case/Controller/BranchesControllerTest.php
diff --git a/Core/Contact/Test/Case/Controller/ContactsControllerTest.php b/Core/Contact/Test/Case/Controller/ContactsControllerTest.php
diff --git a/Core/Contents/Test/Case/Controller/GlobalCategoriesControllerTest.php b/Core/Contents/Test/Case/Controller/GlobalCategoriesControllerTest.php
diff --git a/Core/Contents/Test/Case/Controller/GlobalTagsControllerTest.php b/Core/Contents/Test/Case/Controller/GlobalTagsControllerTest.php