projects
/
m6w6
/
merry
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
c5cc1f0
)
fix bug with expected class type
master
v1.1.0
author
Michael Wallner
<mike@php.net>
Thu, 12 Mar 2015 13:49:46 +0000
(14:49 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 12 Mar 2015 13:49:46 +0000
(14:49 +0100)
lib/merry/Container.php
patch
|
blob
|
history
diff --git
a/lib/merry/Container.php
b/lib/merry/Container.php
index 7f4d8fc7b2e1ce459510cca904de861ceff1bade..8a628661ad2767c695c28f735a58249e2cfc5847 100644
(file)
--- a/
lib/merry/Container.php
+++ b/
lib/merry/Container.php
@@
-68,7
+68,7
@@
class Container implements \ArrayAccess, \RecursiveIterator, \JsonSerializable
/**
* Apply one or mor modifier callbacks
* @param mixed $modifier
/**
* Apply one or mor modifier callbacks
* @param mixed $modifier
- * @return \merry\Con
fig
+ * @return \merry\Con
tainer
*/
public function apply($modifier) {
if (is_callable($modifier)) {
*/
public function apply($modifier) {
if (is_callable($modifier)) {
@@
-111,7
+111,7
@@
class Container implements \ArrayAccess, \RecursiveIterator, \JsonSerializable
* @ignore
*/
function __set($prop, $value) {
* @ignore
*/
function __set($prop, $value) {
- if (isset($value) && !is_scalar($value) && !($value instanceof Con
fig
)) {
+ if (isset($value) && !is_scalar($value) && !($value instanceof Con
tainer
)) {
$value = new static((array) $value);
}
if (!strlen($prop)) {
$value = new static((array) $value);
}
if (!strlen($prop)) {