From 8db4c94af1dc887b47e2999f598220709c5ed52e Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 11 Sep 2012 00:50:56 -0400
Subject: [PATCH] CC-4389: Convert all PHP errors to throw exceptions instead

-echo to stdout as well
---
 airtime_mvc/application/Bootstrap.php                     | 6 +++++-
 airtime_mvc/application/controllers/LibraryController.php | 1 -
 airtime_mvc/public/index.php                              | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 8666d60bf..454bc4cba 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -15,7 +15,6 @@ require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
 
 date_default_timezone_set(Application_Model_Preference::GetTimezone());
 
-
 global $CC_CONFIG;
 $airtime_version = Application_Model_Preference::GetAirtimeVersion();
 $uniqueid = Application_Model_Preference::GetUniqueId();
@@ -105,6 +104,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
     protected function _initZFDebug()
     {
+
+        Zend_Controller_Front::getInstance()->throwExceptions(true); 
+
+        /*
         if (APPLICATION_ENV == "development") {
             $autoloader = Zend_Loader_Autoloader::getInstance();
             $autoloader->registerNamespace('ZFDebug');
@@ -121,6 +124,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $frontController = $this->getResource('frontController');
             $frontController->registerPlugin($debug);
         }
+        */
     }
 
     protected function _initRouter()
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index cba555785..cc13cd649 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -19,7 +19,6 @@ class LibraryController extends Zend_Controller_Action
                     ->addActionContext('get-upload-to-soundcloud-status', 'json')
                     ->addActionContext('set-num-entries', 'json')
                     ->initContext();
-
     }
 
     public function indexAction()
diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index 46b97adfc..fba26a71a 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -37,6 +37,10 @@ if (file_exists('/usr/share/php/libzend-framework-php')) {
 
 /** Zend_Application */
 require_once 'Zend/Application.php';
+$application = new Zend_Application(
+    APPLICATION_ENV,
+    APPLICATION_PATH . '/configs/application.ini'
+);
 
 date_default_timezone_set('UTC');
 require_once (APPLICATION_PATH."/logging/Logging.php");