Stefanius67 / PNServer

PNSubscriber.php

Indentation +19 added lines, -19 removed lines

@@ -33,26 +33,26 @@
 $result = array();

 // only serve POST request containing valid json data

 if (strtolower($_SERVER['REQUEST_METHOD']) == 'post') {

-	if (isset($_SERVER['CONTENT_TYPE'])	&& trim(strtolower($_SERVER['CONTENT_TYPE']) == 'application/json')) {

-		// get posted json data

-		if (($strJSON = trim(file_get_contents('php://input'))) === false) {

-			$result['msg'] = 'invalid JSON data!';

-		} else {

-			$oDP = new PNDataProviderSQLite();

-			if ($oDP->saveSubscription($strJSON) !== false) {

-				$result['msg'] = 'subscription saved on server!';

-				if ($bSendWelcome) {

-				    sendWelcome(PNSubscription::fromJSON($strJSON));

-				}

-			} else {

-				$result['msg'] = 'error saving subscription!';

-			}

-		}

-	} else {

-		$result['msg'] = 'invalid content type!';

-	}

+    if (isset($_SERVER['CONTENT_TYPE'])	&& trim(strtolower($_SERVER['CONTENT_TYPE']) == 'application/json')) {

+        // get posted json data

+        if (($strJSON = trim(file_get_contents('php://input'))) === false) {

+            $result['msg'] = 'invalid JSON data!';

+        } else {

+            $oDP = new PNDataProviderSQLite();

+            if ($oDP->saveSubscription($strJSON) !== false) {

+                $result['msg'] = 'subscription saved on server!';

+                if ($bSendWelcome) {

+                    sendWelcome(PNSubscription::fromJSON($strJSON));

+                }

+            } else {

+                $result['msg'] = 'error saving subscription!';

+            }

+        }

+    } else {

+        $result['msg'] = 'invalid content type!';

+    }

 } else {

-	$result['msg'] = 'no post request!';

+    $result['msg'] = 'no post request!';

 }

 // let the service-worker know the result

 echo json_encode($result);

SKien/PNServer/PNEncryption.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -58,7 +58,7 @@ 
      * @param string $strSubscrAuth     subscription authenthication code
      * @param string $strEncoding       encoding (default: 'aesgcm')
      */
-    public function __construct(string $strSubscrKey, string $strSubscrAuth, string $strEncoding='aesgcm') 
+    public function __construct(string $strSubscrKey, string $strSubscrAuth, string $strEncoding = 'aesgcm') 
     {
         $this->strSubscrKey = self::decodeBase64URL($strSubscrKey);
         $this->strSubscrAuth = self::decodeBase64URL($strSubscrAuth);
@@ -150,7 +150,7 @@ 
      * @param array $aHeaders   existing headers to merge with
      * @return array
      */
-    public function getHeaders(?array $aHeaders=null) : array 
+    public function getHeaders(?array $aHeaders = null) : array 
     {
         if (!$aHeaders) {
             $aHeaders = array();
@@ -331,7 +331,7 @@ 
      * @param int $iMaxLengthToPad
      * @return string
      */
-    private function padPayload(string $strPayload, int $iMaxLengthToPad=0) : string
+    private function padPayload(string $strPayload, int $iMaxLengthToPad = 0) : string
     {
         $iLen = mb_strlen($strPayload, '8bit');
         $iPad = $iMaxLengthToPad ? $iMaxLengthToPad - $iLen : 0;
@@ -370,6 +370,6 @@ 
         $prk = hash_hmac('sha256', $ikm, $salt, true);
     
         // expand
-        return mb_substr(hash_hmac('sha256', $info.chr(1), $prk, true), 0, $length, '8bit');
+        return mb_substr(hash_hmac('sha256', $info . chr(1), $prk, true), 0, $length, '8bit');
     }
 }

SKien/PNServer/PNPayload.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -42,7 +42,7 @@ 
      * @param string $strText A string representing an extra content to display within the notification.
      * @param string $strIcon containing the URL of an image to be used as an icon by the notification.
      */
-    public function __construct(string $strTitle, ?string $strText=null, ?string $strIcon=null) 
+    public function __construct(string $strTitle, ?string $strText = null, ?string $strIcon = null) 
     {
         $this->aPayload = array(
                 'title' => $strTitle,
@@ -60,7 +60,7 @@ 
     public function setURL(string $strURL) : void
     {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
-            if (!isset($this->aPayload['opt']['data']) || !is_array($this->aPayload['opt']['data'] )) {
+            if (!isset($this->aPayload['opt']['data']) || !is_array($this->aPayload['opt']['data'])) {
                 $this->aPayload['opt']['data'] = array();
             }
             $this->aPayload['opt']['data']['url'] = $strURL;
@@ -76,7 +76,7 @@ 
      * @param string $strTag
      * @param bool $bReNotify
      */
-    public function setTag(string $strTag, bool $bReNotify=false) : void
+    public function setTag(string $strTag, bool $bReNotify = false) : void
     {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['tag'] = $strTag;
@@ -126,10 +126,10 @@ 
      * @param string $strIcon       containing the URL of an icon to display with the action.
      * @param string $strCustom     custom info - not part of the showNotification()- Options!
      */
-    public function addAction(string $strAction, string $strTitle, ?string $strIcon=null, string $strCustom='') : void
+    public function addAction(string $strAction, string $strTitle, ?string $strIcon = null, string $strCustom = '') : void
     {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
-            if (!isset($this->aPayload['opt']['actions']) || !is_array($this->aPayload['opt']['actions'] )) {
+            if (!isset($this->aPayload['opt']['actions']) || !is_array($this->aPayload['opt']['actions'])) {
                 $this->aPayload['opt']['actions'] = array();
             }
             $this->aPayload['opt']['actions'][] = array('action' => $strAction, 'title' => $strTitle, 'icon' => $strIcon, 'custom' => $strCustom);
@@ -156,7 +156,7 @@ 
                 $iTimestamp = strtotime($timestamp);
             }
             // timestamp in milliseconds!
-            $this->aPayload['opt']['timestamp'] = bcmul((string)$iTimestamp, '1000');
+            $this->aPayload['opt']['timestamp'] = bcmul((string) $iTimestamp, '1000');
         }
     }
     
@@ -168,7 +168,7 @@ 
      * 
      * @param bool $bSet
      */
-    public function requireInteraction(bool $bSet=true) : void
+    public function requireInteraction(bool $bSet = true) : void
     {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['requireInteraction'] = $bSet;
@@ -180,7 +180,7 @@ 
      * If this 'mute' function is activated, a previously set vibration is reset to prevent a TypeError exception.
      * @param bool $bSet
      */
-    public function setSilent(bool $bSet=true) : void
+    public function setSilent(bool $bSet = true) : void
     {
         if (is_array($this->aPayload) && isset($this->aPayload['opt']) && is_array($this->aPayload['opt'])) {
             $this->aPayload['opt']['silent'] = $bSet;

SKien/PNServer/PNSubscription.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -39,7 +39,7 @@ 
      * @param int $timeExpiration
      * @param string $strEncoding
      */
-    public function __construct(string $strEndpoint, string $strPublicKey, string $strAuth, int $timeExpiration=0, string $strEncoding='aesgcm') 
+    public function __construct(string $strEndpoint, string $strPublicKey, string $strAuth, int $timeExpiration = 0, string $strEncoding = 'aesgcm') 
     {
         $this->strEndpoint = $strEndpoint;
         $this->strPublicKey = $strPublicKey;
@@ -90,7 +90,7 @@ 
                     isset($this->strEndpoint) && strlen($this->strEndpoint) > 0 &&
                     isset($this->strPublicKey) && strlen($this->strPublicKey) > 0 &&
                     isset($this->strAuth) && strlen($this->strAuth) > 0 &&
-                    ($this->strEncoding == 'aesgcm'|| $this->strEncoding == 'aes128gcm') 
+                    ($this->strEncoding == 'aesgcm' || $this->strEncoding == 'aes128gcm') 
                 );
         }
         return $bValid;

SKien/PNServer/PNServerHelper.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -69,9 +69,9 @@ 
         $der  = self::p256PrivateKey($strPrivateKey);
         $der .= $strPublicKey;
     
-        $pem = '-----BEGIN EC PRIVATE KEY-----'.PHP_EOL;
+        $pem = '-----BEGIN EC PRIVATE KEY-----' . PHP_EOL;
         $pem .= chunk_split(base64_encode($der), 64, PHP_EOL);
-        $pem .= '-----END EC PRIVATE KEY-----'.PHP_EOL;
+        $pem .= '-----END EC PRIVATE KEY-----' . PHP_EOL;
     
         return $pem;
     }
@@ -126,7 +126,7 @@ 
         }
         
         if ($R !== false && $S !== false) {
-            $sig = \pack('H*', $R.$S);
+            $sig = \pack('H*', $R . $S);
         }
     
         return $sig;

SKien/PNServer/Utils/Math.php

Indentation +11 added lines, -11 removed lines

@@ -120,17 +120,17 @@
     }
     
     public static function modSub(\GMP $minuend, \GMP $subtrahend, \GMP $modulus) : \GMP
-   	{
-   		return self::mod(self::sub($minuend, $subtrahend), $modulus);
-   	}
+        {
+            return self::mod(self::sub($minuend, $subtrahend), $modulus);
+        }
     
-   	public static function modMul(\GMP $multiplier, \GMP $muliplicand, \GMP $modulus) : \GMP
-   	{
-   		return self::mod(self::mul($multiplier, $muliplicand), $modulus);
-   	}
+        public static function modMul(\GMP $multiplier, \GMP $muliplicand, \GMP $modulus) : \GMP
+        {
+            return self::mod(self::mul($multiplier, $muliplicand), $modulus);
+        }
     
-   	public static function modDiv(\GMP $dividend, \GMP $divisor, \GMP $modulus) : \GMP
-   	{
-   		return self::mul($dividend, self::inverseMod($divisor, $modulus));
-   	}
+        public static function modDiv(\GMP $dividend, \GMP $divisor, \GMP $modulus) : \GMP
+        {
+            return self::mul($dividend, self::inverseMod($divisor, $modulus));
+        }
 }

SKien/PNServer/Utils/Curve.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
             if (!$mul->isInfinity()) {
                 throw new \RuntimeException('SELF * ORDER MUST EQUAL INFINITY. (' . (string) $mul . ' found instead)');
             }
-            */
+             */
         }
 
         return $point;

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
         $n = \str_pad(Math::baseConvert(Math::toString($n), 10, 2), $k, '0', STR_PAD_LEFT);
 
         for ($i = 0; $i < $k; ++$i) {
-            $j = (int)$n[$i];
+            $j = (int) $n[$i];
             Point::cswap($r[0], $r[1], $j ^ 1);
             $r[0] = $this->add($r[0], $r[1]);
             $r[1] = $this->getDouble($r[1]);

SKien/PNServer/PNServer.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -48,7 +48,7 @@ 
      *    
      * @param PNDataProvider $oDP
      */
-    public function __construct(?PNDataProvider $oDP=null)
+    public function __construct(?PNDataProvider $oDP = null)
     {
         $this->oDP = $oDP;
         $this->reset();
@@ -78,7 +78,7 @@ 
      * set VAPID subject and keys.
      * @param PNVapid $oVapid
      */
-    public function setVapid (PNVapid $oVapid) : void 
+    public function setVapid(PNVapid $oVapid) : void 
     {
         $this->oVapid = $oVapid;
     }
@@ -90,7 +90,7 @@ 
     public function setPayload($payload) : void 
     {
         if (is_string($payload) || self::className($payload) == 'PNPayload') {
-            $this->strPayload = (string)$payload;
+            $this->strPayload = (string) $payload;
         }
     }
     
@@ -158,7 +158,7 @@ 
      * has only affect, if data loaded through DataProvider 
      * @param bool $bAutoRemove
      */
-    public function setAutoRemove(bool $bAutoRemove=true) : void 
+    public function setAutoRemove(bool $bAutoRemove = true) : void 
     {
         $this->bAutoRemove = $bAutoRemove;
     }
@@ -179,9 +179,9 @@ 
     {
         if (!$this->oVapid) {
             $this->strError = 'no VAPID-keys set!';
-        } elseif(!$this->oVapid->isValid()) {
+        } elseif (!$this->oVapid->isValid()) {
             $this->strError = 'VAPID error: ' . $this->oVapid->getError();
-        } elseif(count($this->aSubscription) == 0) {
+        } elseif (count($this->aSubscription) == 0) {
             $this->strError = 'no valid Subscriptions set!';
         } else {
             // create multi requests...

SKien/PNServer/PNVapid.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;