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 @@ | |||
| /** | ||||
|  * AclShell Test file | ||||
|  * | ||||
|  * 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 | ||||
|  * @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('ConsoleOutput', 'Console'); | ||||
|  | @ -115,6 +114,7 @@ class AclShellTest extends CakeTestCase { | |||
| 	public function testParsingModelAndForeignKey() { | ||||
| 		$result = $this->Task->parseIdentifier('Model.foreignKey'); | ||||
| 		$expected = array('model' => 'Model', 'foreign_key' => 'foreignKey'); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 
 | ||||
| 		$result = $this->Task->parseIdentifier('mySuperUser'); | ||||
| 		$this->assertEquals('mySuperUser', $result); | ||||
|  | @ -253,7 +253,7 @@ class AclShellTest extends CakeTestCase { | |||
| 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create'); | ||||
| 		$this->Task->check(); | ||||
| 
 | ||||
| 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', '*'); | ||||
| 		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'delete'); | ||||
| 		$this->Task->check(); | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko