Skip to content

Commit 94fef7f

Browse files
committed
Fix default
1 parent 2429521 commit 94fef7f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Manager.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function defaults($class, $configuration = array(), $domain = '__d
5858
}
5959
if (isset(static::$configurations[$domain][$class])) {
6060
$configuration = array_replace_recursive($configuration, static::$configurations[$domain][$class]);
61-
} elseif($default = static::get($class)) {
61+
} elseif($default = static::get($class, null, $domain)) {
6262
$configuration = array_replace_recursive($configuration, $default);
6363
}
6464
static::$configurations[$domain][$class] = $configuration;
@@ -74,12 +74,12 @@ public static function configure($class, $configuration = array(), $domain = '__
7474

7575
public static function get($class, $key = null, $domain = '__default__')
7676
{
77+
if (! isset(static::$configurations[$domain][$class])) {
78+
return $domain === '__default__' ? array() : static::get($class, $key);
79+
}
7780
if (! isset(static::$configured[$class])) {
7881
static::defaults($class, array(), $domain);
7982
}
80-
if (! isset(static::$configurations[$domain][$class])) {
81-
return $domain === '__default__' ? null : static::get($class, $key);
82-
}
8383
$configuration = ($domain === '__default__') ? static::$configurations[$domain][$class] : array_replace_recursive(static::get($class), static::$configurations[$domain][$class]);
8484
if (null !== $key) {
8585
foreach (explode('.', $key) as $key) {

0 commit comments

Comments
 (0)