PHP81 syntax

fykosak · Mar 22, 2024 · d6e1ba2 · d6e1ba2
1 parent 3e15a20
commit d6e1ba2
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 54 deletions.
diff --git a/app/Components/ApiResults/ApiResultsComponent.php b/app/Components/ApiResults/ApiResultsComponent.php
@@ -17,14 +17,12 @@
 
 class ApiResultsComponent extends DIComponent
 {
-    private Connector $gameServerApiConnector;
-    private FKSDBDownloader $downloader;
-    private int $eventId;
+    private readonly Connector $gameServerApiConnector;
+    private readonly FKSDBDownloader $downloader;
 
-    public function __construct(Container $container, int $eventId)
+    public function __construct(Container $container, private readonly int $eventId)
     {
         parent::__construct($container);
-        $this->eventId = $eventId;
     }
 
     public function inject(Connector $connector, FKSDBDownloader $downloader): void

diff --git a/app/Components/Countdown/CountdownComponent.php b/app/Components/Countdown/CountdownComponent.php
@@ -9,13 +9,14 @@
 
 class CountdownComponent extends DIComponent
 {
-    private \DateTimeInterface $countdownTo;
-    private string $id;
+    private readonly string $id;
 
-    public function __construct(Container $container, \DateTimeInterface $countdownTo, string $id = null)
-    {
+    public function __construct(
+        Container $container,
+        private readonly \DateTimeInterface $countdownTo,
+        string $id = null
+    ) {
         parent::__construct($container);
-        $this->countdownTo = $countdownTo;
         $this->id = $id ?? uniqid();
     }
 

diff --git a/app/Components/ImageGallery/ImageGalleryControl.php b/app/Components/ImageGallery/ImageGalleryControl.php
@@ -14,8 +14,8 @@
 
 class ImageGalleryControl extends DIComponent
 {
-    private string $wwwDir;
-    private Cache $cache;
+    private readonly string $wwwDir;
+    private readonly Cache $cache;
 
     public function __construct(Container $container)
     {

diff --git a/app/Components/Map/MapComponent.php b/app/Components/Map/MapComponent.php
@@ -15,7 +15,7 @@ class MapComponent extends DIComponent
 {
     private static int $uniqueId = 0;
 
-    private DummyService $dummyService;
+    private readonly DummyService $dummyService;
 
     protected int $teamCount;
     /** @var string[] */

diff --git a/app/Components/PdfGallery/PdfGalleryControl.php b/app/Components/PdfGallery/PdfGalleryControl.php
@@ -13,8 +13,8 @@
 
 class PdfGalleryControl extends DIComponent
 {
-    private string $wwwDir;
-    private Cache $cache;
+    private readonly string $wwwDir;
+    private readonly Cache $cache;
 
     public function __construct(Container $container)
     {

diff --git a/app/Components/PersonSchedule/AllScheduleListComponent.php b/app/Components/PersonSchedule/AllScheduleListComponent.php
@@ -13,16 +13,14 @@
 
 final class AllScheduleListComponent extends DIComponent
 {
-    private ServiceEventDetail $serviceEventDetail;
-    private int $eventId;
-    private FKSDBDownloader $downloader;
+    private readonly ServiceEventDetail $serviceEventDetail;
+    private readonly FKSDBDownloader $downloader;
 
     /** @var ModelPersonSchedule[][] | null */
     private ?array $groupedPersonSchedule = null;
 
-    public function __construct(int $eventId, Container $container)
+    public function __construct(private readonly int $eventId, Container $container)
     {
-        $this->eventId = $eventId;
         parent::__construct($container);
     }
 

diff --git a/app/Components/TeamList/TeamListComponent.php b/app/Components/TeamList/TeamListComponent.php
@@ -13,16 +13,14 @@
 
 class TeamListComponent extends DIComponent
 {
-    protected DummyService $serviceTeam;
-    protected int $eventId;
+    protected readonly DummyService $serviceTeam;
 
     protected string $category;
     protected array $teams;
 
-    public function __construct(Container $container, int $eventId)
+    public function __construct(Container $container, protected readonly int $eventId)
     {
         parent::__construct($container);
-        $this->eventId = $eventId;
     }
 
     public function injectServiceTeam(DummyService $serviceTeam): void

diff --git a/app/Components/TeamResults/TeamResultsComponent.php b/app/Components/TeamResults/TeamResultsComponent.php
@@ -14,14 +14,12 @@
 
 class TeamResultsComponent extends DIComponent
 {
-    protected DummyService $serviceTeam;
-    protected int $eventId;
+    protected readonly DummyService $serviceTeam;
     protected ?array $filterData = null;
 
-    public function __construct(Container $container, int $eventId)
+    public function __construct(Container $container,protected readonly int $eventId)
     {
         parent::__construct($container);
-        $this->eventId = $eventId;
     }
 
     public function injectServiceTeam(DummyService $serviceTeam): void

diff --git a/app/Components/UpperHomeMap/UpperHomeMapComponent.php b/app/Components/UpperHomeMap/UpperHomeMapComponent.php
@@ -13,7 +13,7 @@
 
 final class UpperHomeMapComponent extends DIComponent
 {
-    private GamePhaseCalculator $gamePhaseCalculator;
+    private readonly GamePhaseCalculator $gamePhaseCalculator;
 
     public function __construct(Container $container, private readonly ModelEvent $event)
     {

diff --git a/app/Components/UpperHomePrague/UpperHomePrague.php b/app/Components/UpperHomePrague/UpperHomePrague.php
@@ -13,9 +13,9 @@
 
 final class UpperHomePrague extends DIComponent
 {
-    private GamePhaseCalculator $gamePhaseCalculator;
+    private readonly GamePhaseCalculator $gamePhaseCalculator;
 
-    public function __construct(Container $container,private readonly ModelEvent $event)
+    public function __construct(Container $container, private readonly ModelEvent $event)
     {
         parent::__construct($container);
     }

diff --git a/app/Models/GamePhaseCalculator.php b/app/Models/GamePhaseCalculator.php
@@ -10,20 +10,15 @@
 use Nette\SmartObject;
 use Throwable;
 
-class GamePhaseCalculator
+final class GamePhaseCalculator
 {
     use SmartObject;
 
-    private ServiceEventList $serviceEventList;
-    private Container $container;
-
-    private int $eventTypeId;
-
-    public function __construct(int $eventTypeId, ServiceEventList $serviceEventList, Container $container)
-    {
-        $this->eventTypeId = $eventTypeId;
-        $this->serviceEventList = $serviceEventList;
-        $this->container = $container;
+    public function __construct(
+        private readonly int $eventTypeId,
+        private readonly ServiceEventList $serviceEventList,
+        private readonly Container $container
+    ) {
     }
 
     /**
@@ -38,15 +33,6 @@ public function getGameBegin(): \DateTime
         return $time;
     }
 
-    /**
-     * Returns true about a week after the event when no one is interested in game already.
-     * @throws Throwable
-     */
-    public function isLongAfterTheEvent(): bool
-    {
-        return $this->getFKSDBEvent()->isLongAfterTheEvent();
-    }
-
     /**
      * Returns newest FKSDB event. That means by creating a new one, the application automatically switches to the new
      * year.

diff --git a/app/Models/NetteDownloader/ORM/Models/ModelEvent.php b/app/Models/NetteDownloader/ORM/Models/ModelEvent.php
@@ -42,7 +42,7 @@ public function getNearEventPeriod(): Period
     }
     /**
      * Returns true about a week after the event when no one is interested in game already.
-     * @throws Throwable
+     * @throws \Throwable
      */
     public function isLongAfterTheEvent(): bool
     {

diff --git a/app/Models/NetteDownloader/ORM/Services/AbstractJSONService.php b/app/Models/NetteDownloader/ORM/Services/AbstractJSONService.php
@@ -15,8 +15,8 @@ abstract class AbstractJSONService
     use SmartObject;
 
     protected NetteDownloader $downloader;
-    protected Cache $cache;
-    protected string $expiration;
+    protected readonly Cache $cache;
+    protected readonly string $expiration;
 
     public function __construct(string $expiration, Storage $storage)
     {