brmlab/brmsklad
9
0
Fork 0
mirror of https://github.com/brmlab/brmsklad.git synced 2025-10-31 08:13:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade CakePHP from 2.2.5 to 2.9.5

Browse source
This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
View file

@ -2,30 +2,40 @@
/**
* ConsoleLogTest file
*
* PHP 5
*
* CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
* @package Cake.Test.Case.Log.Engine
* @since CakePHP(tm) v 1.3
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('ConsoleLog', 'Log/Engine');
/**
* TestConsoleLog
*
* @package Cake.Test.Case.Log.Engine
*/
class TestConsoleLog extends ConsoleLog {
}
/**
* TestCakeLog
*
* @package Cake.Test.Case.Log.Engine
*/
class TestCakeLog extends CakeLog {
public static function replace($key, &$engine) {
self::$_Collection->{$key} = $engine;
static::$_Collection->{$key} = $engine;
}
}
@ -40,12 +50,12 @@ class ConsoleLogTest extends CakeTestCase {
public function setUp() {
parent::setUp();
CakeLog::config('debug', array(
'engine' => 'FileLog',
'engine' => 'File',
'types' => array('notice', 'info', 'debug'),
'file' => 'debug',
));
CakeLog::config('error', array(
'engine' => 'FileLog',
'engine' => 'File',
'types' => array('error', 'warning'),
'file' => 'error',
));
@ -63,10 +73,12 @@ class ConsoleLogTest extends CakeTestCase {
/**
* Test writing to ConsoleOutput
*
* @return void
*/
public function testConsoleOutputWrites() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));
$mock = $this->getMock('TestConsoleLog', array('write'), array(
@ -82,10 +94,12 @@ class ConsoleLogTest extends CakeTestCase {
/**
* Test logging to both ConsoleLog and FileLog
*
* @return void
*/
public function testCombinedLogWriting() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));
$mock = $this->getMock('TestConsoleLog', array('write'), array(
array('types' => 'error'),
@ -118,12 +132,16 @@ class ConsoleLogTest extends CakeTestCase {
/**
* test default value of stream 'outputAs'
*
* @return void
*/
public function testDefaultOutputAs() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));
if (DS == '\\' && !(bool)env('ANSICON')) {
if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
(function_exists('posix_isatty') && !posix_isatty(null))
) {
$expected = ConsoleOutput::PLAIN;
} else {
$expected = ConsoleOutput::COLOR;