Add JMS attributes for php8

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5]
         os: [ubuntu-latest]
         env: ['low', 'high']
     name: PHP ${{ matrix.php }} Test ${{ matrix.env }} on ${{ matrix.os }}
@@ -52,7 +52,7 @@ jobs:
         fi;
         if [ "$DEPENDENCIES" = 'low' ]; then
             composer update $DEFAULT_COMPOSER_FLAGS --prefer-lowest
-            if [ "$PHP_VERSION" = '8' ] || [ "$PHP_VERSION" = '8.1' ] || [ "$PHP_VERSION" = '8.2' ] || [ "$PHP_VERSION" = '8.3' ]; then
+            if [ "$PHP_VERSION" = '8' ] || [ "$PHP_VERSION" = '8.1' ] || [ "$PHP_VERSION" = '8.2' ] || [ "$PHP_VERSION" = '8.3' ] || [ "$PHP_VERSION" = '8.4' ] || [ "$PHP_VERSION" = '8.5' ]; then
                 composer update $DEFAULT_COMPOSER_FLAGS --prefer-lowest --with-all-dependencies jms/serializer:^3.14
             fi;
         fi;

composer.json

@@ -26,7 +26,7 @@
     "doctrine/annotations": "^1.13"
   },
   "require-dev": {
-    "phpstan/phpstan": "^1.0",
+    "phpstan/phpstan": "^1.12",
     "phpstan/phpstan-phpunit": "^1.0",
     "phpunit/phpunit": "^8.5.23 || ^9.0"
   },

phpstan.neon.dist

@@ -1,10 +1,11 @@
 parameters:
     level: max
-    checkMissingIterableValueType: false
     reportUnmatchedIgnoredErrors: false
     paths:
         - src
         - tests
+    ignoreErrors:
+        - identifier: missingType.iterableValue
 
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon

src/Auth/IAuth.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Feech\SmsAero\Auth;
 
 
@@ -19,4 +21,4 @@ public function getPassword(): string;
      * @return string
      */
     public function getSign(): string;
-}
+}

src/Client/ClientGuzzle.php

@@ -28,7 +28,7 @@ class ClientGuzzle implements IClient
      */
     private $client;
 
-    public function __construct(IAuth $auth, ClientInterface $client = null)
+    public function __construct(IAuth $auth, ?ClientInterface $client = null)
     {
         $this->auth = $auth;
 

src/Dto/BalanceResponse.php

@@ -12,5 +12,6 @@ class BalanceResponse extends BaseResponse
      * @var BalanceResult
      * @JMS\Type("Feech\SmsAero\Dto\BalanceResult")
      */
+    #[JMS\Type('Feech\SmsAero\Dto\BalanceResult')]
     public $data;
 }

src/Dto/BalanceResult.php

@@ -12,5 +12,6 @@ class BalanceResult
      * @var float
      * @JMS\Type("float")
      */
+    #[JMS\Type('float')]
     public $balance;
 }

src/Dto/BaseResponse.php

@@ -12,11 +12,13 @@ class BaseResponse
      * @var boolean
      * @JMS\Type("boolean")
      */
+    #[JMS\Type('boolean')]
     public $success;
 
     /**
      * @var string|null
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $message;
 }

src/Dto/FlashCallResponse.php

@@ -12,5 +12,6 @@ class FlashCallResponse extends BaseResponse
      * @var FlashCallStatus|null
      * @JMS\Type("Feech\SmsAero\Dto\FlashCallStatus")
      */
+    #[JMS\Type('Feech\SmsAero\Dto\FlashCallStatus')]
     public $data;
 }

src/Dto/FlashCallStatus.php

@@ -17,43 +17,52 @@ class FlashCallStatus
      * @var int
      * @JMS\Type("int")
      */
+    #[JMS\Type('int')]
     public $id;
 
     /**
      * @var int
      * @JMS\Type("int")
      */
+    #[JMS\Type('int')]
     public $status;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $code;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $phone;
 
     /**
      * @var float
      * @JMS\Type("float")
      */
+    #[JMS\Type('float')]
     public $cost;
 
     /**
      * @var int
      * @JMS\Type("int")
      * @JMS\SerializedName("timeCreate")
      */
+    #[JMS\Type('int')]
+    #[JMS\SerializedName('timeCreate')]
     public $timeCreate;
 
     /**
      * @var int
      * @JMS\Type("int")
      * @JMS\SerializedName("timeUpdate")
      */
+    #[JMS\Type('int')]
+    #[JMS\SerializedName('timeUpdate')]
     public $timeUpdate;
 }

src/Dto/SendBulkMessageResponse.php

@@ -12,5 +12,6 @@ class SendBulkMessageResponse extends BaseResponse
      * @var SmsMessageResult[]
      * @JMS\Type("array<Feech\SmsAero\Dto\SmsMessageResult>")
      */
+    #[JMS\Type('array<Feech\SmsAero\Dto\SmsMessageResult>')]
     public $data;
 }

src/Dto/SendSingleMessageResponse.php

@@ -12,5 +12,6 @@ class SendSingleMessageResponse extends BaseResponse
      * @var SmsMessageResult
      * @JMS\Type("Feech\SmsAero\Dto\SmsMessageResult")
      */
+    #[JMS\Type('Feech\SmsAero\Dto\SmsMessageResult')]
     public $data;
 }

src/Dto/SmsMessageResult.php

@@ -20,62 +20,75 @@ class SmsMessageResult
      * @var int
      * @JMS\Type("int")
      */
+    #[JMS\Type('int')]
     public $id;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $from;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $number;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $text;
 
     /**
      * @var int
      * @JMS\Type("int")
      */
+    #[JMS\Type('int')]
     public $status;
 
     /**
      * @var string
      * @JMS\Type("string")
      * @JMS\SerializedName("extendStatus")
      */
+    #[JMS\Type('string')]
+    #[JMS\SerializedName('extendStatus')]
     public $extendStatus;
 
     /**
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $channel;
 
     /**
      * @var float
      * @JMS\Type("float")
      */
+    #[JMS\Type('float')]
     public $cost;
 
     /**
      * @var int
      * @JMS\Type("int")
      * @JMS\SerializedName("dateCreate")
      */
+    #[JMS\Type('int')]
+    #[JMS\SerializedName('dateCreate')]
     public $dateCreate;
 
     /**
      * @var int
      * @JMS\Type("int")
      * @JMS\SerializedName("dateSend")
      */
+    #[JMS\Type('int')]
+    #[JMS\SerializedName('dateSend')]
     public $dateSend;
 }

src/Dto/ViberNumberStatus.php

@@ -18,25 +18,31 @@ class ViberNumberStatus
      * @var string
      * @JMS\Type("string")
      */
+    #[JMS\Type('string')]
     public $number;
 
     /**
      * @var int
      * @JMS\Type("int")
      */
+    #[JMS\Type('int')]
     public $status;
 
     /**
      * @var string
      * @JMS\Type("string")
      * @JMS\SerializedName("extendStatus")
      */
+    #[JMS\Type('string')]
+    #[JMS\SerializedName('extendStatus')]
     public $extendStatus;
 
     /**
      * @var int
      * @JMS\Type("int")
      * @JMS\SerializedName("dateSend")
      */
+    #[JMS\Type('int')]
+    #[JMS\SerializedName('dateSend')]
     public $dateSend;
 }

src/Dto/ViberSendRequest.php

@@ -99,7 +99,7 @@ public static function toSingleNumber(
         string $sign,
         string $channel,
         string $text,
-        string $marker = null
+        ?string $marker = null
     ): self {
         $request = new self();
         $request->number = $number;
@@ -122,7 +122,7 @@ public static function toMultipleNumbers(
         string $sign,
         string $channel,
         string $text,
-        string $marker = null
+        ?string $marker = null
     ): self {
         assert(count($numbers) > 0 && count($numbers) <= 50);
 

src/Dto/ViberSendResponse.php

@@ -12,5 +12,6 @@ class ViberSendResponse extends BaseResponse
      * @var ViberStatus|null
      * @JMS\Type("Feech\SmsAero\Dto\ViberStatus")
      */
+    #[JMS\Type('Feech\SmsAero\Dto\ViberStatus')]
     public $data;
 }

src/Dto/ViberStatisticResponse.php

@@ -12,5 +12,6 @@ class ViberStatisticResponse extends BaseResponse
      * @var ViberNumberStatus[]
      * @JMS\Type("array<Feech\SmsAero\Dto\ViberNumberStatus>")
      */
+    #[JMS\Type('array<Feech\SmsAero\Dto\ViberNumberStatus>')]
     public $data;
 }