Updates and fixes

danwdart · danwdart · commit 49981212fa14 · 2015-04-04T22:06:31.000+01:00
diff --git a/application/modules/admin/controllers/SetupController.php b/application/modules/admin/controllers/SetupController.php
@@ -117,7 +117,7 @@ public function writeAction()
             $adapter = Zend_Db::factory($strAdapter, $arrParams);
             $adapter->getConnection()->exec($schemaSql);
         } catch (Exception $e) {
-            echo 'Error writing DB. Please refresh and try again.';
+            echo 'Error writing DB: '.$e->getMessage().' Please refresh and try again.';
             exit();
         }
 
diff --git a/application/modules/cli/controllers/ClierrorController.php b/application/modules/cli/controllers/ClierrorController.php
@@ -22,7 +22,7 @@
  * @version    git
  * @link       https://github.com/dandart/projectchaplin
 **/
-class ErrorController extends Zend_Controller_Action
+class ClierrorController extends Zend_Controller_Action
 {
     public function preDispatch()
     {
diff --git a/application/modules/default/views/layouts/_header.phtml b/application/modules/default/views/layouts/_header.phtml
@@ -27,7 +27,7 @@ if(Chaplin_Auth::getInstance()->hasIdentity()) :
 	$modelUser = Chaplin_Auth::getInstance()->getIdentity()->getUser();
 	$bIsLoggedIn = true;
 endif;
-?>#
+?>
 
 <div class="wrap">
 	<a href="/"><div class="logo">
diff --git a/cli/cli.php b/cli/cli.php
@@ -72,7 +72,7 @@
 $error = $front->getPlugin('Zend_Controller_Plugin_ErrorHandler');
 $error->setErrorHandler(
     array(
-        'controller'	=> 'error',
+        'controller'	=> 'clierror',
         'action'		=> 'error'
     )
 );
diff --git a/composer.json b/composer.json
@@ -38,8 +38,7 @@
         "robmorgan/phinx": "dev-master"
     },
     "require-dev": {
-        "mockery/mockery": "dev-master",
-        "hamcrest/hamcrest-php": "dev-master"
+        "mockery/mockery": "dev-master"
     },
     "autoload": {
         "classmap": [
diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function writeAction()`
`117`	`117`	`$adapter = Zend_Db::factory($strAdapter, $arrParams);`
`118`	`118`	`$adapter->getConnection()->exec($schemaSql);`
`119`	`119`	`} catch (Exception $e) {`
`120`		`- echo 'Error writing DB. Please refresh and try again.';`
	`120`	`+ echo 'Error writing DB: '.$e->getMessage().' Please refresh and try again.';`
`121`	`121`	`exit();`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @version git`
`23`	`23`	`* @link https://github.com/dandart/projectchaplin`
`24`	`24`	`**/`
`25`		`-class ErrorController extends Zend_Controller_Action`
	`25`	`+class ClierrorController extends Zend_Controller_Action`
`26`	`26`	`{`
`27`	`27`	`public function preDispatch()`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`$error = $front->getPlugin('Zend_Controller_Plugin_ErrorHandler');`
`73`	`73`	`$error->setErrorHandler(`
`74`	`74`	`array(`
`75`		`- 'controller' => 'error',`
	`75`	`+ 'controller' => 'clierror',`
`76`	`76`	`'action' => 'error'`
`77`	`77`	`)`
`78`	`78`	`);`