Merge pull request #376 from j0k3r/fix/2.x-backport-master

Jump to Codecov & Remove Guzzle 5

Author: j0k3r

.github/workflows/continuous-integration.yml

@@ -90,16 +90,11 @@ jobs:
       - name: "Run PHPUnit (with coverage)"
         run: "php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml"
 
-      - name: "Retrieve Coveralls phar"
-        run: "wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.2/php-coveralls.phar"
-
-      - name: "Enable Coveralls phar"
-        run: "chmod +x php-coveralls.phar"
-
-      - name: "Upload to Coveralls"
-        run: "php php-coveralls.phar -v -x build/logs/clover.xml"
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: ./build/logs/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   phpunit-lowest:
     name: "PHPUnit lowest deps (PHP ${{ matrix.php }})"
@@ -137,45 +132,6 @@ jobs:
       - name: "Run PHPUnit"
         run: "php vendor/bin/simple-phpunit -v"
 
-  phpunit-guzzle5:
-    name: "PHPUnit (PHP ${{ matrix.php }} and Guzzle 5)"
-    runs-on: "ubuntu-latest"
-
-    strategy:
-      matrix:
-        php:
-          - "7.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: "none"
-          tools: composer:v2
-          extensions: tidy
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
-
-      - name: "Setup adapter: Guzzle 5"
-        run: |
-          composer remove guzzlehttp/guzzle php-http/guzzle6-adapter --dev -n
-          composer require php-http/guzzle5-adapter --dev -n --with-all-dependencies
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit"
-        run: "php vendor/bin/simple-phpunit -v"
-
   phpunit-guzzle7:
     name: "PHPUnit (PHP ${{ matrix.php }} and Guzzle 7)"
     runs-on: "ubuntu-latest"
@@ -254,37 +210,3 @@ jobs:
 
       - name: "Run PHPUnit"
         run: "php vendor/bin/simple-phpunit -v"
-
-  phpunit-composerv1:
-    name: "PHPUnit Composer v1 (PHP ${{ matrix.php }})"
-    runs-on: "ubuntu-latest"
-
-    strategy:
-      matrix:
-        php:
-          - "7.4"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: "none"
-          tools: composer:v1
-          extensions: tidy
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
-
-      - name: "Setup logs"
-        run: "mkdir -p build/logs"
-
-      - name: "Run PHPUnit"
-        run: "php vendor/bin/simple-phpunit -v"

README.md

@@ -9,7 +9,7 @@
 
 [![Join the chat at https://gitter.im/j0k3r/graby](https://badges.gitter.im/j0k3r/graby.svg)](https://gitter.im/j0k3r/graby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 ![CI](https://github.com/j0k3r/graby/workflows/CI/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/j0k3r/graby/badge.svg?branch=master&service=github)](https://coveralls.io/github/j0k3r/graby?branch=master)
+[![codecov](https://codecov.io/github/j0k3r/graby/branch/2.x/graph/badge.svg?token=yyhZtiTBlc)](https://codecov.io/github/j0k3r/graby)
 [![Total Downloads](https://img.shields.io/packagist/dt/j0k3r/graby.svg)](https://packagist.org/packages/j0k3r/graby)
 [![License](https://poser.pugx.org/j0k3r/graby/license)](https://packagist.org/packages/j0k3r/graby)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/j0k3r/graby/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/j0k3r/graby/?branch=master)
@@ -57,7 +57,6 @@ Why `php-http/guzzle6-adapter`? Because Graby is decoupled from any HTTP client
 Graby is tested & should work great with:
 
 - Guzzle 6 (using `php-http/guzzle6-adapter`)
-- Guzzle 5 (using `php-http/guzzle5-adapter`)
 - cURL (using `php-http/curl-client` and a PSR-17 response factory [from this list](https://packagist.org/providers/psr/http-factory-implementation))
 
 ### Retrieve content from an url
@@ -198,20 +197,6 @@ $logs = $this->get('monolog.handler.graby')->getRecords();
 If you need to define a timeout, you must create the `Http\Client\HttpClient` manually,
 configure it and inject it to `Graby\Graby`.
 
-- For Guzzle 5:
-
-    ```php
-    use Graby\Graby;
-    use GuzzleHttp\Client as GuzzleClient;
-    use Http\Adapter\Guzzle5\Client as GuzzleAdapter;
-    $guzzle = new GuzzleClient([
-        'defaults' => [
-            'timeout' => 2,
-        ]
-    ]);
-    $graby = new Graby([], new GuzzleAdapter($guzzle));
-    ```
-
 - For Guzzle 6:
 
     ```php

UPGRADE-2.0.md

@@ -12,7 +12,7 @@ Graby 1 was hardly tied to Guzzle 5.
 Graby 2 supports any [HTTP client implementation](https://packagist.org/providers/php-http/client-implementation). It is currently tested against:
 
 - Guzzle 6
-- Guzzle 5
+- Guzzle 7
 - cURL
 
 Here is how to install Graby with Guzzle 6:

composer.json

@@ -21,7 +21,7 @@
         "fossar/htmlawed": "^1.2.7",
         "http-interop/http-factory-guzzle": "^1.1",
         "j0k3r/graby-site-config": "^1.0.181",
-        "j0k3r/httplug-ssrf-plugin": "^2.0",
+        "j0k3r/httplug-ssrf-plugin": "^2.0|^3.0",
         "j0k3r/php-readability": "^1.2.10",
         "monolog/monolog": "^1.18.0|^2.0",
         "php-http/client-common": "^2.7",

phpstan.neon

@@ -8,9 +8,9 @@ parameters:
         - vendor/bin/.phpunit/phpunit-8.5-0/vendor/autoload.php
 
     ignoreErrors:
-        # because we check for some HTTP client to exist or not (Guzzle 5/6 & cURL)
+        # because we check for some HTTP client to exist or not (Guzzle 6 & cURL)
         -
-            message: '#Http\\Adapter\\Guzzle5\\Client\\|Http\\Adapter\\Guzzle6\\Client\\|Http\\Client\\Curl\\Client given#'
+            message: '#Http\\Adapter\\Guzzle6\\Client\\|Http\\Client\\Curl\\Client given#'
             path: %currentWorkingDirectory%/tests/Extractor/HttpClientTest.php
         # we don't want to BC by defining typehint everywhere
         # TODO: remove when jumping to 3.0

tests/Extractor/HttpClientTest.php

@@ -280,10 +280,6 @@ public function testTimeout(): void
             $isGuzzle = true;
             $guzzle = new \GuzzleHttp\Client(['timeout' => 2]);
             $adapter = new \Http\Adapter\Guzzle6\Client($guzzle);
-        } elseif (class_exists('Http\Adapter\Guzzle5\Client')) {
-            $isGuzzle = true;
-            $guzzle = new \GuzzleHttp\Client(['defaults' => ['timeout' => 2]]);
-            $adapter = new \Http\Adapter\Guzzle5\Client($guzzle);
         } elseif (class_exists('Http\Client\Curl\Client')) {
             $isCurl = true;
             $adapter = new \Http\Client\Curl\Client(