Merge pull request #23 from cronitorio/unit-tests

Fixes and unit tests

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 /coverage
 *.code-workspace
+.phpunit.result.cache

VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

lib/Client.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Cronitor;
 
 class Client

lib/Monitor.php

@@ -6,7 +6,7 @@ class Monitor
 {
     private const BASE_MONITOR_API_URL = 'https://cronitor.io/api/monitors';
     private const BASE_PING_API_URL = "https://cronitor.link/p";
-    private const BASE_FALLBACK_PING_URL = "https://cronitor.link/p";
+    private const BASE_FALLBACK_PING_API_URL = "https://cronitor.io/p";
     private const PING_RETRY_THRESHOLD = 5;
 
     public $apiKey;
@@ -76,7 +76,7 @@ public static function delete($apiKey, $apiVersion, $key)
 
     public function ping($params = array())
     {
-        $retryCount = $params['retryCount'] ?: 0;
+        $retryCount = isset($params['retryCount']) ? $params['retryCount'] : 0;
 
         if (!$this->apiKey) {
             \error_log('No API key detected. Set Cronitor.api_key or initialize Monitor with an api_key:', 0);
@@ -86,24 +86,24 @@ public function ping($params = array())
         try {
             $queryString = $this->buildPingQuery($params);
             $client = $this->getPingClient($retryCount);
-            $response = $client->get("/?$queryString");
+            $response = $client->get("?$queryString");
             $responseCode = $response['code'];
 
-            if ($responseCode < 200 || $responseCode > 299) {
+            if ($responseCode !== 200) {
                 \error_log("Cronitor Telemetry Error: $responseCode", 0);
                 return false;
             }
 
             return true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // rescue instances of StandardError i.e. Timeout::Error, SocketError, etc
             \error_log("Cronitor Telemetry Error: $e", 0);
             if ($retryCount >= self::PING_RETRY_THRESHOLD) {
                 return false;
             }
 
             // apply a backoff before sending the next ping
-            sleep(calculateSleep($retryCount));
+            sleep($this->calculateSleep($retryCount));
             $this->ping(array_merge($params, ['retryCount' => $retryCount + 1]));
         }
     }
@@ -163,9 +163,11 @@ private function cleanParams($params)
             'env' => isset($params['env']) ? $params['env'] : null,
         ];
 
-        return array_filter($cleanedParams, function ($v) {
+        $filteredParams = array_filter($cleanedParams, function ($v) {
             return !is_null($v);
         });
+
+        return $filteredParams;
     }
 
     private function cleanMetrics($metrics)
@@ -183,21 +185,21 @@ private function getPingClient($retryCount)
     }
     private function getPingApiUrl()
     {
-        return self::BASE_PING_API_URL . "/$apiKey/$key";
+        return self::BASE_PING_API_URL . "/$this->apiKey/$this->key";
     }
 
     private function getFallbackPingApiUrl()
     {
-        return self::BASE_FALLBACK_PING_API_URL . "/$apiKey/$key";
+        return self::BASE_FALLBACK_PING_API_URL . "/$this->apiKey/$this->key";
     }
 
     private function buildPingQuery($params)
     {
         $cleanParams = $this->cleanParams($params);
         $metrics = $cleanParams['metric'];
         unset($cleanParams['metric']);
-
-        $queryParams = array_map(function ($key) {
+        
+        $queryParams = array_map(function ($key) use ($cleanParams) {
             $value = $cleanParams[$key];
             return "$key=$value";
         }, array_keys($cleanParams));

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

tests/ClientTest.php

@@ -0,0 +1,32 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+final class ClientTest extends TestCase
+{
+    private $client;
+
+    protected function setUp(): void
+    {
+        $this->client = new Cronitor\Client($apiKey, $apiVersion, $environment);
+    }
+
+    public function testIsInitializable()
+    {
+        $apiKey = '1234';
+        $apiVersion = '2020-01-01';
+        $environment = 'staging';
+
+        $this->client = new Cronitor\Client($apiKey, $apiVersion, $environment);
+        $this->assertEquals($this->client->apiKey, $apiKey);
+        $this->assertEquals($this->client->apiVersion, $apiVersion);
+        $this->assertEquals($this->client->environment, $environment);
+    }
+
+    public function testMonitor()
+    {
+        $monitorKey = '1234';
+        $monitor = $this->client->monitor($monitorKey);
+        $this->assertInstanceOf(Cronitor\Monitor::class, $monitor);
+    }
+}