Merge pull request #130 from mixcom/2.x

WyriHaximus · web-flow · commit 8e41741a518c · 2019-01-07T17:40:08.000+01:00
Fix file_exists warning when resolving with long strings
diff --git a/src/functions.php b/src/functions.php
@@ -8,7 +8,9 @@ function resolve($promiseOrValue = null)
         return $promiseOrValue;
     }
 
-    if (method_exists($promiseOrValue, 'then')) {
+    // Check is_object() first to avoid method_exists() triggering
+    // class autoloaders if $promiseOrValue is a string.
+    if (is_object($promiseOrValue) && method_exists($promiseOrValue, 'then')) {
         $canceller = null;
 
         if (method_exists($promiseOrValue, 'cancel')) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ function resolve($promiseOrValue = null)`
`8`	`8`	`return $promiseOrValue;`
`9`	`9`	`}`
`10`	`10`
`11`		`- if (method_exists($promiseOrValue, 'then')) {`
	`11`	`+ // Check is_object() first to avoid method_exists() triggering`
	`12`	`+ // class autoloaders if $promiseOrValue is a string.`
	`13`	`+ if (is_object($promiseOrValue) && method_exists($promiseOrValue, 'then')) {`
`12`	`14`	`$canceller = null;`
`13`	`15`
`14`	`16`	`if (method_exists($promiseOrValue, 'cancel')) {`