Merge pull request facebookarchive#903 from carusogabriel/null-coalesce-operator

Use Null Coalesce Operator

Author: yguedidi

src/BatchRequest.php

@@ -95,7 +95,7 @@ public function add($request, $options = null)
         // File uploads
         $attachedFiles = $this->extractFileAttachments($request);
 
-        $name = isset($options['name']) ? $options['name'] : null;
+        $name = $options['name'] ?? null;
 
         unset($options['name']);
 
@@ -315,6 +315,6 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        return isset($this->requests[$offset]) ? $this->requests[$offset] : null;
+        return $this->requests[$offset] ?? null;
     }
 }

src/BatchResponse.php

@@ -94,11 +94,11 @@ public function setResponses(array $responses)
      */
     public function addResponse($key, $response)
     {
-        $originalRequestName = isset($this->batchRequest[$key]['name']) ? $this->batchRequest[$key]['name'] : $key;
-        $originalRequest = isset($this->batchRequest[$key]['request']) ? $this->batchRequest[$key]['request'] : null;
+        $originalRequestName = $this->batchRequest[$key]['name'] ?? $key;
+        $originalRequest = $this->batchRequest[$key]['request'] ?? null;
 
-        $httpResponseBody = isset($response['body']) ? $response['body'] : null;
-        $httpResponseCode = isset($response['code']) ? $response['code'] : null;
+        $httpResponseBody = $response['body'] ?? null;
+        $httpResponseCode = $response['code'] ?? null;
         // @TODO With PHP 5.5 support, this becomes array_column($response['headers'], 'value', 'name')
         $httpResponseHeaders = isset($response['headers']) ? $this->normalizeBatchHeaders($response['headers']) : [];
 
@@ -147,7 +147,7 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        return isset($this->responses[$offset]) ? $this->responses[$offset] : null;
+        return $this->responses[$offset] ?? null;
     }
 
     /**

src/Exception/ResponseException.php

@@ -71,8 +71,8 @@ public static function create(Response $response)
             $data = ['error' => $data];
         }
 
-        $code = isset($data['error']['code']) ? $data['error']['code'] : null;
-        $message = isset($data['error']['message']) ? $data['error']['message'] : 'Unknown error from Graph.';
+        $code = $data['error']['code'] ?? null;
+        $message = $data['error']['message'] ?? 'Unknown error from Graph.';
 
         if (isset($data['error']['error_subcode'])) {
             switch ($data['error']['error_subcode']) {

src/FileUpload/Mimetypes.php

@@ -969,7 +969,7 @@ public function fromExtension($extension)
     {
         $extension = strtolower($extension);
 
-        return isset($this->mimetypes[$extension]) ? $this->mimetypes[$extension] : null;
+        return $this->mimetypes[$extension] ?? null;
     }
 
     /**

src/GraphNode/GraphNodeFactory.php

@@ -258,7 +258,7 @@ public function safelyMakeGraphNode(array $data, $subclassName = null)
         static::validateSubclass($subclassName);
 
         // Remember the parent node ID
-        $parentNodeId = isset($data['id']) ? $data['id'] : null;
+        $parentNodeId = $data['id'] ?? null;
 
         $items = [];
 
@@ -269,9 +269,7 @@ public function safelyMakeGraphNode(array $data, $subclassName = null)
                 // This is always empty on the GraphNode collection, but subclasses can define
                 // their own array of smart-casting types.
                 $graphNodeMap = $subclassName::getNodeMap();
-                $objectSubClass = isset($graphNodeMap[$k])
-                    ? $graphNodeMap[$k]
-                    : null;
+                $objectSubClass = $graphNodeMap[$k] ?? null;
 
                 // Could be a GraphEdge or GraphNode
                 $items[$k] = $this->castAsGraphNodeOrGraphEdge($v, $objectSubClass, $k, $parentNodeId);

src/Helper/RedirectLoginHelper.php

@@ -311,6 +311,6 @@ public function getErrorDescription()
      */
     private function getInput($key)
     {
-        return isset($_GET[$key]) ? $_GET[$key] : null;
+        return $_GET[$key] ?? null;
     }
 }

src/PersistentData/InMemoryPersistentDataHandler.php

@@ -37,7 +37,7 @@ class InMemoryPersistentDataHandler implements PersistentDataInterface
      */
     public function get($key)
     {
-        return isset($this->sessionData[$key]) ? $this->sessionData[$key] : null;
+        return $this->sessionData[$key] ?? null;
     }
 
     /**

src/Response.php

@@ -166,7 +166,7 @@ public function getAppSecretProof()
      */
     public function getETag()
     {
-        return isset($this->headers['ETag']) ? $this->headers['ETag'] : null;
+        return $this->headers['ETag'] ?? null;
     }
 
     /**
@@ -176,7 +176,7 @@ public function getETag()
      */
     public function getGraphVersion()
     {
-        return isset($this->headers['Facebook-API-Version']) ? $this->headers['Facebook-API-Version'] : null;
+        return $this->headers['Facebook-API-Version'] ?? null;
     }
 
     /**

src/SignedRequest.php

@@ -129,8 +129,8 @@ public function hasOAuthData()
      */
     public function make(array $payload)
     {
-        $payload['algorithm'] = isset($payload['algorithm']) ? $payload['algorithm'] : 'HMAC-SHA256';
-        $payload['issued_at'] = isset($payload['issued_at']) ? $payload['issued_at'] : time();
+        $payload['algorithm'] = $payload['algorithm'] ?? 'HMAC-SHA256';
+        $payload['issued_at'] = $payload['issued_at'] ?? time();
         $encodedPayload = $this->base64UrlEncode(json_encode($payload));
 
         $hashedSig = $this->hashSignature($encodedPayload);

src/Url/UrlDetectionHandler.php

@@ -144,7 +144,7 @@ protected function getCurrentPort()
      */
     protected function getServerVar($key)
     {
-        return isset($_SERVER[$key]) ? $_SERVER[$key] : '';
+        return $_SERVER[$key] ?? '';
     }
 
     /**
@@ -171,7 +171,7 @@ protected function isValidForwardedHost($header)
     {
         $elements = explode(',', $header);
         $host = $elements[count($elements) - 1];
-        
+
         return preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $host) //valid chars check
             && 0 < strlen($host) && strlen($host) < 254 //overall length check
             && preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $host); //length of each label