Merge pull request #15 from sunrise-php/release/v2.0.1

v2.0.1
sunrise-php · Apr 17, 2022 · 1b8267a · 1b8267a
2 parents a8d1b0e + ac98377
commit 1b8267a
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,39 +10,39 @@ jobs:
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: composer install --no-interaction
       - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
   php72:
     docker:
       - image: circleci/php:7.2-cli-node-browsers
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: composer install --no-interaction
       - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
   php73:
     docker:
       - image: circleci/php:7.3-cli-node-browsers
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: composer install --no-interaction
       - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
   php74:
     docker:
       - image: circleci/php:7.4-cli-node-browsers
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: composer install --no-interaction
       - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
   php80:
     docker:
       - image: circleci/php:8.0-cli-node-browsers
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --no-suggest --prefer-source
+      - run: composer install --no-interaction
       - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
 workflows:
   version: 2

diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 /phpbench.json
 /phpcs.xml
 /phpunit.xml
+/psalm.xml
 /vendor/
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## HTTP factory for PHP 7.1+ based on PSR-17
+# HTTP factory for PHP 7.1+ based on PSR-17
 
 [![Build Status](https://circleci.com/gh/sunrise-php/http-factory.svg?style=shield)](https://circleci.com/gh/sunrise-php/http-factory)
 [![Code Coverage](https://scrutinizer-ci.com/g/sunrise-php/http-factory/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-factory/?branch=master)
@@ -28,11 +28,7 @@ use Sunrise\Http\Factory\UriFactory;
 // just use PSR-17 methods...
 ```
 
-#### HTTP headers as objects
-
-* https://github.com/sunrise-php/http-header-kit
-
-#### Based on the following packages
+## Based on the following packages
 
 * https://github.com/sunrise-php/http-message
 * https://github.com/sunrise-php/http-server-request

diff --git a/composer.json b/composer.json
@@ -1,24 +1,28 @@
 {
     "name": "sunrise/http-factory",
     "homepage": "https://github.com/sunrise-php/http-factory",
-    "description": "Sunrise // HTTP factory for PHP 7.1+ based on PSR-17",
+    "description": "HTTP factory for PHP 7.1+ based on PSR-17",
     "license": "MIT",
     "keywords": [
         "fenric",
         "sunrise",
         "http",
-        "http-factory",
+        "factory",
+        "psr-7",
         "psr-17",
         "php7",
         "php8"
     ],
     "authors": [
         {
             "name": "Anatoly Fenric",
-            "email": "anatoly@fenric.ru",
-            "homepage": "https://anatoly.fenric.ru/"
+            "email": "afenric@gmail.com",
+            "homepage": "https://github.com/fenric"
         }
     ],
+    "provide": {
+        "psr/http-factory-implementation": "1.0"
+    },
     "require": {
         "php": "^7.1|^8.0",
         "sunrise/http-message": "^2.0",
@@ -30,9 +34,6 @@
         "phpunit/phpunit": "7.5.20|9.5.0",
         "sunrise/coding-standard": "1.0.0"
     },
-    "provide": {
-        "psr/http-factory-implementation": "1.0"
-    },
     "autoload": {
         "psr-4": {
             "Sunrise\\Http\\Factory\\": "src/"
@@ -41,6 +42,7 @@
     "scripts": {
         "test": [
             "phpcs",
+            "psalm",
             "XDEBUG_MODE=coverage phpunit --coverage-text --colors=always"
         ],
         "build": [

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
     <coverage>
         <include>
             <directory>./src</directory>
         </include>
     </coverage>
     <testsuites>
-        <testsuite name="Sunrise.HttpFactory">
+        <testsuite name="sunrise/http-factory">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -30,58 +30,46 @@ class FactoryTest extends TestCase
      */
     public function testRequestFactory() : void
     {
-        $factory = new RequestFactory();
-
-        $this->assertInstanceOf(RequestFactoryInterface::class, $factory);
+        $this->assertInstanceOf(RequestFactoryInterface::class, new RequestFactory());
     }
 
     /**
      * @return void
      */
     public function testResponseFactory() : void
     {
-        $factory = new ResponseFactory();
-
-        $this->assertInstanceOf(ResponseFactoryInterface::class, $factory);
+        $this->assertInstanceOf(ResponseFactoryInterface::class, new ResponseFactory());
     }
 
     /**
      * @return void
      */
     public function testServerRequestFactory() : void
     {
-        $factory = new ServerRequestFactory();
-
-        $this->assertInstanceOf(ServerRequestFactoryInterface::class, $factory);
+        $this->assertInstanceOf(ServerRequestFactoryInterface::class, new ServerRequestFactory());
     }
 
     /**
      * @return void
      */
     public function testStreamFactory() : void
     {
-        $factory = new StreamFactory();
-
-        $this->assertInstanceOf(StreamFactoryInterface::class, $factory);
+        $this->assertInstanceOf(StreamFactoryInterface::class, new StreamFactory());
     }
 
     /**
      * @return void
      */
     public function testUploadedFileFactory() : void
     {
-        $factory = new UploadedFileFactory();
-
-        $this->assertInstanceOf(UploadedFileFactoryInterface::class, $factory);
+        $this->assertInstanceOf(UploadedFileFactoryInterface::class, new UploadedFileFactory());
     }
 
     /**
      * @return void
      */
     public function testUriFactory() : void
     {
-        $factory = new UriFactory();
-
-        $this->assertInstanceOf(UriFactoryInterface::class, $factory);
+        $this->assertInstanceOf(UriFactoryInterface::class, new UriFactory());
     }
 }