run rector

samsonasik · paulbalandan · commit ea8396abfffe · 2021-01-31T01:03:11.000+08:00
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -18,13 +18,14 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\DownloadResponse;
-use CodeIgniter\HTTP\RedirectResponse;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\RouteCollectionInterface;
+use CodeIgniter\Router\Router;
 use Config\App;
 use Config\Cache;
 use Config\Services;
@@ -76,7 +77,7 @@ class CodeIgniter
 	/**
 	 * Current request.
 	 *
-	 * @var Request|HTTP\IncomingRequest|CLIRequest
+	 * @var Request|IncomingRequest|CLIRequest
 	 */
 	protected $request;
 
@@ -90,7 +91,7 @@ class CodeIgniter
 	/**
 	 * Router to use.
 	 *
-	 * @var Router\Router
+	 * @var Router
 	 */
 	protected $router;
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
@@ -67,7 +67,7 @@ class Seeder
 	/**
 	 * Faker Generator instance.
 	 *
-	 * @var \Faker\Generator|null
+	 * @var Generator|null
 	 */
 	private static $faker;
 
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
@@ -67,12 +68,11 @@ public function before(RequestInterface $request, $arguments = null)
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * We don't have anything to do here.
 	 *
 	 * @param RequestInterface|IncomingRequest             $request
-	 * @param ResponseInterface|\CodeIgniter\HTTP\Response $response
+	 * @param ResponseInterface|Response $response
 	 * @param array|null                                   $arguments
 	 *
 	 * @return mixed
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
@@ -14,8 +14,6 @@
 use CodeIgniter\Exceptions\DownloadException;
 use CodeIgniter\Files\File;
 use Config\Mimes;
-use DateTime;
-use DateTimeZone;
 
 /**
  * HTTP response when a download is requested.
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -132,7 +132,7 @@ function base_url($uri = '', string $protocol = null): string
 	 *
 	 * @param boolean $returnObject True to return an object instead of a strong
 	 *
-	 * @return string|\CodeIgniter\HTTP\URI
+	 * @return string|URI
 	 */
 	function current_url(bool $returnObject = false)
 	{
@@ -212,7 +212,7 @@ function uri_string(bool $relative = false): string
 	 *
 	 * Returns the "index_page" from your config file
 	 *
-	 * @param  \Config\App|null $altConfig Alternate configuration to use
+	 * @param  App|null $altConfig Alternate configuration to use
 	 * @return string
 	 */
 	function index_page(App $altConfig = null): string
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Pager;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\Pager\Exceptions\PagerException;
 use CodeIgniter\View\RendererInterface;
 use Config\Pager as PagerConfig;
@@ -335,22 +336,21 @@ public function getFirstPage(string $group = 'default'): int
 	}
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the URI for a specific page for the specified group.
 	 *
 	 * @param integer|null $page
 	 * @param string       $group
 	 * @param boolean      $returnObject
 	 *
-	 * @return string|\CodeIgniter\HTTP\URI
+	 * @return string|URI
 	 */
 	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false)
 	{
 		$this->ensureGroup($group);
 
 		/**
-		 * @var \CodeIgniter\HTTP\URI $uri
+		 * @var URI $uri
 		 */
 		$uri = $this->groups[$group]['uri'];
 
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Pager;
 
+use CodeIgniter\HTTP\URI;
+
 /**
  * Expected behavior for a Pager
  */
@@ -103,15 +105,14 @@ public function getPageCount(string $group = 'default'): int;
 	public function getCurrentPage(string $group = 'default'): int;
 
 	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the URI for a specific page for the specified group.
 	 *
 	 * @param integer|null $page
 	 * @param string       $group
 	 * @param boolean      $returnObject
 	 *
-	 * @return string|\CodeIgniter\HTTP\URI
+	 * @return string|URI
 	 */
 	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false);
 
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Pager;
 
+use CodeIgniter\HTTP\URI;
+
 /**
  * Class PagerRenderer
  *
@@ -58,7 +60,7 @@ class PagerRenderer
 	/**
 	 * URI base for pagination links
 	 *
-	 * @var \CodeIgniter\HTTP\URI
+	 * @var URI
 	 */
 	protected $uri;
 
diff --git a/system/Pager/Views/default_full.php b/system/Pager/Views/default_full.php
@@ -1,9 +1,10 @@
 <?php
 
+use CodeIgniter\Pager\PagerRenderer;
+
 /**
- * @var \CodeIgniter\Pager\PagerRenderer $pager
+ * @var PagerRenderer $pager
  */
-
 $pager->setSurroundCount(2);
 ?>
 
diff --git a/system/Pager/Views/default_head.php b/system/Pager/Views/default_head.php
@@ -9,8 +9,10 @@
  * file that was distributed with this source code.
  */
 
-/**
- * @var \CodeIgniter\Pager\PagerRenderer $pager
+use CodeIgniter\Pager\PagerRenderer;
+
+ /**
+ * @var PagerRenderer $pager
  */
 $pager->setSurroundCount(0);
 
diff --git a/system/Pager/Views/default_simple.php b/system/Pager/Views/default_simple.php
@@ -1,8 +1,10 @@
 <?php
+
+use CodeIgniter\Pager\PagerRenderer;
+
 /**
- * @var \CodeIgniter\Pager\PagerRenderer $pager
+ * @var PagerRenderer $pager
  */
-
 $pager->setSurroundCount(0);
 ?>
 <nav>
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\RESTful;
 
-use CodeIgniter\Config\Factories;
 use CodeIgniter\Controller;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
diff --git a/system/Security/Security.php b/system/Security/Security.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Security;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\App;
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\MigrationRunner;
+use CodeIgniter\Database\Seeder;
 use CodeIgniter\Exceptions\ConfigException;
 use Config\Database;
 use Config\Migrations;
@@ -117,7 +118,7 @@ abstract class CIDatabaseTestCase extends CIUnitTestCase
 	/**
 	 * Seeder instance
 	 *
-	 * @var \CodeIgniter\Database\Seeder
+	 * @var Seeder
 	 */
 	protected $seeder;
 
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Services;
 use Config\Autoload;
 use Config\Modules;
@@ -90,6 +91,6 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 require_once APPPATH . 'Config/Routes.php';
 
 /**
- * @var \CodeIgniter\Router\RouteCollection $routes
+ * @var RouteCollection $routes
  */
 $routes->getRoutes('*');
diff --git a/system/bootstrap.php b/system/bootstrap.php
@@ -14,6 +14,7 @@
 use Config\App;
 use Config\Autoload;
 use Config\Modules;
+use Config\Paths;
 use Config\Services;
 
 /*
@@ -30,7 +31,7 @@
 if (! defined('APPPATH'))
 {
 	/**
-	 * @var \Config\Paths $paths
+	 * @var Paths $paths
 	 */
 	define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
@@ -45,7 +46,7 @@
 if (! defined('SYSTEMPATH'))
 {
 	/**
-	 * @var \Config\Paths $paths
+	 * @var Paths $paths
 	 */
 	define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
@@ -54,7 +55,7 @@
 if (! defined('WRITEPATH'))
 {
 	/**
-	 * @var \Config\Paths $paths
+	 * @var Paths $paths
 	 */
 	define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
@@ -63,7 +64,7 @@
 if (! defined('TESTPATH'))
 {
 	/**
-	 * @var \Config\Paths $paths
+	 * @var Paths $paths
 	 */
 	define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class Seeder`
`67`	`67`	`/**`
`68`	`68`	`* Faker Generator instance.`
`69`	`69`	`*`
`70`		`- * @var \Faker\Generator\|null`
	`70`	`+ * @var Generator\|null`
`71`	`71`	`*/`
`72`	`72`	`private static $faker;`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use CodeIgniter\HTTP\IncomingRequest;`
`15`	`15`	`use CodeIgniter\HTTP\RequestInterface;`
	`16`	`+use CodeIgniter\HTTP\Response;`
`16`	`17`	`use CodeIgniter\HTTP\ResponseInterface;`
`17`	`18`	`use CodeIgniter\Security\Exceptions\SecurityException;`
`18`	`19`	`use Config\Services;`
`@@ -67,12 +68,11 @@ public function before(RequestInterface $request, $arguments = null)`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`//--------------------------------------------------------------------`
`70`		`-`
`71`	`71`	`/**`
`72`	`72`	`* We don't have anything to do here.`
`73`	`73`	`*`
`74`	`74`	`* @param RequestInterface\|IncomingRequest $request`
`75`		`- * @param ResponseInterface\|\CodeIgniter\HTTP\Response $response`
	`75`	`+ * @param ResponseInterface\|Response $response`
`76`	`76`	`* @param array\|null $arguments`
`77`	`77`	`*`
`78`	`78`	`* @return mixed`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function base_url($uri = '', string $protocol = null): string`
`132`	`132`	`*`
`133`	`133`	`* @param boolean $returnObject True to return an object instead of a strong`
`134`	`134`	`*`
`135`		`- * @return string\|\CodeIgniter\HTTP\URI`
	`135`	`+ * @return string\|URI`
`136`	`136`	`*/`
`137`	`137`	`function current_url(bool $returnObject = false)`
`138`	`138`	`{`
`@@ -212,7 +212,7 @@ function uri_string(bool $relative = false): string`
`212`	`212`	`*`
`213`	`213`	`* Returns the "index_page" from your config file`
`214`	`214`	`*`
`215`		`- * @param \Config\App\|null $altConfig Alternate configuration to use`
	`215`	`+ * @param App\|null $altConfig Alternate configuration to use`
`216`	`216`	`* @return string`
`217`	`217`	`*/`
`218`	`218`	`function index_page(App $altConfig = null): string`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace CodeIgniter\Pager;`
`13`	`13`
	`14`	`+use CodeIgniter\HTTP\URI;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* Class PagerRenderer`
`16`	`18`	`*`
`@@ -58,7 +60,7 @@ class PagerRenderer`
`58`	`60`	`/**`
`59`	`61`	`* URI base for pagination links`
`60`	`62`	`*`
`61`		`- * @var \CodeIgniter\HTTP\URI`
	`63`	`+ * @var URI`
`62`	`64`	`*/`
`63`	`65`	`protected $uri;`
`64`	`66`