Merge pull request #4 from php-http/patch-3

Using constants instead of environments variables

Author: Nyholm

phpunit.xml.dist

@@ -36,7 +36,7 @@
   </filter>
 
     <php>
-        <env name="URI_FACTORY" value=""/>
-        <env name="STREAM_FACTORY" value=""/>
+        <const name="URI_FACTORY" value=""/>
+        <const name="STREAM_FACTORY" value=""/>
     </php>
 </phpunit>

src/BaseTest.php

@@ -20,15 +20,14 @@ protected function assertNotSameObject($a, $b)
 
     protected function buildUri($uri)
     {
-        $factory = getenv('URI_FACTORY');
-
-        if (!empty($factory)) {
-            $factoryClass = new $factory();
-            if (!$factoryClass instanceof \Http\Message\UriFactory) {
-                throw new \RuntimeException('Environment variable "URI_FACTORY" must be a reference to a Http\Message\UriFactory');
+        if (!defined('URI_FACTORY')) {
+            $factoryClass = URI_FACTORY;
+            $factory = new $factoryClass();
+            if (!$factory instanceof \Http\Message\UriFactory) {
+                throw new \RuntimeException('Constant "URI_FACTORY" must be a reference to a Http\Message\UriFactory');
             }
 
-            return $factoryClass->createUri($uri);
+            return $factory->createUri($uri);
         }
 
         if (class_exists(GuzzleUri::class)) {
@@ -48,15 +47,14 @@ protected function buildUri($uri)
 
     protected function buildStream($data)
     {
-        $factory = getenv('STREAM_FACTORY');
-
-        if (!empty($factory)) {
-            $factoryClass = new $factory();
-            if (!$factoryClass instanceof \Http\Message\StreamFactory) {
-                throw new \RuntimeException('Environment variable "STREAM_FACTORY" must be a reference to a Http\Message\StreamFactory');
+        if (!defined('STREAM_FACTORY')) {
+            $factoryClass = STREAM_FACTORY;
+            $factory = new $factoryClass();
+            if (!$factory instanceof \Http\Message\StreamFactory) {
+                throw new \RuntimeException('Constant "STREAM_FACTORY" must be a reference to a Http\Message\StreamFactory');
             }
 
-            return $factoryClass->createStream($data);
+            return $factory->createStream($data);
         }
 
         if (class_exists(GuzzleStream::class)) {