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 @@ | |||
| /** | ||||
|  * CacheHelperTest 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.View.Helper | ||||
|  * @since         CakePHP(tm) v 1.2.0.4206 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('Controller', 'Controller'); | ||||
|  | @ -151,7 +150,7 @@ class CacheHelperTest extends CakeTestCase { | |||
| 		$this->Controller->action = 'view'; | ||||
| 
 | ||||
| 		$View = new View($this->Controller); | ||||
| 		$result = $View->render('index'); | ||||
| 		$View->render('index'); | ||||
| 
 | ||||
| 		$filename = CACHE . 'views' . DS . 'posts_view_風街ろまん.php'; | ||||
| 		$this->assertTrue(file_exists($filename)); | ||||
|  | @ -338,7 +337,7 @@ class CacheHelperTest extends CakeTestCase { | |||
| 		$this->Controller->cache_parsing(); | ||||
| 
 | ||||
| 		$View = new View($this->Controller); | ||||
| 		$result = $View->render('index'); | ||||
| 		$View->render('index'); | ||||
| 
 | ||||
| 		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php'; | ||||
| 		$this->assertTrue(file_exists($filename)); | ||||
|  | @ -514,10 +513,10 @@ class CacheHelperTest extends CakeTestCase { | |||
|  * | ||||
|  * This test verifies view cache is created correctly when the app name is contained in part of the controller name. | ||||
|  * (webapp Name) base name is 'cache' controller is 'cacheTest' action is 'cache_name' | ||||
|  * apps url would look something like http://localhost/cache/cacheTest/cache_name | ||||
|  * apps URL would look something like http://localhost/cache/cacheTest/cache_name | ||||
|  * | ||||
|  * @return void | ||||
|  **/ | ||||
|  */ | ||||
| 	public function testCacheBaseNameControllerName() { | ||||
| 		$this->Controller->cache_parsing(); | ||||
| 		$this->Controller->cacheAction = array( | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko