webwarejp / notificationhubs-rest-php

src/NotificationHubsRest/Notification/NotificationFactory.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
      */
     public function createNotification($format, $alert, array $options = array(), $tagsOrTagExpression = '', \DateTime $scheduleTime = null)
     {
-        $class = __NAMESPACE__ . '\\' . ucfirst($format) . 'Notification';
+        $class = __NAMESPACE__.'\\'.ucfirst($format).'Notification';
 
         if (!class_exists($class)) {
-            throw new \RuntimeException('Invalid format: ' . $format);
+            throw new \RuntimeException('Invalid format: '.$format);
         }
 
         return new $class($alert, $options, $tagsOrTagExpression, $scheduleTime);

src/NotificationHubsRest/Notification/AbstractNotification.php

Spacing +8 added lines, -8 removed lines

@@ -49,17 +49,17 @@ 
         }
 
         $headers = array(
-            'Content-Type: ' . $this->getContentType(),
-            'ServiceBusNotification-Format: ' . $this->getFormat()
+            'Content-Type: '.$this->getContentType(),
+            'ServiceBusNotification-Format: '.$this->getFormat()
         );
 
         if ('' !== $tagExpression) {
-            $headers[] = 'ServiceBusNotification-Tags: ' . $tagExpression;
+            $headers[] = 'ServiceBusNotification-Tags: '.$tagExpression;
         }
 
         if ($this->scheduleTime instanceof \DateTime) {
             $this->scheduleTime->setTimeZone(new \DateTimeZone('UTC'));
-            $headers[] = 'ServiceBusNotification-ScheduleTime: ' . $this->scheduleTime->format(self::SCHEDULE_TIME_FORMAT);
+            $headers[] = 'ServiceBusNotification-ScheduleTime: '.$this->scheduleTime->format(self::SCHEDULE_TIME_FORMAT);
         }
 
         return $headers;
@@ -71,22 +71,22 @@ 
     public function buildUri($endpoint, $hubPath)
     {
         if ($this->scheduleTime instanceof \DateTime) {
-            return $endpoint . $hubPath . '/schedulednotifications/';
+            return $endpoint.$hubPath.'/schedulednotifications/';
         }
-        return $endpoint . $hubPath . '/messages/';
+        return $endpoint.$hubPath.'/messages/';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setToken($deviceToken){
+    public function setToken($deviceToken) {
         $this->deviceToken = $deviceToken;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getToken(){
+    public function getToken() {
         return $this->deviceToken;
     }
 

src/NotificationHubsRest/Registration/RegistrationFactory.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
      */
     public function createRegistration($type)
     {
-        $class = __NAMESPACE__ . '\\' . ucfirst($type) . 'Registration';
+        $class = __NAMESPACE__.'\\'.ucfirst($type).'Registration';
 
         if (!class_exists($class)) {
-            throw new \RuntimeException('Invalid type: ' . $type);
+            throw new \RuntimeException('Invalid type: '.$type);
         }
 
         return new $class;

src/NotificationHubsRest/Registration/AbstractRegistration.php

Spacing +5 added lines, -5 removed lines

@@ -155,7 +155,7 @@ 
      */
     public function buildUri($endpoint, $hubPath)
     {
-        $uri = $endpoint . $hubPath . '/registrations/';
+        $uri = $endpoint.$hubPath.'/registrations/';
 
         if ($this->registrationId) {
             $uri .= $this->registrationId;
@@ -178,12 +178,12 @@ 
     public function getHeaders()
     {
         $headers = array(
-            'Content-Type: ' . $this->getContentType(),
-            'x-ms-version: ' . '2015-01'
+            'Content-Type: '.$this->getContentType(),
+            'x-ms-version: '.'2015-01'
         );
 
         if ($this->eTag) {
-            $headers[] = 'If-Match: ' . $this->eTag;
+            $headers[] = 'If-Match: '.$this->eTag;
         }
 
         return $headers;
@@ -297,7 +297,7 @@ 
 
         $description = $dom->getElementsByTagName($descriptionTag)->item(0);
         if (!$description) {
-            throw new \RuntimeException("Could not find '" . $descriptionTag . "' tag in the response: " . $response);
+            throw new \RuntimeException("Could not find '".$descriptionTag."' tag in the response: ".$response);
         }
 
         $result = array();

src/NotificationHubsRest/NotificationHub/NotificationHub.php

Spacing +26 added lines, -26 removed lines

@@ -48,12 +48,12 @@ 
     {
         $parts = explode(";", $connectionString);
         if (sizeof($parts) != 3) {
-            throw new \RuntimeException("Error parsing connection string: " . $connectionString);
+            throw new \RuntimeException("Error parsing connection string: ".$connectionString);
         }
 
         foreach ($parts as $part) {
             if (strpos($part, "Endpoint") === 0) {
-                $this->endpoint = "https" . substr($part, 11);
+                $this->endpoint = "https".substr($part, 11);
             } else if (strpos($part, "SharedAccessKeyName") === 0) {
                 $this->sasKeyName = substr($part, 20);
             } else if (strpos($part, "SharedAccessKey") === 0) {
@@ -62,7 +62,7 @@ 
         }
 
         if (!$this->endpoint || !$this->sasKeyName || !$this->sasKeyValue) {
-            throw new \RuntimeException("Invalid connection string: " . $connectionString);
+            throw new \RuntimeException("Invalid connection string: ".$connectionString);
         }
     }
 
@@ -79,9 +79,9 @@ 
         $expires = time();
         $expiresInMins = 60;
         $expires = $expires + $expiresInMins * 60;
-        $toSign = $targetUri . "\n" . $expires;
+        $toSign = $targetUri."\n".$expires;
         $signature = rawurlencode(base64_encode(hash_hmac('sha256', $toSign, $this->sasKeyValue, TRUE)));
-        $token = "SharedAccessSignature sr=" . $targetUri . "&sig=" . $signature . "&se=" . $expires . "&skn=" . $this->sasKeyName;
+        $token = "SharedAccessSignature sr=".$targetUri."&sig=".$signature."&se=".$expires."&skn=".$this->sasKeyName;
 
         return $token;
     }
@@ -95,11 +95,11 @@ 
      */
     public function sendNotification(NotificationInterface $notification)
     {
-        $uri = $notification->buildUri($this->endpoint, $this->hubPath). self::API_VERSION;
+        $uri = $notification->buildUri($this->endpoint, $this->hubPath).self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
 
-        $headers = array_merge(['Authorization: ' . $token], $notification->getHeaders());
+        $headers = array_merge(['Authorization: '.$token], $notification->getHeaders());
 
         $this->request(self::METHOD_POST, $uri, $headers, $notification->getPayload());
     }
@@ -114,13 +114,13 @@ 
     public function sendNotificationWithToken(NotificationInterface $notification)
     {
         // $uri = $notification->buildUri($this->endpoint, $this->hubPath). '?direct&api-version=2015-01';
-        $uri = $notification->buildUri($this->endpoint, $this->hubPath). '?direct' . self::API_VERSION;
+        $uri = $notification->buildUri($this->endpoint, $this->hubPath).'?direct'.self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
 
         $headers = array_merge([
-            'Authorization: ' . $token,
-            'ServiceBusNotification-DeviceHandle: ' . $notification->getToken(),
+            'Authorization: '.$token,
+            'ServiceBusNotification-DeviceHandle: '.$notification->getToken(),
             ],
             $notification->getHeaders()
         );
@@ -143,10 +143,10 @@ 
             throw new \RuntimeException('Registration ID and ETag must be empty.');
         }
 
-        $uri = $registration->buildUri($this->endpoint, $this->hubPath) . self::API_VERSION;
+        $uri = $registration->buildUri($this->endpoint, $this->hubPath).self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
 
         // $testing = ["uri" => $uri, "headers" => $headers];
         // return $testing;
@@ -171,10 +171,10 @@ 
             throw new \RuntimeException('Registration ID is mandatory.');
         }
 
-        $uri = $registration->buildUri($this->endpoint, $this->hubPath) . self::API_VERSION;
+        $uri = $registration->buildUri($this->endpoint, $this->hubPath).self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
 
         $response = $this->request(self::METHOD_PUT, $uri, $headers, $registration->getPayload());
 
@@ -196,10 +196,10 @@ 
             throw new \RuntimeException('Registration ID and ETag are mandatory.');
         }
 
-        $uri = $registration->buildUri($this->endpoint, $this->hubPath) . self::API_VERSION;
+        $uri = $registration->buildUri($this->endpoint, $this->hubPath).self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
 
         $this->request(self::METHOD_DELETE, $uri, $headers);
     }
@@ -219,10 +219,10 @@ 
             throw new \RuntimeException('Registration ID is mandatory.');
         }
 
-        $uri = $registration->buildUri($this->endpoint, $this->hubPath) . self::API_VERSION;
+        $uri = $registration->buildUri($this->endpoint, $this->hubPath).self::API_VERSION;
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
 
         $response = $this->request(self::METHOD_GET, $uri, $headers);
 
@@ -244,11 +244,11 @@ 
             throw new \RuntimeException('Token is mandatory.');
         }
 
-        $uri = $registration->buildUri($this->endpoint, $this->hubPath) . self::API_VERSION .
-                '&$filter=' . urlencode($registration->getTokenTag() . ' eq \'' . $registration->getToken() . '\'');
+        $uri = $registration->buildUri($this->endpoint, $this->hubPath).self::API_VERSION.
+                '&$filter='.urlencode($registration->getTokenTag().' eq \''.$registration->getToken().'\'');
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
 
         $response = $this->request(self::METHOD_GET, $uri, $headers);
 
@@ -273,16 +273,16 @@ 
     {
         $registration = new GcmRegistration();
         // build uri
-        $uri = $this->endpoint . $this->hubPath . "/registrationIDs/";
+        $uri = $this->endpoint.$this->hubPath."/registrationIDs/";
 
         $token = $this->generateSasToken($uri);
-        $headers = array_merge(array('Authorization: ' . $token), $registration->getHeaders());
+        $headers = array_merge(array('Authorization: '.$token), $registration->getHeaders());
         $headers = array_merge(array('Content-length: 0'), $headers);
 
-        $response = $this->request(self::METHOD_POST, $uri . self::API_VERSION, $headers, null, true);
+        $response = $this->request(self::METHOD_POST, $uri.self::API_VERSION, $headers, null, true);
 
         preg_match(
-            '#' . $uri . '([^?]+)' . preg_quote(self::API_VERSION) . '#',
+            '#'.$uri.'([^?]+)'.preg_quote(self::API_VERSION).'#',
             $response,
             $matches
         );
@@ -332,7 +332,7 @@ 
 
         $info = curl_getinfo($ch);
         if ($info['http_code'] != 200 && $info['http_code'] != 201) {
-            throw new \RuntimeException('Error sending request: ' . $info['http_code'] . ' msg: ' . $response);
+            throw new \RuntimeException('Error sending request: '.$info['http_code'].' msg: '.$response);
         }
 
         return $response;