php 8.0+ fixes, phpcs fixes

api_tools.services.yml

@@ -9,7 +9,7 @@ services:
 
   api_tools.rest.api_manager:
     class: Drupal\api_tools\Rest\ApiManager
-    arguments: ['@http_client', '@logger.channel.api_tools']
+    arguments: ['@http_client']
 
   api_tools.rest.request_factory:
     class: Drupal\api_tools\Rest\RequestFactory

modules/api_tools_example/src/Plugin/RestApiRequest/Example.php

@@ -4,12 +4,11 @@
 
 namespace Drupal\api_tools_example\Plugin\RestApiRequest;
 
-use Drupal\Core\Url;
 use Drupal\api_tools\Request\Request;
 use Drupal\api_tools\Rest\ApiRequestBase;
 use Drupal\api_tools_example\Mock\ResponseEntity;
 use Drupal\api_tools_example\Response\ExampleResponse;
-use Generator;
+use Drupal\Core\Url;
 use League\Uri\Uri;
 use Psr\Http\Message\ResponseInterface;
 
@@ -54,7 +53,7 @@ public function getExampleData() : ExampleResponse {
    * @yield \Drupal\api_tools_example\Response\ExampleResponse
    *   The response.
    */
-  public function getMultipleExampleData(int $num) : Generator {
+  public function getMultipleExampleData(int $num) : \Generator {
     $requests = [];
 
     for ($i = 0; $i < $num; $i++) {

src/Exception/ErrorResponseException.php

@@ -5,20 +5,12 @@
 namespace Drupal\api_tools\Exception;
 
 use Drupal\api_tools\Response\ErrorResponse;
-use Throwable;
 
 /**
  * An exception for ErrorResponse responses.
  */
 final class ErrorResponseException extends \Exception {
 
-  /**
-   * The response.
-   *
-   * @var \Drupal\api_tools\Response\ErrorResponse
-   */
-  private $response;
-
   /**
    * Constructs a new instance.
    *
@@ -27,9 +19,7 @@ final class ErrorResponseException extends \Exception {
    * @param \Throwable|null $previous
    *   The throwable.
    */
-  public function __construct(ErrorResponse $response, Throwable $previous = NULL) {
-    $this->response = $response;
-
+  public function __construct(private ErrorResponse $response, \Throwable $previous = NULL) {
     $message = '';
 
     if ($response->getResponseDebug()) {
@@ -44,7 +34,7 @@ public function __construct(ErrorResponse $response, Throwable $previous = NULL)
    * @return \Drupal\api_tools\Response\ErrorResponse
    *   The response.
    */
-  public function getResposne(): ErrorResponse {
+  public function getResponse(): ErrorResponse {
     return $this->response;
   }
 

src/Request/Request.php

@@ -11,29 +11,6 @@
  */
 class Request {
 
-  /**
-   * The method.
-   *
-   * @var string
-   */
-  protected string $method = 'GET';
-
-  /**
-   * The uri.
-   *
-   * @var \League\Uri\Contracts\UriInterface
-   */
-  protected UriInterface $uri;
-
-  /**
-   * The request options.
-   *
-   * @var array
-   *
-   * @see \GuzzleHttp\Client::requestAsync()
-   */
-  protected array $options = [];
-
   /**
    * Constructs a new instance.
    *
@@ -44,10 +21,11 @@ class Request {
    * @param array $options
    *   The request options.
    */
-  public function __construct(UriInterface $uri, string $method = 'GET', array $options = []) {
-    $this->uri = $uri;
-    $this->method = $method;
-    $this->options = $options;
+  public function __construct(
+    private UriInterface $uri,
+    private string $method = 'GET',
+    private array $options = []
+  ) {
   }
 
   /**

src/Response/Debug.php

@@ -9,20 +9,6 @@
  */
 final class Debug {
 
-  /**
-   * The response description.
-   *
-   * @var string
-   */
-  protected string $description;
-
-  /**
-   * The improvement instructions.
-   *
-   * @var string[]
-   */
-  protected array $instructions = [];
-
   /**
    * Constructs a new instance.
    *
@@ -32,11 +18,9 @@ final class Debug {
    *   The improvement instructions.
    */
   public function __construct(
-    string $description,
-    array $instructions = []
+    private string $description,
+    private array $instructions = []
   ) {
-    $this->description = $description;
-    $this->instructions = $instructions;
   }
 
   /**
@@ -50,12 +34,12 @@ public function getDescription() {
   }
 
   /**
-   * Gets the improvement instructoins.
+   * Gets the improvement instructions.
    *
    * @return string[]
    *   The improvement instructions.
    */
-  public function getInstructions() {
+  public function getInstructions() : array {
     return $this->instructions;
   }
 

src/Rest/ApiManager.php

@@ -4,47 +4,27 @@
 
 namespace Drupal\api_tools\Rest;
 
+use Drupal\api_tools\Exception\ErrorResponseException;
 use Drupal\api_tools\Request\Request;
 use Drupal\api_tools\Response\Debug;
 use Drupal\api_tools\Response\ErrorResponse;
-use Drupal\api_tools\Exception\ErrorResponseException;
-use Generator;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\Utils;
-use Psr\Log\LoggerInterface;
 
 /**
  * Provides connector for sending API requests to Portal API.
  */
 final class ApiManager {
 
-  /**
-   * The http client.
-   *
-   * @var \GuzzleHttp\ClientInterface
-   */
-  protected ClientInterface $client;
-
-  /**
-   * The logger.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected LoggerInterface $logger;
-
   /**
    * Constructs a new instance.
    *
-   * @param \GuzzleHttp\ClientInterface $httpClient
+   * @param \GuzzleHttp\ClientInterface $client
    *   The http client.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   The logger.
    */
-  public function __construct(ClientInterface $httpClient, LoggerInterface $logger) {
-    $this->client = $httpClient;
-    $this->logger = $logger;
+  public function __construct(private ClientInterface $client) {
   }
 
   /**
@@ -62,7 +42,7 @@ public function __construct(ClientInterface $httpClient, LoggerInterface $logger
    *
    * @throws \Drupal\api_tools\Exception\ErrorResponseException
    */
-  public function handlePromises(array $promises, callable $callable) : Generator {
+  public function handlePromises(array $promises, callable $callable) : \Generator {
     // Wait all promises to be finished.
     try {
       $results = Utils::unwrap($promises);

src/Rest/ApiRequestBase.php

@@ -4,25 +4,17 @@
 
 namespace Drupal\api_tools\Rest;
 
-use Drupal\Component\Plugin\PluginBase;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\api_tools\Request\Request;
 use Drupal\api_tools\Response\Response;
-use Generator;
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base class for rest request plugins.
  */
 abstract class ApiRequestBase extends PluginBase implements ContainerFactoryPluginInterface {
 
-  /**
-   * The api manager.
-   *
-   * @var \Drupal\api_tools\Rest\ApiManager
-   */
-  protected ApiManager $apiManager;
-
   /**
    * Constructs a new instance.
    *
@@ -35,16 +27,14 @@ abstract class ApiRequestBase extends PluginBase implements ContainerFactoryPlug
    * @param \Drupal\api_tools\Rest\ApiManager $apiManager
    *   The api manager.
    */
-  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, ApiManager $apiManager) {
-    $this->apiManager = $apiManager;
-
+  public function __construct(array $configuration, string $plugin_id, array $plugin_definition, protected ApiManager $apiManager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) : static {
     return new static(
       $configuration,
       $plugin_id,
@@ -85,7 +75,7 @@ public function request(Request $request, callable $callback) : Response {
    *
    * @throws \Drupal\api_tools\Exception\ErrorResponseException
    */
-  public function requestMultiple(array $requests, callable $callback): Generator {
+  public function requestMultiple(array $requests, callable $callback): \Generator {
     $promises = [];
 
     foreach ($requests as $request) {

src/Rest/RequestFactory.php

@@ -9,21 +9,13 @@
  */
 final class RequestFactory {
 
-  /**
-   * The request plugin manager.
-   *
-   * @var \Drupal\api_tools\Rest\ApiRequestPluginManager
-   */
-  private ApiRequestPluginManager $requestManager;
-
   /**
    * Constructs a new instance.
    *
-   * @param \Drupal\api_tools\Rest\ApiRequestPluginManager $apiRequestManager
+   * @param \Drupal\api_tools\Rest\ApiRequestPluginManager $requestManager
    *   The api request manager.
    */
-  public function __construct(ApiRequestPluginManager $apiRequestManager) {
-    $this->requestManager = $apiRequestManager;
+  public function __construct(private ApiRequestPluginManager $requestManager) {
   }
 
   /**
@@ -42,4 +34,3 @@ public function create(string $id) : ApiRequestBase {
   }
 
 }
-

tests/src/Kernel/RequestTest.php

@@ -131,6 +131,9 @@ public function testPostRequest() {
     $this->assertEquals('Test 2', $response->getEntities()[0]->title);
   }
 
+  /**
+   * Tests post requests.
+   */
   public function testPostRequests() {
     $requestFactory = $this->getMockRequestFactory([
       new Response(200, [], json_encode([
@@ -157,4 +160,3 @@ public function testPostRequests() {
   }
 
 }
-