Add type declaration to (private) properties

JaZo · JaZo · commit f4570290b74d · 2022-09-08T09:51:43.000+02:00
diff --git a/src/Client.php b/src/Client.php
@@ -16,39 +16,19 @@
 
 class Client implements ClientInterface
 {
-    /**
-     * @var \Psr\Http\Client\ClientInterface
-     */
-    private $client;
+    private HttpClientInterface $client;
 
-    /**
-     * @var \Psr\Http\Message\RequestFactoryInterface
-     */
-    private $requestFactory;
+    private RequestFactoryInterface $requestFactory;
 
-    /**
-     * @var \Psr\Http\Message\StreamFactoryInterface
-     */
-    private $streamFactory;
+    private StreamFactoryInterface $streamFactory;
 
-    /**
-     * @var string
-     */
-    private $baseUri = '';
+    private string $baseUri = '';
 
-    /**
-     * @var array
-     */
-    private $defaultHeaders = [
+    private array $defaultHeaders = [
         'Accept' => 'application/vnd.api+json',
         'Content-Type' => 'application/vnd.api+json',
     ];
 
-    /**
-     * @param \Psr\Http\Client\ClientInterface|null          $client
-     * @param \Psr\Http\Message\RequestFactoryInterface|null $requestFactory
-     * @param \Psr\Http\Message\StreamFactoryInterface|null  $streamFactory
-     */
     public function __construct(
         HttpClientInterface $client = null,
         RequestFactoryInterface $requestFactory = null,
diff --git a/src/DocumentClient.php b/src/DocumentClient.php
@@ -16,20 +16,10 @@
 
 class DocumentClient implements DocumentClientInterface
 {
-    /**
-     * @var \Swis\JsonApi\Client\Interfaces\ClientInterface
-     */
-    private $client;
+    private ClientInterface $client;
 
-    /**
-     * @var \Swis\JsonApi\Client\Interfaces\ResponseParserInterface
-     */
-    private $parser;
+    private ResponseParserInterface $parser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Interfaces\ClientInterface         $client
-     * @param \Swis\JsonApi\Client\Interfaces\ResponseParserInterface $parser
-     */
     public function __construct(ClientInterface $client, ResponseParserInterface $parser)
     {
         $this->client = $client;
diff --git a/src/Parsers/CollectionParser.php b/src/Parsers/CollectionParser.php
@@ -12,14 +12,8 @@
  */
 class CollectionParser
 {
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\ItemParser
-     */
-    private $itemParser;
+    private ItemParser $itemParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\ItemParser $itemParser
-     */
     public function __construct(ItemParser $itemParser)
     {
         $this->itemParser = $itemParser;
diff --git a/src/Parsers/DocumentParser.php b/src/Parsers/DocumentParser.php
@@ -20,44 +20,18 @@
 
 class DocumentParser implements DocumentParserInterface
 {
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\ItemParser
-     */
-    private $itemParser;
+    private ItemParser $itemParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\CollectionParser
-     */
-    private $collectionParser;
+    private CollectionParser $collectionParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\ErrorCollectionParser
-     */
-    private $errorCollectionParser;
+    private ErrorCollectionParser $errorCollectionParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\LinksParser
-     */
-    private $linksParser;
+    private LinksParser $linksParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\JsonapiParser
-     */
-    private $jsonapiParser;
+    private JsonapiParser $jsonapiParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\MetaParser
-     */
-    private $metaParser;
+    private MetaParser $metaParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\ItemParser            $itemParser
-     * @param \Swis\JsonApi\Client\Parsers\CollectionParser      $collectionParser
-     * @param \Swis\JsonApi\Client\Parsers\ErrorCollectionParser $errorCollectionParser
-     * @param \Swis\JsonApi\Client\Parsers\LinksParser           $linksParser
-     * @param \Swis\JsonApi\Client\Parsers\JsonapiParser         $jsonapiParser
-     * @param \Swis\JsonApi\Client\Parsers\MetaParser            $metaParser
-     */
     public function __construct(
         ItemParser $itemParser,
         CollectionParser $collectionParser,
diff --git a/src/Parsers/ErrorCollectionParser.php b/src/Parsers/ErrorCollectionParser.php
@@ -12,14 +12,8 @@
  */
 class ErrorCollectionParser
 {
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\ErrorParser
-     */
-    private $errorParser;
+    private ErrorParser $errorParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\ErrorParser $errorParser
-     */
     public function __construct(ErrorParser $errorParser)
     {
         $this->errorParser = $errorParser;
diff --git a/src/Parsers/ErrorParser.php b/src/Parsers/ErrorParser.php
@@ -13,20 +13,10 @@
  */
 class ErrorParser
 {
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\LinksParser
-     */
-    private $linksParser;
+    private LinksParser $linksParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\MetaParser
-     */
-    private $metaParser;
+    private MetaParser $metaParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\LinksParser $linksParser
-     * @param \Swis\JsonApi\Client\Parsers\MetaParser  $metaParser
-     */
     public function __construct(LinksParser $linksParser, MetaParser $metaParser)
     {
         $this->linksParser = $linksParser;
diff --git a/src/Parsers/ItemParser.php b/src/Parsers/ItemParser.php
@@ -16,26 +16,12 @@
  */
 class ItemParser
 {
-    /**
-     * @var \Swis\JsonApi\Client\Interfaces\TypeMapperInterface
-     */
-    private $typeMapper;
+    private TypeMapperInterface $typeMapper;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\LinksParser
-     */
-    private $linksParser;
+    private LinksParser $linksParser;
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\MetaParser
-     */
-    private $metaParser;
+    private MetaParser $metaParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Interfaces\TypeMapperInterface $typeMapper
-     * @param \Swis\JsonApi\Client\Parsers\LinksParser            $linksParser
-     * @param \Swis\JsonApi\Client\Parsers\MetaParser             $metaParser
-     */
     public function __construct(TypeMapperInterface $typeMapper, LinksParser $linksParser, MetaParser $metaParser)
     {
         $this->typeMapper = $typeMapper;
diff --git a/src/Parsers/JsonapiParser.php b/src/Parsers/JsonapiParser.php
@@ -12,14 +12,8 @@
  */
 class JsonapiParser
 {
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\MetaParser
-     */
-    private $metaParser;
+    private MetaParser $metaParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\MetaParser $metaParser
-     */
     public function __construct(MetaParser $metaParser)
     {
         $this->metaParser = $metaParser;
diff --git a/src/Parsers/LinksParser.php b/src/Parsers/LinksParser.php
@@ -27,14 +27,8 @@ class LinksParser
         'related',
     ];
 
-    /**
-     * @var \Swis\JsonApi\Client\Parsers\MetaParser
-     */
-    private $metaParser;
+    private MetaParser $metaParser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Parsers\MetaParser $metaParser
-     */
     public function __construct(MetaParser $metaParser)
     {
         $this->metaParser = $metaParser;
diff --git a/src/Parsers/ResponseParser.php b/src/Parsers/ResponseParser.php
@@ -14,14 +14,8 @@
 
 class ResponseParser implements ResponseParserInterface
 {
-    /**
-     * @var \Swis\JsonApi\Client\Interfaces\DocumentParserInterface
-     */
-    private $parser;
+    private DocumentParserInterface $parser;
 
-    /**
-     * @param \Swis\JsonApi\Client\Interfaces\DocumentParserInterface $parser
-     */
     public function __construct(DocumentParserInterface $parser)
     {
         $this->parser = $parser;
diff --git a/src/Util.php b/src/Util.php
@@ -4,23 +4,16 @@
 
 namespace Swis\JsonApi\Client;
 
+/**
+ * @internal
+ */
 class Util
 {
-    /**
-     * The cache of snake-cased words.
-     *
-     * @var array
-     */
-    protected static $snakeCache = [];
+    private static array $camelCache = [];
 
-    /**
-     * The cache of studly-cased words.
-     *
-     * @var array
-     */
-    protected static $studlyCache = [];
+    private static array $snakeCache = [];
 
-    private static $camelCache;
+    private static array $studlyCache = [];
 
     /**
      * Convert the given string to lower-case.

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,8 @@`
`14`	`14`
`15`	`15`	`class ResponseParser implements ResponseParserInterface`
`16`	`16`	`{`
`17`		`- /**`
`18`		`- * @var \Swis\JsonApi\Client\Interfaces\DocumentParserInterface`
`19`		`- */`
`20`		`- private $parser;`
	`17`	`+ private DocumentParserInterface $parser;`
`21`	`18`
`22`		`- /**`
`23`		`- * @param \Swis\JsonApi\Client\Interfaces\DocumentParserInterface $parser`
`24`		`- */`
`25`	`19`	`public function __construct(DocumentParserInterface $parser)`
`26`	`20`	`{`
`27`	`21`	`$this->parser = $parser;`