From cba174c2a93016f18ab90417c76af5ab3b7af39b Mon Sep 17 00:00:00 2001
From: Daniel Lienert <daniel@lienert.cc>
Date: Fri, 6 Mar 2020 21:47:47 +0100
Subject: [PATCH] TASK: Improve code quality

---
 Classes/AssetSource/UnsplashAssetProxyQuery.php       |  4 +++-
 Classes/AssetSource/UnsplashAssetProxyQueryResult.php |  7 ++++---
 Classes/AssetSource/UnsplashAssetProxyRepository.php  |  4 ++++
 Classes/AssetSource/UnsplashAssetSource.php           |  1 +
 Classes/AssetSource/UnsplashImageSizeInterface.php    | 10 +++++-----
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Classes/AssetSource/UnsplashAssetProxyQuery.php b/Classes/AssetSource/UnsplashAssetProxyQuery.php
index d1b605d..d59e7b4 100644
--- a/Classes/AssetSource/UnsplashAssetProxyQuery.php
+++ b/Classes/AssetSource/UnsplashAssetProxyQuery.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace DL\AssetSource\Unsplash\AssetSource;
 
 /*
@@ -114,9 +115,10 @@ public function execute(): AssetProxyQueryResultInterface
 
     /**
      * @return int
+     * @throws \Exception
      */
     public function count(): int
     {
-        throw new \Exception(__METHOD__ . ' is not yet implemented');
+        return $this->execute()->count();
     }
 }
diff --git a/Classes/AssetSource/UnsplashAssetProxyQueryResult.php b/Classes/AssetSource/UnsplashAssetProxyQueryResult.php
index 9b7e2d7..3c9070c 100644
--- a/Classes/AssetSource/UnsplashAssetProxyQueryResult.php
+++ b/Classes/AssetSource/UnsplashAssetProxyQueryResult.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace DL\AssetSource\Unsplash\AssetSource;
 
 /*
@@ -91,11 +92,11 @@ public function current()
         /** @var Photo $photo */
         $photo = $this->unsplashQueryResultIterator->current();
 
-        if($photo instanceof Photo) {
+        if ($photo instanceof Photo) {
             return new UnsplashAssetProxy($photo, $this->assetSource);
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
diff --git a/Classes/AssetSource/UnsplashAssetProxyRepository.php b/Classes/AssetSource/UnsplashAssetProxyRepository.php
index 8ca69fb..20014b9 100644
--- a/Classes/AssetSource/UnsplashAssetProxyRepository.php
+++ b/Classes/AssetSource/UnsplashAssetProxyRepository.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace DL\AssetSource\Unsplash\AssetSource;
 
 /*
@@ -55,6 +56,7 @@ public function filterByType(AssetTypeFilter $assetType = null): void
     /**
      * @return AssetProxyQueryResultInterface
      * @throws AssetSourceConnectionExceptionInterface
+     * @throws \Exception
      */
     public function findAll(): AssetProxyQueryResultInterface
     {
@@ -78,6 +80,7 @@ public function findBySearchTerm(string $searchTerm): AssetProxyQueryResultInter
     /**
      * @param Tag $tag
      * @return AssetProxyQueryResultInterface
+     * @throws \Exception
      */
     public function findByTag(Tag $tag): AssetProxyQueryResultInterface
     {
@@ -86,6 +89,7 @@ public function findByTag(Tag $tag): AssetProxyQueryResultInterface
 
     /**
      * @return AssetProxyQueryResultInterface
+     * @throws \Exception
      */
     public function findUntagged(): AssetProxyQueryResultInterface
     {
diff --git a/Classes/AssetSource/UnsplashAssetSource.php b/Classes/AssetSource/UnsplashAssetSource.php
index 083a483..f0c173f 100644
--- a/Classes/AssetSource/UnsplashAssetSource.php
+++ b/Classes/AssetSource/UnsplashAssetSource.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace DL\AssetSource\Unsplash\AssetSource;
 
 /*
diff --git a/Classes/AssetSource/UnsplashImageSizeInterface.php b/Classes/AssetSource/UnsplashImageSizeInterface.php
index 515dac2..2549769 100644
--- a/Classes/AssetSource/UnsplashImageSizeInterface.php
+++ b/Classes/AssetSource/UnsplashImageSizeInterface.php
@@ -11,9 +11,9 @@
 
 interface UnsplashImageSizeInterface
 {
-    const RAW = 'raw';
-    const FULL = 'full';
-    const REGULAR = 'regular';
-    const SMALL = 'small';
-    const THUMB = 'thumb';
+    public const RAW = 'raw';
+    public const FULL = 'full';
+    public const REGULAR = 'regular';
+    public const SMALL = 'small';
+    public const THUMB = 'thumb';
 }