From b79cc70a6b39ee3602191f9112a80026704171f1 Mon Sep 17 00:00:00 2001 From: AD7six Date: Fri, 6 Feb 2015 10:00:03 +0000 Subject: [PATCH] Flatten the code Remove used-once intermediary variables, and move the pluginSplit call to where it's used --- src/ORM/TableRegistry.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ORM/TableRegistry.php b/src/ORM/TableRegistry.php index 26d60b975d4..56b6c51ce1a 100644 --- a/src/ORM/TableRegistry.php +++ b/src/ORM/TableRegistry.php @@ -155,21 +155,18 @@ public static function config($alias = null, $options = null) */ public static function get($alias, array $options = []) { - list(, $classAlias) = pluginSplit($alias); - $exists = isset(static::$_instances[$alias]); - - if ($exists && !empty($options)) { - if (static::$_options[$alias] !== $options) { + if (isset(static::$_instances[$alias])) { + if (!empty($options) && static::$_options[$alias] !== $options) { throw new RuntimeException(sprintf( 'You cannot configure "%s", it already exists in the registry.', $alias )); } - } - if ($exists) { return static::$_instances[$alias]; } + static::$_options[$alias] = $options; + list(, $classAlias) = pluginSplit($alias); $options = ['alias' => $classAlias] + $options; if (empty($options['className'])) {