Merge branch 'develop-jordan' into develop-4.3-jordan

Silic0nS0ldier · Silic0nS0ldier · commit 319676c15f30 · 2019-02-16T16:25:31.000+11:00
diff --git a/app/sprinkles/core/src/Util/ClassMapper.php b/app/sprinkles/core/src/Util/ClassMapper.php
@@ -37,10 +37,7 @@ public function createInstance($identifier)
 
         $params = array_slice(func_get_args(), 1);
 
-        // We must use reflection in PHP < 5.6.  See http://stackoverflow.com/questions/8734522/dynamically-call-class-with-variable-number-of-parameters-in-the-constructor
-        $reflection = new \ReflectionClass($className);
-
-        return $reflection->newInstanceArgs($params);
+        return new $className(...$params);
     }
 
     /**
@@ -90,6 +87,6 @@ public function staticMethod($identifier, $methodName)
 
         $params = array_slice(func_get_args(), 2);
 
-        return call_user_func_array("$className::$methodName", $params);
+        return $className::$methodName(...$params);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ public function createInstance($identifier)`
`37`	`37`
`38`	`38`	`$params = array_slice(func_get_args(), 1);`
`39`	`39`
`40`		`- // We must use reflection in PHP < 5.6. See http://stackoverflow.com/questions/8734522/dynamically-call-class-with-variable-number-of-parameters-in-the-constructor`
`41`		`- $reflection = new \ReflectionClass($className);`
`42`		`-`
`43`		`- return $reflection->newInstanceArgs($params);`
	`40`	`+ return new $className(...$params);`
`44`	`41`	`}`
`45`	`42`
`46`	`43`	`/**`
`@@ -90,6 +87,6 @@ public function staticMethod($identifier, $methodName)`
`90`	`87`
`91`	`88`	`$params = array_slice(func_get_args(), 2);`
`92`	`89`
`93`		`- return call_user_func_array("$className::$methodName", $params);`
	`90`	`+ return $className::$methodName(...$params);`
`94`	`91`	`}`
`95`	`92`	`}`