Merge pull request #22 from sunrise-php/release/v1.3.2

fenric · web-flow · commit f06ee1e4e5cb · 2022-04-19T13:53:44.000+05:00
v1.3.2
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,40 +10,40 @@ jobs:
     steps:
       - checkout
       - run: php -v
-      - run: composer install --no-interaction --prefer-source
-      - run: php vendor/bin/phpunit --colors=always
+      - 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 --prefer-source
-      - run: php vendor/bin/phpunit --colors=always
+      - 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 --prefer-source
-      - run: php vendor/bin/phpunit --colors=always
+      - 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 --prefer-source
-      - run: php vendor/bin/phpunit --colors=always
+      - 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 --prefer-source
-      - run: php vendor/bin/phpunit --colors=always
+      - run: composer install --no-interaction
+      - run: XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-text
 workflows:
   version: 2
   build:
diff --git a/.editorconfig b/.editorconfig
@@ -11,8 +11,5 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
-trim_trailing_whitespace = false
-
 [*.yml]
 indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
-.php_cs.cache
-.phpunit.result.cache
-composer.lock
-coverage.xml
-phpcs.xml
-phpunit.xml
-vendor/
+/.php_cs.cache
+/.phpunit.result.cache
+/composer.lock
+/coverage.xml
+/phpbench.json
+/phpcs.xml
+/phpunit.xml
+/psalm.xml
+/vendor/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,4 +1,7 @@
 build:
+  environment:
+    php:
+      version: '8.0'
   nodes:
     analysis:
       tests:
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Sunrise // PHP
+Copyright (c) 2018 Anatoly Nekhay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Stream wrapper for PHP 7.1+ (incl. PHP 8) based on PSR-7 & PSR-17
+## Stream wrapper for PHP 7.1+ based on PSR-7 and PSR-17
 
 [![Gitter](https://badges.gitter.im/sunrise-php/support.png)](https://gitter.im/sunrise-php/support)
 [![Build Status](https://circleci.com/gh/sunrise-php/stream.svg?style=shield)](https://circleci.com/gh/sunrise-php/stream)
@@ -8,10 +8,6 @@
 [![Latest Stable Version](https://poser.pugx.org/sunrise/stream/v/stable?format=flat)](https://packagist.org/packages/sunrise/stream)
 [![License](https://poser.pugx.org/sunrise/stream/license?format=flat)](https://packagist.org/packages/sunrise/stream)
 
-## Awards
-
-[![SymfonyInsight](https://insight.symfony.com/projects/a6301a76-9b35-49a3-adb1-ebbf59f810f2/big.svg)](https://insight.symfony.com/projects/a6301a76-9b35-49a3-adb1-ebbf59f810f2)
-
 ## Installation
 
 ```bash
@@ -46,6 +42,8 @@ $stream = (new StreamFactory)->createStreamFromTemporaryFile(?string);
 $stream->close();
 ```
 
+---
+
 ## Test run
 
 ```bash
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "sunrise/stream",
     "homepage": "https://github.com/sunrise-php/stream",
-    "description": "Simple Stream wrapper for PHP 7.1+ based on PSR-7 & PSR-17",
+    "description": "Stream wrapper for PHP 7.1+ based on PSR-7 and PSR-17",
     "license": "MIT",
     "keywords": [
         "fenric",
@@ -16,15 +16,18 @@
     "authors": [
         {
             "name": "Anatoly Fenric",
-            "email": "anatoly@fenric.ru",
-            "homepage": "https://anatoly.fenric.ru/"
+            "email": "afenric@gmail.com",
+            "homepage": "https://github.com/fenric"
         },
         {
             "name": "李昀陞 (Peter)",
             "email": "peter279k@gmail.com",
             "homepage": "https://github.com/peter279k"
         }
     ],
+    "provide": {
+        "psr/http-message-implementation": "1.0"
+    },
     "require": {
         "php": "^7.1|^8.0",
         "psr/http-factory": "^1.0",
@@ -34,9 +37,6 @@
         "phpunit/phpunit": "7.5.20|9.5.0",
         "sunrise/coding-standard": "1.0.0"
     },
-    "provide": {
-        "psr/http-message-implementation": "1.0"
-    },
     "autoload": {
         "psr-4": {
             "Sunrise\\Stream\\": "src/"
@@ -45,7 +45,12 @@
     "scripts": {
         "test": [
             "phpcs",
-            "XDEBUG_MODE=coverage phpunit --colors=always --coverage-text"
+            "psalm",
+            "XDEBUG_MODE=coverage phpunit --coverage-text --colors=always"
+        ],
+        "build": [
+            "phpdoc -d src/ -t phpdoc/",
+            "XDEBUG_MODE=coverage phpunit --coverage-html coverage/"
         ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
-<phpunit colors="true">
+<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 Stream Test Suite">
+        <testsuite name="sunrise/stream">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <const name="STREAM_FACTORY" value="Sunrise\Stream\StreamFactory"/>
-    </php>
 </phpunit>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -0,0 +1,18 @@
+<?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>
+
+    <issueHandlers>
+        <DocblockTypeContradiction errorLevel="info" />
+    </issueHandlers>
+</psalm>
diff --git a/src/Stream.php b/src/Stream.php
diff --git a/src/StreamFactory.php b/src/StreamFactory.php
diff --git a/tests/StreamFactoryTest.php b/tests/StreamFactoryTest.php
