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,20 +2,20 @@
|
|||
/**
|
||||
* SetTest 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.Utility
|
||||
* @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('Set', 'Utility');
|
||||
App::uses('Model', 'Model');
|
||||
|
||||
|
|
@ -182,7 +182,7 @@ class SetTest extends CakeTestCase {
|
|||
$expected = array('users' => array('lisa' => array('id' => 5, 'pw' => 'you-will-never-guess', 'age' => 25, 'pet' => 'dog')), 'cakephp', 'ice-cream', 'chocolate');
|
||||
$this->assertEquals($expected, Set::merge($a, $b, $c));
|
||||
|
||||
$this->assertEquals(Set::merge($a, $b, array(), $c), $expected);
|
||||
$this->assertEquals($expected, Set::merge($a, $b, array(), $c));
|
||||
|
||||
$r = Set::merge($a, $b, $c);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
|
@ -230,10 +230,10 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$a = array(
|
||||
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
|
||||
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
|
||||
1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
|
||||
);
|
||||
$b = array(
|
||||
0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
|
||||
0 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
|
||||
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
|
||||
|
||||
);
|
||||
|
|
@ -242,10 +242,10 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$b = array(
|
||||
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
|
||||
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
|
||||
1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
|
||||
);
|
||||
$a = array(
|
||||
0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
|
||||
0 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
|
||||
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
|
||||
|
||||
);
|
||||
|
|
@ -254,42 +254,42 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$a = array(
|
||||
0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
|
||||
1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
|
||||
2 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob')))
|
||||
1 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay'))),
|
||||
2 => array('Person' => array('name' => 'Adam'), 'Friend' => array(array('name' => 'Bob')))
|
||||
);
|
||||
$b = array(
|
||||
0 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob'))),
|
||||
0 => array('Person' => array('name' => 'Adam'), 'Friend' => array(array('name' => 'Bob'))),
|
||||
1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
|
||||
2 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
|
||||
2 => array('Person' => array('name' => 'Tracy'), 'Friend' => array(array('name' => 'Lindsay')))
|
||||
);
|
||||
$a = Set::sort($a, '{n}.Person.name', 'asc');
|
||||
$this->assertEquals($a, $b);
|
||||
|
||||
$a = array(
|
||||
array(7,6,4),
|
||||
array(3,4,5),
|
||||
array(3,2,1),
|
||||
array(7, 6, 4),
|
||||
array(3, 4, 5),
|
||||
array(3, 2, 1),
|
||||
);
|
||||
|
||||
$b = array(
|
||||
array(3,2,1),
|
||||
array(3,4,5),
|
||||
array(7,6,4),
|
||||
array(3, 2, 1),
|
||||
array(3, 4, 5),
|
||||
array(7, 6, 4),
|
||||
);
|
||||
|
||||
$a = Set::sort($a, '{n}.{n}', 'asc');
|
||||
$this->assertEquals($a, $b);
|
||||
|
||||
$a = array(
|
||||
array(7,6,4),
|
||||
array(3,4,5),
|
||||
array(3,2,array(1,1,1)),
|
||||
array(7, 6, 4),
|
||||
array(3, 4, 5),
|
||||
array(3, 2, array(1, 1, 1)),
|
||||
);
|
||||
|
||||
$b = array(
|
||||
array(3,2,array(1,1,1)),
|
||||
array(3,4,5),
|
||||
array(7,6,4),
|
||||
array(3, 2, array(1, 1, 1)),
|
||||
array(3, 4, 5),
|
||||
array(7, 6, 4),
|
||||
);
|
||||
|
||||
$a = Set::sort($a, '{n}', 'asc');
|
||||
|
|
@ -878,11 +878,11 @@ class SetTest extends CakeTestCase {
|
|||
)
|
||||
)
|
||||
);
|
||||
$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x-zip-compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
|
||||
$expected = array(array('name' => 'zipfile2.zip', 'type' => 'application/x-zip-compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784'));
|
||||
$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
||||
$expected = array(array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'));
|
||||
$expected = array(array('name' => 'zipfile.zip', 'type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'));
|
||||
$r = Set::extract('/file/.[type=application/zip]', $f);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
||||
|
|
@ -915,13 +915,13 @@ class SetTest extends CakeTestCase {
|
|||
)
|
||||
)
|
||||
);
|
||||
$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
|
||||
$expected = array(array('name' => 'zipfile2.zip', 'type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784'));
|
||||
$r = Set::extract('/file/.[type=application/x zip compressed]', $f);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
||||
$expected = array(
|
||||
array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'),
|
||||
array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784')
|
||||
array('name' => 'zipfile.zip', 'type' => 'application/zip', 'tmp_name' => '/tmp/php178.tmp', 'error' => 0, 'size' => '564647'),
|
||||
array('name' => 'zipfile2.zip', 'type' => 'application/x zip compressed', 'tmp_name' => '/tmp/php179.tmp', 'error' => 0, 'size' => '354784')
|
||||
);
|
||||
$r = Set::extract('/file/.[tmp_name=/tmp\/php17/]', $f);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
|
@ -1108,7 +1108,7 @@ class SetTest extends CakeTestCase {
|
|||
)
|
||||
);
|
||||
|
||||
$expected = array(7,2,1);
|
||||
$expected = array(7, 2, 1);
|
||||
$r = Set::extract('/CallType[name=Internal Voice]/../x/hour', $multiple);
|
||||
$this->assertEquals($expected, $r);
|
||||
|
||||
|
|
@ -1221,21 +1221,21 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$nonSequential = array(
|
||||
'User' => array(
|
||||
0 => array('id' => 1),
|
||||
2 => array('id' => 2),
|
||||
6 => array('id' => 3),
|
||||
9 => array('id' => 4),
|
||||
3 => array('id' => 5),
|
||||
0 => array('id' => 1),
|
||||
2 => array('id' => 2),
|
||||
6 => array('id' => 3),
|
||||
9 => array('id' => 4),
|
||||
3 => array('id' => 5),
|
||||
),
|
||||
);
|
||||
|
||||
$nonZero = array(
|
||||
'User' => array(
|
||||
2 => array('id' => 1),
|
||||
4 => array('id' => 2),
|
||||
6 => array('id' => 3),
|
||||
9 => array('id' => 4),
|
||||
3 => array('id' => 5),
|
||||
2 => array('id' => 1),
|
||||
4 => array('id' => 2),
|
||||
6 => array('id' => 3),
|
||||
9 => array('id' => 4),
|
||||
3 => array('id' => 5),
|
||||
),
|
||||
);
|
||||
|
||||
|
|
@ -1352,6 +1352,8 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
/**
|
||||
* Test that extract() + matching can hit null things.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testExtractMatchesNull() {
|
||||
$data = array(
|
||||
|
|
@ -1558,7 +1560,7 @@ class SetTest extends CakeTestCase {
|
|||
0 => array('name' => 'zero')
|
||||
);
|
||||
$result = Set::extract($a, '{s}.name');
|
||||
$expected = array('page','fruit');
|
||||
$expected = array('page', 'fruit');
|
||||
$this->assertEquals($expected, $result);
|
||||
|
||||
$a = array(
|
||||
|
|
@ -1693,7 +1695,7 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$result = Set::remove($a, 'files');
|
||||
$expected = array(
|
||||
'pages' => array('name' => 'page')
|
||||
'pages' => array('name' => 'page')
|
||||
);
|
||||
$this->assertEquals($expected, $result);
|
||||
}
|
||||
|
|
@ -1733,7 +1735,7 @@ class SetTest extends CakeTestCase {
|
|||
$this->assertFalse(Set::check($set, 'Session Test'));
|
||||
|
||||
$expected = array('Session Test' => array('Test Case' => 'test'));
|
||||
$this->assertEquals(Set::insert(array(), 'Session Test.Test Case', "test"), $expected);
|
||||
$this->assertEquals($expected, Set::insert(array(), 'Session Test.Test Case', "test"));
|
||||
$this->assertTrue(Set::check($expected, 'Session Test.Test Case'));
|
||||
}
|
||||
|
||||
|
|
@ -1854,11 +1856,11 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$a = array(
|
||||
array('User' => array('id' => 2, 'group_id' => 1,
|
||||
'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))),
|
||||
'Data' => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'))),
|
||||
array('User' => array('id' => 14, 'group_id' => 2,
|
||||
'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
|
||||
array('User' => array('id' => 25, 'group_id' => 1,
|
||||
'Data' => array('user' => 'gwoo','name' => 'The Gwoo'))));
|
||||
'Data' => array('user' => 'gwoo', 'name' => 'The Gwoo'))));
|
||||
$result = Set::combine($a, '{n}.User.id');
|
||||
$expected = array(2 => null, 14 => null, 25 => null);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
|
@ -1869,9 +1871,9 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$result = Set::combine($a, '{n}.User.id', '{n}.User.Data');
|
||||
$expected = array(
|
||||
2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
|
||||
14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters'),
|
||||
25 => array('user' => 'gwoo', 'name' => 'The Gwoo'));
|
||||
2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
|
||||
14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters'),
|
||||
25 => array('user' => 'gwoo', 'name' => 'The Gwoo'));
|
||||
$this->assertEquals($expected, $result);
|
||||
|
||||
$result = Set::combine($a, '{n}.User.id', '{n}.User.Data.name');
|
||||
|
|
@ -1959,11 +1961,11 @@ class SetTest extends CakeTestCase {
|
|||
$b = new stdClass();
|
||||
$b->users = array(
|
||||
array('User' => array('id' => 2, 'group_id' => 1,
|
||||
'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))),
|
||||
'Data' => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'))),
|
||||
array('User' => array('id' => 14, 'group_id' => 2,
|
||||
'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
|
||||
array('User' => array('id' => 25, 'group_id' => 1,
|
||||
'Data' => array('user' => 'gwoo','name' => 'The Gwoo'))));
|
||||
'Data' => array('user' => 'gwoo', 'name' => 'The Gwoo'))));
|
||||
$result = Set::combine($b, 'users.{n}.User.id');
|
||||
$expected = array(2 => null, 14 => null, 25 => null);
|
||||
$this->assertEquals($expected, $result);
|
||||
|
|
@ -2030,7 +2032,7 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$expected = array(
|
||||
'Array1' => array(
|
||||
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4',
|
||||
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3', 'Array1Data4' => 'Array1Data4 value 4',
|
||||
'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
|
||||
'string' => 1,
|
||||
'another' => 'string',
|
||||
|
|
@ -2053,7 +2055,7 @@ class SetTest extends CakeTestCase {
|
|||
|
||||
$expected = array(
|
||||
'Array1' => array(
|
||||
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4',
|
||||
'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3', 'Array1Data4' => 'Array1Data4 value 4',
|
||||
'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
|
||||
'string' => 1,
|
||||
'another' => 'string',
|
||||
|
|
@ -2355,7 +2357,7 @@ class SetTest extends CakeTestCase {
|
|||
'Content-Length' => "50210",
|
||||
),
|
||||
'meta' => array(
|
||||
'keywords' => array('testing','tests'),
|
||||
'keywords' => array('testing', 'tests'),
|
||||
'description' => 'describe me',
|
||||
),
|
||||
'get_vars' => '',
|
||||
|
|
@ -2382,7 +2384,7 @@ class SetTest extends CakeTestCase {
|
|||
'Content-Length' => "50210",
|
||||
),
|
||||
'meta' => array(
|
||||
'keywords' => array('testing','tests'),
|
||||
'keywords' => array('testing', 'tests'),
|
||||
'description' => 'describe me',
|
||||
),
|
||||
'get_vars' => '',
|
||||
|
|
@ -2441,8 +2443,8 @@ class SetTest extends CakeTestCase {
|
|||
$expected->hash = '68a9f053b19526d08e36c6a9ad150737933816a5';
|
||||
$expected->get_vars = '';
|
||||
$expected->redirect = '';
|
||||
$expected->created = "1195055503";
|
||||
$expected->updated = "1195055503";
|
||||
$expected->created = '1195055503';
|
||||
$expected->updated = '1195055503';
|
||||
// @codingStandardsIgnoreEnd
|
||||
$this->assertEquals($expected, $mapped[1]);
|
||||
|
||||
|
|
@ -2468,8 +2470,8 @@ class SetTest extends CakeTestCase {
|
|||
array(
|
||||
'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
|
||||
'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'),
|
||||
)
|
||||
, array(
|
||||
),
|
||||
array(
|
||||
'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
|
||||
'Author' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31', 'test' => 'working'),
|
||||
)
|
||||
|
|
@ -2490,9 +2492,9 @@ class SetTest extends CakeTestCase {
|
|||
$expected->Author->id = '1';
|
||||
$expected->Author->user = 'mariano';
|
||||
$expected->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
|
||||
$expected->Author->created = "2007-03-17 01:16:23";
|
||||
$expected->Author->updated = "2007-03-17 01:18:31";
|
||||
$expected->Author->test = "working";
|
||||
$expected->Author->created = '2007-03-17 01:16:23';
|
||||
$expected->Author->updated = '2007-03-17 01:18:31';
|
||||
$expected->Author->test = 'working';
|
||||
$expected->Author->_name_ = 'Author';
|
||||
|
||||
$expected2 = new stdClass;
|
||||
|
|
@ -2509,9 +2511,9 @@ class SetTest extends CakeTestCase {
|
|||
$expected2->Author->id = '3';
|
||||
$expected2->Author->user = 'larry';
|
||||
$expected2->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
|
||||
$expected2->Author->created = "2007-03-17 01:20:23";
|
||||
$expected2->Author->updated = "2007-03-17 01:22:31";
|
||||
$expected2->Author->test = "working";
|
||||
$expected2->Author->created = '2007-03-17 01:20:23';
|
||||
$expected2->Author->updated = '2007-03-17 01:22:31';
|
||||
$expected2->Author->test = 'working';
|
||||
$expected2->Author->_name_ = 'Author';
|
||||
// @codingStandardsIgnoreEnd
|
||||
|
||||
|
|
@ -2544,7 +2546,7 @@ class SetTest extends CakeTestCase {
|
|||
$expected->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
|
||||
$expected->Author->created = "2007-03-17 01:16:23";
|
||||
$expected->Author->updated = "2007-03-17 01:18:31";
|
||||
$expected->Author->test = "working";
|
||||
$expected->Author->test = 'working';
|
||||
$expected->Author->_name_ = 'Author';
|
||||
// @codingStandardsIgnoreEnd
|
||||
$this->assertEquals($expected, $result);
|
||||
|
|
@ -2761,7 +2763,6 @@ class SetTest extends CakeTestCase {
|
|||
/**
|
||||
* testSetApply method
|
||||
* @return void
|
||||
*
|
||||
*/
|
||||
public function testApply() {
|
||||
$data = array(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue