Skip to content

Commit 0674657

Browse files
lonnieezelllonnieezell
authored
Merge pull request #1416 from samsonasik/remove-psr4-test-in-app
remove $psr4['Tests\Support'] definition in application\Config\Autoload::__construct()
2 parents fed0ae9 + dbdb763 commit 0674657

File tree

2 files changed

+84
-83
lines changed

2 files changed

+84
-83
lines changed

‎application/Config/Autoload.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ public function __construct()
5555
'App' => APPPATH, // To ensure filters, etc still found,
5656
];
5757

58-
if (defined('ENVIRONMENT') && ENVIRONMENT === 'testing')
59-
{
60-
$psr4['Tests\Support'] = TESTPATH . '_support'; // So custom migrations can run during testing
61-
}
62-
6358
/**
6459
* -------------------------------------------------------------------
6560
* Class Map

‎system/Config/AutoloadConfig.php‎

Lines changed: 84 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2828
* THE SOFTWARE.
2929
*
30-
* @package CodeIgniter
31-
* @author CodeIgniter Dev Team
32-
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
33-
* @license https://opensource.org/licenses/MIT MIT License
34-
* @link https://codeigniter.com
35-
* @since Version 3.0.0
30+
* @package CodeIgniter
31+
* @author CodeIgniter Dev Team
32+
* @copyright 2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
33+
* @license https://opensource.org/licenses/MIT MIT License
34+
* @link https://codeigniter.com
35+
* @since Version 3.0.0
3636
* @filesource
3737
*/
3838

@@ -47,12 +47,14 @@ class AutoloadConfig
4747

4848
/**
4949
* Array of namespaces for autoloading.
50+
*
5051
* @var array
5152
*/
5253
public $psr4 = [];
5354

5455
/**
5556
* Map of class names and locations
57+
*
5658
* @var array
5759
*/
5860
public $classmap = [];
@@ -86,12 +88,12 @@ public function __construct()
8688
* `];
8789
*/
8890
$this->psr4 = [
89-
'CodeIgniter' => realpath(BASEPATH)
91+
'CodeIgniter' => realpath(BASEPATH),
9092
];
9193

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

9799
/**
@@ -111,77 +113,81 @@ public function __construct()
111113
* ];
112114
*/
113115
$this->classmap = [
114-
'CodeIgniter\CodeIgniter' => BASEPATH . 'CodeIgniter.php',
115-
'CodeIgniter\CLI\CLI' => BASEPATH . 'CLI/CLI.php',
116-
'CodeIgniter\Cache\CacheFactory' => BASEPATH . 'Cache/CacheFactory.php',
117-
'CodeIgniter\Cache\CacheInterface' => BASEPATH . 'Cache/CacheInterface.php',
118-
'CodeIgniter\Cache\Handlers\DummyHandler' => BASEPATH . 'Cache/Handlers/DummyHandler.php',
119-
'CodeIgniter\Cache\Handlers\FileHandler' => BASEPATH . 'Cache/Handlers/FileHandler.php',
120-
'CodeIgniter\Cache\Handlers\MemcachedHandler' => BASEPATH . 'Cache/Handlers/MemcachedHandler.php',
121-
'CodeIgniter\Cache\Handlers\PredisHandler' => BASEPATH . 'Cache/Handlers/PredisHandler.php',
122-
'CodeIgniter\Cache\Handlers\RedisHandler' => BASEPATH . 'Cache/Handlers/RedisHandler.php',
123-
'CodeIgniter\Cache\Handlers\WincacheHandler' => BASEPATH . 'Cache/Handlers/WincacheHandler.php',
124-
'CodeIgniter\Controller' => BASEPATH . 'Controller.php',
125-
'CodeIgniter\Config\AutoloadConfig' => BASEPATH . 'Config/Autoload.php',
126-
'CodeIgniter\Config\BaseConfig' => BASEPATH . 'Config/BaseConfig.php',
127-
'CodeIgniter\Config\Database' => BASEPATH . 'Config/Database.php',
128-
'CodeIgniter\Config\Database\Connection' => BASEPATH . 'Config/Database/Connection.php',
129-
'CodeIgniter\Config\Database\Connection\MySQLi' => BASEPATH . 'Config/Database/Connection/MySQLi.php',
130-
'CodeIgniter\Config\DotEnv' => BASEPATH . 'Config/DotEnv.php',
131-
'CodeIgniter\Database\BaseBuilder' => BASEPATH . 'Database/BaseBuilder.php',
132-
'CodeIgniter\Database\BaseConnection' => BASEPATH . 'Database/BaseConnection.php',
133-
'CodeIgniter\Database\BaseResult' => BASEPATH . 'Database/BaseResult.php',
134-
'CodeIgniter\Database\Config' => BASEPATH . 'Database/Config.php',
135-
'CodeIgniter\Database\ConnectionInterface' => BASEPATH . 'Database/ConnectionInterface.php',
136-
'CodeIgniter\Database\Database' => BASEPATH . 'Database/Database.php',
137-
'CodeIgniter\Database\Query' => BASEPATH . 'Database/Query.php',
138-
'CodeIgniter\Database\QueryInterface' => BASEPATH . 'Database/QueryInterface.php',
139-
'CodeIgniter\Database\ResultInterface' => BASEPATH . 'Database/ResultInterface.php',
140-
'CodeIgniter\Database\Migration' => BASEPATH . 'Database/Migration.php',
141-
'CodeIgniter\Database\MigrationRunner' => BASEPATH . 'Database/MigrationRunner.php',
142-
'CodeIgniter\Debug\Exceptions' => BASEPATH . 'Debug/Exceptions.php',
143-
'CodeIgniter\Debug\Timer' => BASEPATH . 'Debug/Timer.php',
144-
'CodeIgniter\Debug\Iterator' => BASEPATH . 'Debug/Iterator.php',
145-
'CodeIgniter\Events\Events' => BASEPATH . 'Events/Events.php',
146-
'CodeIgniter\HTTP\CLIRequest' => BASEPATH . 'HTTP/CLIRequest.php',
147-
'CodeIgniter\HTTP\ContentSecurityPolicy' => BASEPATH . 'HTTP/ContentSecurityPolicy.php',
148-
'CodeIgniter\HTTP\CURLRequest' => BASEPATH . 'HTTP/CURLRequest.php',
149-
'CodeIgniter\HTTP\IncomingRequest' => BASEPATH . 'HTTP/IncomingRequest.php',
150-
'CodeIgniter\HTTP\Message' => BASEPATH . 'HTTP/Message.php',
151-
'CodeIgniter\HTTP\Negotiate' => BASEPATH . 'HTTP/Negotiate.php',
152-
'CodeIgniter\HTTP\Request' => BASEPATH . 'HTTP/Request.php',
153-
'CodeIgniter\HTTP\RequestInterface' => BASEPATH . 'HTTP/RequestInterface.php',
154-
'CodeIgniter\HTTP\Response' => BASEPATH . 'HTTP/Response.php',
155-
'CodeIgniter\HTTP\ResponseInterface' => BASEPATH . 'HTTP/ResponseInterface.php',
156-
'CodeIgniter\HTTP\URI' => BASEPATH . 'HTTP/URI.php',
157-
'CodeIgniter\Log\Logger' => BASEPATH . 'Log/Logger.php',
158-
'Psr\Log\LoggerAwareInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
159-
'Psr\Log\LoggerAwareTrait' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
160-
'Psr\Log\LoggerInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
161-
'Psr\Log\LogLevel' => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
162-
'CodeIgniter\Log\Handlers\BaseHandler' => BASEPATH . 'Log/Handlers/BaseHandler.php',
163-
'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
164-
'CodeIgniter\Log\Handlers\FileHandler' => BASEPATH . 'Log/Handlers/FileHandler.php',
165-
'CodeIgniter\Log\Handlers\HandlerInterface' => BASEPATH . 'Log/Handlers/HandlerInterface.php',
166-
'CodeIgniter\Router\RouteCollection' => BASEPATH . 'Router/RouteCollection.php',
167-
'CodeIgniter\Router\RouteCollectionInterface' => BASEPATH . 'Router/RouteCollectionInterface.php',
168-
'CodeIgniter\Router\Router' => BASEPATH . 'Router/Router.php',
169-
'CodeIgniter\Router\RouterInterface' => BASEPATH . 'Router/RouterInterface.php',
170-
'CodeIgniter\Security\Security' => BASEPATH . 'Security/Security.php',
171-
'CodeIgniter\Session\Session' => BASEPATH . 'Session/Session.php',
172-
'CodeIgniter\Session\SessionInterface' => BASEPATH . 'Session/SessionInterface.php',
173-
'CodeIgniter\Session\Handlers\BaseHandler' => BASEPATH . 'Session/Handlers/BaseHandler.php',
174-
'CodeIgniter\Session\Handlers\FileHandler' => BASEPATH . 'Session/Handlers/FileHandler.php',
175-
'CodeIgniter\Session\Handlers\MemcachedHandler' => BASEPATH . 'Session/Handlers/MemcachedHandler.php',
176-
'CodeIgniter\Session\Handlers\RedisHandler' => BASEPATH . 'Session/Handlers/RedisHandler.php',
177-
'CodeIgniter\View\RendererInterface' => BASEPATH . 'View/RendererInterface.php',
178-
'CodeIgniter\View\View' => BASEPATH . 'View/View.php',
179-
'CodeIgniter\View\Parser' => BASEPATH . 'View/Parser.php',
180-
'CodeIgniter\View\Cell' => BASEPATH . 'View/Cell.php',
181-
'Zend\Escaper\Escaper' => BASEPATH . 'ThirdParty/ZendEscaper/Escaper.php',
182-
'CodeIgniter\Log\TestLogger' => BASEPATH . '../tests/_support/Log/TestLogger.php',
183-
'CIDatabaseTestCase' => BASEPATH . '../tests/_support/CIDatabaseTestCase.php'
116+
'CodeIgniter\CodeIgniter' => BASEPATH . 'CodeIgniter.php',
117+
'CodeIgniter\CLI\CLI' => BASEPATH . 'CLI/CLI.php',
118+
'CodeIgniter\Cache\CacheFactory' => BASEPATH . 'Cache/CacheFactory.php',
119+
'CodeIgniter\Cache\CacheInterface' => BASEPATH . 'Cache/CacheInterface.php',
120+
'CodeIgniter\Cache\Handlers\DummyHandler' => BASEPATH . 'Cache/Handlers/DummyHandler.php',
121+
'CodeIgniter\Cache\Handlers\FileHandler' => BASEPATH . 'Cache/Handlers/FileHandler.php',
122+
'CodeIgniter\Cache\Handlers\MemcachedHandler' => BASEPATH . 'Cache/Handlers/MemcachedHandler.php',
123+
'CodeIgniter\Cache\Handlers\PredisHandler' => BASEPATH . 'Cache/Handlers/PredisHandler.php',
124+
'CodeIgniter\Cache\Handlers\RedisHandler' => BASEPATH . 'Cache/Handlers/RedisHandler.php',
125+
'CodeIgniter\Cache\Handlers\WincacheHandler' => BASEPATH . 'Cache/Handlers/WincacheHandler.php',
126+
'CodeIgniter\Controller' => BASEPATH . 'Controller.php',
127+
'CodeIgniter\Config\AutoloadConfig' => BASEPATH . 'Config/Autoload.php',
128+
'CodeIgniter\Config\BaseConfig' => BASEPATH . 'Config/BaseConfig.php',
129+
'CodeIgniter\Config\Database' => BASEPATH . 'Config/Database.php',
130+
'CodeIgniter\Config\Database\Connection' => BASEPATH . 'Config/Database/Connection.php',
131+
'CodeIgniter\Config\Database\Connection\MySQLi' => BASEPATH . 'Config/Database/Connection/MySQLi.php',
132+
'CodeIgniter\Config\DotEnv' => BASEPATH . 'Config/DotEnv.php',
133+
'CodeIgniter\Database\BaseBuilder' => BASEPATH . 'Database/BaseBuilder.php',
134+
'CodeIgniter\Database\BaseConnection' => BASEPATH . 'Database/BaseConnection.php',
135+
'CodeIgniter\Database\BaseResult' => BASEPATH . 'Database/BaseResult.php',
136+
'CodeIgniter\Database\Config' => BASEPATH . 'Database/Config.php',
137+
'CodeIgniter\Database\ConnectionInterface' => BASEPATH . 'Database/ConnectionInterface.php',
138+
'CodeIgniter\Database\Database' => BASEPATH . 'Database/Database.php',
139+
'CodeIgniter\Database\Query' => BASEPATH . 'Database/Query.php',
140+
'CodeIgniter\Database\QueryInterface' => BASEPATH . 'Database/QueryInterface.php',
141+
'CodeIgniter\Database\ResultInterface' => BASEPATH . 'Database/ResultInterface.php',
142+
'CodeIgniter\Database\Migration' => BASEPATH . 'Database/Migration.php',
143+
'CodeIgniter\Database\MigrationRunner' => BASEPATH . 'Database/MigrationRunner.php',
144+
'CodeIgniter\Debug\Exceptions' => BASEPATH . 'Debug/Exceptions.php',
145+
'CodeIgniter\Debug\Timer' => BASEPATH . 'Debug/Timer.php',
146+
'CodeIgniter\Debug\Iterator' => BASEPATH . 'Debug/Iterator.php',
147+
'CodeIgniter\Events\Events' => BASEPATH . 'Events/Events.php',
148+
'CodeIgniter\HTTP\CLIRequest' => BASEPATH . 'HTTP/CLIRequest.php',
149+
'CodeIgniter\HTTP\ContentSecurityPolicy' => BASEPATH . 'HTTP/ContentSecurityPolicy.php',
150+
'CodeIgniter\HTTP\CURLRequest' => BASEPATH . 'HTTP/CURLRequest.php',
151+
'CodeIgniter\HTTP\IncomingRequest' => BASEPATH . 'HTTP/IncomingRequest.php',
152+
'CodeIgniter\HTTP\Message' => BASEPATH . 'HTTP/Message.php',
153+
'CodeIgniter\HTTP\Negotiate' => BASEPATH . 'HTTP/Negotiate.php',
154+
'CodeIgniter\HTTP\Request' => BASEPATH . 'HTTP/Request.php',
155+
'CodeIgniter\HTTP\RequestInterface' => BASEPATH . 'HTTP/RequestInterface.php',
156+
'CodeIgniter\HTTP\Response' => BASEPATH . 'HTTP/Response.php',
157+
'CodeIgniter\HTTP\ResponseInterface' => BASEPATH . 'HTTP/ResponseInterface.php',
158+
'CodeIgniter\HTTP\URI' => BASEPATH . 'HTTP/URI.php',
159+
'CodeIgniter\Log\Logger' => BASEPATH . 'Log/Logger.php',
160+
'Psr\Log\LoggerAwareInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
161+
'Psr\Log\LoggerAwareTrait' => BASEPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
162+
'Psr\Log\LoggerInterface' => BASEPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
163+
'Psr\Log\LogLevel' => BASEPATH . 'ThirdParty/PSR/Log/LogLevel.php',
164+
'CodeIgniter\Log\Handlers\BaseHandler' => BASEPATH . 'Log/Handlers/BaseHandler.php',
165+
'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => BASEPATH . 'Log/Handlers/ChromeLoggerHandler.php',
166+
'CodeIgniter\Log\Handlers\FileHandler' => BASEPATH . 'Log/Handlers/FileHandler.php',
167+
'CodeIgniter\Log\Handlers\HandlerInterface' => BASEPATH . 'Log/Handlers/HandlerInterface.php',
168+
'CodeIgniter\Router\RouteCollection' => BASEPATH . 'Router/RouteCollection.php',
169+
'CodeIgniter\Router\RouteCollectionInterface' => BASEPATH . 'Router/RouteCollectionInterface.php',
170+
'CodeIgniter\Router\Router' => BASEPATH . 'Router/Router.php',
171+
'CodeIgniter\Router\RouterInterface' => BASEPATH . 'Router/RouterInterface.php',
172+
'CodeIgniter\Security\Security' => BASEPATH . 'Security/Security.php',
173+
'CodeIgniter\Session\Session' => BASEPATH . 'Session/Session.php',
174+
'CodeIgniter\Session\SessionInterface' => BASEPATH . 'Session/SessionInterface.php',
175+
'CodeIgniter\Session\Handlers\BaseHandler' => BASEPATH . 'Session/Handlers/BaseHandler.php',
176+
'CodeIgniter\Session\Handlers\FileHandler' => BASEPATH . 'Session/Handlers/FileHandler.php',
177+
'CodeIgniter\Session\Handlers\MemcachedHandler' => BASEPATH . 'Session/Handlers/MemcachedHandler.php',
178+
'CodeIgniter\Session\Handlers\RedisHandler' => BASEPATH . 'Session/Handlers/RedisHandler.php',
179+
'CodeIgniter\View\RendererInterface' => BASEPATH . 'View/RendererInterface.php',
180+
'CodeIgniter\View\View' => BASEPATH . 'View/View.php',
181+
'CodeIgniter\View\Parser' => BASEPATH . 'View/Parser.php',
182+
'CodeIgniter\View\Cell' => BASEPATH . 'View/Cell.php',
183+
'Zend\Escaper\Escaper' => BASEPATH . 'ThirdParty/ZendEscaper/Escaper.php',
184184
];
185+
186+
if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
187+
{
188+
$this->classmap['CodeIgniter\Log\TestLogger'] = SUPPORTPATH . 'Log/TestLogger.php';
189+
$this->classmap['CIDatabaseTestCase'] = SUPPORTPATH . 'CIDatabaseTestCase.php';
190+
}
185191
}
186192

187193
//--------------------------------------------------------------------

0 commit comments

Comments
 (0)