Reformat code

AgelxNash · Jun 3, 2018 · 474ad70 · 474ad70
1 parent 06988d5
commit 474ad70
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/src/Traits/SupportTrait.php b/src/Traits/SupportTrait.php
@@ -73,7 +73,7 @@ protected function convertValue($value)
     public function convertDate(int $timestamp, string $fieldType = 'DATETIME')
     {
         $date = false;
-        if (!empty($timestamp) && $timestamp > 0) {
+        if (! empty($timestamp) && $timestamp > 0) {
             switch ($fieldType) {
                 case 'DATE':
                     $date = date('Y-m-d', $timestamp);
@@ -104,7 +104,7 @@ protected function prepareFields($data, $ignoreAlias = false): string
         if (\is_array($data)) {
             $tmp = [];
             foreach ($data as $alias => $field) {
-                $tmp[] = ($alias !== $field && !\is_int($alias) && $ignoreAlias === false) ?
+                $tmp[] = ($alias !== $field && ! \is_int($alias) && $ignoreAlias === false) ?
                     ($field . ' as `' . $alias . '`') : $field;
             }
 
@@ -183,7 +183,7 @@ protected function prepareValues($data, $level = 1, $skipFieldNames = false)
             }
         }
 
-        if (!\is_scalar($values)) {
+        if (! \is_scalar($values)) {
             throw (new Exceptions\InvalidFieldException('values'))
                 ->setData($values);
         }
@@ -227,7 +227,7 @@ protected function arrayOnlyNumeric(array $data) : bool
     {
         $onlyNumbers = true;
         foreach ($data as $value) {
-            if (!\is_numeric($value)) {
+            if (! \is_numeric($value)) {
                 $onlyNumbers = false;
                 break;
             }
@@ -272,7 +272,7 @@ protected function prepareFrom($data, bool $hasArray = false): string
             }
             $data = implode(' ', $tmp);
         }
-        if (!is_scalar($data) || empty($data)) {
+        if (! is_scalar($data) || empty($data)) {
             throw new Exceptions\TableNotDefinedException($data);
         }
 
@@ -295,7 +295,7 @@ protected function prepareWhere($data): string
             }
         }
         $data = trim($data);
-        if (!empty($data) && stripos($data, 'WHERE') !== 0) {
+        if (! empty($data) && stripos($data, 'WHERE') !== 0) {
             $data = "WHERE {$data}";
         }
 
@@ -309,7 +309,7 @@ protected function prepareWhere($data): string
     protected function prepareOrder($data): string
     {
         $data = trim($data);
-        if (!empty($data) && stripos($data, 'ORDER') !== 0) {
+        if (! empty($data) && stripos($data, 'ORDER') !== 0) {
             $data = "ORDER BY {$data}";
         }
 
@@ -323,7 +323,7 @@ protected function prepareOrder($data): string
     protected function prepareLimit($data): string
     {
         $data = trim($data);
-        if (!empty($data) && stripos($data, 'LIMIT') !== 0) {
+        if (! empty($data) && stripos($data, 'LIMIT') !== 0) {
             $data = "LIMIT {$data}";
         }
 

diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -40,7 +40,6 @@ protected function setUp()
         $this->instance->setDebug(true)->connect();
 
         $this->table = $this->instance->getFullTableName('site_content');
-
     }
 
     public function testConnect()
@@ -101,7 +100,7 @@ public function testOptimize()
 
     public function testHelperMethods()
     {
-        $result = $this->instance->query('SELECT id,pagetitle FROM '. $this->table . ' ORDER BY id ASC LIMIT 3');
+        $result = $this->instance->query('SELECT id,pagetitle FROM ' . $this->table . ' ORDER BY id ASC LIMIT 3');
 
         $this->assertEquals(
             ['id', 'pagetitle'],
@@ -199,7 +198,7 @@ public function testSave()
 
         $this->assertTrue(
             $this->instance->save(
-                "`pagetitle`='testSave5 - ". $time . "'",
+                "`pagetitle`='testSave5 - " . $time . "'",
                 $this->table,
                 'id = 48'
             )
@@ -318,7 +317,6 @@ public function testQuery()
                 'LIMIT 10',
             ])
         );
-
     }
 
     public function testMakeArray()
@@ -348,7 +346,7 @@ public function testInsert()
     {
         $maxId = (int)$this->instance->getColumn(
             'Auto_increment',
-            "SHOW TABLE STATUS WHERE `name`='" . $this->instance->getTableName('site_content', false) ."'"
+            "SHOW TABLE STATUS WHERE `name`='" . $this->instance->getTableName('site_content', false) . "'"
         )[0];
         $this->assertGreaterThan(
             0,
@@ -382,7 +380,7 @@ public function testInsert()
             );
 
             $this->assertTrue(false, 'STEP 3/3 (Need QueryException)');
-        } catch(Database\Exceptions\QueryException $exception) {
+        } catch (Database\Exceptions\QueryException $exception) {
             $this->assertEquals(
                 1062,
                 $exception->getCode(),
@@ -402,7 +400,7 @@ public function testMassInsert()
 
         $this->assertTrue(
             $this->instance->query(
-                'CREATE TABLE '. $table . ' LIKE ' . $this->table
+                'CREATE TABLE ' . $table . ' LIKE ' . $this->table
             )
         );
 
@@ -411,7 +409,7 @@ public function testMassInsert()
                 'CREATE TABLE ' . $table . ' LIKE ' . $this->table
             );
             $this->assertTrue(false, 'Need QueryException');
-        } catch(Database\Exceptions\QueryException $exception) {
+        } catch (Database\Exceptions\QueryException $exception) {
             $this->assertEquals(
                 1050,
                 $exception->getCode()
@@ -431,7 +429,7 @@ public function testMassInsert()
         try {
             $this->instance->checkLastError();
             $this->assertTrue(false, 'Need QueryException');
-        } catch(Database\Exceptions\QueryException $exception) {
+        } catch (Database\Exceptions\QueryException $exception) {
             $this->assertTrue(true);
         }
 

diff --git a/tests/Traits/DebugTraitTest.php b/tests/Traits/DebugTraitTest.php
@@ -2,7 +2,6 @@
 
 use PHPUnit\Framework\TestCase;
 use AgelxNash\Modx\Evo\Database;
-use ReflectionMethod;
 
 class DebugTraitTest extends TestCase
 {

diff --git a/tests/Traits/SupportTraitTest.php b/tests/Traits/SupportTraitTest.php
@@ -301,7 +301,7 @@ public function testConvertValue()
                 $this->assertThat(
                     $method->invoke($this->instance, $item),
                     $this->isType($type),
-                    '[ STEP '. ++$step . '] Check ' . $item . ' as '. $type
+                    '[ STEP ' . ++$step . '] Check ' . $item . ' as ' . $type
                 );
             }
         }