Fixing a bug with GuzzleClientAdapter calling the wrong method to determine caching headers

Changing null comparison

Author: jaimz22

src/ClientAdapters/ClientAdapter.php

@@ -28,7 +28,7 @@ protected function buildRequestURL($latitude, $longitude, \DateTime $time = NULL
     {
         $requestUrl = Overcast::API_ENDPOINT . Overcast::getApiKey() . '/' . $latitude . ',' . $longitude;
 
-        if (!is_null($time)) {
+        if (NULL !== $time) {
             $requestUrl .= ',' . $time->getTimestamp();
         }
 
@@ -45,7 +45,7 @@ protected function buildRequestURL($latitude, $longitude, \DateTime $time = NULL
      */
     private function buildRequestParameters($parameters)
     {
-        if (is_null($parameters) || empty($parameters)) {
+        if (NULL === $parameters || empty($parameters)) {
             return null;
         }
 

src/ClientAdapters/GuzzleClientAdapter.php

@@ -33,7 +33,7 @@ class GuzzleClientAdapter extends ClientAdapter implements ClientAdapterInterfac
      */
     public function __construct(Client $guzzleClient = null)
     {
-        if (is_null($guzzleClient)) {
+        if (NULL === $guzzleClient) {
             $guzzleClient = new Client();
         }
         $this->guzzleClient = $guzzleClient;
@@ -87,14 +87,14 @@ protected function buildCacheDirectives($response)
     {
         $cacheControlHeader = null;
         if ($response->hasHeader('cache-control')) {
-            $cacheControlHeader = $this->parse_header($response->getHeader('cache-control'));
+            $cacheControlHeader = $this->parseHeader($response->getHeader('cache-control'));
             $cacheControlHeader = current($cacheControlHeader);
             $cacheControlHeader = (isset($cacheControlHeader['max-age'])?$cacheControlHeader['max-age']:null);
         }
 
         $expiresHeader = null;
         if ($response->hasHeader('expires')){
-            $expiresHeader = join(' ',array_column($this->parse_header($response->getHeader('expires')),0));
+            $expiresHeader = implode(' ',array_column($this->parseHeader($response->getHeader('expires')),0));
         }
 
         return array_filter([

src/Overcast.php

@@ -31,7 +31,7 @@ class Overcast
      * Private API Key
      * @var string
      */
-    private static $apiKey = null;
+    private static $apiKey;
     /**
      * The number of API calls made today
      * @var int
@@ -58,7 +58,7 @@ class Overcast
     public function __construct($apiKey, ClientAdapterInterface $adapter = null)
     {
         self::$apiKey = $apiKey;
-        if (is_null($adapter)) {
+        if (NULL === $adapter) {
             if (class_exists('GuzzleHttp\Client', true)) {
                 $adapter = new GuzzleClientAdapter();
             } else {
@@ -85,14 +85,14 @@ public function getForecast($latitude, $longitude, \DateTime $time = null, array
             $response = $this->adapter->getForecast($latitude, $longitude, $time, $parameters);
             $responseHeaders = $this->adapter->getHeaders();
 
-            if (!is_null($responseHeaders['apiCalls'])) {
+            if (NULL !== $responseHeaders['apiCalls']) {
                 $this->apiCalls = $responseHeaders['apiCalls'];
             }
 
             $cacheAge = 0;
-            if (!is_null($responseHeaders['cache']['maxAge'])) {
+            if (NULL !== $responseHeaders['cache']['maxAge']) {
                 $cacheAge = $responseHeaders['cache']['maxAge'];
-            } elseif (!is_null($responseHeaders['cache']['expires'])) {
+            } elseif (NULL !== $responseHeaders['cache']['expires']) {
                 $cacheAge = (new \DateTime())->getTimestamp() - (new \DateTime($responseHeaders['cache']['expires']))->getTimestamp();
             }