From cfd6536c5f4c1aa585a394473047be48d733f8c5 Mon Sep 17 00:00:00 2001 From: Alexander Demidov Date: Wed, 27 Jun 2012 17:56:06 +0400 Subject: [PATCH] Replace constant DEBUG to use in Config. Remove start profiler from FrontController (moved to bootstrap). --- app/FrontController.php | 7 +--- logger/Logger.php | 2 +- model/MongoStatement.php | 2 +- model/MySQLiStatement.php | 2 +- redis/RedisManager.php | 2 +- tests/LoadTest.php | 4 +- tests/app/ActionTest.php | 17 +++----- tests/app/AjaxActionTest.php | 15 +++---- tests/app/ErrorActionTest.php | 10 ++--- tests/app/FrontControllerTest.php | 5 +-- tests/app/PagerActionTest.php | 25 +++++------- tests/app/StaticActionTest.php | 10 ++--- tests/classes/EnvTest.php | 10 ++--- tests/layout/ErrorLayoutTest.php | 10 ++--- tests/layout/LayoutTest.php | 20 ++++------ tests/logger/CliLoggerTest.php | 5 +-- tests/logger/FileLoggerTest.php | 12 ++---- tests/model/MongoDriverTest.php | 64 ++++++++---------------------- tests/model/MongoModelTest.php | 40 +++++-------------- tests/model/MongoStatementTest.php | 76 +++++++++--------------------------- tests/model/MySQLiDriverTest.php | 32 ++++----------- tests/model/MySQLiStatementTest.php | 40 +++++-------------- tests/redis/RedisDebugTest.php | 12 ++---- tests/redis/RedisManagerTest.php | 4 +- tests/util/profiler/ProfilerTest.php | 28 ++++--------- util/profiler/Profiler.php | 2 +- 26 files changed, 134 insertions(+), 322 deletions(-) diff --git a/app/FrontController.php b/app/FrontController.php index 4e79609..cb31776 100644 --- a/app/FrontController.php +++ b/app/FrontController.php @@ -32,9 +32,6 @@ class FrontController private function __construct() { ErrorHandler::init(); - if (DEBUG == true) { - Profiler::getInstance()->start(); - } $this->router = new Router(); } @@ -120,7 +117,7 @@ class FrontController $layout = new $layout_class(); $html = $layout->fetch($action); - if (DEBUG) { + if (Config::get('PROFILER')) { if (is_subclass_of($action, 'AjaxAction')) { Profiler::getInstance()->getJson(); } else { @@ -129,7 +126,7 @@ class FrontController } return $html; } catch (Exception $e) { - if (DEBUG == true) { + if (Config::get('DEBUG')) { if (!headers_sent()) { header('HTTP/1.0 500 Internal Server Error'); } diff --git a/logger/Logger.php b/logger/Logger.php index c8637c0..53be1de 100644 --- a/logger/Logger.php +++ b/logger/Logger.php @@ -43,7 +43,7 @@ abstract class Logger */ public function log($message) { - if (DEBUG) { + if (Config::get('LOGGING')) { $this->concreteLog($message); } } diff --git a/model/MongoStatement.php b/model/MongoStatement.php index 45d194c..49f4c53 100644 --- a/model/MongoStatement.php +++ b/model/MongoStatement.php @@ -138,7 +138,7 @@ class MongoStatement extends DbStatement $this->result = false; $mongo = $this->driver->getConnection(); if ($mongo instanceof Mongo) { - if (DEBUG) { + if (Config::get('PROFILER_DETAILS')) { $profiler = Profiler::getInstance()->profilerCommand('Mongo', $request); $result = $request->execute(); $profiler->end(); diff --git a/model/MySQLiStatement.php b/model/MySQLiStatement.php index 0176cfd..a89adb4 100644 --- a/model/MySQLiStatement.php +++ b/model/MySQLiStatement.php @@ -157,7 +157,7 @@ class MySQLiStatement extends DbStatement * @var MySQLi */ $mysqli = $this->driver->getConnection(); - if (DEBUG) { + if (Config::get('PROFILER_DETAILS')) { $profiler = Profiler::getInstance()->profilerCommand('MySQL', $request); $result = $mysqli->query($request); $profiler->end(); diff --git a/redis/RedisManager.php b/redis/RedisManager.php index 4a64f63..5da5651 100644 --- a/redis/RedisManager.php +++ b/redis/RedisManager.php @@ -49,7 +49,7 @@ class RedisManager * @var Redis */ $connection = new Redis(); - if (defined('DEBUG') && DEBUG == true) { + if (Config::get('DEBUG')) { $connection = new RedisDebug($connection); } if (!$connection->connect($host, $port)) { diff --git a/tests/LoadTest.php b/tests/LoadTest.php index 78e9e43..104f9ee 100644 --- a/tests/LoadTest.php +++ b/tests/LoadTest.php @@ -164,9 +164,7 @@ class LoadTest extends PHPUnit_Framework_TestCase $autoload = require(self::$file); $this->assertNotEmpty($autoload); - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); Load::autoload('Some'); Load::autoload('DbDriver'); } diff --git a/tests/app/ActionTest.php b/tests/app/ActionTest.php index da8e3fd..7fd03ed 100644 --- a/tests/app/ActionTest.php +++ b/tests/app/ActionTest.php @@ -20,9 +20,7 @@ class ActionTest extends Action_TestCase */ public function testActionConstructWithParams() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); Env::setParams(array('param1' => 'value1', 'param2' => 'value2')); $action = $this->getMockForAbstractClass('Action' ); $this->assertSame('value1', $action->param1); @@ -33,9 +31,7 @@ class ActionTest extends Action_TestCase */ public function testFetch() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $load = new ReflectionClass('Load'); $classes = $load->getProperty('autoload'); $classes->setAccessible(true); @@ -53,9 +49,7 @@ class ActionTest extends Action_TestCase */ public function testFetchNoTemplate() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); Env::setParams(array('template' => '')); $controller = FrontController::getInstance(); $controller->setView('SomeView'); @@ -70,9 +64,8 @@ class ActionTest extends Action_TestCase public function testRedirect() { set_exit_overload(function() { return false; }); - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $load = new ReflectionClass('Action'); $redirect = $load->getMethod('redirect'); $redirect->setAccessible(true); diff --git a/tests/app/AjaxActionTest.php b/tests/app/AjaxActionTest.php index 65d9859..b8f22d2 100644 --- a/tests/app/AjaxActionTest.php +++ b/tests/app/AjaxActionTest.php @@ -21,9 +21,8 @@ class AjaxActionTest extends Action_TestCase */ public function testConstruct() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('ajax' => 'AjaxTemplate', 'param2' => 'value2')); $action = $this->getMockForAbstractClass('AjaxAction' ); $this->assertAttributeEquals('ajax', 'template', $action); @@ -34,9 +33,8 @@ class AjaxActionTest extends Action_TestCase */ public function testFetchWithEncode() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $controller = FrontController::getInstance(); $controller->setView('SomeView'); $action = $this->getMockForAbstractClass('AjaxAction' ); @@ -51,9 +49,8 @@ class AjaxActionTest extends Action_TestCase */ public function testFetchNoEncode() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('encode' => false)); $controller = FrontController::getInstance(); $controller->setView('SomeView'); diff --git a/tests/app/ErrorActionTest.php b/tests/app/ErrorActionTest.php index 045e7aa..466770a 100644 --- a/tests/app/ErrorActionTest.php +++ b/tests/app/ErrorActionTest.php @@ -80,9 +80,8 @@ class ErrorActionTest extends Action_TestCase */ public function testFetchNoTemplate() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $exception = $this->getMock('ErrorException'); $controller = FrontController::getInstance(); $controller->setView('SomeView'); @@ -123,9 +122,8 @@ class ErrorActionTest extends Action_TestCase private function setConstants($val = false) { - if (!defined('DEBUG')) { - define('DEBUG', $val); - } + + Config::set('DEBUG', $val); } private function header() diff --git a/tests/app/FrontControllerTest.php b/tests/app/FrontControllerTest.php index 59b0c8f..426cdfa 100644 --- a/tests/app/FrontControllerTest.php +++ b/tests/app/FrontControllerTest.php @@ -210,9 +210,8 @@ class FrontControllerTest extends PHPUnit_Framework_TestCase private function setConstants($val = false) { - if (!defined('DEBUG')) { - define('DEBUG', $val); - } + + Config::set('DEBUG', $val); } public function tearDown() diff --git a/tests/app/PagerActionTest.php b/tests/app/PagerActionTest.php index 80f9823..386a4e7 100644 --- a/tests/app/PagerActionTest.php +++ b/tests/app/PagerActionTest.php @@ -21,9 +21,8 @@ class PagerActionTest extends Action_TestCase */ public function testConstructWithParams() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $action = $this->getMockForAbstractClass('PagerAction'); $this->assertSame(20, $action->getLimit()); $action = $this->getMockForAbstractClass('PagerAction', array(50)); @@ -35,9 +34,8 @@ class PagerActionTest extends Action_TestCase */ public function testSetCount() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $action = $this->getMockForAbstractClass('PagerAction'); $action->setCount(50); $this->assertSame(1, $action->page); @@ -60,9 +58,8 @@ class PagerActionTest extends Action_TestCase */ public function testGetOffset() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $action = $this->getMockForAbstractClass('PagerAction'); $this->assertSame(0, $action->getOffset()); } @@ -72,9 +69,8 @@ class PagerActionTest extends Action_TestCase */ public function testFetchNoTemplate() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('template' => '')); $controller = FrontController::getInstance(); $controller->setView('SomeView'); @@ -88,9 +84,8 @@ class PagerActionTest extends Action_TestCase */ public function testFetchWithTemplate() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('template' => 'SomeTemplate')); $controller = FrontController::getInstance(); $controller->setView('SomeView'); diff --git a/tests/app/StaticActionTest.php b/tests/app/StaticActionTest.php index 979589b..283e482 100644 --- a/tests/app/StaticActionTest.php +++ b/tests/app/StaticActionTest.php @@ -21,9 +21,8 @@ class StaticActionTest extends Action_TestCase */ public function testFetchNoTemplate() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('template' => '')); $controller = FrontController::getInstance(); $controller->setView('SomeView'); @@ -37,9 +36,8 @@ class StaticActionTest extends Action_TestCase */ public function testFetchWithTemplate() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); Env::setParams(array('template' => 'SomeTemplate')); $controller = FrontController::getInstance(); $controller->setView('SomeView'); diff --git a/tests/classes/EnvTest.php b/tests/classes/EnvTest.php index 542370c..89d3659 100644 --- a/tests/classes/EnvTest.php +++ b/tests/classes/EnvTest.php @@ -24,9 +24,8 @@ class EnvTest extends PHPUnit_Framework_TestCase */ public function testGetRequestUri() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $_SERVER['REQUEST_URI'] = '/test/index.php?id=1&test=wet&id_theme=512'; $this->assertSame('/test/index.php', Env::getRequestUri()); $_SERVER['REQUEST_URI'] = '/tes?t/index.php?id=1&test=wet&id_theme=512'; @@ -38,9 +37,8 @@ class EnvTest extends PHPUnit_Framework_TestCase */ public function testTrimBaseRequestUri() { - if(!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $class = new ReflectionClass('Env'); $this->started = $class->getProperty('request'); $this->started->setAccessible(true); diff --git a/tests/layout/ErrorLayoutTest.php b/tests/layout/ErrorLayoutTest.php index 4efb16f..9affe12 100644 --- a/tests/layout/ErrorLayoutTest.php +++ b/tests/layout/ErrorLayoutTest.php @@ -40,9 +40,8 @@ class ErrorLayoutTest extends PHPUnit_Framework_TestCase public function testSetException() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $layout = new ErrorLayout(); $layout->setException(new GeneralException()); $this->assertAttributeInstanceOf('GeneralException', 'exception', $layout); @@ -50,9 +49,8 @@ class ErrorLayoutTest extends PHPUnit_Framework_TestCase public function testExecute() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $action = $this->getMock('Action', array('fetch')); $action->expects($this->once()) ->method('fetch') diff --git a/tests/layout/LayoutTest.php b/tests/layout/LayoutTest.php index 603a741..e7029ea 100644 --- a/tests/layout/LayoutTest.php +++ b/tests/layout/LayoutTest.php @@ -40,18 +40,16 @@ class LayoutTest extends PHPUnit_Framework_TestCase public function testConstruct() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $layout = $this->getMockForAbstractClass('Layout'); $this->assertAttributeInstanceOf('PHPView', 'view', $layout); } public function testFetch() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $layout = $this->getMockForAbstractClass('Layout'); $action = $this->getMock('Action', array('fetch')); @@ -64,9 +62,8 @@ class LayoutTest extends PHPUnit_Framework_TestCase public function testFetchWithTemplate() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $layout = $this->getMockForAbstractClass('Layout'); $class = new ReflectionClass('Layout'); @@ -89,9 +86,8 @@ class LayoutTest extends PHPUnit_Framework_TestCase public function testAppend() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + + Config::set('DEBUG', 0); $layout = $this->getMockForAbstractClass('Layout', array('append', 'prepend'), 'LayoutMock'); $action = $this->getMock('Action', array('fetch')); diff --git a/tests/logger/CliLoggerTest.php b/tests/logger/CliLoggerTest.php index 6ef0673..8874834 100644 --- a/tests/logger/CliLoggerTest.php +++ b/tests/logger/CliLoggerTest.php @@ -43,9 +43,8 @@ class CliLoggerTest extends PHPUnit_Framework_TestCase */ public function testLog() { - if(!defined('DEBUG')) { - define('DEBUG', true); - } + + Config::set('DEBUG', 1); $logger = Logger::getInstance(); ob_start(); $logger->setPid(123); diff --git a/tests/logger/FileLoggerTest.php b/tests/logger/FileLoggerTest.php index 889f985..cfe763e 100644 --- a/tests/logger/FileLoggerTest.php +++ b/tests/logger/FileLoggerTest.php @@ -54,9 +54,7 @@ class FileLoggerTest extends PHPUnit_Framework_TestCase */ public function testCannotWrite() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $conf = array('logger' => 'FileLogger', 'filepath' => '/log.txt'); Config::set('Logger', $conf); @@ -71,9 +69,7 @@ class FileLoggerTest extends PHPUnit_Framework_TestCase */ public function testLog() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->assertFileNotExists($this->conf['filepath']); $logger = Logger::getInstance(); $logger->setPid(123); @@ -86,9 +82,7 @@ class FileLoggerTest extends PHPUnit_Framework_TestCase */ public function testDestruct() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $my_pid = posix_getpid(); $fd_command = 'lsof -n -p ' . $my_pid . ' | wc -l'; $fd_count_start = (int) `$fd_command`; diff --git a/tests/model/MongoDriverTest.php b/tests/model/MongoDriverTest.php index 26c6a1c..551a4fa 100644 --- a/tests/model/MongoDriverTest.php +++ b/tests/model/MongoDriverTest.php @@ -114,9 +114,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testFind() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(1, $mongo->find('items', array('name' => 'bread'))->numRows()); @@ -145,9 +143,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testOrderSkipLimit() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); @@ -184,9 +180,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testCount() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(5, $mongo->count('items')); $this->assertEquals(2, $mongo->count('items', array('name' => 'eggs'))); @@ -199,9 +193,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testCursorCount() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(5, $mongo->find('items')->count(5)); $this->assertCount(3, $mongo->find('items')->limit(3)->fetchAll()); @@ -214,9 +206,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testGet() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $eggs = $mongo->get('items', array('name' => 'eggs'))->fetchObject(); @@ -232,9 +222,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testRemove() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(1, $mongo->find('items', array('name' => 'bread'))->numRows()); @@ -250,9 +238,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testInsert() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(1, $mongo->find('items', array('name' => 'bread'))->numRows()); @@ -269,9 +255,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testBatchInsert() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $data = array( array('name' => 'first object'), @@ -292,9 +276,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testGetInsertId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(0, $mongo->getInsertId()); @@ -316,9 +298,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testUpdate() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $this->assertEquals(1, $mongo->find('items', array('name' => 'bread'))->numRows()); @@ -336,9 +316,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testUpsert() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); @@ -353,9 +331,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testFindAndModify() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); @@ -371,9 +347,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testFindAndModifyNoItem() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); @@ -389,9 +363,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testEvalCommand() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $result = $mongo->command('items', array('$eval' => 'function() { return db.items.count();}')); $this->assertEquals(5, $result->fetch()); @@ -406,9 +378,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testEval() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $result = $mongo->command('items', array('$eval' => 'function() {return true; }')); $this->assertTrue($result->fetch()); @@ -424,9 +394,7 @@ class MongoDriverTest extends PHPUnit_Framework_TestCase */ public function testCommand() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mongo = new MongoDriver($this->conf); $result = $mongo->command('items', array('distinct' => 'items', 'key' => 'name')); $this->assertEquals(4, count($result->fetch(DB::FETCH_ASSOC))); diff --git a/tests/model/MongoModelTest.php b/tests/model/MongoModelTest.php index af136a3..c15004e 100644 --- a/tests/model/MongoModelTest.php +++ b/tests/model/MongoModelTest.php @@ -64,9 +64,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testFind() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $result = $this->model->find(); $this->assertInstanceOf('MongoStatement', $result); $this->assertEquals('milk', $result->limit(2)->order(array('name' => -1))->fetch()->name); @@ -83,9 +81,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testGet() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $result = $this->model->find()->limit(1)->order(array('name' => 1)); $result = $result->fetch(); $this->assertEquals('bread', $result->name); @@ -99,9 +95,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testDelete() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $result = $this->model->find()->limit(1)->order(array('name' => 1)); $id = $result->fetch()->_id; $this->assertEquals(1, $this->model->delete($id)); @@ -114,9 +108,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testBatchInsert() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $data = array( array('name' => 'first object'), array('name' => 'second object'), @@ -135,9 +127,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testDeleteAll() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertEquals(2, $this->model->count(array('name' => 'eggs'))); $this->assertEquals(0, $this->model->deleteAll(array('name' => 'eggs'))); @@ -150,9 +140,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testCount() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertEquals(5, $this->model->count()); $this->assertEquals(2, $this->model->count(array('name' => 'eggs'))); } @@ -163,9 +151,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testFetch() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $mock = $this->getMock('CacheKey', array('set', 'get')); $mock->expects($this->exactly(3)) @@ -204,9 +190,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testUseMongoId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertAttributeEquals(true, 'useMongoId', $this->model); } @@ -217,9 +201,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $class = new ReflectionClass('MongoModel'); $prop = $class->getProperty('useMongoId'); $prop->setAccessible(true); @@ -239,9 +221,7 @@ class MongoModelTest extends PHPUnit_Framework_TestCase */ public function testIdToMongoId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->model->insert(array('name' => 'testbread', 'price' => 3.2, 'quantity' => 10)); $this->model->insert(array('name' => 'testbread', 'price' => 12, 'quantity' => 2)); diff --git a/tests/model/MongoStatementTest.php b/tests/model/MongoStatementTest.php index b2415f1..a857051 100644 --- a/tests/model/MongoStatementTest.php +++ b/tests/model/MongoStatementTest.php @@ -61,9 +61,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testAffectedNumRowsNoResult() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertFalse($this->stmt->affectedRows()); $this->assertFalse($this->stmt->numRows()); @@ -82,9 +80,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testAffectedNumRows() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->request ->expects($this->once()) @@ -100,9 +96,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testGetInsertId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->request = $this->getMockBuilder('InsertMongoCommand') @@ -131,9 +125,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testExecute() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod()->setRequestExecuteMethod(); $this->assertTrue($this->stmt->execute()); @@ -145,9 +137,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testExecuteNoResult() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->request ->expects($this->any()) @@ -163,9 +153,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testExecuteNoConnection() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->driver ->expects($this->any()) ->method('getConnection') @@ -180,9 +168,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testExecuteWithDebug() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod()->setRequestExecuteMethod(); $this->assertTrue($this->stmt->execute()); $this->assertEquals(10, $this->stmt->numRows()); @@ -194,9 +180,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testBindParam() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->request ->expects($this->once()) @@ -217,9 +201,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testFetch() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->assertFalse($this->stmt->fetch()); $this->setDriverGetConnectionMethod()->setRequestForFetch(); @@ -236,9 +218,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchWithInitialArray() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->assertFalse($this->stmt->fetch()); $this->setDriverGetConnectionMethod(); @@ -257,9 +237,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchAssocFromCursor() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->assertFalse($this->stmt->fetch()); $this->setDriverGetConnectionMethod()->setRequestForFetch(); @@ -276,9 +254,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchAssocFromArray() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->assertFalse($this->stmt->fetch()); $this->setDriverGetConnectionMethod(); @@ -298,9 +274,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchWrongMode() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->assertFalse($this->stmt->fetch()); $this->setDriverGetConnectionMethod(); @@ -320,9 +294,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testSkipOrderLimit() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->stmt->execute(); @@ -340,9 +312,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testCount() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->stmt->execute(); @@ -357,9 +327,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testCountException() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod(); $this->request ->expects($this->once()) @@ -377,9 +345,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testOrderException() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod(); $this->request ->expects($this->once()) @@ -397,9 +363,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testSkipException() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod(); $this->request ->expects($this->once()) @@ -417,9 +381,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase */ public function testLimitException() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1; $this->setDriverGetConnectionMethod(); $this->request ->expects($this->once()) diff --git a/tests/model/MySQLiDriverTest.php b/tests/model/MySQLiDriverTest.php index d7ddb51..6321190 100644 --- a/tests/model/MySQLiDriverTest.php +++ b/tests/model/MySQLiDriverTest.php @@ -57,9 +57,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testDriver() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); @@ -78,9 +76,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testGetConnection() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); $this->assertInstanceOf('mysqli', $driver->getConnection()); @@ -91,9 +87,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testGetConnectionWrongConfig() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->conf['database'] = 'nodb'; $driver = new MySQLiDriver($this->conf); @@ -106,9 +100,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testDisconnect() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); @@ -125,9 +117,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testInsert() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); @@ -147,9 +137,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testGetInsertId() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); @@ -161,9 +149,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testTransaction() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); @@ -194,9 +180,7 @@ class MySQLiDriverTest extends PHPUnit_Extensions_Database_TestCase */ public function testRollback() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $driver = new MySQLiDriver($this->conf); diff --git a/tests/model/MySQLiStatementTest.php b/tests/model/MySQLiStatementTest.php index 83dfc96..e372c01 100644 --- a/tests/model/MySQLiStatementTest.php +++ b/tests/model/MySQLiStatementTest.php @@ -81,9 +81,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testExecute() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->driver ->expects($this->any()) @@ -102,9 +100,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testExecuteNoPlaceholders() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->sql = 'PLAIN SQL'; @@ -118,9 +114,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchNoResult() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertFalse($this->stmt->fetch()); } @@ -130,9 +124,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testDriverExecuteNoResult() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionWrongResultMethod(); $this->setExpectedException('GeneralException', 'ERROR'); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); @@ -144,9 +136,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testFetch() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); $this->assertSame('OBJECT', $this->stmt->fetch()); @@ -161,9 +151,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchObject() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); $this->assertSame('OBJECT', $this->stmt->fetchObject()); @@ -175,9 +163,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchPairs() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $resultMock = $this->getMockBuilder('mysqli_result') ->disableOriginalConstructor() @@ -232,9 +218,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testClose() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->assertAttributeEquals(null, 'result', $this->stmt); $this->setDriverGetConnectionMethod(); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); @@ -275,9 +259,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase public function testNumRows() { $this->markTestSkipped('Unable to execute a method or access a property of an incomplete object.'); - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); $this->assertNull($this->stmt->numRows()); @@ -289,9 +271,7 @@ class MySQLiStatementTest extends PHPUnit_Framework_TestCase */ public function testFetchInvalidMode() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setDriverGetConnectionMethod(); $this->stmt->execute(array('place' => 'place_val', 'new' => 'new_val')); diff --git a/tests/redis/RedisDebugTest.php b/tests/redis/RedisDebugTest.php index 83642f7..e79a063 100644 --- a/tests/redis/RedisDebugTest.php +++ b/tests/redis/RedisDebugTest.php @@ -57,9 +57,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase */ public function testCallSimpleParams() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $mock = $this->getMock('Redis', array('connect')); $mock->expects($this->once()) @@ -77,9 +75,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase */ public function testCallArrayParam() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $mock = $this->getMock('Redis', array('connect')); $mock->expects($this->once()) @@ -97,9 +93,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase */ public function testCallUndefinedMethod() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $mock = $this->getMock('Redis', array('connect')); $redisDebug = new RedisDebug($mock); diff --git a/tests/redis/RedisManagerTest.php b/tests/redis/RedisManagerTest.php index fed1e28..a64769e 100644 --- a/tests/redis/RedisManagerTest.php +++ b/tests/redis/RedisManagerTest.php @@ -107,9 +107,7 @@ class RedisManagerTest extends PHPUnit_Framework_TestCase */ public function testConnectWithDebug() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->getMock('RedisDebug'); Config::set('Redis', array('new' => array('host' => true, 'port' => 2023, 'database' => true))); diff --git a/tests/util/profiler/ProfilerTest.php b/tests/util/profiler/ProfilerTest.php index 554ecf2..3fef636 100644 --- a/tests/util/profiler/ProfilerTest.php +++ b/tests/util/profiler/ProfilerTest.php @@ -36,9 +36,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testGetInstaceNoDebug() { - if (!defined('DEBUG')) { - define('DEBUG', false); - } + Config::set('DEBUG', 0); $this->setExpectedException('GeneralException', 'Need to turn on DEBUG before use.'); Profiler::getInstance(); } @@ -48,9 +46,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testGetInstance() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $profiler = Profiler::getInstance(); $this->assertInstanceOf('Profiler', $profiler); $this->assertSame($profiler, Profiler::getInstance()); @@ -61,9 +57,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testProfilerCommand() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $profiler = Profiler::getInstance(); $cmdProfiler = $profiler->profilerCommand('command', 'type'); @@ -75,9 +69,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testStartEndNoCommandProfiler() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $profiler = Profiler::getInstance(); $profiler->start(); $result = $profiler->end(''); @@ -95,9 +87,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testStartEndWithCommandProfiler() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $profiler = Profiler::getInstance(); @@ -115,9 +105,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testGetJSON() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $profiler = Profiler::getInstance(); @@ -130,9 +118,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase */ public function testGetCLI() { - if (!defined('DEBUG')) { - define('DEBUG', true); - } + Config::set('DEBUG', 1); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $profiler = Profiler::getInstance(); diff --git a/util/profiler/Profiler.php b/util/profiler/Profiler.php index 0f423e2..68fa9dc 100644 --- a/util/profiler/Profiler.php +++ b/util/profiler/Profiler.php @@ -22,7 +22,7 @@ class Profiler private function __construct() { - if (DEBUG == false) { + if (Config::get('DEBUG') == false) { throw new GeneralException('Need to turn on DEBUG before use.'); } }