Stefanius67 / PNServer

SKien/PNServer/PNDataProviderSQLite.php

Indentation +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
             if (!file_exists($strDBName)) {
                 $strDir = pathinfo($strDBName, PATHINFO_DIRNAME) == '' ?  __DIR__ : pathinfo($strDBName, PATHINFO_DIRNAME);
                 if (!is_writable($strDir)) {
-                   $this->strLastError .= ' (no rights to write on directory ' . $strDir . ')';
+                    $this->strLastError .= ' (no rights to write on directory ' . $strDir . ')';
                 }
             }
         }
@@ -87,7 +87,7 @@ 
             // - can only occur during development using invalid SQL-statement for creation!
             // @codeCoverageIgnoreStart
             if (strlen($this->strLastError) == 0) {
-               $this->strLastError = 'database table ' . $this->strTableName . ' not exist!';
+                $this->strLastError = 'database table ' . $this->strTableName . ' not exist!';
             }
             // @codeCoverageIgnoreEnd
         }

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -27,7 +27,7 @@ 
     /** @var string name of the DB file          */
     protected   string $strDBName; 
     /** @var \SQLite3 internal SqLite DB         */
-    protected   ?\SQLite3 $db = null;
+    protected ?\SQLite3 $db = null;
     /** @var \SQLite3Result|bool result of DB queries (no type hint - \SQLite3::query() returns \SQLite3Result|bool) */
     protected   $dbres = false;
     /** @var array|bool last fetched row or false (no type hint - \SQLite3Result::fetchArray() returns array|bool)    */
@@ -35,14 +35,14 @@ 
     /** @var string last error                   */
     protected   string $strLastError;
     /** @var bool does table exist               */
-    protected   ?bool $bTableExist = null;
+    protected ?bool $bTableExist = null;
     
     /**
      * @param string $strDir        directory -  if null, current working directory assumed
      * @param string $strDBName     name of DB file - if null, file 'pnsub.sqlite' is used and created if not exist
      * @param string $strTableName  tablename for the subscriptions - if null, self::TABLE_NAME is used and created if not exist
      */
