mirror of
				https://github.com/brmlab/brmsklad.git
				synced 2025-10-31 16:23:59 +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,20 +2,20 @@ | |||
| /** | ||||
|  * FileLogTest 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('FileLog', 'Log/Engine'); | ||||
| 
 | ||||
| /** | ||||
|  | @ -31,36 +31,26 @@ class FileLogTest extends CakeTestCase { | |||
|  * @return void | ||||
|  */ | ||||
| 	public function testLogFileWriting() { | ||||
| 		if (file_exists(LOGS . 'error.log')) { | ||||
| 			unlink(LOGS . 'error.log'); | ||||
| 		} | ||||
| 		$this->_deleteLogs(LOGS); | ||||
| 
 | ||||
| 		$log = new FileLog(); | ||||
| 		$log->write('warning', 'Test warning'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'error.log')); | ||||
| 
 | ||||
| 		$result = file_get_contents(LOGS . 'error.log'); | ||||
| 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result); | ||||
| 		unlink(LOGS . 'error.log'); | ||||
| 
 | ||||
| 		if (file_exists(LOGS . 'debug.log')) { | ||||
| 			unlink(LOGS . 'debug.log'); | ||||
| 		} | ||||
| 		$log->write('debug', 'Test warning'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'debug.log')); | ||||
| 
 | ||||
| 		$result = file_get_contents(LOGS . 'debug.log'); | ||||
| 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Debug: Test warning/', $result); | ||||
| 		unlink(LOGS . 'debug.log'); | ||||
| 
 | ||||
| 		if (file_exists(LOGS . 'random.log')) { | ||||
| 			unlink(LOGS . 'random.log'); | ||||
| 		} | ||||
| 		$log->write('random', 'Test warning'); | ||||
| 		$this->assertTrue(file_exists(LOGS . 'random.log')); | ||||
| 
 | ||||
