Skip to content

remove $psr4['Tests\Support'] definition in application\Config\Autoload::__construct() #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 6, 2018
Merged

remove $psr4['Tests\Support'] definition in application\Config\Autoload::__construct() #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b2d853
remove $psr4['Tests\Support'] definition in application\Config\Autolo…
samsonasik Nov 6, 2018
40900db
use SUPPORTPATH constant
samsonasik Nov 6, 2018
60c467a
use SUPPORTPATH constant int classmap definition as well
samsonasik Nov 6, 2018
dbdb763
use SUPPORTPATH constant int classmap definition as well
samsonasik Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions application/Config/Autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ public function __construct()
'App' => APPPATH, // To ensure filters, etc still found,
];

if (defined('ENVIRONMENT') && ENVIRONMENT === 'testing')
{
$psr4['Tests\Support'] = TESTPATH . '_support'; // So custom migrations can run during testing
}

/**
* -------------------------------------------------------------------
* Class Map
Expand Down
162 changes: 84 additions & 78 deletions system/Config/AutoloadConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @package CodeIgniter
* @author CodeIgniter Dev Team
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
*/

Expand All @@ -47,12 +47,14 @@ class AutoloadConfig

/**
* Array of namespaces for autoloading.
*
* @var array
*/
public $psr4 = [];

/**
* Map of class names and locations
*
* @var array
*/
public $classmap = [];
Expand Down Expand Up @@ -86,12 +88,12 @@ public function __construct()
* `];
*/
$this->psr4 = [
'CodeIgniter' => realpath(BASEPATH)
'CodeIgniter' => realpath(BASEPATH),
];

if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
{
$this->psr4['Tests\Support'] = BASEPATH . '../tests/_support';
$this->psr4['Tests\Support'] = SUPPORTPATH;
}

/**
Expand All @@ -111,77 +113,81 @@ public function __construct()
* ];
*/
$this->classmap = [
'CodeIgniter\CodeIgniter' => BASEPATH . 'CodeIgniter.php',
'CodeIgniter\CLI\CLI' => BASEPATH . 'CLI/CLI.php',
'CodeIgniter\Cache\CacheFactory' => BASEPATH . 'Cache/CacheFactory.php',
'CodeIgniter\Cache\CacheInterface' => BASEPATH . 'Cache/CacheInterface.php',
'CodeIgniter\Cache\Handlers\DummyHandler' => BASEPATH . 'Cache/Handlers/DummyHandler.php',
'CodeIgniter\Cache\Handlers\FileHandler' => BASEPATH . 'Cache/Handlers/FileHandler.php',
'CodeIgniter\Cache\Handlers\MemcachedHandler' => BASEPATH . 'Cache/Handlers/MemcachedHandler.php',
'CodeIgniter\Cache\Handlers\PredisHandler' => BASEPATH . 'Cache/Handlers/PredisHandler.php',
'CodeIgniter\Cache\Handlers\RedisHandler' => BASEPATH . 'Cache/Handlers/RedisHandler.php',
'CodeIgniter\Cache\Handlers\WincacheHandler' => BASEPATH . 'Cache/Handlers/WincacheHandler.php',
'CodeIgniter\Controller' => BASEPATH . 'Controller.php',
'CodeIgniter\Config\AutoloadConfig' => BASEPATH . 'Config/Autoload.php',
'CodeIgniter\Config\BaseConfig' => BASEPATH . 'Config/BaseConfig.php',
'CodeIgniter\Config\Database' => BASEPATH . 'Config/Database.php',
'CodeIgniter\Config\Database\Connection' => BASEPATH . 'Config/Database/Connection.php',
'CodeIgniter\Config\Database\Connection\MySQLi' => BASEPATH . 'Config/Database/Connection/MySQLi.php',
'CodeIgniter\Config\DotEnv' => BASEPATH . 'Config/DotEnv.php',
'CodeIgniter\Database\BaseBuilder' => BASEPATH . 'Database/BaseBuilder.php',
'CodeIgniter\Database\BaseConnection' => BASEPATH . 'Database/BaseConnection.php',
'CodeIgniter\Database\BaseResult' => BASEPATH . 'Database/BaseResult.php',
'CodeIgniter\Database\Config' => BASEPATH . 'Database/Config.php',
'CodeIgniter\Database\ConnectionInterface' => BASEPATH . 'Database/ConnectionInterface.php',
'CodeIgniter\Database\Database' => BASEPATH . 'Database/Database.php',
'CodeIgniter\Database\Query' => BASEPATH . 'Database/Query.php',
'CodeIgniter\Database\QueryInterface' => BASEPATH . 'Database/QueryInterface.php',
'CodeIgniter\Database\ResultInterface' => BASEPATH . 'Database/ResultInterface.php',
'CodeIgniter\Database\Migration' => BASEPATH . 'Database/Migration.php',
'CodeIgniter\Database\MigrationRunner' => BASEPATH . 'Database/MigrationRunner.php',
'CodeIgniter\Debug\Exceptions' => BASEPATH . 'Debug/Exceptions.php',
'CodeIgniter\Debug\Timer' => BASEPATH . 'Debug/Timer.php',
'CodeIgniter\Debug\Iterator' => BASEPATH . 'Debug/Iterator.php',
'CodeIgniter\Events\Events' => BASEPATH . 'Events/Events.php',
'CodeIgniter\HTTP\CLIRequest' => BASEPATH . 'HTTP/CLIRequest.php',
'CodeIgniter\HTTP\ContentSecurityPolicy' => BASEPATH . 'HTTP/ContentSecurityPolicy.php',
'CodeIgniter\HTTP\CURLRequest' => BASEPATH . 'HTTP/CURLRequest.php',
'CodeIgniter\HTTP\IncomingRequest' => BASEPATH . 'HTTP/IncomingRequest.php',
'CodeIgniter\HTTP\Message' => BASEPATH . 'HTTP/Message.php',
'CodeIgniter\HTTP\Negotiate' => BASEPATH . 'HTTP/Negotiate.php',
'CodeIgniter\HTTP\Request' => BASEPATH . 'HTTP/Request.php',
'CodeIgniter\HTTP\RequestInterface' => BASEPATH . 'HTTP/RequestInterface.php',
'CodeIgniter\HTTP\Response' => BASEPATH . 'HTTP/Response.php',
'CodeIgniter\HTTP\ResponseInterface' => BASEPATH . 'HTTP/ResponseInterface.php',
'CodeIgniter\HTTP\URI' => BASEPATH . 'HTTP/URI.php',
'CodeIgniter\Log\Logger' => BASEPATH . 'Log/Logger.php',
'Psr\Log\LoggerAwareInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
'Psr\Log\LoggerAwareTrait' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
'Psr\Log\LoggerInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
'Psr\Log\LogLevel' => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
'CodeIgniter\Log\Handlers\BaseHandler' => BASEPATH . 'Log/Handlers/BaseHandler.php',
'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
'CodeIgniter\Log\Handlers\FileHandler' => BASEPATH . 'Log/Handlers/FileHandler.php',
'CodeIgniter\Log\Handlers\HandlerInterface' => BASEPATH . 'Log/Handlers/HandlerInterface.php',
'CodeIgniter\Router\RouteCollection' => BASEPATH . 'Router/RouteCollection.php',
'CodeIgniter\Router\RouteCollectionInterface' => BASEPATH . 'Router/RouteCollectionInterface.php',
'CodeIgniter\Router\Router' => BASEPATH . 'Router/Router.php',
'CodeIgniter\Router\RouterInterface' => BASEPATH . 'Router/RouterInterface.php',
'CodeIgniter\Security\Security' => BASEPATH . 'Security/Security.php',
'CodeIgniter\Session\Session' => BASEPATH . 'Session/Session.php',
'CodeIgniter\Session\SessionInterface' => BASEPATH . 'Session/SessionInterface.php',
'CodeIgniter\Session\Handlers\BaseHandler' => BASEPATH . 'Session/Handlers/BaseHandler.php',
'CodeIgniter\Session\Handlers\FileHandler' => BASEPATH . 'Session/Handlers/FileHandler.php',
'CodeIgniter\Session\Handlers\MemcachedHandler' => BASEPATH . 'Session/Handlers/MemcachedHandler.php',
'CodeIgniter\Session\Handlers\RedisHandler' => BASEPATH . 'Session/Handlers/RedisHandler.php',
'CodeIgniter\View\RendererInterface' => BASEPATH . 'View/RendererInterface.php',
'CodeIgniter\View\View' => BASEPATH . 'View/View.php',
'CodeIgniter\View\Parser' => BASEPATH . 'View/Parser.php',
'CodeIgniter\View\Cell' => BASEPATH . 'View/Cell.php',
'Zend\Escaper\Escaper' => BASEPATH . 'ThirdParty/ZendEscaper/Escaper.php',
'CodeIgniter\Log\TestLogger' => BASEPATH . '../tests/_support/Log/TestLogger.php',
'CIDatabaseTestCase' => BASEPATH . '../tests/_support/CIDatabaseTestCase.php'
'CodeIgniter\CodeIgniter' => BASEPATH . 'CodeIgniter.php',
'CodeIgniter\CLI\CLI' => BASEPATH . 'CLI/CLI.php',
'CodeIgniter\Cache\CacheFactory' => BASEPATH . 'Cache/CacheFactory.php',
'CodeIgniter\Cache\CacheInterface' => BASEPATH . 'Cache/CacheInterface.php',
'CodeIgniter\Cache\Handlers\DummyHandler' => BASEPATH . 'Cache/Handlers/DummyHandler.php',
'CodeIgniter\Cache\Handlers\FileHandler' => BASEPATH . 'Cache/Handlers/FileHandler.php',
'CodeIgniter\Cache\Handlers\MemcachedHandler' => BASEPATH . 'Cache/Handlers/MemcachedHandler.php',
'CodeIgniter\Cache\Handlers\PredisHandler' => BASEPATH . 'Cache/Handlers/PredisHandler.php',
'CodeIgniter\Cache\Handlers\RedisHandler' => BASEPATH . 'Cache/Handlers/RedisHandler.php',
'CodeIgniter\Cache\Handlers\WincacheHandler' => BASEPATH . 'Cache/Handlers/WincacheHandler.php',
'CodeIgniter\Controller' => BASEPATH . 'Controller.php',
'CodeIgniter\Config\AutoloadConfig' => BASEPATH . 'Config/Autoload.php',
'CodeIgniter\Config\BaseConfig' => BASEPATH . 'Config/BaseConfig.php',
'CodeIgniter\Config\Database' => BASEPATH . 'Config/Database.php',
'CodeIgniter\Config\Database\Connection' => BASEPATH . 'Config/Database/Connection.php',
'CodeIgniter\Config\Database\Connection\MySQLi' => BASEPATH . 'Config/Database/Connection/MySQLi.php',
'CodeIgniter\Config\DotEnv' => BASEPATH . 'Config/DotEnv.php',
'CodeIgniter\Database\BaseBuilder' => BASEPATH . 'Database/BaseBuilder.php',
'CodeIgniter\Database\BaseConnection' => BASEPATH . 'Database/BaseConnection.php',
'CodeIgniter\Database\BaseResult' => BASEPATH . 'Database/BaseResult.php',
'CodeIgniter\Database\Config' => BASEPATH . 'Database/Config.php',
'CodeIgniter\Database\ConnectionInterface' => BASEPATH . 'Database/ConnectionInterface.php',
'CodeIgniter\Database\Database' => BASEPATH . 'Database/Database.php',
'CodeIgniter\Database\Query' => BASEPATH . 'Database/Query.php',
'CodeIgniter\Database\QueryInterface' => BASEPATH . 'Database/QueryInterface.php',
'CodeIgniter\Database\ResultInterface' => BASEPATH . 'Database/ResultInterface.php',
'CodeIgniter\Database\Migration' => BASEPATH . 'Database/Migration.php',
'CodeIgniter\Database\MigrationRunner' => BASEPATH . 'Database/MigrationRunner.php',
'CodeIgniter\Debug\Exceptions' => BASEPATH . 'Debug/Exceptions.php',
'CodeIgniter\Debug\Timer' => BASEPATH . 'Debug/Timer.php',
'CodeIgniter\Debug\Iterator' => BASEPATH . 'Debug/Iterator.php',
'CodeIgniter\Events\Events' => BASEPATH . 'Events/Events.php',
'CodeIgniter\HTTP\CLIRequest' => BASEPATH . 'HTTP/CLIRequest.php',
'CodeIgniter\HTTP\ContentSecurityPolicy' => BASEPATH . 'HTTP/ContentSecurityPolicy.php',
'CodeIgniter\HTTP\CURLRequest' => BASEPATH . 'HTTP/CURLRequest.php',
'CodeIgniter\HTTP\IncomingRequest' => BASEPATH . 'HTTP/IncomingRequest.php',
'CodeIgniter\HTTP\Message' => BASEPATH . 'HTTP/Message.php',
'CodeIgniter\HTTP\Negotiate' => BASEPATH . 'HTTP/Negotiate.php',
'CodeIgniter\HTTP\Request' => BASEPATH . 'HTTP/Request.php',
'CodeIgniter\HTTP\RequestInterface' => BASEPATH . 'HTTP/RequestInterface.php',
'CodeIgniter\HTTP\Response' => BASEPATH . 'HTTP/Response.php',
'CodeIgniter\HTTP\ResponseInterface' => BASEPATH . 'HTTP/ResponseInterface.php',
'CodeIgniter\HTTP\URI' => BASEPATH . 'HTTP/URI.php',
'CodeIgniter\Log\Logger' => BASEPATH . 'Log/Logger.php',
'Psr\Log\LoggerAwareInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
'Psr\Log\LoggerAwareTrait' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
'Psr\Log\LoggerInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
'Psr\Log\LogLevel' => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
'CodeIgniter\Log\Handlers\BaseHandler' => BASEPATH . 'Log/Handlers/BaseHandler.php',
'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
'CodeIgniter\Log\Handlers\FileHandler' => BASEPATH . 'Log/Handlers/FileHandler.php',
'CodeIgniter\Log\Handlers\HandlerInterface' => BASEPATH . 'Log/Handlers/HandlerInterface.php',
'CodeIgniter\Router\RouteCollection' => BASEPATH . 'Router/RouteCollection.php',
'CodeIgniter\Router\RouteCollectionInterface' => BASEPATH . 'Router/RouteCollectionInterface.php',
'CodeIgniter\Router\Router' => BASEPATH . 'Router/Router.php',
'CodeIgniter\Router\RouterInterface' => BASEPATH . 'Router/RouterInterface.php',
'CodeIgniter\Security\Security' => BASEPATH . 'Security/Security.php',
'CodeIgniter\Session\Session' => BASEPATH . 'Session/Session.php',
'CodeIgniter\Session\SessionInterface' => BASEPATH . 'Session/SessionInterface.php',
'CodeIgniter\Session\Handlers\BaseHandler' => BASEPATH . 'Session/Handlers/BaseHandler.php',
'CodeIgniter\Session\Handlers\FileHandler' => BASEPATH . 'Session/Handlers/FileHandler.php',
'CodeIgniter\Session\Handlers\MemcachedHandler' => BASEPATH . 'Session/Handlers/MemcachedHandler.php',
'CodeIgniter\Session\Handlers\RedisHandler' => BASEPATH . 'Session/Handlers/RedisHandler.php',
'CodeIgniter\View\RendererInterface' => BASEPATH . 'View/RendererInterface.php',
'CodeIgniter\View\View' => BASEPATH . 'View/View.php',
'CodeIgniter\View\Parser' => BASEPATH . 'View/Parser.php',
'CodeIgniter\View\Cell' => BASEPATH . 'View/Cell.php',
'Zend\Escaper\Escaper' => BASEPATH . 'ThirdParty/ZendEscaper/Escaper.php',
];

if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
{
$this->classmap['CodeIgniter\Log\TestLogger'] = SUPPORTPATH . 'Log/TestLogger.php';
$this->classmap['CIDatabaseTestCase'] = SUPPORTPATH . 'CIDatabaseTestCase.php';
}
}

//--------------------------------------------------------------------
Expand Down