evolution-cms / evolution

core/vendor/agelxnash/modx-evo-database/src/Drivers/IlluminateDriver.php

Doc Comments +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
 
     /**
      * {@inheritDoc}
-     * @return bool|PDOStatement
+     * @return PDOStatement
      */
     public function query($sql)
     {
@@ -423,7 +423,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return bool
      */
     public function hasConnectionName($name)

Unused Use Statements +4 added lines, -4 removed lines

@@ -1,14 +1,14 @@
 <?php namespace AgelxNash\Modx\Evo\Database\Drivers;
 
 use AgelxNash\Modx\Evo\Database\Exceptions;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Illuminate\Database\Connection;
-use PDOStatement;
 use Illuminate\Events\Dispatcher;
-use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
-use Illuminate\Container\Container;
-use ReflectionClass;
 use PDO;
+use PDOStatement;
+use ReflectionClass;
 
 /**
  * @property Connection $conn

Spacing +8 added lines, -8 removed lines

@@ -114,9 +114,9 @@ 
      */
     public function getConnect()
     {
-        if (! $this->isConnected()) {
+        if (!$this->isConnected()) {
             $this->connect();
-            if (! $this->conn->getPdo() instanceof PDO) {
+            if (!$this->conn->getPdo() instanceof PDO) {
                 $this->conn->reconnect();
             }
         }
@@ -157,7 +157,7 @@ 
     public function connect()
     {
         try {
-            if (! $this->hasConnectionName($this->connection)) {
+            if (!$this->hasConnectionName($this->connection)) {
                 $this->getCapsule()->addConnection([
                     'driver'    => $this->driver,
                     'host'      => $this->getConfig('host'),
@@ -231,9 +231,9 @@ 
             $method = $this->getConfig('method');
         }
 
-        $query = $method . ' ' . $charset;
+        $query = $method.' '.$charset;
 
-        return (bool)$this->query($query);
+        return (bool) $this->query($query);
     }
 
     /**
@@ -241,7 +241,7 @@ 
      */
     public function selectDb($name)
     {
-        return $this->getConnect()->getPdo()->exec('USE ' . $name) === 0;
+        return $this->getConnect()->getPdo()->exec('USE '.$name) === 0;
     }
 
     /**
@@ -270,7 +270,7 @@ 
             $result = $this->prepare($sql);
             $this->execute($result);
 
-            if ($this->saveAffectedRows($result) === 0 && $this->isResult($result) && ! $this->isSelectQuery($sql)) {
+            if ($this->saveAffectedRows($result) === 0 && $this->isResult($result) && !$this->isSelectQuery($sql)) {
                 $result = true;
             }
             $this->getConnect()->logQuery($sql, [], $this->getElapsedTime($start));
@@ -385,7 +385,7 @@ 
      */
     public function execute($result)
     {
-        return $this->isResult($result) ? $result->execute() : (bool)$result;
+        return $this->isResult($result) ? $result->execute() : (bool) $result;
     }
 
     /**

core/vendor/agelxnash/modx-evo-database/src/Drivers/MySqliDriver.php

Doc Comments +2 added lines, -1 removed lines

@@ -102,6 +102,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param mysqli_result $result
      */
     public function isResult($result)
     {
@@ -161,7 +162,7 @@ 
 
     /**
      * {@inheritDoc}
-     * @return bool|mysqli_result
+     * @return mysqli_result
      * @throws \ReflectionException
      */
     public function query($sql)

Unused Use Statements +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php namespace AgelxNash\Modx\Evo\Database\Drivers;
 
 use AgelxNash\Modx\Evo\Database\Exceptions;
+use ReflectionClass;
 use mysqli;
+use mysqli_driver;
 use mysqli_result;
 use mysqli_sql_exception;
-use mysqli_driver;
-use ReflectionClass;
 
 /**
  * @property mysqli $conn

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function getConnect()
     {
-        if (! $this->isConnected()) {
+        if (!$this->isConnected()) {
             return $this->connect();
         }
 
@@ -57,7 +57,7 @@ 
      */
     public function getLastErrorNo()
     {
-        $out = (string)$this->getConnect()->sqlstate;
+        $out = (string) $this->getConnect()->sqlstate;
 
         if ($out === '00000') {
             $out = '';
@@ -138,7 +138,7 @@ 
             $method = $this->getConfig('method');
         }
 
-        $this->query($method . ' ' . $charset);
+        $this->query($method.' '.$charset);
 
         return $this->getConnect()->set_charset($charset);
     }

core/vendor/agelxnash/modx-evo-database/src/Exceptions/QueryException.php

Doc Comments +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
     /**
      * @param string $message
-     * @param int|string $code
+     * @param integer $code
      * @param Throwable|null $previous
      */
     public function __construct($message = '', $code = 0, Throwable $previous = null)

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function __construct($message = '', $code = 0, Throwable $previous = null)
     {
-        parent::__construct($message, (int)$code, $previous);
+        parent::__construct($message, (int) $code, $previous);
 
         $this->code = $code;
     }

core/vendor/agelxnash/modx-evo-database/src/Interfaces/DatabaseInterface.php

Doc Comments +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 interface DatabaseInterface extends ProxyInterface
 {
     /**
-     * @return mixed
+     * @return DriverInterface
      */
     public function getDriver();
 
@@ -26,7 +26,7 @@ 
 
     /**
      * @param string $table
-     * @param string|array $where
+     * @param string $where
      * @param string $orderBy
      * @param string $limit
      * @return mixed
@@ -38,7 +38,7 @@ 
     /**
      * @param string|array $fields
      * @param string|array $tables
-     * @param string|array $where
+     * @param string $where
      * @param string $orderBy
      * @param string $limit
      * @return mixed
@@ -50,7 +50,7 @@ 
     /**
      * @param string|array $values
      * @param string $table
-     * @param string|array $where
+     * @param string $where
      * @return mixed
      * @throws Exceptions\TableNotDefinedException
      * @throws Exceptions\InvalidFieldException
@@ -60,9 +60,9 @@ 
     /**
      * @param string|array $fields
      * @param string $table
-     * @param string|array $fromFields
+     * @param string $fromFields
      * @param string $fromTable
-     * @param string|array $where
+     * @param string $where
      * @param string $limit
      * @return mixed
      * @throws Exceptions\TableNotDefinedException
@@ -82,7 +82,7 @@ 
     /**
      * @param string|array $fields
      * @param string $table
-     * @param string|array $where
+     * @param string $where
      * @return mixed
      * @throws Exceptions\TableNotDefinedException
      * @throws Exceptions\InvalidFieldException

core/vendor/agelxnash/modx-evo-database/src/Traits/ConfigTrait.php

Doc Comments +1 added lines

@@ -9,6 +9,7 @@
 
     /**
      * {@inheritDoc}
+     * @param string $key
      */
     public function getConfig($key = null)
     {

core/vendor/agelxnash/modx-evo-database/src/Traits/DebugTrait.php

Doc Comments +8 added lines, -1 removed lines

@@ -52,6 +52,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @return string
      */
     abstract public function getLastError();
 
@@ -80,6 +81,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param boolean $flag
      */
     public function setDebug($flag)
     {
@@ -90,6 +92,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param string $query
      */
     public function checkLastError($query = null)
     {
@@ -107,6 +110,8 @@ 
 
     /**
      * {@inheritDoc}
+     * @param string $sql
+     * @param double $time
      */
     public function collectQuery($result, $sql, $time)
     {
@@ -143,6 +148,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param string $query
      */
     public function setLastQuery($query)
     {
@@ -207,6 +213,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param double $time
      */
     public function addQueriesTime($time)
     {
@@ -257,7 +264,7 @@ 
     }
 
     /**
-     * @param array $errors
+     * @param string[] $errors
      * @return array
      */
     public function setIgnoreErrors(array $errors)

Spacing +16 added lines, -16 removed lines

@@ -115,7 +115,7 @@ 
         array_shift($debug);
         $path = [];
         foreach ($debug as $line) {
-            $path[] = ($line['class'] ? ($line['class'] . '::') : null) . $line['function'];
+            $path[] = ($line['class'] ? ($line['class'].'::') : null).$line['function'];
             /*$path[] = [
                 'method' => ($line['class'] ? ($line['class'] . '::') : null) . $line['function'],
                 'file' => ($line['file'] ? ($line['file'] . ':') : null) . ($line['line'] ?? 0)
@@ -146,7 +146,7 @@ 
      */
     public function setLastQuery($query)
     {
-        $this->lastQuery = (string)$query;
+        $this->lastQuery = (string) $query;
 
         return $query;
     }
@@ -156,7 +156,7 @@ 
      */
     public function getLastQuery()
     {
-        return (string)$this->lastQuery;
+        return (string) $this->lastQuery;
     }
 
     /**
@@ -220,10 +220,10 @@ 
      */
     public function renderConnectionTime()
     {
-        return '<fieldset style="text-align:left">' .
-            '<legend>Database connection</legend>' .
-            'Database connection was created in ' . $this->getConnectionTime(true) . ' s.' .
-            '</fieldset>' .
+        return '<fieldset style="text-align:left">'.
+            '<legend>Database connection</legend>'.
+            'Database connection was created in '.$this->getConnectionTime(true).' s.'.
+            '</fieldset>'.
             '<br />';
     }
 
@@ -280,17 +280,17 @@ 
 
         foreach ($this->getAllExecutedQuery() as $i => $query) {
             $out .= '<fieldset style="text-align:left">';
-            $out .= '<legend>Query ' . $i . ' - ' . sprintf($this->timeFormat, $query['time']) . '</legend>';
-            $out .= $query['sql'] . '<br><br>';
-            if (! empty($query['element'])) {
-                $out .= $query['element']['type'] . '  => ' . $query['element']['name'] . '<br>';
+            $out .= '<legend>Query '.$i.' - '.sprintf($this->timeFormat, $query['time']).'</legend>';
+            $out .= $query['sql'].'<br><br>';
+            if (!empty($query['element'])) {
+                $out .= $query['element']['type'].'  => '.$query['element']['name'].'<br>';
             }
-            if (! empty($query['event'])) {
-                $out .= 'Current Event  => ' . $query['event'] . '<br>';
+            if (!empty($query['event'])) {
+                $out .= 'Current Event  => '.$query['event'].'<br>';
             }
-            $out .= 'Affected Rows => ' . $query['rows'] . '<br>';
-            if (! empty($query['path'])) {
-                $out .= 'Functions Path => ' . $query['path'] . '<br>';
+            $out .= 'Affected Rows => '.$query['rows'].'<br>';
+            if (!empty($query['path'])) {
+                $out .= 'Functions Path => '.$query['path'].'<br>';
             }
             /*$out .= 'Functions Path => ' . $query['path']['method'] . '<br>';
             $out .= empty($query['path']['file']) ?: $query['path']['file'] . '<br />';*/

core/vendor/agelxnash/modx-evo-database/src/Traits/SupportTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     /**
      * @param int $timestamp
      * @param string $fieldType
-     * @return bool|false|string
+     * @return string|false
      * @deprecated
      */
     public function convertDate($timestamp, $fieldType = 'DATETIME')

Spacing +18 added lines, -18 removed lines

@@ -11,11 +11,11 @@ 
     protected function convertValue($value)
     {
         switch (true) {
-            case (\is_numeric($value) && ! \is_float(1 * $value)):
-                $value = (int)$value;
+            case (\is_numeric($value) && !\is_float(1 * $value)):
+                $value = (int) $value;
                 break;
-            case \is_numeric($value) && \is_float(1*$value):
-                $value = (float)$value;
+            case \is_numeric($value) && \is_float(1 * $value):
+                $value = (float) $value;
                 break;
             default:
                 break;
@@ -33,7 +33,7 @@ 
     public function convertDate($timestamp, $fieldType = 'DATETIME')
     {
         $date = false;
-        if (! empty($timestamp) && $timestamp > 0) {
+        if (!empty($timestamp) && $timestamp > 0) {
             $format = [
                 'DATE' => 'Y-m-d',
                 'TIME' => 'H:i:s',
@@ -57,8 +57,8 @@ 
         if (\is_array($data)) {
             $tmp = [];
             foreach ($data as $alias => $field) {
-                $tmp[] = ($alias !== $field && ! \is_int($alias) && $ignoreAlias === false) ?
-                    ($field . ' as `' . $alias . '`') : $field;
+                $tmp[] = ($alias !== $field && !\is_int($alias) && $ignoreAlias === false) ?
+                    ($field.' as `'.$alias.'`') : $field;
             }
 
             $data = implode(',', $tmp);
@@ -82,7 +82,7 @@ 
                 $value = 'NULL';
                 break;
             case \is_scalar($value):
-                $value = "'" . $value . "'";
+                $value = "'".$value."'";
                 break;
             default:
                 throw (new Exceptions\InvalidFieldException('NULL'))
@@ -130,11 +130,11 @@ 
             }
             $values = $this->withCommaSeparator($values);
             if ($wrap === false) {
-                $values = '(' . $values . ')';
+                $values = '('.$values.')';
             }
         }
 
-        if (! \is_scalar($values)) {
+        if (!\is_scalar($values)) {
             throw (new Exceptions\InvalidFieldException('values'))
                 ->setData($values);
         }
@@ -148,7 +148,7 @@ 
             return compact('fields', 'values');
         }
 
-        return (empty($fields) ? '' : $fields . ' VALUES ') . $values;
+        return (empty($fields) ? '' : $fields.' VALUES ').$values;
     }
 
     /**
@@ -163,7 +163,7 @@ 
             if ($this->arrayOnlyNumeric($fields) === true) {
                 $fields = ($level === 2) ? false : '';
             } else {
-                $fields = '(`' . implode('`, `', $fields) . '`)';
+                $fields = '(`'.implode('`, `', $fields).'`)';
             }
         }
 
@@ -178,7 +178,7 @@ 
     {
         $onlyNumbers = true;
         foreach ($data as $value) {
-            if (! \is_numeric($value)) {
+            if (!\is_numeric($value)) {
                 $onlyNumbers = false;
                 break;
             }
@@ -200,7 +200,7 @@ 
             }
 
             foreach ($data as $key => $value) {
-                $data[$key] = "`{$key}` = " . $value;
+                $data[$key] = "`{$key}` = ".$value;
             }
         }
 
@@ -222,7 +222,7 @@ 
             }
             $data = implode(' ', $tmp);
         }
-        if (! is_scalar($data) || empty($data)) {
+        if (!is_scalar($data) || empty($data)) {
             throw new Exceptions\TableNotDefinedException($data);
         }
 
@@ -245,7 +245,7 @@ 
             }
         }
         $data = trim($data);
-        if (! empty($data) && stripos($data, 'WHERE') !== 0) {
+        if (!empty($data) && stripos($data, 'WHERE') !== 0) {
             $data = "WHERE {$data}";
         }
 
@@ -259,7 +259,7 @@ 
     protected function prepareOrder($data)
     {
         $data = trim($data);
-        if (! empty($data) && stripos($data, 'ORDER') !== 0) {
+        if (!empty($data) && stripos($data, 'ORDER') !== 0) {
             $data = "ORDER BY {$data}";
         }
 
@@ -273,7 +273,7 @@ 
     protected function prepareLimit($data)
     {
         $data = trim($data);
-        if (! empty($data) && stripos($data, 'LIMIT') !== 0) {
+        if (!empty($data) && stripos($data, 'LIMIT') !== 0) {
             $data = "LIMIT {$data}";
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -246,7 +246,7 @@ 
         }
         $data = trim($data);
         if (! empty($data) && stripos($data, 'WHERE') !== 0) {
-            $data = "WHERE {$data}";
+            $data = "where {$data}";
         }
 
         return $data;
@@ -274,7 +274,7 @@ 
     {
         $data = trim($data);
         if (! empty($data) && stripos($data, 'LIMIT') !== 0) {
-            $data = "LIMIT {$data}";
+            $data = "limit {$data}";
         }
 
         return $data;

core/vendor/agelxnash/modx-evo-database/tests/LegacyDatabaseTest.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace AgelxNash\Modx\Evo\Database\Tests;
 
-use PHPUnit\Framework\TestCase;
 use AgelxNash\Modx\Evo\Database;
+use PHPUnit\Framework\TestCase;
 
 class LegacyDatabaseTest extends TestCase
 {

Indentation +3 added lines, -3 removed lines

@@ -15,9 +15,9 @@
         $this->instance = new Database\LegacyDatabase(
             isset($_SERVER['DB_HOST']) ? $_SERVER['DB_HOST'] : 'localhost',
             isset($_SERVER['DB_BASE']) ? $_SERVER['DB_BASE'] : 'modx',
-          isset($_SERVER['DB_USER']) ? $_SERVER['DB_USER'] : 'homestead',
-       isset($_SERVER['DB_PASSWORD']) ? $_SERVER['DB_PASSWORD'] : 'secret',
-           isset($_SERVER['DB_PREFIX']) ? $_SERVER['DB_PREFIX'] : '{PREFIX}',
+            isset($_SERVER['DB_USER']) ? $_SERVER['DB_USER'] : 'homestead',
+        isset($_SERVER['DB_PASSWORD']) ? $_SERVER['DB_PASSWORD'] : 'secret',
+            isset($_SERVER['DB_PREFIX']) ? $_SERVER['DB_PREFIX'] : '{PREFIX}',
             isset($_SERVER['DB_CHARSET']) ? $_SERVER['DB_CHARSET'] : 'utf8mb4',
             isset($_SERVER['DB_METHOD']) ? $_SERVER['DB_METHOD'] : 'SET NAMES',
             isset($_SERVER['DB_COLLATION']) ? $_SERVER['DB_COLLATION'] : 'utf8mb4_unicode_ci',

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $this->assertEquals(
             $this->instance->query("SELECT count(*) FROM [+prefix+]site_content"),
-            $this->instance->query("SELECT count(*) FROM " . $this->instance->getFullTableName('site_content'))
+            $this->instance->query("SELECT count(*) FROM ".$this->instance->getFullTableName('site_content'))
         );
 
         $allQuery = $this->instance->getAllExecutedQuery();
@@ -68,7 +68,7 @@ 
     {
         $queries = [
             "SELECT count(*) FROM [+prefix+]site_content",
-            "SELECT count(*) FROM " . $this->instance->getFullTableName('site_content')
+            "SELECT count(*) FROM ".$this->instance->getFullTableName('site_content')
         ];
 
         $this->assertCount(

core/vendor/agelxnash/modx-evo-database/tests/MultiConnectTest.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,8 +1,8 @@
 <?php namespace AgelxNash\Modx\Evo\Database\Tests;
 
-use PHPUnit\Framework\TestCase;
 use AgelxNash\Modx\Evo\Database;
 use Illuminate\Database\Capsule\Manager as Capsule;
+use PHPUnit\Framework\TestCase;
 
 class MultiConnectTest extends TestCase
 {