| 		$result = file_get_contents(LOGS . 'random.log'); | ||||
| 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Random: Test warning/', $result); | ||||
| 		unlink(LOGS . 'random.log'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -70,14 +60,135 @@ class FileLogTest extends CakeTestCase { | |||
|  */ | ||||
| 	public function testPathSetting() { | ||||
| 		$path = TMP . 'tests' . DS; | ||||
| 		if (file_exists(LOGS . 'error.log')) { | ||||
| 			unlink(LOGS . 'error.log'); | ||||
| 		} | ||||
| 		$this->_deleteLogs($path); | ||||
| 
 | ||||
| 		$log = new FileLog(compact('path')); | ||||
| 		$log->write('warning', 'Test warning'); | ||||
| 		$this->assertTrue(file_exists($path . 'error.log')); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * test log rotation | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testRotation() { | ||||
| 		$path = TMP . 'tests' . DS; | ||||
| 		$this->_deleteLogs($path); | ||||
| 
 | ||||
| 		file_put_contents($path . 'error.log', "this text is under 35 bytes\n"); | ||||
| 		$log = new FileLog(array( | ||||
| 			'path' => $path, | ||||
| 			'size' => 35, | ||||
| 			'rotate' => 2 | ||||
| 		)); | ||||
| 		$log->write('warning', 'Test warning one'); | ||||
| 		$this->assertTrue(file_exists($path . 'error.log')); | ||||
| 
 | ||||
| 		$result = file_get_contents($path . 'error.log'); | ||||
| 		$this->assertRegExp('/Warning: Test warning one/', $result); | ||||
| 		$this->assertEquals(0, count(glob($path . 'error.log.*'))); | ||||
| 
 | ||||
| 		clearstatcache(); | ||||
| 		$log->write('warning', 'Test warning second'); | ||||
| 
 | ||||
| 		$files = glob($path . 'error.log.*'); | ||||
| 		$this->assertEquals(1, count($files)); | ||||
| 
 | ||||
| 		$result = file_get_contents($files[0]); | ||||
| 		$this->assertRegExp('/this text is under 35 bytes/', $result); | ||||
| 		$this->assertRegExp('/Warning: Test warning one/', $result); | ||||
| 
 | ||||
| 		sleep(1); | ||||
| 		clearstatcache(); | ||||
| 		$log->write('warning', 'Test warning third'); | ||||
| 
 | ||||
| 		$result = file_get_contents($path . 'error.log'); | ||||
| 		$this->assertRegExp('/Warning: Test warning third/', $result); | ||||
| 
 | ||||
| 		$files = glob($path . 'error.log.*'); | ||||
| 		$this->assertEquals(2, count($files)); | ||||
| 
 | ||||
| 		$result = file_get_contents($files[0]); | ||||
| 		$this->assertRegExp('/this text is under 35 bytes/', $result); | ||||
| 
 | ||||
| 		$result = file_get_contents($files[1]); | ||||
| 		$this->assertRegExp('/Warning: Test warning second/', $result); | ||||
| 
 | ||||
| 		file_put_contents($path . 'error.log.0000000000', "The oldest log file with over 35 bytes.\n"); | ||||
| 
 | ||||
| 		sleep(1); | ||||
| 		clearstatcache(); | ||||
| 		$log->write('warning', 'Test warning fourth'); | ||||
| 
 | ||||
| 		// rotate count reached so file count should not increase
 | ||||
| 		$files = glob($path . 'error.log.*'); | ||||
| 		$this->assertEquals(2, count($files)); | ||||
| 
 | ||||
| 		$result = file_get_contents($path . 'error.log'); | ||||
| 		$this->assertRegExp('/Warning: Test warning fourth/', $result); | ||||
| 
 | ||||
| 		$result = file_get_contents(array_pop($files)); | ||||
| 		$this->assertRegExp('/Warning: Test warning third/', $result); | ||||
| 
 | ||||
| 		$result = file_get_contents(array_pop($files)); | ||||
| 		$this->assertRegExp('/Warning: Test warning second/', $result); | ||||
| 
 | ||||
| 		file_put_contents($path . 'debug.log', "this text is just greater than 35 bytes\n"); | ||||
| 		$log = new FileLog(array( | ||||
| 			'path' => $path, | ||||
| 			'size' => 35, | ||||
| 			'rotate' => 0 | ||||
| 		)); | ||||
| 		file_put_contents($path . 'debug.log.0000000000', "The oldest log file with over 35 bytes.\n"); | ||||
| 		$log->write('debug', 'Test debug'); | ||||
| 		$this->assertTrue(file_exists($path . 'debug.log')); | ||||
| 
 | ||||
| 		$result = file_get_contents($path . 'debug.log'); | ||||
| 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Debug: Test debug/', $result); | ||||
| 		$this->assertFalse(strstr($result, 'greater than 5 bytes')); | ||||
| 		$this->assertEquals(0, count(glob($path . 'debug.log.*'))); | ||||
| 	} | ||||
| 
 | ||||
| 	public function testMaskSetting() { | ||||
| 		if (DS === '\\') { | ||||
| 			$this->markTestSkipped('File permission testing does not work on Windows.'); | ||||
| 		} | ||||
| 
 | ||||
| 		$path = TMP . 'tests' . DS; | ||||
| 		$this->_deleteLogs($path); | ||||
| 
 | ||||
| 		$log = new FileLog(array('path' => $path, 'mask' => 0666)); | ||||
| 		$log->write('warning', 'Test warning one'); | ||||
| 		$result = substr(sprintf('%o', fileperms($path . 'error.log')), -4); | ||||
| 		$expected = '0666'; | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 		unlink($path . 'error.log'); | ||||
| 
 | ||||
| 		$log = new FileLog(array('path' => $path, 'mask' => 0644)); | ||||
| 		$log->write('warning', 'Test warning two'); | ||||
| 		$result = substr(sprintf('%o', fileperms($path . 'error.log')), -4); | ||||
| 		$expected = '0644'; | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 		unlink($path . 'error.log'); | ||||
| 
 | ||||
| 		$log = new FileLog(array('path' => $path, 'mask' => 0640)); | ||||
| 		$log->write('warning', 'Test warning three'); | ||||
| 		$result = substr(sprintf('%o', fileperms($path . 'error.log')), -4); | ||||
| 		$expected = '0640'; | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 		unlink($path . 'error.log'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * helper function to clears all log files in specified directory | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	protected function _deleteLogs($dir) { | ||||
| 		$files = array_merge(glob($dir . '*.log'), glob($dir . '*.log.*')); | ||||
| 		foreach ($files as $file) { | ||||
| 			unlink($file); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko