Skip to content

Commit

Permalink
changing yml
Browse files Browse the repository at this point in the history
  • Loading branch information
ceeram committed Jun 21, 2012
1 parent 9c8d940 commit 24a9ecf
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 25 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Expand Up @@ -6,10 +6,14 @@ php:
env:
- CAKE_VERSION=2.2

env:
- DB=mysql

before_script:
- cd .. && git clone git://github.com/cakephp/cakephp && cd cakephp && git checkout $CAKE_VERSION
- cd .. && ln -s cakephp/lib lib
- chmod -R 777 ./tmp
- 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"
Expand Down Expand Up @@ -45,7 +49,7 @@ before_script:
'host' => '',
'login' => '',
'password' => '',
'database' => 'infinitas',
'database' => 'infinitas_test',
'prefix' => ''
);
public \$test = array(
Expand All @@ -72,10 +76,10 @@ before_script:
\$this->{\$source} = \$config;
}
}
}" > infinitas/Config/database.php
}" > Config/database.php

script:
- lib/Cake/Console/cake test core Utility/Hash
- Console/cake test app AllPluginTests

notifications:
irc: "irc.freenode.org#infinitas"
48 changes: 29 additions & 19 deletions Config/core.php
Expand Up @@ -9,7 +9,7 @@
Configure::write('debug', 2);
}
else{
Configure::write('debug', 0);
Configure::write('debug', 2);
}

Configure::write('log', true);
Expand All @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions Controller/AppController.php
Expand Up @@ -521,8 +521,6 @@ private function __loadAsset($data, $method){
* @return Full output string of view contents
*/
public function render($view = null, $layout = null) {
var_dump(Debugger::trace());
exit;
if(($this->request->action == 'admin_edit' || $this->request->action == 'admin_add')) {
$viewPath = App::pluginPath($this->plugin) . 'View' . DS . $this->viewPath . DS . $this->request->action . '.ctp';
if(!file_exists($viewPath)) {
Expand Down

0 comments on commit 24a9ecf

Please sign in to comment.