Flatten the code

Remove used-once intermediary variables, and move the pluginSplit call to where it's used
cakephp · Feb 10, 2015 · b79cc70 · b79cc70
1 parent d3aae7e
commit b79cc70
Showing 1 changed file with 4 additions and 7 deletions.
diff --git 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'])) {