codeigniter4 · samsonasik · Mar 23, 2021 · Mar 23, 2021 · Mar 22, 2021 · Mar 23, 2021
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 		"phpstan/phpstan": "0.12.82",
 		"phpunit/phpunit": "^9.1",
 		"predis/predis": "^1.1",
-		"rector/rector": "^0.9",
+		"rector/rector": "^0.10",
 		"squizlabs/php_codesniffer": "^3.3"
 	},
 	"suggest": {

diff --git a/rector.php b/rector.php
@@ -24,6 +24,8 @@
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
+require_once __DIR__ . '/system/Test/bootstrap.php';
+
 return static function (ContainerConfigurator $containerConfigurator): void {
 	$parameters = $containerConfigurator->parameters();
 
@@ -41,12 +43,6 @@
 		PassStrictParameterToFunctionParameterRector::class => [__DIR__ . '/tests/system/Database/Live/SelectTest.php'],
 	]);
 
-	// Rector relies on autoload setup of your project; Composer autoload is included by default; to add more:
-	$parameters->set(Option::AUTOLOAD_PATHS, [
-		// autoload specific file
-		__DIR__ . '/system/Test/bootstrap.php',
-	]);
-
 	// auto import fully qualified class names
 	$parameters->set(Option::AUTO_IMPORT_NAMES, true);
 	$parameters->set(Option::ENABLE_CACHE, true);

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -22,12 +22,11 @@ class FileLocator
 	/**
 	 * The Autoloader to use.
 	 *
-	 * @var \CodeIgniter\Autoloader\Autoloader
+	 * @var Autoloader
 	 */
 	protected $autoloader;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *

diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
@@ -79,7 +79,6 @@ abstract class BaseCommand
 	protected $commands;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * BaseCommand constructor.
 	 *

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -247,7 +247,6 @@ class BaseBuilder
 	];
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
@@ -263,7 +262,9 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 			throw new DatabaseException('A table must be specified when creating a new Query Builder.');
 		}
 
-		/** @var BaseConnection $db */
+		/**
+		 * @var BaseConnection $db
+		 */
 		$this->db = $db;
 
 		$this->tableName = $tableName;
@@ -282,7 +283,6 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the current database connection
 	 *
@@ -2022,7 +2022,6 @@ public function getCompiledQBWhere()
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Get_Where
 	 *

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -950,7 +950,6 @@ abstract protected function _transCommit(): bool;
 	abstract protected function _transRollback(): bool;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns an instance of the query builder for this connection.
 	 *
@@ -972,7 +971,6 @@ public function table($tableName)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Creates a prepared statement with the database that can then
 	 * be used to execute multiple statements against. Within the

diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
@@ -56,7 +56,6 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
 	protected $db;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor.
 	 *
@@ -90,7 +89,7 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
 		$sql = preg_replace('/:[^\s,)]+/', '?', $sql);
 
 		/**
-		 * @var \CodeIgniter\Database\Query $query
+		 * @var Query $query
 		 */
 		$query = new $queryClass($this->db);
 
@@ -119,7 +118,6 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
 	abstract public function _prepare(string $sql, array $options = []);
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Takes a new set of data and runs it against the currently
 	 * prepared query. Upon success, will return a Results object.

diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
@@ -49,7 +49,6 @@ abstract class BaseUtils
 	protected $repairTable = false;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Class constructor
 	 *
@@ -221,7 +220,6 @@ public function repairTable(string $tableName)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Generate CSV from a query result object
 	 *
@@ -258,7 +256,6 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Generate XML data from a query result object
 	 *

diff --git a/system/Database/Config.php b/system/Database/Config.php
@@ -36,7 +36,6 @@ class Config extends BaseConfig
 	static protected $factory;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Creates the default
 	 *
@@ -119,7 +118,6 @@ public static function forge($group = null)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns a new instance of the Database Utilities class.
 	 *
@@ -135,7 +133,6 @@ public static function utils($group = null)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns a new instance of the Database Seeder.
 	 *

diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
@@ -145,7 +145,6 @@ public function query(string $sql, $binds = null);
 	public function simpleQuery(string $sql);
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns an instance of the query builder for this connection.
 	 *

diff --git a/system/Database/Database.php b/system/Database/Database.php
@@ -23,7 +23,7 @@ class Database
 	/**
 	 * Maintains an array of the instances of all connections that have
 	 * been created.
-	 * 
+	 *
 	 * Helps to keep track of all open connections for performance
 	 * monitoring, logging, etc.
 	 *
@@ -41,9 +41,9 @@ class Database
 	 * @param string $alias
 	 *
 	 * @return mixed
-	 * 
+	 *
 	 * @throws InvalidArgumentException
-	 * 
+	 *
 	 * @internal param bool $useBuilder
 	 */
 	public function load(array $params = [], string $alias = '')
@@ -72,7 +72,6 @@ public function load(array $params = [], string $alias = '')
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Creates a Forge instance for the current database type.
 	 *
@@ -92,7 +91,6 @@ public function loadForge(ConnectionInterface $db): object
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Creates a Utils instance for the current database type.
 	 *
@@ -119,7 +117,7 @@ public function loadUtils(ConnectionInterface $db): object
 	 * @param array $params
 	 *
 	 * @return array
-	 * 
+	 *
 	 * @throws InvalidArgumentException
 	 */
 	protected function parseDSN(array $params): array

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -161,7 +161,6 @@ class Forge
 	protected $default = ' DEFAULT ';
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor.
 	 *
@@ -173,7 +172,6 @@ public function __construct(BaseConnection $db)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Provides access to the forge's current database connection.
 	 *

diff --git a/system/Database/Migration.php b/system/Database/Migration.php
@@ -40,7 +40,6 @@ abstract class Migration
 	protected $forge;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor.
 	 *

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -73,7 +73,6 @@ class CURLRequest extends Request
 	protected $delay = 0.0;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Takes an array of options to set the following possible class properties:
 	 *
@@ -105,7 +104,6 @@ public function __construct(App $config, URI $uri, ResponseInterface $response =
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Sends an HTTP request to the specified $url. If this is a relative
 	 * URL, it will be merged with $this->baseURI to form a complete URL.
@@ -130,7 +128,6 @@ public function request($method, string $url, array $options = []): ResponseInte
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a GET request.
 	 *
@@ -145,7 +142,6 @@ public function get(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a DELETE request.
 	 *
@@ -160,7 +156,6 @@ public function delete(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a HEAD request.
 	 *
@@ -175,7 +170,6 @@ public function head(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending an OPTIONS request.
 	 *
@@ -190,7 +184,6 @@ public function options(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a PATCH request.
 	 *
@@ -205,7 +198,6 @@ public function patch(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a POST request.
 	 *
@@ -220,7 +212,6 @@ public function post(string $url, array $options = []): ResponseInterface
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Convenience method for sending a PUT request.
 	 *
@@ -375,7 +366,6 @@ public function getMethod(bool $upper = false): string
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Fires the actual cURL request.
 	 *

diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
@@ -243,7 +243,6 @@ public function setStatusCode(int $code, string $reason = '')
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Sets the Content Type header for this response with the mime type
 	 * and, optionally, the charset.

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -120,7 +120,6 @@ class IncomingRequest extends Request
 	protected $userAgent;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
@@ -472,7 +471,6 @@ public function getCookie($index = null, $filter = null, $flags = null)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Fetch the user agent string
 	 *

diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
@@ -32,7 +32,6 @@ class Negotiate
 	protected $request;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
@@ -47,7 +46,6 @@ public function __construct(RequestInterface $request = null)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Stores the request instance to grab the headers from.
 	 *
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,6 @@ abstract class BaseCommand @@
     	protected $commands;
     	//--------------------------------------------------------------------
     	/**
     	 * BaseCommand constructor.
     	 *
@@ Expand Down @@