-    public function __construct(?string $strDir=null, ?string $strDBName=null, ?string $strTableName=null) 
+    public function __construct(?string $strDir = null, ?string $strDBName = null, ?string $strTableName = null) 
     {
         $this->strTableName = isset($strTableName) ? $strTableName : self::TABLE_NAME;
         $this->strDBName = isset($strDBName) ? $strDBName : 'pnsub.sqlite';
@@ -64,7 +64,7 @@ 
             $this->db = null;
             $this->strLastError = $e->getMessage();
             if (!file_exists($strDBName)) {
-                $strDir = pathinfo($strDBName, PATHINFO_DIRNAME) == '' ?  __DIR__ : pathinfo($strDBName, PATHINFO_DIRNAME);
+                $strDir = pathinfo($strDBName, PATHINFO_DIRNAME) == '' ? __DIR__ : pathinfo($strDBName, PATHINFO_DIRNAME);
                 if (!is_writable($strDir)) {
                    $this->strLastError .= ' (no rights to write on directory ' . $strDir . ')';
                 }
@@ -104,12 +104,12 @@ 
         if ($this->isConnected()) {
             $oSubscription = json_decode($strJSON, true);
             if ($oSubscription) {
-                $iExpires = isset($oSubscription['expirationTime']) ? bcdiv((string)$oSubscription['expirationTime'], '1000') : 0;
+                $iExpires = isset($oSubscription['expirationTime']) ? bcdiv((string) $oSubscription['expirationTime'], '1000') : 0;
                 $strUserAgent = isset($oSubscription['userAgent']) ? $oSubscription['userAgent'] : 'unknown UserAgent';
                 
                 // insert or update - relevant is the endpoint as unique index 
                 $strSQL  = "REPLACE INTO " . $this->strTableName . " (";
-                $strSQL .=       self::COL_ENDPOINT;
+                $strSQL .= self::COL_ENDPOINT;
                 $strSQL .= "," . self::COL_EXPIRES;
                 $strSQL .= "," . self::COL_SUBSCRIPTION;
                 $strSQL .= "," . self::COL_USERAGENT;
@@ -153,7 +153,7 @@ 
      * {@inheritDoc}
      * @see PNDataProvider::init()
      */
-    public function init(bool $bAutoRemove=true) : bool 
+    public function init(bool $bAutoRemove = true) : bool 
     {
         $bSucceeded = false;
         $this->dbres = false;
@@ -181,7 +181,7 @@ 
                 $this->setSQLiteError($bSucceeded);
             }
         }
-        return (bool)$bSucceeded;
+        return (bool) $bSucceeded;
     }
 
     /**

SKien/PNServer/PNDataProviderMySQL.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\PNServer;
 
@@ -37,11 +37,11 @@ 
     /** @var \mysqli_result|bool result of DB queries  (No type hint, as \mysqli_result or bool is possible type) */
     protected   $dbres = false;
     /** @var array last fetched row or null      */
-    protected   ?array $row = null;
+    protected ?array $row = null;
     /** @var string last error                   */
     protected   string $strLastError = '';
     /** @var bool does table exist               */
-    protected   ?bool $bTableExist = null;
+    protected ?bool $bTableExist = null;
     
     /**
      * @param string $strDBHost     DB Host
@@ -50,7 +50,7 @@ 
      * @param string $strDBName     DB Name
      * @param string $strTableName  tablename for the subscriptions - if null, self::TABLE_NAME is used and created if not exist
      */
-    public function __construct(string $strDBHost, string $strDBUser, string $strDBPwd, string $strDBName, ?string $strTableName=null) 
+    public function __construct(string $strDBHost, string $strDBUser, string $strDBPwd, string $strDBName, ?string $strTableName = null) 
     {
         $this->strDBHost = $strDBHost; 
         $this->strDBUser = $strDBUser; 
@@ -105,7 +105,7 @@ 
                 $strUserAgent = isset($oSubscription['userAgent']) ? $oSubscription['userAgent'] : 'unknown UserAgent';
                                 
                 $strSQL  = "INSERT INTO " . $this->strTableName . " (";
-                $strSQL .=       self::COL_ENDPOINT;
+                $strSQL .= self::COL_ENDPOINT;
                 $strSQL .= "," . self::COL_EXPIRES;
                 $strSQL .= "," . self::COL_SUBSCRIPTION;
                 $strSQL .= "," . self::COL_USERAGENT;
@@ -115,7 +115,7 @@ 
                 $strSQL .= ",'" . $strJSON . "'";
                 $strSQL .= ",'" . $strUserAgent . "'";
                 $strSQL .= ") ";
-                $strSQL .= "ON DUPLICATE KEY UPDATE ";  // in case of UPDATE UA couldn't have been changed and endpoint is the UNIQUE key!
+                $strSQL .= "ON DUPLICATE KEY UPDATE "; // in case of UPDATE UA couldn't have been changed and endpoint is the UNIQUE key!
                 $strSQL .= " expires = " . $tsExpires;
                 $strSQL .= ",subscription = '" . $strJSON . "'";
                 $strSQL .= ";";
@@ -155,7 +155,7 @@ 
      * {@inheritDoc}
      * @see PNDataProvider::init()
      */
-    public function init(bool $bAutoRemove=true) : bool 
+    public function init(bool $bAutoRemove = true) : bool 
     {
         $bSucceeded = false;
         $this->dbres = false;
@@ -181,7 +181,7 @@ 
             }
             if ($bSucceeded) {
                 $strSQL  = "SELECT ";
-                $strSQL .=       self::COL_ID;
+                $strSQL .= self::COL_ID;
                 $strSQL .= "," . self::COL_ENDPOINT;
                 $strSQL .= ",UNIX_TIMESTAMP(" . self::COL_EXPIRES . ") AS " . self::COL_EXPIRES;
                 $strSQL .= "," . self::COL_SUBSCRIPTION;

SKien/Test/PNServer/PNEncryptionTest.php

Spacing +1 added lines, -1 removed lines

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

SKien/Test/PNServer/PNDataProviderMySQLTest.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\Test\PNServer;
 
@@ -20,7 +20,7 @@ 
     public static function setUpBeforeClass() : void
     {
         $db = mysqli_connect($GLOBALS['MYSQL_HOST'], $GLOBALS['MYSQL_USER'], $GLOBALS['MYSQL_PASSWD'], $GLOBALS['MYSQL_DBNAME']);
-        if(!$db) {
+        if (!$db) {
             fwrite(STDOUT, 'MySQL: Connect Error ' . mysqli_connect_errno() . PHP_EOL);
         }
         $db->query("DROP TABLE IF EXISTS " . PNDataProviderMySQL::TABLE_NAME);

SKien/Test/PNServer/PNServerTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\Test\PNServer;
 
@@ -147,9 +147,9 @@ 
         $log = $srv->getLog();
         $this->assertIsArray($log);
         $this->assertEquals(5, count($log));
-        $aResponse = [-1, 201, 404, 410, 0];    // Encryption error, OK, Not Found, Gone. inv. Endpoint
+        $aResponse = [-1, 201, 404, 410, 0]; // Encryption error, OK, Not Found, Gone. inv. Endpoint
         $i = 0;
-        foreach ($log as $strEndpoint => $aMsg ) {
+        foreach ($log as $strEndpoint => $aMsg) {
             $this->assertNotEmpty($strEndpoint);
             $this->assertEquals($aResponse[$i++], $aMsg['curl_response_code']);
             // fwrite(STDOUT, "\n" . $aMsg['msg'] . "\n");

SKien/Test/PNServer/TestHelperTrait.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\Test\PNServer;
 
@@ -16,7 +16,7 @@ 
         
     protected function loadSubscription(string $strFilename) : string
     {
-        return file_get_contents( __DIR__ . DIRECTORY_SEPARATOR . 'testdata' . DIRECTORY_SEPARATOR . $strFilename);
+        return file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'testdata' . DIRECTORY_SEPARATOR . $strFilename);
     }
     
     protected static function getTempDataDir() : string

SKien/Test/PNServer/UtilsMathTest.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\Test\PNServer;
 
@@ -54,17 +54,17 @@ 
     
     public function test_mod() : void
     {
-        $this->assertEquals((int)Math::mod(gmp_init(7), gmp_init(2)), 1);
+        $this->assertEquals((int) Math::mod(gmp_init(7), gmp_init(2)), 1);
     }
     
     public function test_add() : void
     {
-        $this->assertEquals((int)Math::add(gmp_init(2), gmp_init(3)), 5);
+        $this->assertEquals((int) Math::add(gmp_init(2), gmp_init(3)), 5);
     }
     
     public function test_sub() : void
     {
-        $this->assertEquals((int)Math::sub(gmp_init(2), gmp_init(3)), -1);
+        $this->assertEquals((int) Math::sub(gmp_init(2), gmp_init(3)), -1);
     }
     
     /**
@@ -72,7 +72,7 @@ 
      */
     public function test_mul(\GMP $a, \GMP $b, int $expected) : void
     {
-        $this->assertEquals($expected, (int)Math::mul($a, $b));
+        $this->assertEquals($expected, (int) Math::mul($a, $b));
     }
     
     public function mulProvider() : array
@@ -90,7 +90,7 @@ 
      */
     public function test_pow(\GMP $a, int $b, int $expected) : void
     {
-        $this->assertEquals($expected, (int)Math::pow($a, $b));
+        $this->assertEquals($expected, (int) Math::pow($a, $b));
     }
     
     public function powProvider() : array
@@ -105,17 +105,17 @@ 
     
     public function test_bitwiseAnd() : void
     {
-        $this->assertEquals((int)Math::bitwiseAnd(gmp_init('110011', 2), gmp_init('011110', 2)), (int)gmp_init('010010', 2));
+        $this->assertEquals((int) Math::bitwiseAnd(gmp_init('110011', 2), gmp_init('011110', 2)), (int) gmp_init('010010', 2));
     }
     
     public function test_bitwiseXor() : void
     {
-        $this->assertEquals((int)Math::bitwiseXor(gmp_init('110011', 2), gmp_init('011110', 2)), (int)gmp_init('101101', 2));
+        $this->assertEquals((int) Math::bitwiseXor(gmp_init('110011', 2), gmp_init('011110', 2)), (int) gmp_init('101101', 2));
     }
     
     public function test_rightShift() : void
     {
-        $this->assertEquals((int)Math::rightShift(gmp_init('110011', 2), 3), (int)gmp_init('110', 2));
+        $this->assertEquals((int) Math::rightShift(gmp_init('110011', 2), 3), (int) gmp_init('110', 2));
     }
     
     public function test_toString() : void
@@ -130,24 +130,24 @@ 
     
     public function test_inverseMod() : void
     {
-        $this->assertEquals(9, (int)Math::inverseMod(gmp_init(5), gmp_init(11)));
-        $this->assertEquals(11, (int)Math::inverseMod(gmp_init(-4), gmp_init(15)));
+        $this->assertEquals(9, (int) Math::inverseMod(gmp_init(5), gmp_init(11)));
+        $this->assertEquals(11, (int) Math::inverseMod(gmp_init(-4), gmp_init(15)));
         $this->assertFalse(Math::inverseMod(gmp_init(5), gmp_init(10)));
     }
     
     public function test_modSub() : void
     {
-        $this->assertEquals((int)Math::modSub(gmp_init(12), gmp_init(4), gmp_init(5)), 3);
+        $this->assertEquals((int) Math::modSub(gmp_init(12), gmp_init(4), gmp_init(5)), 3);
     }
     
     public function test_modMul() : void
     {
-        $this->assertEquals((int)Math::modMul(gmp_init(3), gmp_init(4), gmp_init(5)), 2);
+        $this->assertEquals((int) Math::modMul(gmp_init(3), gmp_init(4), gmp_init(5)), 2);
     }
     
     public function test_modDiv() : void
     {
-        $this->assertEquals((int)Math::modDiv(gmp_init(12), gmp_init(2), gmp_init(5)), 36);
+        $this->assertEquals((int) Math::modDiv(gmp_init(12), gmp_init(2), gmp_init(5)), 36);
     }
 }
 

SKien/Test/PNServer/UtilsCurveTest.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace SKien\Test\PNServer;
 
@@ -30,9 +30,9 @@ 
     public function test_create() : void
     {
         $this->assertEquals($this->cv->getSize(), 256);
-        $this->assertEquals((int)$this->cv->getA(), 9223372036854775804);
-        $this->assertEquals((int)$this->cv->getB(), 4309448131093880907);
-        $this->assertEquals((int)$this->cv->getPrime(), 999999999999);
+        $this->assertEquals((int) $this->cv->getA(), 9223372036854775804);
+        $this->assertEquals((int) $this->cv->getB(), 4309448131093880907);
+        $this->assertEquals((int) $this->cv->getPrime(), 999999999999);
     }
     
     public function test_getPoint() : void
@@ -71,12 +71,12 @@ 
         $pt2 = Point::create(gmp_init(10), gmp_init(40));
         // result must be $pt1
         $pt = $this->cv->add($pt1, Point::infinity());
-        $this->assertSame((int)$pt1->getX(), (int)$pt->getX());
-        $this->assertSame((int)$pt1->getY(), (int)$pt->getY());
+        $this->assertSame((int) $pt1->getX(), (int) $pt->getX());
+        $this->assertSame((int) $pt1->getY(), (int) $pt->getY());
         // result must be $pt2
         $pt = $this->cv->add(Point::infinity(), $pt2);
-        $this->assertSame((int)$pt2->getX(), (int)$pt->getX());
-        $this->assertSame((int)$pt2->getY(), (int)$pt->getY());
+        $this->assertSame((int) $pt2->getX(), (int) $pt->getX());
+        $this->assertSame((int) $pt2->getY(), (int) $pt->getY());
         // result must be infinity
         $pt = $this->cv->add($pt1, $pt2);
         $this->assertTrue($pt->isInfinity());

SKien/Test/PNServer/PNVapidTest.php

Spacing +1 added lines, -1 removed lines

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