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:
Brm Ko
parent
5a580df460
commit
235a541597
793 changed files with 60746 additions and 23753 deletions
|
|
@ -2,19 +2,18 @@
|
|||
/**
|
||||
* ObjectCollectionTest file
|
||||
*
|
||||
* PHP 5
|
||||
*
|
||||
* 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://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
|
||||
* @package Cake.Test.Case.Utility
|
||||
* @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('ObjectCollection', 'Utility');
|
||||
|
|
@ -28,8 +27,8 @@ class GenericObject {
|
|||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param GenericObjectCollection $collection
|
||||
* @param array $settings
|
||||
* @param GenericObjectCollection $collection A collection.
|
||||
* @param array $settings Settings.
|
||||
*/
|
||||
public function __construct(GenericObjectCollection $collection, $settings = array()) {
|
||||
$this->_Collection = $collection;
|
||||
|
|
@ -39,12 +38,14 @@ class GenericObject {
|
|||
}
|
||||
|
||||
/**
|
||||
* First Extension of Generic Object
|
||||
* First Extension of Generic CakeObject
|
||||
*/
|
||||
class FirstGenericObject extends GenericObject {
|
||||
|
||||
/**
|
||||
* A generic callback
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function callback() {
|
||||
}
|
||||
|
|
@ -52,20 +53,26 @@ class FirstGenericObject extends GenericObject {
|
|||
}
|
||||
|
||||
/**
|
||||
* Second Extension of Generic Object
|
||||
* Second Extension of Generic CakeObject
|
||||
*/
|
||||
class SecondGenericObject extends GenericObject {
|
||||
|
||||
/**
|
||||
* @return void
|
||||
*/
|
||||
public function callback() {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Third Extension of Generic Object
|
||||
* Third Extension of Generic CakeObject
|
||||
*/
|
||||
class ThirdGenericObject extends GenericObject {
|
||||
|
||||
/**
|
||||
* @return void
|
||||
*/
|
||||
public function callback() {
|
||||
}
|
||||
|
||||
|
|
@ -79,12 +86,12 @@ class GenericObjectCollection extends ObjectCollection {
|
|||
/**
|
||||
* Loads a generic object
|
||||
*
|
||||
* @param string $object Object name
|
||||
* @param string $object CakeObject name
|
||||
* @param array $settings Settings array
|
||||
* @return array List of loaded objects
|
||||
*/
|
||||
public function load($object, $settings = array()) {
|
||||
list($plugin, $name) = pluginSplit($object);
|
||||
list(, $name) = pluginSplit($object);
|
||||
if (isset($this->_loaded[$name])) {
|
||||
return $this->_loaded[$name];
|
||||
}
|
||||
|
|
@ -97,6 +104,27 @@ class GenericObjectCollection extends ObjectCollection {
|
|||
return $this->_loaded[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper method for adding/overwriting enabled objects including
|
||||
* settings
|
||||
*
|
||||
* @param string $name Name of the object
|
||||
* @param CakeObject $object The object to use
|
||||
* @param array $settings Settings to apply for the object
|
||||
* @return array Loaded objects
|
||||
*/
|
||||
public function setObject($name, $object, $settings = array()) {
|
||||
$this->_loaded[$name] = $object;
|
||||
if (isset($settings['priority'])) {
|
||||
$this->setPriority($name, $settings['priority']);
|
||||
}
|
||||
$enable = isset($settings['enabled']) ? $settings['enabled'] : true;
|
||||
if ($enable === true) {
|
||||
$this->enable($name);
|
||||
}
|
||||
return $this->_loaded;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class ObjectCollectionTest extends CakeTestCase {
|
||||
|
|
@ -131,8 +159,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
$this->assertInstanceOf('FirstGenericObject', $result);
|
||||
$this->assertInstanceOf('FirstGenericObject', $this->Objects->First);
|
||||
|
||||
$result = $this->Objects->attached();
|
||||
$this->assertEquals(array('First'), $result, 'attached() results are wrong.');
|
||||
$result = $this->Objects->loaded();
|
||||
$this->assertEquals(array('First'), $result, 'loaded() results are wrong.');
|
||||
|
||||
$this->assertTrue($this->Objects->enabled('First'));
|
||||
|
||||
|
|
@ -149,17 +177,17 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
$this->Objects->load('First');
|
||||
$this->Objects->load('Second');
|
||||
|
||||
$result = $this->Objects->attached();
|
||||
$result = $this->Objects->loaded();
|
||||
$this->assertEquals(array('First', 'Second'), $result, 'loaded objects are wrong');
|
||||
|
||||
$this->Objects->unload('First');
|
||||
$this->assertFalse(isset($this->Objects->First));
|
||||
$this->assertTrue(isset($this->Objects->Second));
|
||||
|
||||
$result = $this->Objects->attached();
|
||||
$result = $this->Objects->loaded();
|
||||
$this->assertEquals(array('Second'), $result, 'loaded objects are wrong');
|
||||
|
||||
$result = $this->Objects->enabled();
|
||||
$result = $this->Objects->loaded();
|
||||
$this->assertEquals(array('Second'), $result, 'enabled objects are wrong');
|
||||
}
|
||||
|
||||
|
|
@ -171,7 +199,7 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
public function testSet() {
|
||||
$this->Objects->load('First');
|
||||
|
||||
$result = $this->Objects->attached();
|
||||
$result = $this->Objects->loaded();
|
||||
$this->assertEquals(array('First'), $result, 'loaded objects are wrong');
|
||||
|
||||
$result = $this->Objects->set('First', new SecondGenericObject($this->Objects));
|
||||
|
|
@ -189,15 +217,9 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
* @return void
|
||||
*/
|
||||
protected function _makeMockClasses() {
|
||||
if (!class_exists('TriggerMockFirstGenericObject')) {
|
||||
$this->getMock('FirstGenericObject', array(), array(), 'TriggerMockFirstGenericObject', false);
|
||||
}
|
||||
if (!class_exists('TriggerMockSecondGenericObject')) {
|
||||
$this->getMock('SecondGenericObject', array(), array(), 'TriggerMockSecondGenericObject', false);
|
||||
}
|
||||
if (!class_exists('TriggerMockThirdGenericObject')) {
|
||||
$this->getMock('ThirdGenericObject', array(), array(), 'TriggerMockThirdGenericObject', false);
|
||||
}
|
||||
$this->FirstGenericObject = $this->getMock('FirstGenericObject', array(), array(), '', false);
|
||||
$this->SecondGenericObject = $this->getMock('SecondGenericObject', array(), array(), '', false);
|
||||
$this->ThirdGenericObject = $this->getMock('ThirdGenericObject', array(), array(), '', false);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -207,11 +229,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTrigger() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -230,11 +249,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerWithDisabledObjects() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject, array('enabled' => false));
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -243,8 +259,6 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
->method('callback')
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$this->Objects->disable('TriggerMockSecond');
|
||||
|
||||
$this->assertTrue($this->Objects->trigger('callback', array()));
|
||||
}
|
||||
|
||||
|
|
@ -255,11 +269,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerWithCollectReturn() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -283,11 +294,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerWithBreak() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -310,11 +318,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerWithModParams() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -342,11 +347,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerModParamsInvalidIndex() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->never())
|
||||
->method('callback');
|
||||
|
|
@ -354,7 +356,7 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
$this->Objects->TriggerMockSecond->expects($this->never())
|
||||
->method('callback');
|
||||
|
||||
$result = $this->Objects->trigger(
|
||||
$this->Objects->trigger(
|
||||
'callback',
|
||||
array(array('value')),
|
||||
array('modParams' => 2)
|
||||
|
|
@ -368,11 +370,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerModParamsNullIgnored() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
|
|
@ -399,11 +398,8 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
*/
|
||||
public function testTriggerPriority() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond', array('priority' => 5));
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject, array('priority' => 5));
|
||||
|
||||
$this->Objects->TriggerMockFirst->expects($this->any())
|
||||
->method('callback')
|
||||
|
|
@ -419,8 +415,7 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
||||
$this->Objects->load('TriggerMockThird', array('priority' => 7));
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockThird;
|
||||
$this->Objects->setObject('TriggerMockThird', $this->ThirdGenericObject, array('priority' => 7));
|
||||
$this->Objects->TriggerMockThird->expects($this->any())
|
||||
->method('callback')
|
||||
->will($this->returnValue('3rd'));
|
||||
|
|
@ -540,16 +535,14 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
* tests that passing an instance of CakeEvent to trigger will prepend the subject to the list of arguments
|
||||
*
|
||||
* @return void
|
||||
* @triggers callback $subjectClass, array('first argument')
|
||||
*/
|
||||
public function testDispatchEventWithSubject() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
|
||||
$subjectClass = new Object();
|
||||
$subjectClass = new CakeObject();
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
->with($subjectClass, 'first argument')
|
||||
|
|
@ -568,16 +561,14 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
* will NOT prepend the subject to the list of arguments
|
||||
*
|
||||
* @return void
|
||||
* @triggers callback $subjectClass, array('first argument')
|
||||
*/
|
||||
public function testDispatchEventNoSubject() {
|
||||
$this->_makeMockClasses();
|
||||
$this->Objects->load('TriggerMockFirst');
|
||||
$this->Objects->load('TriggerMockSecond');
|
||||
$this->Objects->setObject('TriggerMockFirst', $this->FirstGenericObject);
|
||||
$this->Objects->setObject('TriggerMockSecond', $this->SecondGenericObject);
|
||||
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockFirst;
|
||||
$this->mockObjects[] = $this->Objects->TriggerMockSecond;
|
||||
|
||||
$subjectClass = new Object();
|
||||
$subjectClass = new CakeObject();
|
||||
$this->Objects->TriggerMockFirst->expects($this->once())
|
||||
->method('callback')
|
||||
->with('first argument')
|
||||
|
|
@ -592,4 +583,33 @@ class ObjectCollectionTest extends CakeTestCase {
|
|||
$this->assertTrue($this->Objects->trigger($event));
|
||||
}
|
||||
|
||||
/**
|
||||
* test that the various methods ignore plugin prefixes
|
||||
*
|
||||
* plugin prefixes should be removed consistently as load() will
|
||||
* remove them. Furthermore the __get() method does not support
|
||||
* names with '.' in them.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testPluginPrefixes() {
|
||||
$this->Objects->load('TestPlugin.First');
|
||||
$this->assertTrue($this->Objects->loaded('First'));
|
||||
$this->assertTrue($this->Objects->loaded('TestPlugin.First'));
|
||||
|
||||
$this->assertTrue($this->Objects->enabled('First'));
|
||||
$this->assertTrue($this->Objects->enabled('TestPlugin.First'));
|
||||
|
||||
$this->assertNull($this->Objects->disable('TestPlugin.First'));
|
||||
$this->assertFalse($this->Objects->enabled('First'));
|
||||
$this->assertFalse($this->Objects->enabled('TestPlugin.First'));
|
||||
|
||||
$this->assertNull($this->Objects->enable('TestPlugin.First'));
|
||||
$this->assertTrue($this->Objects->enabled('First'));
|
||||
$this->assertTrue($this->Objects->enabled('TestPlugin.First'));
|
||||
$this->Objects->setPriority('TestPlugin.First', 1000);
|
||||
|
||||
$result = $this->Objects->prioritize();
|
||||
$this->assertEquals(1000, $result['First'][0]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue