Php8 (#15)

* Allowed PHP 8 or above in composer.json * initial refactor * continued refactor
silktide · Jul 26, 2022 · ef98576 · ef98576
1 parent 03f33ac
commit ef98576
Show file tree

Hide file tree

Showing 26 changed files with 181 additions and 263 deletions.
diff --git a/composer.json b/composer.json
@@ -1,32 +1,31 @@
 {
 	"name": "silktide/prospect-php-client",
 	"description": "PHP client for integrating Prospect into your projects.",
-
 	"require": {
-		"php": "^7.4",
+		"php": "^7.4|^8",
 		"ext-json": "*",
 		"guzzlehttp/guzzle": "~6.0"
 	},
-
 	"require-dev": {
 		"phpunit/phpunit": "^8.5",
 		"phpstan/phpstan": "^0.12.36",
 		"symfony/dotenv": "^5.1"
     },
-
 	"authors": [
 		{
 			"name": "Greg Bowler",
 			"email": "greg.bowler@g105b.com"
+		},
+		{
+			"name": "Alex Blackham",
+			"email": "alexblackham@silktide.com"
 		}
 	],
-
 	"autoload": {
 		"psr-4": {
 			"Silktide\\ProspectClient\\": "src"
 		}
 	},
-
 	"autoload-dev": {
 		"psr-4": {
 			"Silktide\\ProspectClient\\UnitTest\\": "test/unit"

diff --git a/src/Api/ReportApi.php b/src/Api/ReportApi.php
@@ -6,7 +6,6 @@
 use Silktide\ProspectClient\Request\FetchReportRequest;
 use Silktide\ProspectClient\Request\ReanalyzeReportRequest;
 use Silktide\ProspectClient\Request\SearchReportRequest;
-use Silktide\ProspectClient\Entity\Report;
 use Silktide\ProspectClient\Http\HttpWrapper;
 
 class ReportApi
@@ -37,4 +36,4 @@ public function search(): SearchReportRequest
     {
         return new SearchReportRequest($this->httpWrapper);
     }
-}
+}
diff --git a/src/Entity/Report.php b/src/Entity/Report.php
@@ -6,11 +6,7 @@ class Report
 {
     private array $data;
 
-    private function __construct()
-    {
-    }
-
-    public static function create(array $data) : Report
+    public static function create(array $data): Report
     {
         $report = new Report();
         $report->data = $data;
@@ -19,22 +15,22 @@ public static function create(array $data) : Report
 
     public function getReportId(): string
     {
-        return $this->data["report_id"];
+        return $this->data['report_id'];
     }
 
     public function getAccountId(): string
     {
-        return $this->data["account_id"];
+        return $this->data['account_id'];
     }
 
     public function getDomain(): string
     {
-        return $this->data["domain"];
+        return $this->data['domain'];
     }
 
     public function getOverallScore(): int
     {
-        return $this->data["overall_score"];
+        return $this->data['overall_score'];
     }
 
     /**
@@ -43,7 +39,7 @@ public function getOverallScore(): int
      */
     public function getReportSection(string $name): ?array
     {
-        if(!is_array($this->data)) {
+        if (!is_array($this->data)) {
             return null;
         }
 
@@ -52,26 +48,21 @@ public function getReportSection(string $name): ?array
 
     public function getAllReportSections(): array
     {
-        $skipKeys = ["meta"];
+        $skipKeys = ['meta'];
         $sections = $this->data;
 
-        $sections = array_filter($sections, function($value, $key)use($skipKeys) {
-            if(in_array($key, $skipKeys)) {
-                return false;
-            }
-            if(!is_array($value)) {
+        return array_filter($sections, function($value, $key) use ($skipKeys) {
+            if (in_array($key, $skipKeys) || !is_array($value)) {
                 return false;
             }
 
             return true;
         }, ARRAY_FILTER_USE_BOTH);
-
-        return $sections;
     }
 
     public function getMetaValue(string $key): ?string
     {
-        return $this->data["meta"][$key] ?? null;
+        return $this->data['meta'][$key] ?? null;
     }
 
     /**
@@ -82,4 +73,4 @@ public function getValue(string $key)
     {
         return $this->data[$key] ?? null;
     }
-}
+}
diff --git a/src/Entity/ReportCategory.php b/src/Entity/ReportCategory.php
@@ -8,11 +8,7 @@ class ReportCategory
     private float $score;
     private array $sections;
 
-    private function __construct()
-    {
-    }
-
-    public static function create(string $label, float $score, array $sections) : ReportCategory
+    public static function create(string $label, float $score, array $sections): ReportCategory
     {
         $reportCategory = new ReportCategory();
         $reportCategory->label = $label;
@@ -31,9 +27,11 @@ public function getScore(): float
         return $this->score;
     }
 
-    /** @return string[] */
+    /**
+     * @return string[]
+     */
     public function getSections(): array
     {
         return $this->sections;
     }
-}
+}
diff --git a/src/Entity/ReportPercentile.php b/src/Entity/ReportPercentile.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace Silktide\ProspectClient\Entity;
 
-
 class ReportPercentile
 {
     private string $type;
@@ -14,10 +12,6 @@ class ReportPercentile
     private int $count;
     private int $percentile;
 
-    private function __construct()
-    {
-    }
-
     public function getType(): string
     {
         return $this->type;
@@ -61,7 +55,7 @@ public static function create(
         float $average,
         int $count,
         int $percentile
-    ) : ReportPercentile
+    ): ReportPercentile
     {
         $entity = new ReportPercentile();
         $entity->type = $type;
@@ -73,4 +67,4 @@ public static function create(
         $entity->percentile = $percentile;
         return $entity;
     }
-}
+}
diff --git a/src/Exception/Api/InvalidRequestException.php b/src/Exception/Api/InvalidRequestException.php
@@ -1,12 +1,7 @@
 <?php
 
-
 namespace Silktide\ProspectClient\Exception\Api;
 
-
 use Silktide\ProspectClient\Exception\ProspectClientException;
 
-class InvalidRequestException extends ProspectClientException
-{
-
-}
+class InvalidRequestException extends ProspectClientException {}
diff --git a/src/Exception/Api/InvalidServerResponseException.php b/src/Exception/Api/InvalidServerResponseException.php
@@ -1,12 +1,7 @@
 <?php
 
-
 namespace Silktide\ProspectClient\Exception\Api;
 
-
 use Silktide\ProspectClient\Exception\ProspectClientException;
 
-class InvalidServerResponseException extends ProspectClientException
-{
-
-}
+class InvalidServerResponseException extends ProspectClientException {}
diff --git a/src/Exception/Api/ReportAlreadyExistsException.php b/src/Exception/Api/ReportAlreadyExistsException.php
@@ -6,48 +6,26 @@
 
 class ReportAlreadyExistsException extends ProspectClientException
 {
+    protected string $reportId;
+    protected ?string $resolvedUrl;
 
-    /**
-     * @var string
-     */
-    protected $reportId;
-
-    /**
-     * @var string|null
-     */
-    protected $resolvedUrl;
-
-    /**
-     * @return string
-     */
     public function getReportId(): string
     {
         return $this->reportId;
     }
 
-    /**
-     * @param string $reportId
-     */
     public function setReportId(string $reportId): void
     {
         $this->reportId = $reportId;
     }
 
-    /**
-     * @return string|null
-     */
     public function getResolvedUrl(): ?string
     {
         return $this->resolvedUrl;
     }
 
-    /**
-     * @param string|null $resolvedUrl
-     */
     public function setResolvedUrl(?string $resolvedUrl): void
     {
         $this->resolvedUrl = $resolvedUrl;
     }
-
-
-}
+}
diff --git a/src/Exception/Api/ReportNotFoundException.php b/src/Exception/Api/ReportNotFoundException.php
@@ -4,7 +4,4 @@
 
 use Silktide\ProspectClient\Exception\ProspectClientException;
 
-class ReportNotFoundException extends ProspectClientException
-{
-
-}
+class ReportNotFoundException extends ProspectClientException {}
diff --git a/src/Exception/Api/ReportPathDoesNotExistException.php b/src/Exception/Api/ReportPathDoesNotExistException.php
@@ -1,9 +1,7 @@
 <?php
+
 namespace Silktide\ProspectClient\Exception\Api;
 
 use Silktide\ProspectClient\Exception\ProspectClientException;
 
-class ReportPathDoesNotExistException extends ProspectClientException
-{
-
-}
+class ReportPathDoesNotExistException extends ProspectClientException {}
diff --git a/src/Exception/Api/ReportStillRunningException.php b/src/Exception/Api/ReportStillRunningException.php
@@ -4,7 +4,4 @@
 
 use Silktide\ProspectClient\Exception\ProspectClientException;
 
-class ReportStillRunningException extends ProspectClientException
-{
-
-}
+class ReportStillRunningException extends ProspectClientException {}
diff --git a/src/Exception/Api/ReportUnprocessableException.php b/src/Exception/Api/ReportUnprocessableException.php
@@ -10,33 +10,33 @@ class ReportUnprocessableException extends ProspectClientException
     private ?string $url = null;
     private bool $isUrlRecommended = false;
 
-    public function setIssue(?string $issue) : void
+    public function setIssue(?string $issue): void
     {
         $this->issue = $issue;
     }
 
-    public function getIssue() : ?string
+    public function getIssue(): ?string
     {
         return $this->issue;
     }
 
-    public function setUrl(string $url) : void
+    public function setUrl(string $url): void
     {
         $this->url = $url;
     }
 
-    public function getUrl() : ?string
+    public function getUrl(): ?string
     {
         return $this->url;
     }
 
-    public function setUrlRecommended(bool $recommended)
+    public function setUrlRecommended(bool $recommended): void
     {
         $this->isUrlRecommended = $recommended;
     }
 
-    public function isUrlRecommended() : bool
+    public function isUrlRecommended(): bool
     {
         return $this->isUrlRecommended;
     }
-}
+}
diff --git a/src/Exception/ProspectClientException.php b/src/Exception/ProspectClientException.php
@@ -4,7 +4,4 @@
 
 use RuntimeException;
 
-class ProspectClientException extends RuntimeException
-{
-
-}
+class ProspectClientException extends RuntimeException {}