@@ -58,7 +58,7 @@ public static function defaults($class, $configuration = array(), $domain = '__d
58
58
}
59
59
if (isset (static ::$ configurations [$ domain ][$ class ])) {
60
60
$ configuration = array_replace_recursive ($ configuration , static ::$ configurations [$ domain ][$ class ]);
61
- } elseif ($ default = static ::get ($ class )) {
61
+ } elseif ($ default = static ::get ($ class, null , $ domain )) {
62
62
$ configuration = array_replace_recursive ($ configuration , $ default );
63
63
}
64
64
static ::$ configurations [$ domain ][$ class ] = $ configuration ;
@@ -74,12 +74,12 @@ public static function configure($class, $configuration = array(), $domain = '__
74
74
75
75
public static function get ($ class , $ key = null , $ domain = '__default__ ' )
76
76
{
77
+ if (! isset (static ::$ configurations [$ domain ][$ class ])) {
78
+ return $ domain === '__default__ ' ? array () : static ::get ($ class , $ key );
79
+ }
77
80
if (! isset (static ::$ configured [$ class ])) {
78
81
static ::defaults ($ class , array (), $ domain );
79
82
}
80
- if (! isset (static ::$ configurations [$ domain ][$ class ])) {
81
- return $ domain === '__default__ ' ? null : static ::get ($ class , $ key );
82
- }
83
83
$ configuration = ($ domain === '__default__ ' ) ? static ::$ configurations [$ domain ][$ class ] : array_replace_recursive (static ::get ($ class ), static ::$ configurations [$ domain ][$ class ]);
84
84
if (null !== $ key ) {
85
85
foreach (explode ('. ' , $ key ) as $ key ) {
0 commit comments