Merge pull request #50 from imagekit-developer/dev

Dev

Author: imagekitio

src/ImageKit/Constants/ErrorMessages.php

@@ -144,5 +144,5 @@ class ErrorMessages
     public static $DELETE_CUSTOM_METADATA_ID_MISSING = ['message' => 'Missing Custom Metadata Field ID parameter for this request', 'help' => 'For support kindly contact us at support@imagekit.io .'];
     public static $PHASH_DISTANCE_FIRST_PHASH_MISSING = ['message' => 'Missing First pHash parameter for this request', 'help' => 'For support kindly contact us at support@imagekit.io .'];
     public static $PHASH_DISTANCE_SECOND_PHASH_MISSING = ['message' => 'Missing Second pHash parameter for this request', 'help' => 'For support kindly contact us at support@imagekit.io .'];
-    
+    public static $URL_GENERATION_EXPIRESECONDS_PARAMETER_INVALID = ['message' => 'expireSeconds accepts an integer value, non integer value provided.', 'help' => 'For support kindly contact us at support@imagekit.io .'];       
 }

src/ImageKit/ImageKit.php

@@ -25,13 +25,6 @@
  */
 class ImageKit
 {
-    /**
-     * ImageKit SDK VERSION
-     *
-     * @var string
-     */
-    const SDK_VERSION = '3.0.0';
-
     /**
      * @var Configuration
      */
@@ -127,6 +120,12 @@ public function url($options=null)
             return json_encode(Response::respond(true, ((object)ErrorMessages::$URL_GENERATION_TRANSFORMATION_PARAMETER_INVALID)));
         }
 
+        if (isset($options['signed']) && $options['signed'] === true){
+            if(isset($options['expireSeconds']) && $options['expireSeconds'] !== '' && !is_numeric($options['expireSeconds'])){
+                return json_encode(Response::respond(true, ((object)ErrorMessages::$URL_GENERATION_EXPIRESECONDS_PARAMETER_INVALID)));
+            }
+        }
+
         $urlInstance = new Url();
         return $urlInstance->buildURL(array_merge((array)$this->configuration, $options));
     }

src/ImageKit/Url/Url.php

@@ -40,10 +40,6 @@ public function buildURL($urlOptions)
 
         if (isset($obj->expireSeconds)) {
             $expireSeconds = $obj->expireSeconds;
-
-            if ($signed === true && $expireSeconds !== '' && !is_numeric($expireSeconds)) {
-                throw new \InvalidArgumentException('expireSeconds should be numeric');
-            }
         }
 
         if (isset($obj->path)) {
@@ -340,10 +336,12 @@ public function unparsed_url(array $parsed)
                 (strlen($host) > 0 ? "//$host" : '') .
                 (strlen($pathname) > 0 ? "$pathname" : '') .
                 (strlen($search) > 0 ? str_replace('=',':',$search).'/' : '') .
-                 $file_name .
-                 (strlen($queryParameters) > 0 ? ( '?' . $queryParameters): '') .
-                 ((!empty($timestampParameterString) && strlen($timestampParameterString) > 0) ? (((!empty($queryParameters) && strlen($queryParameters)>0)?'&':'?') . $timestampParameterString): '') .
-                 ((!empty($signatureParameterString) && strlen($signatureParameterString) > 0) ? ('&' . $signatureParameterString): '');
+                $file_name .
+                (strlen($queryParameters) > 0 ? ( '?' . $queryParameters): '') .
+                ((!empty($timestampParameterString) && strlen($timestampParameterString) > 0) ? (((!empty($queryParameters) && strlen($queryParameters)>0)?'&':'?') . $timestampParameterString): '') .
+                ((!empty($signatureParameterString) && strlen($signatureParameterString) > 0) ? (((!empty($queryParameters) && strlen($queryParameters)>0)?'&':
+                ((!empty($timestampParameterString) && strlen($timestampParameterString) > 0)?'&':'?')
+                ) . $signatureParameterString): '');
 
         }
     }

tests/ImageKit/Url/UrlTest.php

@@ -115,14 +115,133 @@ public function testUrlSignedUrlWithEmptyExpiryString()
      */
     public function testUrlSignedUrlWithInvalidExpiryString()
     {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('expireSeconds should be numeric');
         $url = $this->client->url([
             'path' => '/default-image.jpg',
             'signed' => true,
             'expireSeconds' => 'asdad'
         ]);
-        // UrlTest::assertEquals('expireSeconds should be numericasd',$url);
+        UrlTest::assertEquals('expireSeconds accepts an integer value, non integer value provided.',json_decode($url)->error->message);
+    }
+
+    /**
+     *
+     */
+    public function testUrlSignedUrlWithoutExpiry()
+    {
+        $url = $this->client->url([
+            'path' => '/default-image.jpg',
+            'signed' => true
+        ]);
+        UrlTest::assertStringContainsString(
+            '?ik-s=',
+            $url
+        );
+    }
+
+    /**
+     *
+     */
+    public function testUrlSignedUrlWithExpiryWithTransformation()
+    {
+        $url = $this->client->url([
+            'path' => '/default-image.jpg',
+            "transformation" => [
+                [
+                    "height" => "300",
+                ]
+            ],
+            'signed' => true,
+            'expireSeconds' => 300
+        ]);
+        UrlTest::assertStringContainsString(
+            '?ik-t=',
+            $url
+        );
+        UrlTest::assertStringContainsString(
+            '&ik-s=',
+            $url
+        );
+    }
+
+    /**
+     *
+     */
+    public function testUrlSignedUrlWithExpiryWithQueryParameters()
+    {
+        $url = $this->client->url([
+            'path' => '/default-image.jpg',
+            "queryParameters" => 
+            [
+                "key" => "value"
+            ],
+            'signed' => true,
+            'expireSeconds' => 300
+        ]);
+        UrlTest::assertStringContainsString(
+            '&ik-t=',
+            $url
+        );
+        UrlTest::assertStringContainsString(
+            '&ik-s=',
+            $url
+        );
+    }
+
+    /**
+     *
+     */
+    public function testUrlSignedUrlWithExpiryWithTransformationWithQueryParameters()
+    {
+        $url = $this->client->url([
+            'path' => '/default-image.jpg',
+            "queryParameters" => 
+            [
+                "key" => "value"
+            ],
+            "transformation" => [
+                [
+                    "height" => "300",
+                ]
+            ],
+            'signed' => true,
+            'expireSeconds' => 300
+        ]);
+        UrlTest::assertStringContainsString(
+            '&ik-t=',
+            $url
+        );
+        UrlTest::assertStringContainsString(
+            '&ik-s=',
+            $url
+        );
+    }
+
+    /**
+     *
+     */
+    public function testUrlSignedUrlWithoutExpiryWithTransformationWithQueryParameters()
+    {
+        $url = $this->client->url([
+            'path' => '/default-image.jpg',
+            "queryParameters" => 
+            [
+                "key" => "value"
+            ],
+            "transformation" => [
+                [
+                    "height" => "300",
+                ]
+            ],
+            'signed' => true
+        ]);
+        UrlTest::assertStringNotContainsString(
+            '&ik-t=',
+            $url
+        );
+        UrlTest::assertStringContainsString(
+            '&ik-s=',
+            $url
+        );
     }
 
     /**