mirror of
				https://github.com/brmlab/brmsklad.git
				synced 2025-10-31 08:13:58 +01:00 
			
		
		
		
	Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
		
							parent
							
								
									5a580df460
								
							
						
					
					
						commit
						235a541597
					
				
					 793 changed files with 60746 additions and 23753 deletions
				
			
		|  | @ -2,19 +2,18 @@ | |||
| /** | ||||
|  * CakeLogTest 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 | ||||
|  * @since         CakePHP(tm) v 1.2.0.5432 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('CakeLog', 'Log'); | ||||
|  | @ -86,6 +85,18 @@ class CakeLogTest extends CakeTestCase { | |||
|  * @return void | ||||
|  */ | ||||
| 	public function testValidKeyName() { | ||||
| 		CakeLog::config('valid', array('engine' => 'File')); | ||||
| 		$stream = CakeLog::stream('valid'); | ||||
| 		$this->assertInstanceOf('FileLog', $stream); | ||||
| 		CakeLog::drop('valid'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * test config() with valid key name including the deprecated Log suffix | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testValidKeyNameLogSuffix() { | ||||
| 		CakeLog::config('valid', array('engine' => 'FileLog')); | ||||
| 		$stream = CakeLog::stream('valid'); | ||||
| 		$this->assertInstanceOf('FileLog', $stream); | ||||
|  | @ -99,7 +110,7 @@ class CakeLogTest extends CakeTestCase { | |||
|  * @return void | ||||
|  */ | ||||
| 	public function testInvalidKeyName() { | ||||
| 		CakeLog::config('1nv', array('engine' => 'FileLog')); | ||||
| 		CakeLog::config('1nv', array('engine' => 'File')); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -113,27 +124,20 @@ class CakeLogTest extends CakeTestCase { | |||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * Test that CakeLog autoconfigures itself to use a FileLogger with the LOGS dir. | ||||
|  * When no streams are there. | ||||
|  * Test that CakeLog does not auto create logs when no streams are there to listen. | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testAutoConfig() { | ||||
| 	public function testNoStreamListenting() { | ||||
| 		if (file_exists(LOGS . 'error.log')) { | ||||
| 			unlink(LOGS . 'error.log'); | ||||
| 		} | ||||
| 		CakeLog::write(LOG_WARNING, 'Test warning'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'error.log')); | ||||
| 		$res = CakeLog::write(LOG_WARNING, 'Test warning'); | ||||
| 		$this->assertFalse($res); | ||||
| 		$this->assertFalse(file_exists(LOGS . 'error.log')); | ||||
| 
 | ||||
| 		$result = CakeLog::configured(); | ||||
| 		$this->assertEquals(array('default'), $result); | ||||
| 
 | ||||
| 		$testMessage = 'custom message'; | ||||
| 		CakeLog::write('custom', $testMessage); | ||||
| 		$content = file_get_contents(LOGS . 'custom.log'); | ||||
| 		$this->assertContains($testMessage, $content); | ||||
| 		unlink(LOGS . 'error.log'); | ||||
| 		unlink(LOGS . 'custom.log'); | ||||
| 		$this->assertEquals(array(), $result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -143,7 +147,7 @@ class CakeLogTest extends CakeTestCase { | |||
|  */ | ||||
| 	public function testConfig() { | ||||
| 		CakeLog::config('file', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'path' => LOGS | ||||
| 		)); | ||||
| 		$result = CakeLog::configured(); | ||||
|  | @ -164,10 +168,10 @@ class CakeLogTest extends CakeTestCase { | |||
|  * explicit tests for drop() | ||||
|  * | ||||
|  * @return void | ||||
|  **/ | ||||
|  */ | ||||
| 	public function testDrop() { | ||||
| 		CakeLog::config('file', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'path' => LOGS | ||||
| 		)); | ||||
| 		$result = CakeLog::configured(); | ||||
|  | @ -184,6 +188,10 @@ class CakeLogTest extends CakeTestCase { | |||
|  * @return void | ||||
|  */ | ||||
| 	public function testLogFileWriting() { | ||||
| 		CakeLog::config('file', array( | ||||
| 			'engine' => 'File', | ||||
| 			'path' => LOGS | ||||
| 		)); | ||||
| 		if (file_exists(LOGS . 'error.log')) { | ||||
| 			unlink(LOGS . 'error.log'); | ||||
| 		} | ||||
|  | @ -213,12 +221,12 @@ class CakeLogTest extends CakeTestCase { | |||
| 			unlink(LOGS . 'eggs.log'); | ||||
| 		} | ||||
| 		CakeLog::config('spam', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => 'debug', | ||||
| 			'file' => 'spam', | ||||
| 		)); | ||||
| 		CakeLog::config('eggs', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('eggs', 'debug', 'error', 'warning'), | ||||
| 			'file' => 'eggs', | ||||
| 		)); | ||||
|  | @ -249,10 +257,11 @@ class CakeLogTest extends CakeTestCase { | |||
|  * test enable | ||||
|  * | ||||
|  * @expectedException CakeLogException | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testStreamEnable() { | ||||
| 		CakeLog::config('spam', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'file' => 'spam', | ||||
| 			)); | ||||
| 		$this->assertTrue(CakeLog::enabled('spam')); | ||||
|  | @ -264,10 +273,11 @@ class CakeLogTest extends CakeTestCase { | |||
|  * test disable | ||||
|  * | ||||
|  * @expectedException CakeLogException | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testStreamDisable() { | ||||
| 		CakeLog::config('spam', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'file' => 'spam', | ||||
| 			)); | ||||
| 		$this->assertTrue(CakeLog::enabled('spam')); | ||||
|  | @ -281,6 +291,7 @@ class CakeLogTest extends CakeTestCase { | |||
|  * test enabled() invalid stream | ||||
|  * | ||||
|  * @expectedException CakeLogException | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testStreamEnabledInvalid() { | ||||
| 		CakeLog::enabled('bogus_stream'); | ||||
|  | @ -290,24 +301,35 @@ class CakeLogTest extends CakeTestCase { | |||
|  * test disable invalid stream | ||||
|  * | ||||
|  * @expectedException CakeLogException | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testStreamDisableInvalid() { | ||||
| 		CakeLog::disable('bogus_stream'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * resets log config | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	protected function _resetLogConfig() { | ||||
| 		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('warning', 'error', 'critical', 'alert', 'emergency'), | ||||
| 			'file' => 'error', | ||||
| 		)); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * delete logs | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	protected function _deleteLogs() { | ||||
| 		if (file_exists(LOGS . 'shops.log')) { | ||||
| 			unlink(LOGS . 'shops.log'); | ||||
|  | @ -338,7 +360,7 @@ class CakeLogTest extends CakeTestCase { | |||
| 		$this->_resetLogConfig(); | ||||
| 
 | ||||
| 		CakeLog::config('shops', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'notice', 'warning'), | ||||
| 			'scopes' => array('transactions', 'orders'), | ||||
| 			'file' => 'shops', | ||||
|  | @ -383,17 +405,22 @@ class CakeLogTest extends CakeTestCase { | |||
| 		CakeLog::drop('shops'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * Test that scopes are exclusive and don't bleed. | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testScopedLoggingExclusive() { | ||||
| 		$this->_deleteLogs(); | ||||
| 
 | ||||
| 		CakeLog::config('shops', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'notice', 'warning'), | ||||
| 			'scopes' => array('transactions', 'orders'), | ||||
| 			'file' => 'shops.log', | ||||
| 		)); | ||||
| 		CakeLog::config('eggs', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'notice', 'warning'), | ||||
| 			'scopes' => array('eggs'), | ||||
| 			'file' => 'eggs.log', | ||||
|  | @ -418,8 +445,20 @@ class CakeLogTest extends CakeTestCase { | |||
| 	public function testScopedLogging() { | ||||
| 		$this->_resetLogConfig(); | ||||
| 		$this->_deleteLogs(); | ||||
| 
 | ||||
| 		CakeLog::config('string-scope', array( | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'notice', 'warning'), | ||||
| 			'scopes' => 'string-scope', | ||||
| 			'file' => 'string-scope.log' | ||||
| 		)); | ||||
| 		CakeLog::write('info', 'info message', 'string-scope'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'string-scope.log')); | ||||
| 
 | ||||
| 		CakeLog::drop('string-scope'); | ||||
| 
 | ||||
| 		CakeLog::config('shops', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'notice', 'warning'), | ||||
| 			'scopes' => array('transactions', 'orders'), | ||||
| 			'file' => 'shops.log', | ||||
|  | @ -468,11 +507,17 @@ class CakeLogTest extends CakeTestCase { | |||
| /** | ||||
|  * test bogus type and scope | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testBogusTypeAndScope() { | ||||
| 		$this->_resetLogConfig(); | ||||
| 		$this->_deleteLogs(); | ||||
| 
 | ||||
| 		CakeLog::config('file', array( | ||||
| 			'engine' => 'File', | ||||
| 			'path' => LOGS | ||||
| 		)); | ||||
| 
 | ||||
| 		CakeLog::write('bogus', 'bogus message'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'bogus.log')); | ||||
| 		$this->assertFalse(file_exists(LOGS . 'error.log')); | ||||
|  | @ -494,6 +539,8 @@ class CakeLogTest extends CakeTestCase { | |||
| 
 | ||||
| /** | ||||
|  * test scoped logging with convenience methods | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testConvenienceScopedLogging() { | ||||
| 		if (file_exists(LOGS . 'shops.log')) { | ||||
|  | @ -508,7 +555,7 @@ class CakeLogTest extends CakeTestCase { | |||
| 
 | ||||
| 		$this->_resetLogConfig(); | ||||
| 		CakeLog::config('shops', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'types' => array('info', 'debug', 'notice', 'warning'), | ||||
| 			'scopes' => array('transactions', 'orders'), | ||||
| 			'file' => 'shops', | ||||
|  | @ -540,17 +587,19 @@ class CakeLogTest extends CakeTestCase { | |||
| 
 | ||||
| /** | ||||
|  * test convenience methods | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testConvenienceMethods() { | ||||
| 		$this->_deleteLogs(); | ||||
| 
 | ||||
| 		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('emergency', 'alert', 'critical', 'error', 'warning'), | ||||
| 			'file' => 'error', | ||||
| 		)); | ||||
|  | @ -614,6 +663,8 @@ class CakeLogTest extends CakeTestCase { | |||
| 
 | ||||
| /** | ||||
|  * test levels customization | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testLevelCustomization() { | ||||
| 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Log level tests not supported on Windows.'); | ||||
|  | @ -644,12 +695,14 @@ class CakeLogTest extends CakeTestCase { | |||
| 
 | ||||
| /** | ||||
|  * Test writing log files with custom levels | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testCustomLevelWrites() { | ||||
| 		$this->_deleteLogs(); | ||||
| 		$this->_resetLogConfig(); | ||||
| 
 | ||||
| 		$levels = CakeLog::levels(array('spam', 'eggs')); | ||||
| 		CakeLog::levels(array('spam', 'eggs')); | ||||
| 
 | ||||
| 		$testMessage = 'error message'; | ||||
| 		CakeLog::write('error', $testMessage); | ||||
|  | @ -659,12 +712,12 @@ class CakeLogTest extends CakeTestCase { | |||
| 		$this->assertContains('Error: ' . $testMessage, $contents); | ||||
| 
 | ||||
| 		CakeLog::config('spam', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'file' => 'spam.log', | ||||
| 			'types' => 'spam', | ||||
| 			)); | ||||
| 		CakeLog::config('eggs', array( | ||||
| 			'engine' => 'FileLog', | ||||
| 			'engine' => 'File', | ||||
| 			'file' => 'eggs.log', | ||||
| 			'types' => array('spam', 'eggs'), | ||||
| 			)); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko