Update Shortcut.php

manuwhat · Apr 18, 2019 · 3cb13de · 3cb13de
1 parent 761eeec
commit 3cb13de
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/src/Shortcut.php b/src/Shortcut.php
@@ -58,32 +58,37 @@ private static function _create($classname, $name)
             self::getTheRightDir($file, $Dir, $fullQualifiedClassname);
             $fileExists=file_exists($file);
             if (!function_exists($classname)&&!function_exists($name)) {
-                if ($fileExists) {
-                    return include_once($file);
-                }
-                extract(self::forwardInit($name, $Dir, $reflectionClass));
-                if (is_null($reflectionMethod)||$notInstantiable=!$reflectionClass->isInstantiable()) {
-                    self::HandleNotInstantiableAndHasNoConstructor($Shortcut, $fullQualifiedClassname, $name, $notInstantiable, $classname);
-                    if ($Shortcut) {
-                        return self::pushAndShow($file, $Shortcut);
-                    }
-                    $private_scope=true;
+                return self::handleNewShortcut($classname, $name, $file, $Dir, $fullQualifiedClassname, $fileExists, $reflectionClass);
+            } else {
+                self::GetTheRightExceptionMessage($fileExists, $name, $fullQualifiedClassname);
+            }
+        }
+
+        private static function handleNewShortcut($classname, $name, $file, $Dir, $fullQualifiedClassname, $fileExists, \reflectionClass $reflectionClass)
+        {
+            if ($fileExists) {
+                return include_once($file);
+            }
+            extract(self::forwardInit($name, $Dir, $reflectionClass));
+            if (is_null($reflectionMethod)||$notInstantiable=!$reflectionClass->isInstantiable()) {
+                self::HandleNotInstantiableAndHasNoConstructor($Shortcut, $fullQualifiedClassname, $name, $notInstantiable, $classname);
+                if ($Shortcut) {
+                    return self::pushAndShow($file, $Shortcut);
                 }
+                $private_scope=true;
+            }
 
-                self::getSignature($reflectionMethod, $signature, $parameters, $paramsNum, $count);
+            self::getSignature($reflectionMethod, $signature, $parameters, $paramsNum, $count);
 
-                $hasInternal='';
-                if ($count) {
-                    self::BuildTheSwitch($hasInternal, $count, $paramsNum, $parameters, $classname);
-                }
-                self::useTheRightNameAndScope($Shortcut, $name, $fullQualifiedClassname, $signature, $private_scope, $classname);
+            $hasInternal='';
+            if ($count) {
+                self::BuildTheSwitch($hasInternal, $count, $paramsNum, $parameters, $classname);
+            }
+            self::useTheRightNameAndScope($Shortcut, $name, $fullQualifiedClassname, $signature, $private_scope, $classname);
 
-                self::handleInternals($Shortcut, $hasInternal, $parameters, $signature, $classname);
+            self::handleInternals($Shortcut, $hasInternal, $parameters, $signature, $classname);
 
-                return self::pushAndShow($file, $Shortcut);
-            } else {
-                self::GetTheRightExceptionMessage($fileExists, $name, $fullQualifiedClassname);
-            }
+            return self::pushAndShow($file, $Shortcut);
         }
 
         private static function getSignature(\ReflectionMethod $method, &$signature, &$parameters, &$paramsNum, &$count)