Move factories to php-http/utils

Remove factories from discovery

Add better warning for missing factories

Fix tests

Author: sagikazarmark

.travis.yml

@@ -7,7 +7,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
@@ -24,7 +23,7 @@ branches:
 matrix:
     fast_finish: true
     include:
-        - php: 5.4
+        - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:

composer.json

@@ -19,15 +19,15 @@
         "php-http/message-factory": "^1.0"
     },
     "require-dev": {
+        "php-http/utils": "^0.2",
         "zendframework/zend-diactoros": "^1.0",
         "guzzlehttp/psr7": "^1.0",
         "php-http/guzzle6-adapter": "^0.2",
         "phpspec/phpspec": "^2.4",
         "henrikbjorn/phpspec-code-coverage" : "^1.0"
     },
     "suggest": {
-        "zendframework/zend-diactoros": "Used with Diactoros Factories",
-        "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories"
+        "php-http/utils": "To use Guzzle or Diactoros factories"
     },
     "autoload": {
         "psr-4": {

spec/MessageFactory/DiactorosMessageFactorySpec.php

@@ -16,6 +16,11 @@ function it_is_a_class_discovery()
         $this->shouldHaveType('Http\Discovery\ClassDiscovery');
     }
 
+    function it_is_a_factory_discovery()
+    {
+        $this->shouldHaveType('Http\Discovery\FactoryDiscovery');
+    }
+
     function it_finds_an_http_message_factory()
     {
         $this->find()->shouldHaveType('Http\Message\MessageFactory');

spec/MessageFactory/GuzzleMessageFactorySpec.php

@@ -16,6 +16,11 @@ function it_is_a_class_discovery()
         $this->shouldHaveType('Http\Discovery\ClassDiscovery');
     }
 
+    function it_is_a_factory_discovery()
+    {
+        $this->shouldHaveType('Http\Discovery\FactoryDiscovery');
+    }
+
     function it_finds_an_http_stream_factory()
     {
         $this->find()->shouldHaveType('Http\Message\StreamFactory');

spec/MessageFactoryDiscoverySpec.php

@@ -16,6 +16,11 @@ function it_is_a_class_discovery()
         $this->shouldHaveType('Http\Discovery\ClassDiscovery');
     }
 
+    function it_is_a_factory_discovery()
+    {
+        $this->shouldHaveType('Http\Discovery\FactoryDiscovery');
+    }
+
     function it_finds_an_http_uri_factory()
     {
         $this->find()->shouldHaveType('Http\Message\UriFactory');

spec/StreamFactory/DiactorosStreamFactorySpec.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Http\Discovery;
+
+/**
+ * Finds a Factory.
+ *
+ * @author Márk Sági-Kazár <[email protected]>
+ */
+abstract class FactoryDiscovery extends ClassDiscovery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function find()
+    {
+        try {
+            return parent::find();
+        } catch (NotFoundException $e) {
+            throw new NotFoundException(
+                'No factories found. Install php-http/utils >= 0.2 to use Guzzle or Diactoros factories.',
+                0,
+                $e
+            );
+        }
+    }
+}