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
				
			
		|  | @ -4,19 +4,18 @@ | |||
|  * | ||||
|  * Test Case for view generation shell task | ||||
|  * | ||||
|  * PHP 5 | ||||
|  * | ||||
|  * CakePHP : Rapid Development Framework (http://cakephp.org) | ||||
|  * Copyright 2005-2012, Cake Software Foundation, Inc. | ||||
|  * 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. | ||||
|  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) | ||||
|  * @link          http://cakephp.org CakePHP Project | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  * @since         CakePHP v 1.2.0.7726 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('ShellDispatcher', 'Console'); | ||||
|  | @ -30,22 +29,15 @@ App::uses('ProjectTask', 'Console/Command/Task'); | |||
| App::uses('DbConfigTask', 'Console/Command/Task'); | ||||
| App::uses('Model', 'Model'); | ||||
| App::uses('Controller', 'Controller'); | ||||
| App::uses('AppController', 'Controller'); | ||||
| 
 | ||||
| /** | ||||
|  * Test View Task Comment Model | ||||
|  * | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  */ | ||||
| class ViewTaskComment extends Model { | ||||
| 
 | ||||
| /** | ||||
|  * Model name | ||||
|  * | ||||
|  * @var string | ||||
|  */ | ||||
| 	public $name = 'ViewTaskComment'; | ||||
| 
 | ||||
| /** | ||||
|  * Table name | ||||
|  * | ||||
|  | @ -70,17 +62,9 @@ class ViewTaskComment extends Model { | |||
|  * Test View Task Article Model | ||||
|  * | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  */ | ||||
| class ViewTaskArticle extends Model { | ||||
| 
 | ||||
| /** | ||||
|  * Model name | ||||
|  * | ||||
|  * @var string | ||||
|  */ | ||||
| 	public $name = 'ViewTaskArticle'; | ||||
| 
 | ||||
| /** | ||||
|  * Table name | ||||
|  * | ||||
|  | @ -93,17 +77,9 @@ class ViewTaskArticle extends Model { | |||
|  * Test View Task Comments Controller | ||||
|  * | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  */ | ||||
| class ViewTaskCommentsController extends Controller { | ||||
| 
 | ||||
| /** | ||||
|  * Controller name | ||||
|  * | ||||
|  * @var string | ||||
|  */ | ||||
| 	public $name = 'ViewTaskComments'; | ||||
| 
 | ||||
| /** | ||||
|  * Testing public controller action | ||||
|  * | ||||
|  | @ -126,17 +102,9 @@ class ViewTaskCommentsController extends Controller { | |||
|  * Test View Task Articles Controller | ||||
|  * | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  * @package       Cake.Test.Case.Console.Command.Task | ||||
|  */ | ||||
| class ViewTaskArticlesController extends Controller { | ||||
| 
 | ||||
| /** | ||||
|  * Controller name | ||||
|  * | ||||
|  * @var string | ||||
|  */ | ||||
| 	public $name = 'ViewTaskArticles'; | ||||
| 
 | ||||
| /** | ||||
|  * Test public controller action | ||||
|  * | ||||
|  | @ -355,10 +323,11 @@ class ViewTaskTest extends CakeTestCase { | |||
| 	public function testBakeIndex() { | ||||
| 		$this->Task->controllerName = 'ViewTaskComments'; | ||||
| 
 | ||||
| 		$expected = file_get_contents(CAKE . 'Test' . DS . 'bake_compare' . DS . 'View' . DS . 'index.ctp'); | ||||
| 		$this->Task->expects($this->at(0))->method('createFile') | ||||
| 			->with( | ||||
| 				TMP . 'ViewTaskComments' . DS . 'index.ctp', | ||||
| 				$this->stringContains("\$viewTaskComment['Article']['title']") | ||||
| 				$expected | ||||
| 			); | ||||
| 		$this->Task->bake('index', true); | ||||
| 	} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko