Merge pull request #3 from Art4/psr12-code-style

Change code style to PSR-12

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: ['ubuntu-latest']
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout

.gitignore

@@ -1,2 +1,4 @@
+/.php-cs-fixer.cache
+/.phpunit.result.cache
 /composer.lock
 /vendor/

.php-cs-fixer.dist.php

@@ -0,0 +1,17 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in('src')
+    ->in('tests')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR12' => true,
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
+        'void_return' => false,
+        '@PHPUnit84Migration:risky' => true,
+    ])
+    ->setFinder($finder)
+;

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add required PHP version in `composer.json`
 
+### Changed
+
+- Change Code Style to PSR-12
+- Drop support for PHP 7.0
+
 ## [1.0.0-beta](https://github.com/Art4/WP-Requests-PSR18-Adapter/compare/09aae5d7deac8058c5a25c1d951cd350d066ad6e...1.0.0-beta)
 
 ### Added

README.md

@@ -2,7 +2,7 @@
 
 Use [WordPress/Requests](https://github.com/WordPress/Requests) as a [PSR-18](https://www.php-fig.org/psr/psr-18/) HTTP client adapter.
 
-Requires PHP 7.0+
+Requires PHP 7.1+
 
 ## Why?
 
@@ -30,7 +30,7 @@ require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 // Define Requests options
 $options = [
-	'proxy' => '127.0.0.1:8080',
+    'proxy' => '127.0.0.1:8080',
     'transport' => $customTransport,
     // other Requests options
 ];
@@ -50,6 +50,6 @@ try {
     throw $th;
 }
 
-// See the result
+// Use the PSR-7 Response
 var_dump($response);
 ```

composer.json

@@ -13,12 +13,13 @@
         }
     ],
     "require": {
-        "php": "^7.0 || ^8.0",
+        "php": "^7.1 || ^8.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "rmccue/requests": "^2.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.0",
         "yoast/phpunit-polyfills": "^1.0"
     },
     "autoload": {

src/Exception/Psr/NetworkException.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Transport Exception
  *
@@ -23,36 +25,38 @@
  *
  * Example: the target host name can not be resolved or the connection failed.
  */
-class NetworkException extends Exception implements NetworkExceptionInterface {
-
+class NetworkException extends Exception implements NetworkExceptionInterface
+{
     /**
-	 * @var RequestInterface
-	 */
-	private $request;
+     * @var RequestInterface
+     */
+    private $request;
 
-	/**
-	 * Create a new exception
-	 *
-	 * @param RequestInterface $request
-	 * @param Transport        $previous
-	 */
-	public function __construct(RequestInterface $request, Transport $previous) {
-		parent::__construct(
-			$previous->getMessage(),
-			$previous->getType(),
-			$previous->getData(),
-			$previous->getCode()
-		);
+    /**
+     * Create a new exception
+     *
+     * @param RequestInterface $request
+     * @param Transport        $previous
+     */
+    public function __construct(RequestInterface $request, Transport $previous)
+    {
+        parent::__construct(
+            $previous->getMessage(),
+            $previous->getType(),
+            $previous->getData(),
+            $previous->getCode()
+        );
 
-		$this->request = $request;
-	}
+        $this->request = $request;
+    }
 
-	/**
-	 * Returns the request.
-	 *
-	 * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
-	 */
-	public function getRequest(): RequestInterface {
-		return $this->request;
-	}
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     */
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
 }

src/Exception/Psr/RequestException.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Transport Exception
  *
@@ -20,36 +22,38 @@
  *      - Request is invalid (e.g. method is missing)
  *      - Runtime request errors (e.g. the body stream is not seekable)
  */
-class RequestException extends Exception implements RequestExceptionInterface {
-
-	/**
-	 * @var RequestInterface
-	 */
-	private $request;
+class RequestException extends Exception implements RequestExceptionInterface
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
 
-	/**
-	 * Create a new exception
-	 *
-	 * @param RequestInterface $request
-	 * @param Transport        $previous
-	 */
-	public function __construct(RequestInterface $request, Exception $previous) {
-		parent::__construct(
-			$previous->getMessage(),
-			$previous->getType(),
-			$previous->getData(),
-			$previous->getCode()
-		);
+    /**
+     * Create a new exception
+     *
+     * @param RequestInterface $request
+     * @param Transport        $previous
+     */
+    public function __construct(RequestInterface $request, Exception $previous)
+    {
+        parent::__construct(
+            $previous->getMessage(),
+            $previous->getType(),
+            $previous->getData(),
+            $previous->getCode()
+        );
 
-		$this->request = $request;
-	}
+        $this->request = $request;
+    }
 
-	/**
-	 * Returns the request.
-	 *
-	 * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
-	 */
-	public function getRequest(): RequestInterface {
-		return $this->request;
-	}
+    /**
+     * Returns the request.
+     *
+     * The request object MAY be a different object from the one passed to ClientInterface::sendRequest()
+     */
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
 }