Fix whitespace

tvdijen · tvdijen · commit d2d44cd5a8d3 · 2018-05-13T13:12:42.000+02:00
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php
@@ -22,17 +22,17 @@ public function __construct($name, $config = null)
         $datadir = $config->getPathValue('datadir', 'data/');
 
         if (!is_dir($datadir)) {
-            throw new Exception('Data directory [' . $datadir. '] does not exist');
+            throw new Exception('Data directory ['.$datadir.'] does not exist');
         } else if (!is_writable($datadir)) {
-            throw new Exception('Data directory [' . $datadir. '] is not writable');
+            throw new Exception('Data directory ['.$datadir.'] is not writable');
         }
 
-        $sqllitedir = $datadir . 'sqllite/';
+        $sqllitedir = $datadir.'sqllite/';
         if (!is_dir($sqllitedir)) {
             mkdir($sqllitedir);
         }
 
-        $dbfile = 'sqlite:' . $sqllitedir . $name . '.sqlite';
+        $dbfile = 'sqlite:'.$sqllitedir.$name.'.sqlite';
         if ($this->db = new \PDO($dbfile)) {
             $q = @$this->db->query('SELECT key1 FROM data LIMIT 1');
             if ($q === false) {
@@ -50,7 +50,7 @@ public function __construct($name, $config = null)
                 ');
             } 
         } else {
-            throw new Exception('Error creating SQL lite database [' . $dbfile . '].');
+            throw new Exception('Error creating SQL lite database ['.$dbfile.'].');
         }
     }
 
