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,20 +2,20 @@ | |||
| /** | ||||
|  * AclComponentTest 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.Controller.Component | ||||
|  * @since         CakePHP(tm) v 1.2.0.5435 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('AclComponent', 'Controller/Component'); | ||||
| class_exists('AclComponent'); | ||||
| 
 | ||||
|  | @ -61,7 +61,7 @@ class AclComponentTest extends CakeTestCase { | |||
| 	public function testConstrutorException() { | ||||
| 		Configure::write('Acl.classname', 'AclClassNameThatDoesNotExist'); | ||||
| 		$Collection = new ComponentCollection(); | ||||
| 		$acl = new AclComponent($Collection); | ||||
| 		new AclComponent($Collection); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -70,15 +70,15 @@ class AclComponentTest extends CakeTestCase { | |||
|  * @return void | ||||
|  */ | ||||
| 	public function testAdapter() { | ||||
| 		$implementation = new MockAclImplementation(); | ||||
| 		$implementation->expects($this->once())->method('initialize')->with($this->Acl); | ||||
| 		$this->assertNull($this->Acl->adapter($implementation)); | ||||
| 		$Adapter = $this->getMock('AclInterface'); | ||||
| 		$Adapter->expects($this->once())->method('initialize')->with($this->Acl); | ||||
| 
 | ||||
| 		$this->assertEquals($this->Acl->adapter(), $implementation, 'Returned object is different %s'); | ||||
| 		$this->assertNull($this->Acl->adapter($Adapter)); | ||||
| 		$this->assertEquals($this->Acl->adapter(), $Adapter, 'Returned object is different %s'); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * test that adapter() whines when the class is not an AclBase | ||||
|  * test that adapter() whines when the class does not implement AclInterface | ||||
|  * | ||||
|  * @expectedException CakeException | ||||
|  * @return void | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko