Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yii2bootstrap
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
yii2bootstrap
Commits
0005b07d
Commit
0005b07d
authored
May 16, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed Vector and Dictionary.
parent
286f1875
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
1278 deletions
+18
-1278
DictionaryTest.php
tests/unit/framework/base/DictionaryTest.php
+0
-209
ModelTest.php
tests/unit/framework/base/ModelTest.php
+1
-1
VectorTest.php
tests/unit/framework/base/VectorTest.php
+0
-230
upgrade.md
upgrade.md
+1
-2
Dictionary.php
yii/base/Dictionary.php
+0
-297
DictionaryIterator.php
yii/base/DictionaryIterator.php
+0
-92
Model.php
yii/base/Model.php
+13
-11
Vector.php
yii/base/Vector.php
+0
-341
VectorIterator.php
yii/base/VectorIterator.php
+0
-92
CookieCollection.php
yii/web/CookieCollection.php
+3
-3
No files found.
tests/unit/framework/base/DictionaryTest.php
deleted
100644 → 0
View file @
286f1875
<?php
namespace
yiiunit\framework\base
;
use
yii\base\Dictionary
;
class
MapItem
{
public
$data
=
'data'
;
}
class
DictionaryTest
extends
\yiiunit\TestCase
{
/**
* @var \yii\base\Dictionary
*/
protected
$dictionary
;
protected
$item1
;
protected
$item2
;
protected
$item3
;
protected
function
setUp
()
{
parent
::
setUp
();
$this
->
dictionary
=
new
Dictionary
;
$this
->
item1
=
new
MapItem
;
$this
->
item2
=
new
MapItem
;
$this
->
item3
=
new
MapItem
;
$this
->
dictionary
->
add
(
'key1'
,
$this
->
item1
);
$this
->
dictionary
->
add
(
'key2'
,
$this
->
item2
);
}
protected
function
tearDown
()
{
parent
::
tearDown
();
$this
->
dictionary
=
null
;
$this
->
item1
=
null
;
$this
->
item2
=
null
;
$this
->
item3
=
null
;
}
public
function
testConstruct
()
{
$a
=
array
(
1
,
2
,
'key3'
=>
3
);
$dictionary
=
new
Dictionary
(
$a
);
$this
->
assertEquals
(
3
,
$dictionary
->
getCount
());
$dictionary2
=
new
Dictionary
(
$this
->
dictionary
);
$this
->
assertEquals
(
2
,
$dictionary2
->
getCount
());
}
public
function
testGetCount
()
{
$this
->
assertEquals
(
2
,
$this
->
dictionary
->
getCount
());
}
public
function
testGetKeys
()
{
$keys
=
$this
->
dictionary
->
getKeys
();
$this
->
assertEquals
(
2
,
count
(
$keys
));
$this
->
assertEquals
(
'key1'
,
$keys
[
0
]);
$this
->
assertEquals
(
'key2'
,
$keys
[
1
]);
}
public
function
testAdd
()
{
$this
->
dictionary
->
add
(
'key3'
,
$this
->
item3
);
$this
->
assertEquals
(
3
,
$this
->
dictionary
->
getCount
());
$this
->
assertTrue
(
$this
->
dictionary
->
has
(
'key3'
));
$this
->
dictionary
[]
=
'test'
;
}
public
function
testRemove
()
{
$this
->
dictionary
->
remove
(
'key1'
);
$this
->
assertEquals
(
1
,
$this
->
dictionary
->
getCount
());
$this
->
assertTrue
(
!
$this
->
dictionary
->
has
(
'key1'
));
$this
->
assertTrue
(
$this
->
dictionary
->
remove
(
'unknown key'
)
===
null
);
}
public
function
testRemoveAll
()
{
$this
->
dictionary
->
add
(
'key3'
,
$this
->
item3
);
$this
->
dictionary
->
removeAll
();
$this
->
assertEquals
(
0
,
$this
->
dictionary
->
getCount
());
$this
->
assertTrue
(
!
$this
->
dictionary
->
has
(
'key1'
)
&&
!
$this
->
dictionary
->
has
(
'key2'
));
$this
->
dictionary
->
add
(
'key3'
,
$this
->
item3
);
$this
->
dictionary
->
removeAll
(
true
);
$this
->
assertEquals
(
0
,
$this
->
dictionary
->
getCount
());
$this
->
assertTrue
(
!
$this
->
dictionary
->
has
(
'key1'
)
&&
!
$this
->
dictionary
->
has
(
'key2'
));
}
public
function
testHas
()
{
$this
->
assertTrue
(
$this
->
dictionary
->
has
(
'key1'
));
$this
->
assertTrue
(
$this
->
dictionary
->
has
(
'key2'
));
$this
->
assertFalse
(
$this
->
dictionary
->
has
(
'key3'
));
}
public
function
testFromArray
()
{
$array
=
array
(
'key3'
=>
$this
->
item3
,
'key4'
=>
$this
->
item1
);
$this
->
dictionary
->
copyFrom
(
$array
);
$this
->
assertEquals
(
2
,
$this
->
dictionary
->
getCount
());
$this
->
assertEquals
(
$this
->
item3
,
$this
->
dictionary
[
'key3'
]);
$this
->
assertEquals
(
$this
->
item1
,
$this
->
dictionary
[
'key4'
]);
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
dictionary
->
copyFrom
(
$this
);
}
public
function
testMergeWith
()
{
$a
=
array
(
'a'
=>
'v1'
,
'v2'
,
array
(
'2'
),
'c'
=>
array
(
'3'
,
'c'
=>
'a'
));
$b
=
array
(
'v22'
,
'a'
=>
'v11'
,
array
(
'2'
),
'c'
=>
array
(
'c'
=>
'3'
,
'a'
));
$c
=
array
(
'a'
=>
'v11'
,
'v2'
,
array
(
'2'
),
'c'
=>
array
(
'3'
,
'c'
=>
'3'
,
'a'
),
'v22'
,
array
(
'2'
));
$dictionary
=
new
Dictionary
(
$a
);
$dictionary2
=
new
Dictionary
(
$b
);
$dictionary
->
mergeWith
(
$dictionary2
);
$this
->
assertTrue
(
$dictionary
->
toArray
()
===
$c
);
$array
=
array
(
'key2'
=>
$this
->
item1
,
'key3'
=>
$this
->
item3
);
$this
->
dictionary
->
mergeWith
(
$array
,
false
);
$this
->
assertEquals
(
3
,
$this
->
dictionary
->
getCount
());
$this
->
assertEquals
(
$this
->
item1
,
$this
->
dictionary
[
'key2'
]);
$this
->
assertEquals
(
$this
->
item3
,
$this
->
dictionary
[
'key3'
]);
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
dictionary
->
mergeWith
(
$this
,
false
);
}
public
function
testRecursiveMergeWithTraversable
(){
$dictionary
=
new
Dictionary
();
$obj
=
new
\ArrayObject
(
array
(
'k1'
=>
$this
->
item1
,
'k2'
=>
$this
->
item2
,
'k3'
=>
new
\ArrayObject
(
array
(
'k4'
=>
$this
->
item3
,
))
));
$dictionary
->
mergeWith
(
$obj
,
true
);
$this
->
assertEquals
(
3
,
$dictionary
->
getCount
());
$this
->
assertEquals
(
$this
->
item1
,
$dictionary
[
'k1'
]);
$this
->
assertEquals
(
$this
->
item2
,
$dictionary
[
'k2'
]);
$this
->
assertEquals
(
$this
->
item3
,
$dictionary
[
'k3'
][
'k4'
]);
}
public
function
testArrayRead
()
{
$this
->
assertEquals
(
$this
->
item1
,
$this
->
dictionary
[
'key1'
]);
$this
->
assertEquals
(
$this
->
item2
,
$this
->
dictionary
[
'key2'
]);
$this
->
assertEquals
(
null
,
$this
->
dictionary
[
'key3'
]);
}
public
function
testArrayWrite
()
{
$this
->
dictionary
[
'key3'
]
=
$this
->
item3
;
$this
->
assertEquals
(
3
,
$this
->
dictionary
->
getCount
());
$this
->
assertEquals
(
$this
->
item3
,
$this
->
dictionary
[
'key3'
]);
$this
->
dictionary
[
'key1'
]
=
$this
->
item3
;
$this
->
assertEquals
(
3
,
$this
->
dictionary
->
getCount
());
$this
->
assertEquals
(
$this
->
item3
,
$this
->
dictionary
[
'key1'
]);
unset
(
$this
->
dictionary
[
'key2'
]);
$this
->
assertEquals
(
2
,
$this
->
dictionary
->
getCount
());
$this
->
assertTrue
(
!
$this
->
dictionary
->
has
(
'key2'
));
unset
(
$this
->
dictionary
[
'unknown key'
]);
}
public
function
testArrayForeach
()
{
$n
=
0
;
$found
=
0
;
foreach
(
$this
->
dictionary
as
$index
=>
$item
)
{
$n
++
;
if
(
$index
===
'key1'
&&
$item
===
$this
->
item1
)
{
$found
++
;
}
if
(
$index
===
'key2'
&&
$item
===
$this
->
item2
)
{
$found
++
;
}
}
$this
->
assertTrue
(
$n
==
2
&&
$found
==
2
);
}
public
function
testArrayMisc
()
{
$this
->
assertEquals
(
$this
->
dictionary
->
Count
,
count
(
$this
->
dictionary
));
$this
->
assertTrue
(
isset
(
$this
->
dictionary
[
'key1'
]));
$this
->
assertFalse
(
isset
(
$this
->
dictionary
[
'unknown key'
]));
}
public
function
testToArray
()
{
$dictionary
=
new
Dictionary
(
array
(
'key'
=>
'value'
));
$this
->
assertEquals
(
array
(
'key'
=>
'value'
),
$dictionary
->
toArray
());
}
public
function
testIteratorCurrent
()
{
$dictionary
=
new
Dictionary
(
array
(
'key1'
=>
'value1'
,
'key2'
=>
'value2'
));
$val
=
$dictionary
->
getIterator
()
->
current
();
$this
->
assertEquals
(
'value1'
,
$val
);
}
}
tests/unit/framework/base/ModelTest.php
View file @
0005b07d
...
@@ -12,7 +12,7 @@ use yiiunit\data\base\InvalidRulesModel;
...
@@ -12,7 +12,7 @@ use yiiunit\data\base\InvalidRulesModel;
*/
*/
class
ModelTest
extends
TestCase
class
ModelTest
extends
TestCase
{
{
public
function
testGetAttributeLa
l
el
()
public
function
testGetAttributeLa
b
el
()
{
{
$speaker
=
new
Speaker
();
$speaker
=
new
Speaker
();
$this
->
assertEquals
(
'First Name'
,
$speaker
->
getAttributeLabel
(
'firstName'
));
$this
->
assertEquals
(
'First Name'
,
$speaker
->
getAttributeLabel
(
'firstName'
));
...
...
tests/unit/framework/base/VectorTest.php
deleted
100644 → 0
View file @
286f1875
<?php
namespace
yiiunit\framework\base
;
use
yii\base\Vector
;
class
ListItem
{
public
$data
=
'data'
;
}
class
VectorTest
extends
\yiiunit\TestCase
{
/**
* @var Vector
*/
protected
$vector
;
protected
$item1
;
protected
$item2
;
protected
$item3
;
protected
function
setUp
()
{
parent
::
setUp
();
$this
->
vector
=
new
Vector
;
$this
->
item1
=
new
ListItem
;
$this
->
item2
=
new
ListItem
;
$this
->
item3
=
new
ListItem
;
$this
->
vector
->
add
(
$this
->
item1
);
$this
->
vector
->
add
(
$this
->
item2
);
}
protected
function
tearDown
()
{
parent
::
tearDown
();
$this
->
vector
=
null
;
$this
->
item1
=
null
;
$this
->
item2
=
null
;
$this
->
item3
=
null
;
}
public
function
testConstruct
()
{
$a
=
array
(
1
,
2
,
3
);
$vector
=
new
Vector
(
$a
);
$this
->
assertEquals
(
3
,
$vector
->
getCount
());
$vector2
=
new
Vector
(
$this
->
vector
);
$this
->
assertEquals
(
2
,
$vector2
->
getCount
());
}
public
function
testItemAt
()
{
$a
=
array
(
1
,
2
,
null
,
4
);
$vector
=
new
Vector
(
$a
);
$this
->
assertEquals
(
1
,
$vector
->
itemAt
(
0
));
$this
->
assertEquals
(
2
,
$vector
->
itemAt
(
1
));
$this
->
assertNull
(
$vector
->
itemAt
(
2
));
$this
->
assertEquals
(
4
,
$vector
->
itemAt
(
3
));
}
public
function
testGetCount
()
{
$this
->
assertEquals
(
2
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
2
,
$this
->
vector
->
Count
);
}
public
function
testAdd
()
{
$this
->
vector
->
add
(
null
);
$this
->
vector
->
add
(
$this
->
item3
);
$this
->
assertEquals
(
4
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
3
,
$this
->
vector
->
indexOf
(
$this
->
item3
));
}
public
function
testInsertAt
()
{
$this
->
vector
->
insertAt
(
0
,
$this
->
item3
);
$this
->
assertEquals
(
3
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
2
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
$this
->
assertEquals
(
0
,
$this
->
vector
->
indexOf
(
$this
->
item3
));
$this
->
assertEquals
(
1
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
vector
->
insertAt
(
4
,
$this
->
item3
);
}
public
function
testRemove
()
{
$this
->
vector
->
remove
(
$this
->
item1
);
$this
->
assertEquals
(
1
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
assertEquals
(
0
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
$this
->
assertEquals
(
false
,
$this
->
vector
->
remove
(
$this
->
item1
));
}
public
function
testRemoveAt
()
{
$this
->
vector
->
add
(
$this
->
item3
);
$this
->
vector
->
removeAt
(
1
);
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
$this
->
assertEquals
(
1
,
$this
->
vector
->
indexOf
(
$this
->
item3
));
$this
->
assertEquals
(
0
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
vector
->
removeAt
(
2
);
}
public
function
testRemoveAll
()
{
$this
->
vector
->
add
(
$this
->
item3
);
$this
->
vector
->
removeAll
();
$this
->
assertEquals
(
0
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
$this
->
vector
->
add
(
$this
->
item3
);
$this
->
vector
->
removeAll
(
true
);
$this
->
assertEquals
(
0
,
$this
->
vector
->
getCount
());
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
}
public
function
testHas
()
{
$this
->
assertTrue
(
$this
->
vector
->
has
(
$this
->
item1
));
$this
->
assertTrue
(
$this
->
vector
->
has
(
$this
->
item2
));
$this
->
assertFalse
(
$this
->
vector
->
has
(
$this
->
item3
));
}
public
function
testIndexOf
()
{
$this
->
assertEquals
(
0
,
$this
->
vector
->
indexOf
(
$this
->
item1
));
$this
->
assertEquals
(
1
,
$this
->
vector
->
indexOf
(
$this
->
item2
));
$this
->
assertEquals
(
-
1
,
$this
->
vector
->
indexOf
(
$this
->
item3
));
}
public
function
testFromArray
()
{
$array
=
array
(
$this
->
item3
,
$this
->
item1
);
$this
->
vector
->
copyFrom
(
$array
);
$this
->
assertTrue
(
count
(
$array
)
==
2
&&
$this
->
vector
[
0
]
===
$this
->
item3
&&
$this
->
vector
[
1
]
===
$this
->
item1
);
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
vector
->
copyFrom
(
$this
);
}
public
function
testMergeWith
()
{
$array
=
array
(
$this
->
item3
,
$this
->
item1
);
$this
->
vector
->
mergeWith
(
$array
);
$this
->
assertTrue
(
$this
->
vector
->
getCount
()
==
4
&&
$this
->
vector
[
0
]
===
$this
->
item1
&&
$this
->
vector
[
3
]
===
$this
->
item1
);
$a
=
array
(
1
);
$vector
=
new
Vector
(
$a
);
$this
->
vector
->
mergeWith
(
$vector
);
$this
->
assertTrue
(
$this
->
vector
->
getCount
()
==
5
&&
$this
->
vector
[
0
]
===
$this
->
item1
&&
$this
->
vector
[
3
]
===
$this
->
item1
&&
$this
->
vector
[
4
]
===
1
);
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$this
->
vector
->
mergeWith
(
$this
);
}
public
function
testToArray
()
{
$array
=
$this
->
vector
->
toArray
();
$this
->
assertTrue
(
count
(
$array
)
==
2
&&
$array
[
0
]
===
$this
->
item1
&&
$array
[
1
]
===
$this
->
item2
);
}
public
function
testArrayRead
()
{
$this
->
assertTrue
(
$this
->
vector
[
0
]
===
$this
->
item1
);
$this
->
assertTrue
(
$this
->
vector
[
1
]
===
$this
->
item2
);
$this
->
setExpectedException
(
'yii\base\InvalidParamException'
);
$a
=
$this
->
vector
[
2
];
}
public
function
testGetIterator
()
{
$n
=
0
;
$found
=
0
;
foreach
(
$this
->
vector
as
$index
=>
$item
)
{
foreach
(
$this
->
vector
as
$a
=>
$b
)
{
// test of iterator
}
$n
++
;
if
(
$index
===
0
&&
$item
===
$this
->
item1
)
{
$found
++
;
}
if
(
$index
===
1
&&
$item
===
$this
->
item2
)
{
$found
++
;
}
}
$this
->
assertTrue
(
$n
==
2
&&
$found
==
2
);
}
public
function
testArrayMisc
()
{
$this
->
assertEquals
(
$this
->
vector
->
Count
,
count
(
$this
->
vector
));
$this
->
assertTrue
(
isset
(
$this
->
vector
[
1
]));
$this
->
assertFalse
(
isset
(
$this
->
vector
[
2
]));
}
public
function
testOffsetSetAdd
()
{
$vector
=
new
Vector
(
array
(
1
,
2
,
3
));
$vector
->
offsetSet
(
null
,
4
);
$this
->
assertEquals
(
array
(
1
,
2
,
3
,
4
),
$vector
->
toArray
());
}
public
function
testOffsetSetReplace
()
{
$vector
=
new
Vector
(
array
(
1
,
2
,
3
));
$vector
->
offsetSet
(
1
,
4
);
$this
->
assertEquals
(
array
(
1
,
4
,
3
),
$vector
->
toArray
());
}
public
function
testOffsetUnset
()
{
$vector
=
new
Vector
(
array
(
1
,
2
,
3
));
$vector
->
offsetUnset
(
1
);
$this
->
assertEquals
(
array
(
1
,
3
),
$vector
->
toArray
());
}
public
function
testIteratorCurrent
()
{
$vector
=
new
Vector
(
array
(
'value1'
,
'value2'
));
$val
=
$vector
->
getIterator
()
->
current
();
$this
->
assertEquals
(
'value1'
,
$val
);
}
}
upgrade.md
View file @
0005b07d
...
@@ -35,8 +35,7 @@ Upgrading from v1.1.x
...
@@ -35,8 +35,7 @@ Upgrading from v1.1.x
from
`Object`
and supports events and behaviors. Behaviors declared in
from
`Object`
and supports events and behaviors. Behaviors declared in
`Component::behaviors()`
are attached on demand.
`Component::behaviors()`
are attached on demand.
-
`CList`
is renamed to
`Vector`
, and
`CMap`
is renamed to
`Dictionary`
.
-
All collection classes are dropped in favor of SPL classes.
Other collection classes are dropped in favor of SPL classes.
-
`CFormModel`
is removed. Please use
`yii\base\Model`
instead.
-
`CFormModel`
is removed. Please use
`yii\base\Model`
instead.
...
...
yii/base/Dictionary.php
deleted
100644 → 0
View file @
286f1875
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\base
;
use
yii\helpers\ArrayHelper
;
/**
* Dictionary implements a collection that stores key-value pairs.
*
* You can access, add or remove an item with a key by using
* [[itemAt()]], [[add()]], and [[remove()]].
*
* To get the number of the items in the dictionary, use [[getCount()]].
*
* Because Dictionary implements a set of SPL interfaces, it can be used
* like a regular PHP array as follows,
*
* ~~~
* $dictionary[$key] = $value; // add a key-value pair
* unset($dictionary[$key]); // remove the value with the specified key
* if (isset($dictionary[$key])) // if the dictionary contains the key
* foreach ($dictionary as $key => $value) // traverse the items in the dictionary
* $n = count($dictionary); // returns the number of items in the dictionary
* ~~~
*
* @property integer $count the number of items in the dictionary
* @property array $keys The keys in the dictionary
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class
Dictionary
extends
Object
implements
\IteratorAggregate
,
\ArrayAccess
,
\Countable
{
/**
* @var array internal data storage
*/
private
$_d
=
array
();
/**
* Constructor.
* Initializes the dictionary with an array or an iterable object.
* @param mixed $data the initial data to be populated into the dictionary.
* This can be an array or an iterable object.
* @param array $config name-value pairs that will be used to initialize the object properties
* @throws Exception if data is not well formed (neither an array nor an iterable object)
*/
public
function
__construct
(
$data
=
array
(),
$config
=
array
())
{
if
(
!
empty
(
$data
))
{
$this
->
copyFrom
(
$data
);
}
parent
::
__construct
(
$config
);
}
/**
* Returns an iterator for traversing the items in the dictionary.
* This method is required by the SPL interface `IteratorAggregate`.
* It will be implicitly called when you use `foreach` to traverse the dictionary.
* @return DictionaryIterator an iterator for traversing the items in the dictionary.
*/
public
function
getIterator
()
{
return
new
DictionaryIterator
(
$this
->
_d
);
}
/**
* Returns the number of items in the dictionary.
* This method is required by the SPL `Countable` interface.
* It will be implicitly called when you use `count($dictionary)`.
* @return integer number of items in the dictionary.
*/
public
function
count
()
{
return
$this
->
getCount
();
}
/**
* Returns the number of items in the dictionary.
* @return integer the number of items in the dictionary
*/
public
function
getCount
()
{
return
count
(
$this
->
_d
);
}
/**
* Returns the keys stored in the dictionary.
* @return array the key list
*/
public
function
getKeys
()
{
return
array_keys
(
$this
->
_d
);
}
/**
* Returns the item with the specified key.
* @param mixed $key the key
* @return mixed the element with the specified key.
* Null if the key cannot be found in the dictionary.
*/
public
function
itemAt
(
$key
)
{
return
isset
(
$this
->
_d
[
$key
])
?
$this
->
_d
[
$key
]
:
null
;
}
/**
* Adds an item into the dictionary.
* Note, if the specified key already exists, the old value will be overwritten.
* @param mixed $key key
* @param mixed $value value
* @throws Exception if the dictionary is read-only
*/
public
function
add
(
$key
,
$value
)
{
if
(
$key
===
null
)
{
$this
->
_d
[]
=
$value
;
}
else
{
$this
->
_d
[
$key
]
=
$value
;
}
}
/**
* Removes an item from the dictionary by its key.
* @param mixed $key the key of the item to be removed
* @return mixed the removed value, null if no such key exists.
* @throws Exception if the dictionary is read-only
*/
public
function
remove
(
$key
)
{
if
(
isset
(
$this
->
_d
[
$key
]))
{
$value
=
$this
->
_d
[
$key
];
unset
(
$this
->
_d
[
$key
]);
return
$value
;
}
else
{
// the value is null
unset
(
$this
->
_d
[
$key
]);
return
null
;
}
}
/**
* Removes all items from the dictionary.
* @param boolean $safeClear whether to clear every item by calling [[remove]].
* Defaults to false, meaning all items in the dictionary will be cleared directly
* without calling [[remove]].
*/
public
function
removeAll
(
$safeClear
=
false
)
{
if
(
$safeClear
)
{
foreach
(
array_keys
(
$this
->
_d
)
as
$key
)
{
$this
->
remove
(
$key
);
}
}
else
{
$this
->
_d
=
array
();
}
}
/**
* Returns a value indicating whether the dictionary contains the specified key.
* @param mixed $key the key
* @return boolean whether the dictionary contains an item with the specified key
*/
public
function
has
(
$key
)
{
return
isset
(
$this
->
_d
[
$key
])
||
array_key_exists
(
$key
,
$this
->
_d
);
}
/**
* Returns the dictionary as a PHP array.
* @return array the list of items in array
*/
public
function
toArray
()
{
return
$this
->
_d
;
}
/**
* Copies iterable data into the dictionary.
* Note, existing data in the dictionary will be cleared first.
* @param mixed $data the data to be copied from, must be an array or an object implementing `Traversable`
* @throws InvalidParamException if data is neither an array nor an iterator.
*/
public
function
copyFrom
(
$data
)
{
if
(
is_array
(
$data
)
||
$data
instanceof
\Traversable
)
{
if
(
!
empty
(
$this
->
_d
))
{
$this
->
removeAll
();
}
if
(
$data
instanceof
self
)
{
$data
=
$data
->
_d
;
}
foreach
(
$data
as
$key
=>
$value
)
{
$this
->
add
(
$key
,
$value
);
}
}
else
{
throw
new
InvalidParamException
(
'Data must be either an array or an object implementing Traversable.'
);
}
}
/**
* Merges iterable data into the dictionary.
*
* Existing elements in the dictionary will be overwritten if their keys are the same as those in the source.
* If the merge is recursive, the following algorithm is performed:
*
* - the dictionary data is saved as $a, and the source data is saved as $b;
* - if $a and $b both have an array indexed at the same string key, the arrays will be merged using this algorithm;
* - any integer-indexed elements in $b will be appended to $a;
* - any string-indexed elements in $b will overwrite elements in $a with the same index;
*
* @param array|\Traversable $data the data to be merged with. It must be an array or object implementing Traversable
* @param boolean $recursive whether the merging should be recursive.
* @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
*/
public
function
mergeWith
(
$data
,
$recursive
=
true
)
{
if
(
is_array
(
$data
)
||
$data
instanceof
\Traversable
)
{
if
(
$data
instanceof
self
)
{
$data
=
$data
->
_d
;
}
if
(
$recursive
)
{
if
(
$data
instanceof
\Traversable
)
{
$d
=
array
();
foreach
(
$data
as
$key
=>
$value
)
{
$d
[
$key
]
=
$value
;
}
$this
->
_d
=
ArrayHelper
::
merge
(
$this
->
_d
,
$d
);
}
else
{
$this
->
_d
=
ArrayHelper
::
merge
(
$this
->
_d
,
$data
);
}
}
else
{
foreach
(
$data
as
$key
=>
$value
)
{
$this
->
add
(
$key
,
$value
);
}
}
}
else
{
throw
new
InvalidParamException
(
'The data to be merged with must be an array or an object implementing Traversable.'
);
}
}
/**
* Returns whether there is an element at the specified offset.
* This method is required by the SPL interface `ArrayAccess`.
* It is implicitly called when you use something like `isset($dictionary[$offset])`.
* This is equivalent to [[contains]].
* @param mixed $offset the offset to check on
* @return boolean
*/
public
function
offsetExists
(
$offset
)
{
return
$this
->
has
(
$offset
);
}
/**
* Returns the element at the specified offset.
* This method is required by the SPL interface `ArrayAccess`.
* It is implicitly called when you use something like `$value = $dictionary[$offset];`.
* This is equivalent to [[itemAt]].
* @param mixed $offset the offset to retrieve element.
* @return mixed the element at the offset, null if no element is found at the offset
*/
public
function
offsetGet
(
$offset
)
{
return
$this
->
itemAt
(
$offset
);
}
/**
* Sets the element at the specified offset.
* This method is required by the SPL interface `ArrayAccess`.
* It is implicitly called when you use something like `$dictionary[$offset] = $item;`.
* If the offset is null, the new item will be appended to the dictionary.
* Otherwise, the existing item at the offset will be replaced with the new item.
* This is equivalent to [[add]].
* @param mixed $offset the offset to set element
* @param mixed $item the element value
*/
public
function
offsetSet
(
$offset
,
$item
)
{
$this
->
add
(
$offset
,
$item
);
}
/**
* Unsets the element at the specified offset.
* This method is required by the SPL interface `ArrayAccess`.
* It is implicitly called when you use something like `unset($dictionary[$offset])`.
* This is equivalent to [[remove]].
* @param mixed $offset the offset to unset element
*/
public
function
offsetUnset
(
$offset
)
{
$this
->
remove
(
$offset
);
}
}
yii/base/DictionaryIterator.php
deleted
100644 → 0
View file @
286f1875
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\base
;
/**
* DictionaryIterator implements the SPL `Iterator` interface for [[Dictionary]].
*
* It allows [[Dictionary]] to return a new iterator for data traversing purpose.
* You normally do not use this class directly.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class
DictionaryIterator
implements
\Iterator
{
/**
* @var array the data to be iterated through
*/
private
$_d
;
/**
* @var array list of keys in the map
*/
private
$_keys
;
/**
* @var mixed current key
*/
private
$_key
;
/**
* Constructor.
* @param array $data the data to be iterated through
*/
public
function
__construct
(
&
$data
)
{
$this
->
_d
=
&
$data
;
$this
->
_keys
=
array_keys
(
$data
);
$this
->
_key
=
reset
(
$this
->
_keys
);
}
/**
* Rewinds the index of the current item.
* This method is required by the SPL interface `Iterator`.
*/
public
function
rewind
()
{
$this
->
_key
=
reset
(
$this
->
_keys
);
}
/**
* Returns the key of the current array element.
* This method is required by the SPL interface `Iterator`.
* @return mixed the key of the current array element
*/
public
function
key
()
{
return
$this
->
_key
;
}
/**
* Returns the current array element.
* This method is required by the SPL interface `Iterator`.
* @return mixed the current array element
*/
public
function
current
()
{
return
$this
->
_d
[
$this
->
_key
];
}
/**
* Moves the internal pointer to the next element.
* This method is required by the SPL interface `Iterator`.
*/
public
function
next
()
{
$this
->
_key
=
next
(
$this
->
_keys
);
}
/**
* Returns whether there is an element at current position.
* This method is required by the SPL interface `Iterator`.
* @return boolean whether there is an item at current position.
*/
public
function
valid
()
{
return
$this
->
_key
!==
false
;
}
}
yii/base/Model.php
View file @
0005b07d
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
namespace
yii\base
;
namespace
yii\base
;
use
ArrayObject
;
use
ArrayIterator
;
use
yii\helpers\StringHelper
;
use
yii\helpers\StringHelper
;
use
yii\validators\RequiredValidator
;
use
yii\validators\RequiredValidator
;
use
yii\validators\Validator
;
use
yii\validators\Validator
;
...
@@ -30,7 +32,7 @@ use yii\validators\Validator;
...
@@ -30,7 +32,7 @@ use yii\validators\Validator;
* You may directly use Model to store model data, or extend it with customization.
* You may directly use Model to store model data, or extend it with customization.
* You may also customize Model by attaching [[ModelBehavior|model behaviors]].
* You may also customize Model by attaching [[ModelBehavior|model behaviors]].
*
*
* @property
Vector
$validators All the validators declared in the model.
* @property
ArrayObject
$validators All the validators declared in the model.
* @property array $activeValidators The validators applicable to the current [[scenario]].
* @property array $activeValidators The validators applicable to the current [[scenario]].
* @property array $errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
* @property array $errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
* @property array $attributes Attribute values (name => value).
* @property array $attributes Attribute values (name => value).
...
@@ -56,7 +58,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
...
@@ -56,7 +58,7 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
*/
*/
private
$_errors
;
private
$_errors
;
/**
/**
* @var
Vector vector
of validators
* @var
ArrayObject list
of validators
*/
*/
private
$_validators
;
private
$_validators
;
/**
/**
...
@@ -300,15 +302,15 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
...
@@ -300,15 +302,15 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
* This method differs from [[getActiveValidators()]] in that the latter
* This method differs from [[getActiveValidators()]] in that the latter
* only returns the validators applicable to the current [[scenario]].
* only returns the validators applicable to the current [[scenario]].
*
*
* Because this method returns a
[[Vector]]
object, you may
* Because this method returns a
n ArrayObject
object, you may
* manipulate it by inserting or removing validators (useful in model behaviors).
* manipulate it by inserting or removing validators (useful in model behaviors).
* For example,
* For example,
*
*
* ~~~
* ~~~
* $model->validators
->add($newValidator)
;
* $model->validators
[] = $newValidator
;
* ~~~
* ~~~
*
*
* @return
Vector
all the validators declared in the model.
* @return
ArrayObject
all the validators declared in the model.
*/
*/
public
function
getValidators
()
public
function
getValidators
()
{
{
...
@@ -340,18 +342,18 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
...
@@ -340,18 +342,18 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
/**
/**
* Creates validator objects based on the validation rules specified in [[rules()]].
* Creates validator objects based on the validation rules specified in [[rules()]].
* Unlike [[getValidators()]], each time this method is called, a new list of validators will be returned.
* Unlike [[getValidators()]], each time this method is called, a new list of validators will be returned.
* @return
Vector
validators
* @return
ArrayObject
validators
* @throws InvalidConfigException if any validation rule configuration is invalid
* @throws InvalidConfigException if any validation rule configuration is invalid
*/
*/
public
function
createValidators
()
public
function
createValidators
()
{
{
$validators
=
new
Vector
;
$validators
=
new
ArrayObject
;
foreach
(
$this
->
rules
()
as
$rule
)
{
foreach
(
$this
->
rules
()
as
$rule
)
{
if
(
$rule
instanceof
Validator
)
{
if
(
$rule
instanceof
Validator
)
{
$validators
->
a
d
d
(
$rule
);
$validators
->
a
ppen
d
(
$rule
);
}
elseif
(
is_array
(
$rule
)
&&
isset
(
$rule
[
0
],
$rule
[
1
]))
{
// attributes, validator type
}
elseif
(
is_array
(
$rule
)
&&
isset
(
$rule
[
0
],
$rule
[
1
]))
{
// attributes, validator type
$validator
=
Validator
::
createValidator
(
$rule
[
1
],
$this
,
$rule
[
0
],
array_slice
(
$rule
,
2
));
$validator
=
Validator
::
createValidator
(
$rule
[
1
],
$this
,
$rule
[
0
],
array_slice
(
$rule
,
2
));
$validators
->
a
d
d
(
$validator
);
$validators
->
a
ppen
d
(
$validator
);
}
else
{
}
else
{
throw
new
InvalidConfigException
(
'Invalid validation rule: a rule must specify both attribute names and validator type.'
);
throw
new
InvalidConfigException
(
'Invalid validation rule: a rule must specify both attribute names and validator type.'
);
}
}
...
@@ -638,12 +640,12 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
...
@@ -638,12 +640,12 @@ class Model extends Component implements \IteratorAggregate, \ArrayAccess
/**
/**
* Returns an iterator for traversing the attributes in the model.
* Returns an iterator for traversing the attributes in the model.
* This method is required by the interface IteratorAggregate.
* This method is required by the interface IteratorAggregate.
* @return
Dictionar
yIterator an iterator for traversing the items in the list.
* @return
Arra
yIterator an iterator for traversing the items in the list.
*/
*/
public
function
getIterator
()
public
function
getIterator
()
{
{
$attributes
=
$this
->
getAttributes
();
$attributes
=
$this
->
getAttributes
();
return
new
Dictionar
yIterator
(
$attributes
);
return
new
Arra
yIterator
(
$attributes
);
}
}
/**
/**
...
...
yii/base/Vector.php
deleted
100644 → 0
View file @
286f1875
This diff is collapsed.
Click to expand it.
yii/base/VectorIterator.php
deleted
100644 → 0
View file @
286f1875
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\base
;
/**
* VectorIterator implements the SPL `Iterator` interface for [[Vector]].
*
* It allows [[Vector]] to return a new iterator for data traversing purpose.
* You normally do not use this class directly.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class
VectorIterator
implements
\Iterator
{
/**
* @var array the data to be iterated through
*/
private
$_d
;
/**
* @var integer index of the current item
*/
private
$_i
;
/**
* @var integer count of the data items
*/
private
$_c
;
/**
* Constructor.
* @param array $data the data to be iterated through
*/
public
function
__construct
(
&
$data
)
{
$this
->
_d
=
&
$data
;
$this
->
_i
=
0
;
$this
->
_c
=
count
(
$this
->
_d
);
}
/**
* Rewinds the index of the current item.
* This method is required by the SPL interface `Iterator`.
*/
public
function
rewind
()
{
$this
->
_i
=
0
;
}
/**
* Returns the key of the current item.
* This method is required by the SPL interface `Iterator`.
* @return integer the key of the current item
*/
public
function
key
()
{
return
$this
->
_i
;
}
/**
* Returns the current item.
* This method is required by the SPL interface `Iterator`.
* @return mixed the current item
*/
public
function
current
()
{
return
$this
->
_d
[
$this
->
_i
];
}
/**
* Moves the internal pointer to the next item.
* This method is required by the SPL interface `Iterator`.
*/
public
function
next
()
{
$this
->
_i
++
;
}
/**
* Returns a value indicating whether there is an item at current position.
* This method is required by the SPL interface `Iterator`.
* @return boolean whether there is an item at current position.
*/
public
function
valid
()
{
return
$this
->
_i
<
$this
->
_c
;
}
}
yii/web/CookieCollection.php
View file @
0005b07d
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
namespace
yii\web
;
namespace
yii\web
;
use
Yii
;
use
Yii
;
use
yii\base\Dictionar
yIterator
;
use
Arra
yIterator
;
use
yii\helpers\SecurityHelper
;
use
yii\helpers\SecurityHelper
;
/**
/**
...
@@ -50,11 +50,11 @@ class CookieCollection extends \yii\base\Object implements \IteratorAggregate, \
...
@@ -50,11 +50,11 @@ class CookieCollection extends \yii\base\Object implements \IteratorAggregate, \
* Returns an iterator for traversing the cookies in the collection.
* Returns an iterator for traversing the cookies in the collection.
* This method is required by the SPL interface `IteratorAggregate`.
* This method is required by the SPL interface `IteratorAggregate`.
* It will be implicitly called when you use `foreach` to traverse the collection.
* It will be implicitly called when you use `foreach` to traverse the collection.
* @return
Dictionar
yIterator an iterator for traversing the cookies in the collection.
* @return
Arra
yIterator an iterator for traversing the cookies in the collection.
*/
*/
public
function
getIterator
()
public
function
getIterator
()
{
{
return
new
Dictionar
yIterator
(
$this
->
_cookies
);
return
new
Arra
yIterator
(
$this
->
_cookies
);
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment