Merge pull request #49 from ceeram-infinitas/dev

Dev
infinitas · Jun 21, 2012 · db58305 · db58305
2 parents f161260 + a98ccb1
commit db58305
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 90 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,15 +6,14 @@ php:
 env:
   - CAKE_VERSION=2.2
 
+env:
+  - DB=mysql
+
 before_script:
-  - for file in `find /home/vagrant/.phpenv -name 'xdebug.ini'`; do echo "xdebug.max_nesting_level=1000" >> $file; done;
-  - cd .. # ~/builds/<user>
-  - git clone git://github.com/cakephp/cakephp
-  - cd cakephp # ~/builds/<user>/cakephp
-  - git checkout $CAKE_VERSION
-  - cd .. # ~/builds/<user>
-  - cd infinitas # ~/builds/<user>/infinitas
-  - chmod -R 777 ./tmp
+  - cd .. && git clone git://github.com/cakephp/cakephp && cd cakephp && git checkout $CAKE_VERSION
+  - cd .. && ln -s cakephp/lib lib
+  - cd infinitas
+  - chmod -R 777 tmp
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE infinitas_test;'; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE infinitas_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE SCHEMA infinitas_test;' -U postgres -d infinitas_test; fi"
@@ -50,7 +49,7 @@ before_script:
       'host' => '',
       'login' => '',
       'password' => '',
-      'database' => 'infinitas',
+      'database' => 'infinitas_test',
       'prefix' => ''
     );
     public \$test = array(
@@ -80,7 +79,7 @@ before_script:
     }" > Config/database.php
 
 script:
-  - ../cakephp/lib/Cake/Console/cake test app AllCoreTests --stderr
+  - Console/cake test app AllPluginTests
 
 notifications:
   irc: "irc.freenode.org#infinitas"
diff --git a/Config/bootstrap.php b/Config/bootstrap.php
@@ -113,7 +113,11 @@
 
 	configureCache(EventCore::trigger(new StdClass(), 'setupCache'));
 
-	InfinitasPlugin::loadInstalled();
+	if (getenv('TRAVIS_PHP_VERSION')) {
+		InfinitasPlugin::load(InfinitasPlugin::listPlugins('nonCore'));
+	} else {
+		InfinitasPlugin::loadInstalled();
+	}
 
 	/**
 	* Make sure the json defines are loaded.

diff --git a/Config/core.php b/Config/core.php
@@ -9,7 +9,7 @@
 		Configure::write('debug', 2);
 	}
 	else{
-		Configure::write('debug', 0);
+		Configure::write('debug', 2);
 	}
 
 	Configure::write('log', true);
@@ -35,24 +35,34 @@
 
 	App::uses('AppError', 'Lib');
 	App::uses('InfinitasException', 'Lib/Error');
-	Configure::write(
-		'Error',
-		array(
-			'handler' => 'AppError::handleError',
-			'level' => E_ALL,
-			'renderer' => 'InfinitasErrorRenderer',
-			'trace' => true,
-		)
-	);
-
-	Configure::write(
-		'Exception',
-		array(
-			'handler' => 'AppError::handleException',
-			'renderer' => 'InfinitasExceptionRenderer',
-			'log' => true,
-		)
-	);
+//	Configure::write(
+//		'Error',
+//		array(
+//			'handler' => 'AppError::handleError',
+//			'level' => E_ALL,
+//			'renderer' => 'InfinitasErrorRenderer',
+//			'trace' => true,
+//		)
+//	);
+	Configure::write('Error', array(
+		'handler' => 'ErrorHandler::handleError',
+		'level' => E_ALL & ~E_DEPRECATED,
+		'trace' => true
+	));
+
+//	Configure::write(
+//		'Exception',
+//		array(
+//			'handler' => 'AppError::handleException',
+//			'renderer' => 'InfinitasExceptionRenderer',
+//			'log' => true,
+//		)
+//	);
+	Configure::write('Exception', array(
+		'handler' => 'ErrorHandler::handleException',
+		'renderer' => 'ExceptionRenderer',
+		'log' => true
+	));
 
 	Configure::write('Dispatcher.filters', array(
 		'AssetDispatcher',