broken project

stfalcon · Dec 3, 2010 · 8e30d64 · 8e30d64
1 parent 4e40694
commit 8e30d64
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
@@ -18,7 +18,7 @@ public function errorAction()
             case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
 
                 // 404 error -- controller or action not found
-                $this->getResponse()->setHttpResponseCode(404);
+                // $this->getResponse()->setHttpResponseCode(404);
                 $this->view->message = 'Page not found';
                 break;
             default:
@@ -51,6 +51,15 @@ public function getLog()
         return $log;
     }
 
+    public function getLog()
+    {
+        $bootstrap = $this->getInvokeArg('bootstrap');
+        if (!$bootstrap->hasResource('Log')) {
+            return false;
+        }
+        $log = $bootstrap->getResource('Log');
+        return $log;
+    }
 
 }
 
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
@@ -13,6 +13,5 @@ public function indexAction()
         // action body
     }
 
-
 }
 
diff --git a/build.xml b/build.xml
@@ -19,7 +19,7 @@
 
     <!-- PHP copy/paste analysis -->
     <target name="phpcpd">
-        <phpcpd>
+        <phpcpd minLines="2" minTokens="20">
             <fileset dir="${sourcedir}" id="filestocpd">
                 <include name="**/*.php"/>
             </fileset>

diff --git a/tests/application/ControllerTestCase.php b/tests/application/ControllerTestCase.php
@@ -7,13 +7,21 @@
 
 abstract class ControllerTestCase extends Zend_Test_PHPUnit_ControllerTestCase
 {
+
     public function setUp()
+    {
+        $this->bootstrap = array($this, 'appBootstrap');
+        parent::setUp();
+    }
+
+    public function appBootstrap()
     {
         $this->bootstrap = new Zend_Application(
             APPLICATION_ENV,
             APPLICATION_PATH . '/configs/application.ini'
         );
 
-        parent::setUp();
+        $this->bootstrap->bootstrap();
     }
+
 }
diff --git a/tests/application/controllers/IndexControllerTest.php b/tests/application/controllers/IndexControllerTest.php
@@ -10,5 +10,5 @@ public function testIndexAction()
         $this->assertModule('default');
         $this->assertController('index');
         $this->assertAction('index');
-    }
-}
+   }
+}