Fix functions include

jsor · jsor · commit b7692e5e65ee · 2015-07-01T09:04:38.000+02:00
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "psr-0": {
             "React\\Promise": "src/"
         },
-        "files": ["src/React/Promise/functions.php"]
+        "files": ["src/React/Promise/functions_include.php"]
     },
     "extra": {
         "branch-alias": {
diff --git a/src/React/Promise/functions.php b/src/React/Promise/functions.php
@@ -2,10 +2,6 @@
 
 namespace React\Promise;
 
-if (function_exists('React\Promise\resolve')) {
-    return;
-}
-
 function resolve($promiseOrValue = null)
 {
     if ($promiseOrValue instanceof PromiseInterface) {
diff --git a/src/React/Promise/functions_include.php b/src/React/Promise/functions_include.php
@@ -0,0 +1,5 @@
+<?php
+
+if (!function_exists('React\Promise\resolve')) {
+    require __DIR__.'/functions.php';
+}

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace React\Promise;`
`4`	`4`
`5`		`-if (function_exists('React\Promise\resolve')) {`
`6`		`- return;`
`7`		`-}`
`8`		`-`
`9`	`5`	`function resolve($promiseOrValue = null)`
`10`	`6`	`{`
`11`	`7`	`if ($promiseOrValue instanceof PromiseInterface) {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +if (!function_exists('React\Promise\resolve')) {
 +    require __DIR__.'/functions.php';
 +}