Merge pull request #4 from superbrave/DV-8390

[DV-8390] Made package PHP ^8.2 and Symfony ^6.4|^7.0 compatible.
superbrave · Apr 22, 2024 · c9e64f9 · c9e64f9
2 parents b5a26c2 + 9aba54c
commit c9e64f9
Show file tree

Hide file tree

Showing 21 changed files with 357 additions and 3,443 deletions.
diff --git a/.github/workflows/quality-assurance.yaml b/.github/workflows/quality-assurance.yaml
@@ -0,0 +1,33 @@
+on:
+    pull_request:
+        types:
+            - opened
+            - synchronize
+            - reopened
+        branches:
+            - '*'
+
+jobs:
+    qa:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.2'
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
+            - name: Run tests
+              run: composer test
+
+            - name: Check PHPCS
+              run: composer check-code-style
+
+            - name: Check PHPStan
+              run: composer check-phpstan
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor/
 *.cache
+composer.lock
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+    ]);
+
+return (new Config())
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR12' => true,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
+        'phpdoc_to_comment' => false,
+        'declare_strict_types' => true,
+        'global_namespace_import' => [
+            'import_classes' => true,
+        ],
+        'phpdoc_separation' => false,
+        'phpdoc_align' => false,
+        'multiline_whitespace_before_semicolons' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+                'parameters',
+                'match',
+            ],
+        ],
+        'no_unused_imports' => true,
+        'ordered_class_elements' => [
+            'order' => [
+                'use_trait',
+                'constant_public',
+                'constant_protected',
+                'constant_private',
+                'case',
+                'property',
+                'construct',
+                'destruct',
+                'magic',
+                'phpunit',
+                'method_public',
+                'method_protected',
+                'method_private',
+            ],
+        ],
+        'ordered_imports' => true,
+        'yoda_style' => false,
+        'nullable_type_declaration_for_default_null_value' => false,
+    ])
+    ->setFinder($finder);
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/README.md b/README.md
@@ -1,29 +1,26 @@
-# Verbose error HTTP client
+# Verbose error HTTP client bundle
 
 [![Latest version on Packagist][ico-version]][link-version]
 [![Software License][ico-license]][link-license]
-[![Build Status][ico-build]][link-build]
-[![Coverage Status][ico-coverage]][link-coverage]
-[![Code Quality][ico-code-quality]][link-code-quality]
 
 Increased verbosity of error messages in the Symfony HTTP client.
 
 ## Installation using Composer
 Run the following command to add the package to the composer.json of your project:
 
 ``` bash
-$ composer require superbrave/verbose-error-http-client symfony/http-client
+$ composer require superbrave/verbose-error-http-client-bundle symfony/http-client
 ```
 
 The `symfony/http-client` can be replaced with any other HTTP client implementing the Symfony HTTP client contracts.
 
 ## Usage
 The following example shows how to create the instances required execute requests with verbose exception messages:
+
 ```php
 <?php
 
-use Superbrave\VerboseErrorHttpClient\VerboseErrorHttpClient;
-use Symfony\Component\HttpClient\HttpClient;
+use Superbrave\VerboseErrorHttpClient\HttpClient\VerboseErrorHttpClient;use Symfony\Component\HttpClient\HttpClient;
 
 $httpClient = HttpClient::create();
 $verboseErrorHttpClient = new VerboseErrorHttpClient($httpClient);
@@ -32,17 +29,10 @@ $response = $verboseErrorHttpClient->request('GET', 'https://superbrave.nl/api')
 ```
 
 ## License
-The Verbose error HTTP client is licensed under the MIT License. Please see the [LICENSE file][link-license]
-for details.
+The Verbose error HTTP client is licensed under the MIT License. Please see the [LICENSE file][link-license] for details.
 
 [ico-version]: https://img.shields.io/packagist/v/superbrave/verbose-error-http-client
 [ico-license]: https://img.shields.io/packagist/l/superbrave/verbose-error-http-client
-[ico-build]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/badges/build.png?b=master
-[ico-coverage]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/badges/coverage.png?b=master
-[ico-code-quality]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/badges/quality-score.png?b=master
 
 [link-version]: https://packagist.org/packages/superbrave/verbose-error-http-client
 [link-license]: LICENSE
-[link-build]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/build-status/master
-[link-coverage]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/build-status/master
-[link-code-quality]: https://scrutinizer-ci.com/g/superbrave/verbose-error-http-client/build-status/master
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "superbrave/verbose-error-http-client",
+    "name": "superbrave/verbose-error-http-client-bundle",
     "description": "Increased verbosity of error messages in the Symfony HTTP client.",
-    "type": "library",
+    "type": "symfony-bundle",
     "license": "MIT",
     "authors": [
         {
@@ -10,13 +10,17 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "symfony/http-client-contracts": "^1.1 || ^2.0"
+        "php": "^8.2",
+        "symfony/http-client-contracts": "^3.4",
+        "symfony/dependency-injection": "^6.4|^7.0",
+        "symfony/framework-bundle": "^6.4|^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.15",
-        "phpunit/phpunit": "^8.3",
-        "symfony/http-client": "^4.4 || ^5.1"
+        "roave/security-advisories": "dev-latest",
+        "friendsofphp/php-cs-fixer": "^3.54",
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^9.6",
+        "symfony/http-client": "^6.4|^7.0"
     },
     "suggest": {
         "symfony/http-client": "This package requires an actual Symfony HTTP client implementation to decorate."
@@ -26,15 +30,21 @@
     },
     "autoload": {
         "psr-4": {
-            "Superbrave\\VerboseErrorHttpClient\\": "src/"
+            "Superbrave\\VerboseErrorHttpClientBundle\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Superbrave\\VerboseErrorHttpClient\\Tests\\": "tests/"
+            "Superbrave\\VerboseErrorHttpClientBundle\\Tests\\": "tests/"
         }
     },
     "config": {
         "sort-packages": true
+    },
+    "scripts": {
+        "check-phpstan": "vendor/bin/phpstan analyse",
+        "check-code-style": "vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run -v",
+        "fix-code-style": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
+        "test": "phpunit"
     }
 }