mirror of
				https://github.com/brmlab/brmsklad.git
				synced 2025-10-31 00:03: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
				
			
		|  | @ -5,21 +5,27 @@ | |||
|  * PHP5 | ||||
|  * | ||||
|  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org) | ||||
|  * 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://cakephp.org CakePHP(tm) Project | ||||
|  * @package       Cake.Test.Case.TestSuite | ||||
|  * @since         CakePHP(tm) v 2.0 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('HtmlCoverageReport', 'TestSuite/Coverage'); | ||||
| App::uses('CakeBaseReporter', 'TestSuite/Reporter'); | ||||
| 
 | ||||
| /** | ||||
|  * HtmlCoverageReportTest | ||||
|  * | ||||
|  * @package       Cake.Test.Case.TestSuite | ||||
|  */ | ||||
| class HtmlCoverageReportTest extends CakeTestCase { | ||||
| 
 | ||||
| /** | ||||
|  | @ -113,7 +119,7 @@ class HtmlCoverageReportTest extends CakeTestCase { | |||
| 		); | ||||
| 		$result = $this->Coverage->generateDiff('myfile.php', $file, $coverage); | ||||
| 		$this->assertRegExp('/myfile\.php Code coverage\: \d+\.?\d*\%/', $result); | ||||
| 		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php"/', $result); | ||||
| 		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php-' . md5('myfile.php') . '"/', $result); | ||||
| 		$this->assertRegExp('/<pre>/', $result); | ||||
| 		foreach ($file as $i => $line) { | ||||
| 			$this->assertTrue(strpos($line, $result) !== 0, 'Content is missing ' . $i); | ||||
|  | @ -121,7 +127,7 @@ class HtmlCoverageReportTest extends CakeTestCase { | |||
| 			if (in_array($i + 1, array(5, 9, 2))) { | ||||
| 				$class = 'uncovered'; | ||||
| 			} | ||||
| 			if ($i + 1 == 2) { | ||||
| 			if ($i + 1 === 2) { | ||||
| 				$class .= ' dead'; | ||||
| 			} | ||||
| 			$this->assertTrue(strpos($class, $result) !== 0, 'Class name is wrong ' . $i); | ||||
|  | @ -161,7 +167,7 @@ class HtmlCoverageReportTest extends CakeTestCase { | |||
| 
 | ||||
| 		$result = $this->Coverage->generateDiff('myfile.php', $file, $coverage); | ||||
| 		$this->assertRegExp('/myfile\.php Code coverage\: \d+\.?\d*\%/', $result); | ||||
| 		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php"/', $result); | ||||
| 		$this->assertRegExp('/<div class="code-coverage-results" id\="coverage\-myfile\.php-' . md5('myfile.php') . '"/', $result); | ||||
| 		$this->assertRegExp('/<pre>/', $result); | ||||
| 		foreach ($file as $i => $line) { | ||||
| 			$this->assertTrue(strpos($line, $result) !== 0, 'Content is missing ' . $i); | ||||
|  | @ -169,7 +175,7 @@ class HtmlCoverageReportTest extends CakeTestCase { | |||
| 			if (in_array($i + 1, array(5, 9, 2))) { | ||||
| 				$class = 'uncovered'; | ||||
| 			} | ||||
| 			if ($i + 1 == 2) { | ||||
| 			if ($i + 1 === 2) { | ||||
| 				$class .= ' dead'; | ||||
| 			} | ||||
| 			$this->assertTrue(strpos($class, $result) !== 0, 'Class name is wrong ' . $i); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko