Feature/support php8 only

.travis.yml

@@ -1,10 +1,6 @@
 language: php
 
 php:
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
     - 8.0
     - 8.1
 

composer.json

@@ -17,8 +17,9 @@
     "homepage": "https://github.com/JKetelaar/PHP-Kiyoh-API",
     "license": "GPL-3.0+",
     "require": {
-        "php": "~7.3 || ^8.0",
+        "php": "^8.0",
         "ext-simplexml": "*",
+        "guzzlehttp/guzzle": "^7.5"
         "guzzlehttp/guzzle": "^6.2 || ^7.0"
     },
     "require-dev": {

src/JKetelaar/Kiyoh/Factory/ReviewFactory.php

@@ -15,11 +15,6 @@
 
 class ReviewFactory
 {
-    /**
-     * @param SimpleXMLElement $element
-     *
-     * @return Company
-     */
     public static function createCompany(SimpleXMLElement $element): Company
     {
         $company = new Company(
@@ -43,11 +38,6 @@ public static function createCompany(SimpleXMLElement $element): Company
         return $company;
     }
 
-    /**
-     * @param SimpleXMLElement $element
-     *
-     * @return Review
-     */
     public static function createReview(SimpleXMLElement $element): Review
     {
         $review = new Review(
@@ -68,7 +58,7 @@ public static function createReview(SimpleXMLElement $element): Review
     /**
      * @param SimpleXMLElement $elements
      *
-     * @return array
+     * @return array<int, ReviewContent>
      */
     public static function createReviewContent(SimpleXMLElement $elements): array
     {

src/JKetelaar/Kiyoh/Kiyoh.php

@@ -16,48 +16,26 @@ class Kiyoh
 {
     public const COMPANY_REVIEWS_URL = 'https://www.kiyoh.com/v1/review/feed.xml?hash=%s&limit=%s';
 
-    /**
-     * @var string
-     */
-    private $connectorCode;
-
-    /**
-     * @var Client
-     */
-    private $client;
-    /**
-     * @var int
-     */
-    private $reviewCount;
+    private Client $client;
 
     /**
      * Kiyoh constructor.
      *
-     * @param string $connectorCode
-     * @param int    $reviewCount   Either a number of reviews to retrieve
+     * @param int    $reviewCount  A number of reviews to retrieve
      */
-    public function __construct(string $connectorCode, int $reviewCount = 10)
+    public function __construct(private string $connectorCode, private int $reviewCount = 10)
     {
         $this->client = new Client();
-        $this->connectorCode = $connectorCode;
-        $this->reviewCount = $reviewCount;
     }
 
     /**
      * Gets the 10 latest reviews.
-     *
-     * @return Company
      */
     public function getCompany(): Company
     {
         return $this->parseData($this->getContent());
     }
 
-    /**
-     * @param string|null $content
-     *
-     * @return Model\Company
-     */
     protected function parseData(?string $content = null): Model\Company
     {
         if ($content === null) {
@@ -69,26 +47,18 @@ protected function parseData(?string $content = null): Model\Company
         return ReviewFactory::createCompany($content);
     }
 
-    /**
-     * @return string
-     */
     public function getContent(): string
     {
         return $this->getClient()->request('GET', $this->getCompanyURL())->getBody()->getContents();
     }
 
-    /**
-     * @return Client
-     */
     public function getClient(): Client
     {
         return $this->client;
     }
 
     /**
      * Returns parsed Recent Company Reviews URL.
-     *
-     * @return string
      */
     public function getCompanyURL(): string
     {

src/JKetelaar/Kiyoh/Model/Company.php

@@ -10,208 +10,102 @@
 
 class Company
 {
-    /**
-     * @var float
-     */
-    private $averageRating;
-
-    /**
-     * @var int
-     */
-    private $numberReviews;
-
-    /**
-     * @var float
-     */
-    private $last12MonthAverageRating;
-
-    /**
-     * @var int
-     */
-    private $last12MonthNumberReviews;
-
-    /**
-     * @var int
-     */
-    private $percentageRecommendation;
-
-    /**
-     * @var int
-     */
-    private $locationId;
-
-    /**
-     * @var string
-     */
-    private $locationName;
-
     /**
      * @var Review[]
      */
-    private $reviews;
+    private array $reviews;
 
     /**
      * Company constructor.
-     *
-     * @param float  $averageRating
-     * @param int    $numberReviews
-     * @param float  $last12MonthAverageRating
-     * @param int    $last12MonthNumberReviews
-     * @param int    $percentageRecommendation
-     * @param int    $locationId
-     * @param string $locationName
      */
     public function __construct(
-        float $averageRating,
-        int $numberReviews,
-        float $last12MonthAverageRating,
-        int $last12MonthNumberReviews,
-        int $percentageRecommendation,
-        int $locationId,
-        string $locationName
+        private float $averageRating,
+        private int $numberReviews,
+        private float $last12MonthAverageRating,
+        private int $last12MonthNumberReviews,
+        private int $percentageRecommendation,
+        private int $locationId,
+        private string $locationName
     ) {
-        $this->averageRating = $averageRating;
-        $this->numberReviews = $numberReviews;
-        $this->last12MonthAverageRating = $last12MonthAverageRating;
-        $this->last12MonthNumberReviews = $last12MonthNumberReviews;
-        $this->percentageRecommendation = $percentageRecommendation;
-        $this->locationId = $locationId;
-        $this->locationName = $locationName;
     }
 
-    /**
-     * @return float
-     */
     public function getAverageRating(): float
     {
         return $this->averageRating;
     }
 
-    /**
-     * @param float $averageRating
-     *
-     * @return Company
-     */
     public function setAverageRating(float $averageRating): self
     {
         $this->averageRating = $averageRating;
 
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getNumberReviews(): int
     {
         return $this->numberReviews;
     }
 
-    /**
-     * @param int $numberReviews
-     *
-     * @return Company
-     */
     public function setNumberReviews(int $numberReviews): self
     {
         $this->numberReviews = $numberReviews;
 
         return $this;
     }
 
-    /**
-     * @return float
-     */
     public function getLast12MonthAverageRating(): float
     {
         return $this->last12MonthAverageRating;
     }
 
-    /**
-     * @param float $last12MonthAverageRating
-     *
-     * @return Company
-     */
     public function setLast12MonthAverageRating(float $last12MonthAverageRating): self
     {
         $this->last12MonthAverageRating = $last12MonthAverageRating;
 
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getLast12MonthNumberReviews(): int
     {
         return $this->last12MonthNumberReviews;
     }
 
-    /**
-     * @param int $last12MonthNumberReviews
-     *
-     * @return Company
-     */
     public function setLast12MonthNumberReviews(int $last12MonthNumberReviews): self
     {
         $this->last12MonthNumberReviews = $last12MonthNumberReviews;
 
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getPercentageRecommendation(): int
     {
         return $this->percentageRecommendation;
     }
 
-    /**
-     * @param int $percentageRecommendation
-     *
-     * @return Company
-     */
     public function setPercentageRecommendation(int $percentageRecommendation): self
     {
         $this->percentageRecommendation = $percentageRecommendation;
 
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getLocationId(): int
     {
         return $this->locationId;
     }
 
-    /**
-     * @param int $locationId
-     *
-     * @return Company
-     */
     public function setLocationId(int $locationId): self
     {
         $this->locationId = $locationId;
 
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getLocationName(): string
     {
         return $this->locationName;
     }
 
-    /**
-     * @param string $locationName
-     *
-     * @return Company
-     */
     public function setLocationName(string $locationName): self
     {
         $this->locationName = $locationName;
@@ -220,17 +114,15 @@ public function setLocationName(string $locationName): self
     }
 
     /**
-     * @return Review[]
+     * @return array<int, Review>
      */
     public function getReviews(): array
     {
         return $this->reviews;
     }
 
     /**
-     * @param Review[] $reviews
-     *
-     * @return Company
+     * @param array<int, Review> $reviews
      */
     public function setReviews(array $reviews): self
     {