mirror of
https://github.com/codeigniter4/CodeIgniter4.git
synced 2025-02-20 11:44:28 +08:00
run rector
This commit is contained in:
parent
5084adaa07
commit
ea8396abff
@ -18,13 +18,14 @@ use CodeIgniter\Exceptions\FrameworkException;
|
||||
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;
|
||||
|
||||
|
@ -67,7 +67,7 @@ class Seeder
|
||||
/**
|
||||
* Faker Generator instance.
|
||||
*
|
||||
* @var \Faker\Generator|null
|
||||
* @var Generator|null
|
||||
*/
|
||||
private static $faker;
|
||||
|
||||
|
@ -13,6 +13,7 @@ namespace CodeIgniter\Filters;
|
||||
|
||||
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 @@ class CSRF implements FilterInterface
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* 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
|
||||
|
@ -14,8 +14,6 @@ namespace CodeIgniter\HTTP;
|
||||
use CodeIgniter\Exceptions\DownloadException;
|
||||
use CodeIgniter\Files\File;
|
||||
use Config\Mimes;
|
||||
use DateTime;
|
||||
use DateTimeZone;
|
||||
|
||||
/**
|
||||
* HTTP response when a download is requested.
|
||||
|
@ -132,7 +132,7 @@ if (! function_exists('current_url'))
|
||||
*
|
||||
* @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 @@ if (! function_exists('index_page'))
|
||||
*
|
||||
* 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
|
||||
|
@ -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,7 +336,6 @@ class Pager implements PagerInterface
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Returns the URI for a specific page for the specified group.
|
||||
*
|
||||
@ -343,14 +343,14 @@ class Pager implements PagerInterface
|
||||
* @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'];
|
||||
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
namespace CodeIgniter\Pager;
|
||||
|
||||
use CodeIgniter\HTTP\URI;
|
||||
|
||||
/**
|
||||
* Expected behavior for a Pager
|
||||
*/
|
||||
@ -103,7 +105,6 @@ interface PagerInterface
|
||||
public function getCurrentPage(string $group = 'default'): int;
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Returns the URI for a specific page for the specified group.
|
||||
*
|
||||
@ -111,7 +112,7 @@ interface PagerInterface
|
||||
* @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);
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -1,9 +1,10 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @var \CodeIgniter\Pager\PagerRenderer $pager
|
||||
*/
|
||||
use CodeIgniter\Pager\PagerRenderer;
|
||||
|
||||
/**
|
||||
* @var PagerRenderer $pager
|
||||
*/
|
||||
$pager->setSurroundCount(2);
|
||||
?>
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
<?php
|
||||
/**
|
||||
* @var \CodeIgniter\Pager\PagerRenderer $pager
|
||||
*/
|
||||
|
||||
use CodeIgniter\Pager\PagerRenderer;
|
||||
|
||||
/**
|
||||
* @var PagerRenderer $pager
|
||||
*/
|
||||
$pager->setSurroundCount(0);
|
||||
?>
|
||||
<nav>
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
namespace CodeIgniter\RESTful;
|
||||
|
||||
use CodeIgniter\Config\Factories;
|
||||
use CodeIgniter\Controller;
|
||||
use CodeIgniter\HTTP\RequestInterface;
|
||||
use CodeIgniter\HTTP\ResponseInterface;
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
namespace CodeIgniter\Security;
|
||||
|
||||
use CodeIgniter\HTTP\IncomingRequest;
|
||||
use CodeIgniter\HTTP\RequestInterface;
|
||||
use CodeIgniter\Security\Exceptions\SecurityException;
|
||||
use Config\App;
|
||||
|
@ -14,6 +14,7 @@ namespace CodeIgniter\Test;
|
||||
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;
|
||||
|
||||
|
@ -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 @@ $loader->register(); // Register the loader with the SPL autoloader stack.
|
||||
require_once APPPATH . 'Config/Routes.php';
|
||||
|
||||
/**
|
||||
* @var \CodeIgniter\Router\RouteCollection $routes
|
||||
* @var RouteCollection $routes
|
||||
*/
|
||||
$routes->getRoutes('*');
|
||||
|
@ -14,6 +14,7 @@ use CodeIgniter\Config\DotEnv;
|
||||
use Config\App;
|
||||
use Config\Autoload;
|
||||
use Config\Modules;
|
||||
use Config\Paths;
|
||||
use Config\Services;
|
||||
|
||||
/*
|
||||
@ -30,7 +31,7 @@ use Config\Services;
|
||||
if (! defined('APPPATH'))
|
||||
{
|
||||
/**
|
||||
* @var \Config\Paths $paths
|
||||
* @var Paths $paths
|
||||
*/
|
||||
define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
|
||||
}
|
||||
@ -45,7 +46,7 @@ if (! defined('ROOTPATH'))
|
||||
if (! defined('SYSTEMPATH'))
|
||||
{
|
||||
/**
|
||||
* @var \Config\Paths $paths
|
||||
* @var Paths $paths
|
||||
*/
|
||||
define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
|
||||
}
|
||||
@ -54,7 +55,7 @@ if (! defined('SYSTEMPATH'))
|
||||
if (! defined('WRITEPATH'))
|
||||
{
|
||||
/**
|
||||
* @var \Config\Paths $paths
|
||||
* @var Paths $paths
|
||||
*/
|
||||
define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
|
||||
}
|
||||
@ -63,7 +64,7 @@ if (! defined('WRITEPATH'))
|
||||
if (! defined('TESTPATH'))
|
||||
{
|
||||
/**
|
||||
* @var \Config\Paths $paths
|
||||
* @var Paths $paths
|
||||
*/
|
||||
define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user