Fix up CI. PHP 7.4+

dereuromark · dereuromark · commit b3a68235e19c · 2023-01-04T19:00:01.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,103 @@
+name: CI
+
+on:
+    push:
+        branches:
+            - master
+    pull_request:
+    workflow_dispatch:
+
+jobs:
+    testsuite:
+        runs-on: ubuntu-22.04
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: ['7.4', '8.2']
+                db-type: [sqlite, mysql, pgsql]
+                prefer-lowest: ['']
+                include:
+                    - php-version: '7.4'
+                      db-type: 'sqlite'
+                      prefer-lowest: 'prefer-lowest'
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  extensions: mbstring
+                  coverage: pcov
+
+            - name: Get composer cache directory
+              id: composercache
+              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+            - name: Cache dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ${{ steps.composercache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+                  restore-keys: ${{ runner.os }}-composer-
+
+            - name: Composer install
+              run: |
+                  composer --version
+                  if ${{ matrix.prefer-lowest == 'prefer-lowest' }}
+                  then
+                    composer update --prefer-lowest --prefer-stable
+                  else
+                    composer install --no-progress --prefer-dist --optimize-autoloader
+                  fi
+                  if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then composer lowest-setup; fi
+
+            - name: Run PHPUnit
+              run: |
+                  if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'sqlite' ]]; then
+                    vendor/bin/phpunit --coverage-clover=coverage.xml
+                  else
+                    vendor/bin/phpunit
+                  fi
+
+            - name: Validate prefer-lowest
+              run: if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then vendor/bin/validate-prefer-lowest -m; fi
+
+            - name: Code Coverage Report
+              if: success() && matrix.php-version == '7.4' && matrix.db-type == 'sqlite'
+              uses: codecov/codecov-action@v3
+
+    validation:
+        name: Coding Standard & Static Analysis
+        runs-on: ubuntu-22.04
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+                  extensions: mbstring
+                  coverage: none
+
+            - name: Get composer cache directory
+              id: composercache
+              run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+            - name: Cache dependencies
+              uses: actions/cache@v3
+              with:
+                  path: ${{ steps.composercache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+                  restore-keys: ${{ runner.os }}-composer-
+
+            - name: Composer Setup
+              run: composer stan-setup
+
+            - name: Run phpstan
+              run: vendor/bin/phpstan analyse --error-format=github
+
+            - name: Run phpcs
+              run: composer cs-check
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -5,11 +5,12 @@
 [![Build Status](https://img.shields.io/travis/php-http/cakephp-adapter.svg?style=flat-square)](https://travis-ci.org/php-http/cakephp-adapter)
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
 [![Quality Score](https://img.shields.io/scrutinizer/g/php-http/cakephp-adapter.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/cakephp-adapter)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
 [![Total Downloads](https://img.shields.io/packagist/dt/php-http/cakephp-adapter.svg?style=flat-square)](https://packagist.org/packages/php-http/cakephp-adapter)
 
 [HTTPlug](http://httplug.io) adapter for the [CakePHP](https://cakephp.org/) HTTP library.
 
-This branch is for use with CakePHP 4.0+.
+This branch is for use with CakePHP 4.2+.
 
 ## Install
 
diff --git a/composer.json b/composer.json
@@ -11,13 +11,15 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "php-http/httplug": "^2.0",
         "php-http/discovery": "^1.0",
-        "cakephp/cakephp": "^4.0"
+        "cakephp/cakephp": "^4.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^9.5",
+        "php-http/message-factory": "^1.0.2",
+        "spryker/code-sniffer": "^0.17.15"
     },
     "autoload": {
         "psr-4": {
@@ -38,6 +40,21 @@
         "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
     },
     "prefer-stable": true,
+    "scripts": {
+        "test": "phpunit",
+        "test-coverage": "phpunit --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
+        "stan": "phpstan analyse",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.0.0 && mv composer.backup composer.json",
+        "lowest": " validate-prefer-lowest",
+        "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
+        "cs-check": "phpcs --extensions=php",
+        "cs-fix": "phpcbf --extensions=php"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.3-dev"
diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<ruleset name="cakephp-feedback">
+
+	<arg value="nps"/>
+
+	<file>src/</file>
+	<file>tests/</file>
+
+	<exclude-pattern>/TestApp/templates/</exclude-pattern>
+
+    <rule ref="vendor/spryker/code-sniffer/Spryker/ruleset.xml"/>
+
+</ruleset>
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,8 @@
+parameters:
+    level: 8
+    paths:
+        - src/
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    ignoreErrors:
+        - '#Parameter \#3 \$headers of class .+Request constructor expects array<non-empty-string, non-empty-string>, array<array<string>> given.#'
diff --git a/src/Client.php b/src/Client.php
@@ -4,13 +4,11 @@
 
 use Cake\Http\Client as CakeClient;
 use Cake\Http\Client\Request;
+use Exception;
 use Http\Client\Exception\NetworkException;
 use Http\Client\HttpClient;
-use Http\Discovery\MessageFactoryDiscovery;
-use Http\Message\ResponseFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Throwable;
 
 /**
  * Client compatible with PSR7 and Httplug interfaces, using a CakePHP client.
@@ -20,32 +18,27 @@ class Client implements HttpClient
     /**
      * @var \Cake\Http\Client
      */
-    private $client;
-
-    /**
-     * @var \Http\Message\ResponseFactory
-     */
-    private $responseFactory;
+    protected $client;
 
     /**
      * @param \Cake\Http\Client|null $client
-     * @param \Http\Message\ResponseFactory|null $responseFactory
      */
-    public function __construct(CakeClient $client = null, ResponseFactory $responseFactory = null)
+    public function __construct(?CakeClient $client = null)
     {
         $this->client = $client ?: new CakeClient();
-        $this->responseFactory = $responseFactory ?: MessageFactoryDiscovery::find();
     }
 
     /**
      * @inheritdoc
+     *
+     * @throws \Http\Client\Exception\NetworkException
      */
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         $cakeRequest = new Request(
-            (string) $request->getUri(),
+            (string)$request->getUri(),
             $request->getMethod(),
-            $request->getHeaders()
+            $request->getHeaders(),
         );
 
         $cakeRequest = $cakeRequest
@@ -58,7 +51,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 
         try {
             $response = $this->client->send($cakeRequest, $this->client->getConfig());
-        } catch (Throwable $exception) {
+        } catch (Exception $exception) {
             throw new NetworkException('Failed to send request', $request, $exception);
         }
 
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -2,16 +2,40 @@
 
 namespace Http\Adapter\Cake\Tests;
 
+use Cake\Http\Client\Response;
+use Cake\Http\ServerRequest;
 use Http\Adapter\Cake\Client;
-use Http\Client\Tests\HttpClientTest;
+use PHPUnit\Framework\TestCase;
 
-class ClientTest extends HttpClientTest
+class ClientTest extends TestCase
 {
     /**
-     * @return \Http\Adapter\Cake\Client
+     * @return void
      */
-    protected function createHttpAdapter(): Client
+    public function testInstance(): void
     {
-        return new Client();
+        $client = new Client();
+        $this->assertInstanceOf(Client::class, $client);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendRequest(): void
+    {
+        $serverRequest = new ServerRequest();
+
+        $client = new Client();
+        $response = $client->sendRequest($serverRequest);
+
+        $this->assertInstanceOf(Response::class, $response);
+    }
+
+    /**
+     * @return \Http\Adapter\Cake\Client|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected function createHttpAdapterMock(): Client
+    {
+        return $this->getMockBuilder(Client::class)->getMock();
     }
 }
