fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/reorganize-unit-tests

Browse source
This commit is contained in:
Kijin Sung 2016-02-16 17:45:45 +09:00
commit 3237f188e3
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -39,6 +39,8 @@ module.exports = function(grunt) {
import : 2, import : 2,
'adjoining-classes' : false, 'adjoining-classes' : false,
'box-model' : false, 'box-model' : false,
'box-sizing' : false,
'font-sizes' : false,
'duplicate-background-images' : false, 'duplicate-background-images' : false,
'ids' : false, 'ids' : false,
'important' : false, 'important' : false,

3
classes/context/Context.class.php
View file

@ -329,10 +329,11 @@ class Context
} }
else else
{ {
ob_start();
$this->setCacheControl(-1, true); $this->setCacheControl(-1, true);
$_SESSION = array(); $_SESSION = array();
} }
ob_start();
register_shutdown_function('Context::close'); register_shutdown_function('Context::close');
// set authentication information in Context and session // set authentication information in Context and session

5
classes/display/DisplayHandler.class.php
View file

@ -106,7 +106,10 @@ class DisplayHandler extends Handler
} }
// disable gzip if output already exists // disable gzip if output already exists
ob_flush(); while (ob_get_level())
{
ob_end_flush();
}
if(headers_sent()) if(headers_sent())
{ {
$this->gz_enabled = FALSE; $this->gz_enabled = FALSE;

3
common/framework/debug.php
View file

@ -383,11 +383,8 @@ class Debug
* @return void * @return void
*/ */
public static function registerErrorHandlers($error_types) public static function registerErrorHandlers($error_types)
{
if (Config::get('debug.enabled'))
{ {
set_error_handler('\\Rhymix\\Framework\\Debug::addError', $error_types); set_error_handler('\\Rhymix\\Framework\\Debug::addError', $error_types);
}
set_exception_handler('\\Rhymix\\Framework\\Debug::exceptionHandler'); set_exception_handler('\\Rhymix\\Framework\\Debug::exceptionHandler');
register_shutdown_function('\\Rhymix\\Framework\\Debug::shutdownHandler'); register_shutdown_function('\\Rhymix\\Framework\\Debug::shutdownHandler');
} }

9
tests/unit/framework/DebugTest.php
View file

@ -22,10 +22,11 @@ class DebugTest extends \Codeception\TestCase\Test
Rhymix\Framework\Debug::$write_to_error_log = false; Rhymix\Framework\Debug::$write_to_error_log = false;
Rhymix\Framework\Debug::addError(~0, 'Rhymix', $file, $line, null); Rhymix\Framework\Debug::addError(~0, 'Rhymix', $file, $line, null);
$errors = Rhymix\Framework\Debug::getErrors(); $errors = Rhymix\Framework\Debug::getErrors();
$this->assertEquals(1, count($errors)); $this->assertGreaterThanOrEqual(1, count($errors));
$this->assertContains('Rhymix', $errors[0]->message); $error = array_pop($errors);
$this->assertEquals($file, $errors[0]->file); $this->assertContains('Rhymix', $error->message);
$this->assertEquals($line, $errors[0]->line); $this->assertEquals($file, $error->file);
$this->assertEquals($line, $error->line);
} }
public function testDebugQuery() public function testDebugQuery()