Merge pull request #229 from Tustin/php-81

Enforce PHP 8.1

composer.json

@@ -15,11 +15,10 @@
         }
     },
     "require": {
-        "guzzlehttp/guzzle": "^7.0",
-        "php": "^7.4|^8.0|^8.1",
-        "tustin/haste": "1.0.8",
-        "nesbot/carbon": "^2.41",
-        "myclabs/php-enum": "^1.7"
+        "guzzlehttp/guzzle": "^7.5",
+        "php": "^8.1",
+        "tustin/haste": "^1.1",
+        "nesbot/carbon": "^2.41"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"

src/Api.php

@@ -13,7 +13,7 @@ public function __construct(Client $client)
         $this->httpClient = $client;
     }
 
-    public function graphql(string $op, array $variables)
+    public function graphql(string $op, array $variables): object
     {
         // @Temp: This will hopefully be removed at some point for dynamic operation hashing.
         $hashMap = [

src/Enum/CloudStatusType.php

@@ -2,10 +2,8 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class CloudStatusType extends Enum
+enum CloudStatusType: string
 {
-    private const uploading = 'uploading';
-    private const active = 'active';
+    case Uploading = 'uploading';
+    case Active = 'active';
 }

src/Enum/ConsoleType.php

@@ -2,12 +2,10 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class ConsoleType extends Enum
+enum ConsoleType: string
 {
-    private const vita = 'PSVITA';
-    private const ps3 = 'PS3';
-    private const ps4 = 'PS4';
-    private const ps5 = 'PS5';
+    case Vita = 'PSVITA';
+    case PS3 = 'PS3';
+    case PS4 = 'PS4';
+    case PS5 = 'PS5';
 }

src/Enum/LanguageType.php

@@ -1,39 +1,37 @@
 <?php
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class LanguageType extends Enum
+enum LanguageType: string
 {
-    private const english = 'en';
-    private const czech = 'cs';
-    private const danish = 'da';
-    private const german = 'de';
-    private const english_uk = 'en-GB';
-    private const english_us = 'en-US';
-    private const spanish = 'es'; //Spain
-    private const latin_america = 'es-MX';
-    private const french = 'fr';
-    private const french_canada = 'fr-CA'; // Canada (Quebec)
-    private const indonesian = 'id';
-    private const italian = 'it';
-    private const hungarian = 'hu';
-    private const dutch = 'nl';
-    private const norwegian = 'no';
-    private const polish = 'pl';
-    private const portuguese_brazil = 'pt-BR';
-    private const portuguese_portugal = 'pt';
-    private const russian = 'ru';
-    private const romanian = 'ro';
-    private const finnish = 'fi';
-    private const swedish = 'sv';
-    private const vietnamese = 'vi';
-    private const turkish = 'tr';
-    private const arabic = 'ar';
-    private const greek = 'el';
-    private const japanese = 'ja';
-    private const korean = 'ko';
-    private const thai = 'th';
-    private const chinese_simplified = 'zh-CN';
-    private const chinese_taiwan = 'zh-TW';
+    case English = 'en';
+    case Czech = 'cs';
+    case Danish = 'da';
+    case German = 'de';
+    case EnglishUK = 'en-GB';
+    case EnglishUS = 'en-US';
+    case Spanish = 'es'; //Spain
+    case LatinAmerica = 'es-MX';
+    case French = 'fr';
+    case FrenchCanada = 'fr-CA'; // Canada (Quebec)
+    case Indonesian = 'id';
+    case Italian = 'it';
+    case Hungarian = 'hu';
+    case Dutch = 'nl';
+    case Norwegian = 'no';
+    case Polish = 'pl';
+    case PortugueseBrazil = 'pt-BR';
+    case PortuguesePortugal = 'pt';
+    case Russian = 'ru';
+    case Romanian = 'ro';
+    case Finnish = 'fi';
+    case Swedish = 'sv';
+    case Vietnamese = 'vi';
+    case Turkish = 'tr';
+    case Arabic = 'ar';
+    case Greek = 'el';
+    case Japanese = 'ja';
+    case Korean = 'ko';
+    case Thai = 'th';
+    case ChineseSimplified = 'zh-CN';
+    case ChineseTaiwan = 'zh-TW';
 }

src/Enum/MessageType.php

@@ -2,19 +2,17 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class MessageType extends Enum
+enum MessageType: int
 {
-    private const text = 1;
-    private const image = 3;
-    private const video = 210;
-    private const audio = 1011;
-    private const sticker = 1013;
-    private const leftGroup = 2002;
-    private const changedGroupImage = 2004;
-    private const startedVoiceChat = 2020;
+    case Text = 1;
+    case Image = 3;
+    case Video = 210;
+    case Audio = 1011;
+    case Sticker = 1013;
+    case LeftGroup = 2002;
+    case ChangedGroupImage = 2004;
+    case StartedVoiceChat = 2020;
 
     // @TODO: Need to map out all of these events.
-    private const unknown = -1;
+    case Unknown = -1;
 }

src/Enum/SessionType.php

@@ -2,12 +2,10 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class SessionType extends Enum
+enum SessionType: int
 {
     // Flags
-    private const unknown = 1;
-    private const game = 2;
-    private const party = 4;
+    case Unknown = 1;
+    case Game = 2;
+    case Party = 4;
 }

src/Enum/TranscodeStatusType.php

@@ -2,10 +2,8 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class TranscodeStatusType extends Enum
+enum TranscodeStatusType: string
 {
-    private const complete = 'complete';
-    private const inProgress = 'in_progress';
+    case Complete = 'complete';
+    case InProgress = 'in_progress';
 }

src/Enum/TrophyType.php

@@ -1,12 +1,10 @@
 <?php
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class TrophyType extends Enum
+enum TrophyType: string
 {
-    private const platinum = 'platinum';
-    private const bronze = 'bronze';
-    private const silver = 'silver';
-    private const gold = 'gold';
+    case Platinum = 'platinum';
+    case Bronze = 'bronze';
+    case Silver = 'silver';
+    case Gold = 'gold';
 }

src/Enum/UgcType.php

@@ -2,10 +2,8 @@
 
 namespace Tustin\PlayStation\Enum;
 
-use MyCLabs\Enum\Enum;
-
-class UgcType extends Enum
+enum UgcType: int
 {
-    private const image = 1;
-    private const video = 2;
+    case Image = 1;
+    case Video = 2;
 }

src/Factory/FriendsListFactory.php

@@ -13,22 +13,13 @@
 
 class FriendsListFactory extends Api implements IteratorAggregate, FactoryInterface
 {
-    /**
-     * The user.
-     *
-     * @var User
-     */
-    private $user;
-
     private string $onlineId = '';
     private bool $useCloseFriends = false;
     private bool $verified = false;
 
-    public function __construct(User $user)
+    public function __construct(private User $user)
     {
         parent::__construct($user->getHttpClient());
-
-        $this->user = $user;
     }
 
     /**

src/Factory/GameListFactory.php

@@ -12,18 +12,9 @@
 
 class GameListFactory extends Api implements IteratorAggregate, FactoryInterface
 {
-    /**
-     * The user to get game list for.
-     *
-     * @var User|null
-     */
-    private $user;
-
-    public function __construct(User $user)
+    public function __construct(private ?User $user)
     {
         parent::__construct($user->getHttpClient());
-
-        $this->user = $user;
     }
 
     /**

src/Factory/GroupMembersFactory.php

@@ -10,21 +10,13 @@
 
 class GroupMembersFactory implements IteratorAggregate, Countable
 {
-    /**
-     * @var Group
-     */
-    private $group;
-
     /**
      * The name to filter with.
-     *
-     * @var string
      */
-    private $name;
+    private string $name;
 
-    public function __construct(Group $group)
+    public function __construct(private Group $group)
     {
-        $this->group = $group;
     }
 
     /**

src/Factory/GroupsFactory.php

@@ -14,19 +14,13 @@
 
 class GroupsFactory extends Api implements IteratorAggregate
 {
-    private $with = [];
+    private array $with = [];
 
-    /**
-     * @var boolean
-     */
-    private $only = false;
+    private bool $only = false;
 
-    /**
-     * @var Carbon|null
-     */
-    private $since = null;
+    private ?Carbon $since = null;
 
-    public $favorited = false;
+    public bool $favorited = false;
 
     /**
      * Filters groups that only contain these onlineIds.

src/Factory/MessagesFactory.php

@@ -13,25 +13,15 @@
 
 class MessagesFactory extends Api implements IteratorAggregate
 {
-    /**
-     * @var MessageThread
-     */
-    private $thread;
+    private string $typeFilter;
 
-    private $typeFilter;
-
-    public function __construct(MessageThread $thread)
+    public function __construct(private MessageThread $thread)
     {
         parent::__construct($thread->getHttpClient());
-
-        $this->thread = $thread;
     }
 
     /**
      * Gets messages only of a certain type.
-     *
-     * @param string $class
-     * @return MessagesFactory
      */
     public function of(string $class): MessagesFactory
     {
@@ -42,8 +32,6 @@ public function of(string $class): MessagesFactory
 
     /**
      * Gets the iterator and applies any filters.
-     *
-     * @return Iterator
      */
     public function getIterator(): Iterator
     {
@@ -58,8 +46,6 @@ public function getIterator(): Iterator
 
     /**
      * Gets the first message in the message thread.
-     *
-     * @return Message
      */
     public function first(): AbstractMessage
     {

src/Factory/TrophyFactory.php

@@ -9,21 +9,13 @@
 
 class TrophyFactory implements IteratorAggregate
 {
-    /**
-     * The trophy groups' title.
-     *
-     * @var TrophyGroup
-     */
-    private $group;
-
     private array $platforms = [];
 
     private string $withName = '';
     private string $withDetail = '';
 
-    public function __construct(TrophyGroup $group)
+    public function __construct(private TrophyGroup $group)
     {
-        $this->group = $group;
     }
 
     /**