phpstan code fixes

scandesignsdk · May 8, 2018 · 5c037e7 · 5c037e7
1 parent b46b4a3
commit 5c037e7
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 68 deletions.
diff --git a/src/Model/Standing.php b/src/Model/Standing.php
@@ -7,19 +7,18 @@
 
 class Standing
 {
-
     /**
-     * @var Stand[]
+     * @var Stand[]|null
      */
     private $standings;
 
     /**
-     * @var Stand[]
+     * @var Stand[]|null
      */
     private $homeStandings;
 
     /**
-     * @var Stand[]
+     * @var Stand[]|null
      */
     private $awayStandings;
 
@@ -63,7 +62,7 @@ public function addAwayStanding(Stand $stand): void
     public function getTotalStandings(): array
     {
         $standings = $this->standings;
-        usort($standings, function(Stand $a, Stand $b) {
+        usort($standings, function (Stand $a, Stand $b) {
             return $a->getData()->getRank() <=> $b->getData()->getRank();
         });
         return $standings;
@@ -75,7 +74,7 @@ public function getTotalStandings(): array
     public function getHomeStandings(): array
     {
         $standings = $this->homeStandings;
-        usort($standings, function(Stand $a, Stand $b) {
+        usort($standings, function (Stand $a, Stand $b) {
             return $a->getData()->getRank() <=> $b->getData()->getRank();
         });
         return $standings;
@@ -87,7 +86,7 @@ public function getHomeStandings(): array
     public function getAwayStandings(): array
     {
         $standings = $this->awayStandings;
-        usort($standings, function(Stand $a, Stand $b) {
+        usort($standings, function (Stand $a, Stand $b) {
             return $a->getData()->getRank() <=> $b->getData()->getRank();
         });
         return $standings;
@@ -100,5 +99,4 @@ public function getStage(): TournamentStage
     {
         return $this->stage;
     }
-
 }
diff --git a/src/Model/Standing/Stand.php b/src/Model/Standing/Stand.php
@@ -4,7 +4,6 @@
 
 class Stand
 {
-
     /**
      * @var Participant
      */
@@ -30,5 +29,4 @@ public function getData(): StandData
     {
         return $this->data;
     }
-
 }
diff --git a/src/Model/Standing/StandData.php b/src/Model/Standing/StandData.php
@@ -4,7 +4,6 @@
 
 class StandData
 {
-
     /**
      * @var int
      */
@@ -120,5 +119,4 @@ public function getPoints(): int
     {
         return $this->points;
     }
-
 }
diff --git a/src/Provider/ParticipantProvider.php b/src/Provider/ParticipantProvider.php
@@ -95,5 +95,4 @@ protected function queryBuilder(int $eventId): QueryBuilder
         $this->removeDeleted($qb, ['ep', 'p', 'c', 'r']);
         return $qb;
     }
-
 }
diff --git a/src/Provider/StandingProvider.php b/src/Provider/StandingProvider.php
@@ -7,17 +7,15 @@
 use SDM\Enetpulse\Model\Standing;
 use SDM\Enetpulse\Model\Tournament;
 use SDM\Enetpulse\Model\Tournament\TournamentStage;
-use SDM\Enetpulse\Utils\Utils;
 
 class StandingProvider extends AbstractProvider
 {
-
     /**
      * @param TournamentStage $stage
      *
      * @return Standing
      */
-    public function getStandingFromTournamentStage(TournamentStage $stage): Standing
+    public function getStandingFromTournamentStage(TournamentStage $stage): ?Standing
     {
         return $this->getStandingFromTournamentStageId($stage->getId());
     }
@@ -27,7 +25,7 @@ public function getStandingFromTournamentStage(TournamentStage $stage): Standing
      *
      * @return Standing
      */
-    public function getStandingFromTournamentStageId(int $stage): Standing
+    public function getStandingFromTournamentStageId(int $stage): ?Standing
     {
         return $this->build($this->queryBuilder($stage));
     }
@@ -37,69 +35,74 @@ public function getStandingFromTournamentStageId(int $stage): Standing
      *
      * @return Standing
      */
-    private function build(QueryBuilder $qb): Standing
+    private function build(QueryBuilder $qb): ?Standing
     {
         return $this->createObject($this->fetchSingle($qb));
     }
 
-    protected function createObject(\stdClass $data): Standing
+    protected function createObject(?\stdClass $data): ?Standing
     {
-        $standing = new Standing(
-            new TournamentStage(
-                $data->ts_id,
-                $data->ts_name,
-                $data->country_name,
-                $this->createDate($data->ts_startdate),
-                $this->createDate($data->ts_enddate),
-                new Tournament(
-                    $data->t_id,
-                    $data->t_name,
-                    new Tournament\TournamentTemplate(
-                        $data->tt_id,
-                        $data->tt_name,
-                        new Sport(
-                            $data->sport_id,
-                            $data->sport_name
-                        ), $data->tt_gender
+        if ($data) {
+            $standing = new Standing(
+                new TournamentStage(
+                    $data->ts_id,
+                    $data->ts_name,
+                    $data->country_name,
+                    $this->createDate($data->ts_startdate),
+                    $this->createDate($data->ts_enddate),
+                    new Tournament(
+                        $data->t_id,
+                        $data->t_name,
+                        new Tournament\TournamentTemplate(
+                            $data->tt_id,
+                            $data->tt_name,
+                            new Sport(
+                                $data->sport_id,
+                                $data->sport_name
+                            ),
+                            $data->tt_gender
+                        )
                     )
                 )
-            )
-        );
-
-        $standingBuilder = $this->queryBuilderStandingData($data->ts_id);
-        foreach ($this->fetchObjects($standingBuilder) as $object) {
-            $participant = new Standing\Participant(
-                $object->p_id,
-                $object->p_name,
-                $object->p_type,
-                $object->country_name,
-                $this->createImage($object->i_contenttype, $object->i_value)
             );
 
-            $standing->addStanding(
-                new Standing\Stand(
-                    $participant,
-                    $this->queryBuilderStandingDataValues($object->standing_p_id, 'total')
-                )
-            );
-            $standing->addHomeStanding(
-                new Standing\Stand(
-                    $participant,
-                    $this->queryBuilderStandingDataValues($object->standing_p_id, 'home')
-                )
-            );
-            $standing->addAwayStanding(
-                new Standing\Stand(
-                    $participant,
-                    $this->queryBuilderStandingDataValues($object->standing_p_id, 'away')
-                )
-            );
+            $standingBuilder = $this->queryBuilderStandingData($data->ts_id);
+            foreach ($this->fetchObjects($standingBuilder) as $object) {
+                $participant = new Standing\Participant(
+                    $object->p_id,
+                    $object->p_name,
+                    $object->p_type,
+                    $object->country_name,
+                    $this->createImage($object->i_contenttype, $object->i_value)
+                );
+
+                $standing->addStanding(
+                    new Standing\Stand(
+                        $participant,
+                        $this->queryBuilderStandingDataValues($object->standing_p_id, 'total')
+                    )
+                );
+                $standing->addHomeStanding(
+                    new Standing\Stand(
+                        $participant,
+                        $this->queryBuilderStandingDataValues($object->standing_p_id, 'home')
+                    )
+                );
+                $standing->addAwayStanding(
+                    new Standing\Stand(
+                        $participant,
+                        $this->queryBuilderStandingDataValues($object->standing_p_id, 'away')
+                    )
+                );
+            }
+
+            return $standing;
         }
 
-        return $standing;
+        return null;
     }
 
-    protected function queryBuilder($stageId) : QueryBuilder
+    protected function queryBuilder($stageId): QueryBuilder
     {
         $qb = $this->getBuilder();
 
@@ -212,5 +215,4 @@ private function queryBuilderStandingDataValues($id, $type): Standing\StandData
             $points
         );
     }
-
 }