Merge pull request #21 from sunrise-php/release/v1.3.0

v1.3.0
sunrise-php · Feb 1, 2021 · db6bf51 · db6bf51
2 parents 12c452a + ca93d9a
commit db6bf51
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,55 @@
+# PHP CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-php/ for more details
+#
+version: 2
+jobs:
+  php71:
+    docker:
+      - image: circleci/php:7.1-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --prefer-source --no-suggest
+      - run: php vendor/bin/phpunit --colors=always
+  php72:
+    docker:
+      - image: circleci/php:7.2-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --prefer-source --no-suggest
+      - run: php vendor/bin/phpunit --colors=always
+  php73:
+    docker:
+      - image: circleci/php:7.3-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --prefer-source --no-suggest
+      - run: php vendor/bin/phpunit --colors=always
+  php74:
+    docker:
+      - image: circleci/php:7.4-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --prefer-source --no-suggest
+      - run: php vendor/bin/phpunit --colors=always
+  php80:
+    docker:
+      - image: circleci/php:8.0-cli-node-browsers
+    steps:
+      - checkout
+      - run: php -v
+      - run: composer install --no-interaction --prefer-source --no-suggest
+      - run: php vendor/bin/phpunit --colors=always
+workflows:
+  version: 2
+  build:
+    jobs:
+      - php71
+      - php72
+      - php73
+      - php74
+      - php80
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 .php_cs.cache
+.phpunit.result.cache
 composer.lock
 coverage.xml
+phpbench.json
 phpcs.xml
 phpunit.xml
 vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ matrix:
     - php: 7.1
     - php: 7.2
     - php: 7.3
+    - php: 7.4
+    - php: nightly
   fast_finish: true
 
 before_install:

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Anatoly Fenric
+Copyright (c) 2018 Sunrise // PHP
 
 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,13 +1,15 @@
-## Sunrise // HTTP cURL client for PHP 7.1+ based on PSR-18
+## HTTP cURL client for PHP 7.1+ (incl. PHP 8) based on PSR-18
 
 [![Gitter](https://badges.gitter.im/sunrise-php/support.png)](https://gitter.im/sunrise-php/support)
-[![Build Status](https://api.travis-ci.com/sunrise-php/http-client-curl.svg?branch=master)](https://travis-ci.com/sunrise-php/http-client-curl)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/?branch=master)
+[![Build Status](https://circleci.com/gh/sunrise-php/http-client-curl.svg?style=shield)](https://circleci.com/gh/sunrise-php/http-client-curl)
 [![Code Coverage](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/sunrise/http-client-curl/v/stable)](https://packagist.org/packages/sunrise/http-client-curl)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sunrise-php/http-client-curl/?branch=master)
 [![Total Downloads](https://poser.pugx.org/sunrise/http-client-curl/downloads)](https://packagist.org/packages/sunrise/http-client-curl)
+[![Latest Stable Version](https://poser.pugx.org/sunrise/http-client-curl/v/stable)](https://packagist.org/packages/sunrise/http-client-curl)
 [![License](https://poser.pugx.org/sunrise/http-client-curl/license)](https://packagist.org/packages/sunrise/http-client-curl)
 
+---
+
 ## Installation
 
 ```bash
@@ -62,15 +64,15 @@ $client = new Client(new ResponseFactory(), [
 ]);
 ```
 
+---
+
 ## Test run
 
 ```bash
-php vendor/bin/phpunit --colors=always --coverage-text
+composer test
 ```
 
-## Api documentation
-
-https://phpdoc.fenric.ru/
+---
 
 ## Useful links
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,8 @@
 {
     "name": "sunrise/http-client-curl",
-    "description": "Sunrise // HTTP cURL client for PHP 7.1+ based on PSR-18",
+    "homepage": "https://github.com/sunrise-php/http-client-curl",
+    "description": "Sunrise // HTTP cURL client for PHP 7.1+ (incl. PHP 8) based on PSR-18",
+    "license": "MIT",
     "keywords": [
         "fenric",
         "sunrise",
@@ -10,10 +12,10 @@
         "psr-2",
         "psr-7",
         "psr-17",
-        "psr-18"
+        "psr-18",
+        "php7",
+        "php8"
     ],
-    "homepage": "https://github.com/sunrise-php/http-client-curl",
-    "license": "MIT",
     "authors": [
         {
             "name": "Anatoly Fenric",
@@ -27,17 +29,16 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
         "ext-curl": "*",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "7.5.12",
-        "phpunit/php-code-coverage": "6.1.4",
+        "phpunit/phpunit": "7.5.20|9.5.0",
         "sunrise/coding-standard": "1.0.0",
-        "sunrise/http-factory": "1.0.8"
+        "sunrise/http-factory": "1.1.0"
     },
     "provide": {
         "psr/http-client-implementation": "1.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<phpunit colors="true">
+<phpunit colors="true" 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 HTTP CURL Client Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -44,7 +44,7 @@ public function testSendRequestWithEmptyUri()
         $request = (new RequestFactory)->createRequest('GET', '');
 
         $this->expectException(NetworkExceptionInterface::class);
-        $this->expectExceptionMessage('<url> malformed');
+        // $this->expectExceptionMessage('<url> malformed');
         $client->sendRequest($request);
     }