@@ -67,7 +67,7 @@ private function insert($type, $key1, $key2, $value, $duration = null)
     {
         $expire = is_null($duration) ? null : (time() + $duration);
 
-        $query = "INSERT INTO data (key1, key2, type, created, updated, expire, value)" .
+        $query = "INSERT INTO data (key1, key2, type, created, updated, expire, value)".
             " VALUES(:key1, :key2, :type, :created, :updated, :expire, :value)";
         $prepared = $this->db->prepare($query);
         $data = array(':key1' => $key1, ':key2' => $key2,
@@ -96,7 +96,7 @@ private function update($type, $key1, $key2, $value, $duration = null)
     public function get($type = null, $key1 = null, $key2 = null)
     {
         $conditions = self::getCondition($type, $key1, $key2);
-        $query = 'SELECT * FROM data WHERE ' . $conditions;
+        $query = 'SELECT * FROM data WHERE '.$conditions;
 
         $prepared = $this->db->prepare($query);
         $prepared->execute();
@@ -135,7 +135,7 @@ public function exists($type, $key1, $key2)
     public function getList($type = null, $key1 = null, $key2 = null)
     {
         $conditions = self::getCondition($type, $key1, $key2);
-        $query = 'SELECT * FROM data WHERE ' . $conditions;
+        $query = 'SELECT * FROM data WHERE '.$conditions;
         $prepared = $this->db->prepare($query);
         $prepared->execute();
 
@@ -157,7 +157,7 @@ public function getKeys($type = null, $key1 = null, $key2 = null, $whichKey = 't
         }
 
         $conditions = self::getCondition($type, $key1, $key2);
-        $query = 'SELECT DISTINCT :whichKey FROM data WHERE ' . $conditions;
+        $query = 'SELECT DISTINCT :whichKey FROM data WHERE '.$conditions;
         $prepared = $this->db->prepare($query);
         $data = array('whichKey' => $whichKey);
         $prepared->execute($data);
@@ -200,18 +200,17 @@ private function getCondition($type = null, $key1 = null, $key2 = null)
     {
         $conditions = array();
         if (!is_null($type)) {
-            $conditions[] = "type = " . $this->db->quote($type);
+            $conditions[] = "type = ".$this->db->quote($type);
         }
         if (!is_null($key1)) {
-            $conditions[] = "key1 = " . $this->db->quote($key1);
+            $conditions[] = "key1 = ".$this->db->quote($key1);
         }
         if (!is_null($key2)) {
-            $conditions[] = "key2 = " . $this->db->quote($key2);
+            $conditions[] = "key2 = ".$this->db->quote($key2);
         }
         if (count($conditions) === 0) {
             return '1';
-	}	
-
+        }
         return join(' AND ', $conditions);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,17 @@ public function __construct($name, $config = null)`
`22`	`22`	`$datadir = $config->getPathValue('datadir', 'data/');`
`23`	`23`
`24`	`24`	`if (!is_dir($datadir)) {`
`25`		`- throw new Exception('Data directory [' . $datadir. '] does not exist');`
	`25`	`+ throw new Exception('Data directory ['.$datadir.'] does not exist');`
`26`	`26`	`} else if (!is_writable($datadir)) {`
`27`		`- throw new Exception('Data directory [' . $datadir. '] is not writable');`
	`27`	`+ throw new Exception('Data directory ['.$datadir.'] is not writable');`
`28`	`28`	`}`
`29`	`29`
`30`		`- $sqllitedir = $datadir . 'sqllite/';`
	`30`	`+ $sqllitedir = $datadir.'sqllite/';`
`31`	`31`	`if (!is_dir($sqllitedir)) {`
`32`	`32`	`mkdir($sqllitedir);`
`33`	`33`	`}`
`34`	`34`
`35`		`- $dbfile = 'sqlite:' . $sqllitedir . $name . '.sqlite';`
	`35`	`+ $dbfile = 'sqlite:'.$sqllitedir.$name.'.sqlite';`
`36`	`36`	`if ($this->db = new \PDO($dbfile)) {`
`37`	`37`	`$q = @$this->db->query('SELECT key1 FROM data LIMIT 1');`
`38`	`38`	`if ($q === false) {`
`@@ -50,7 +50,7 @@ public function __construct($name, $config = null)`
`50`	`50`	`');`
`51`	`51`	`}`
`52`	`52`	`} else {`
`53`		`- throw new Exception('Error creating SQL lite database [' . $dbfile . '].');`
	`53`	`+ throw new Exception('Error creating SQL lite database ['.$dbfile.'].');`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -67,7 +67,7 @@ private function insert($type, $key1, $key2, $value, $duration = null)`
`67`	`67`	`{`
`68`	`68`	`$expire = is_null($duration) ? null : (time() + $duration);`
`69`	`69`
`70`		`- $query = "INSERT INTO data (key1, key2, type, created, updated, expire, value)" .`
	`70`	`+ $query = "INSERT INTO data (key1, key2, type, created, updated, expire, value)".`
`71`	`71`	`" VALUES(:key1, :key2, :type, :created, :updated, :expire, :value)";`
`72`	`72`	`$prepared = $this->db->prepare($query);`
`73`	`73`	`$data = array(':key1' => $key1, ':key2' => $key2,`
`@@ -96,7 +96,7 @@ private function update($type, $key1, $key2, $value, $duration = null)`
`96`	`96`	`public function get($type = null, $key1 = null, $key2 = null)`
`97`	`97`	`{`
`98`	`98`	`$conditions = self::getCondition($type, $key1, $key2);`
`99`		`- $query = 'SELECT * FROM data WHERE ' . $conditions;`
	`99`	`+ $query = 'SELECT * FROM data WHERE '.$conditions;`
`100`	`100`
`101`	`101`	`$prepared = $this->db->prepare($query);`
`102`	`102`	`$prepared->execute();`
`@@ -135,7 +135,7 @@ public function exists($type, $key1, $key2)`
`135`	`135`	`public function getList($type = null, $key1 = null, $key2 = null)`
`136`	`136`	`{`
`137`	`137`	`$conditions = self::getCondition($type, $key1, $key2);`
`138`		`- $query = 'SELECT * FROM data WHERE ' . $conditions;`
	`138`	`+ $query = 'SELECT * FROM data WHERE '.$conditions;`
`139`	`139`	`$prepared = $this->db->prepare($query);`
`140`	`140`	`$prepared->execute();`
`141`	`141`
`@@ -157,7 +157,7 @@ public function getKeys($type = null, $key1 = null, $key2 = null, $whichKey = 't`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`$conditions = self::getCondition($type, $key1, $key2);`
`160`		`- $query = 'SELECT DISTINCT :whichKey FROM data WHERE ' . $conditions;`
	`160`	`+ $query = 'SELECT DISTINCT :whichKey FROM data WHERE '.$conditions;`
`161`	`161`	`$prepared = $this->db->prepare($query);`
`162`	`162`	`$data = array('whichKey' => $whichKey);`
`163`	`163`	`$prepared->execute($data);`
`@@ -200,18 +200,17 @@ private function getCondition($type = null, $key1 = null, $key2 = null)`
`200`	`200`	`{`
`201`	`201`	`$conditions = array();`
`202`	`202`	`if (!is_null($type)) {`
`203`		`- $conditions[] = "type = " . $this->db->quote($type);`
	`203`	`+ $conditions[] = "type = ".$this->db->quote($type);`
`204`	`204`	`}`
`205`	`205`	`if (!is_null($key1)) {`
`206`		`- $conditions[] = "key1 = " . $this->db->quote($key1);`
	`206`	`+ $conditions[] = "key1 = ".$this->db->quote($key1);`
`207`	`207`	`}`
`208`	`208`	`if (!is_null($key2)) {`
`209`		`- $conditions[] = "key2 = " . $this->db->quote($key2);`
	`209`	`+ $conditions[] = "key2 = ".$this->db->quote($key2);`
`210`	`210`	`}`
`211`	`211`	`if (count($conditions) === 0) {`
`212`	`212`	`return '1';`
`213`		`- }`
`214`		`-`
	`213`	`+ }`
`215`	`214`	`return join(' AND ', $conditions);`
`216`	`215`	`}`
`217`	`216`	`}`