Merge pull request #3555 from paulbalandan/bootstrappings

Optimize bootstrap files

Author: michalsn

qa-bootstrap.php

@@ -1,5 +1,9 @@
 <?php
 
+define('CONFIGPATH', __DIR__ . '/app/Config/');
+define('PUBLICPATH', __DIR__ . '/app/public/');
+define('HOMEPATH', __DIR__);
+
 require 'app/Config/Paths.php';
 $paths = new Config\Paths();
 require_once 'system/bootstrap.php';

system/Test/bootstrap.php

@@ -1,6 +1,6 @@
 <?php
-error_reporting(E_ALL);
 
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 ini_set('display_startup_errors', '1');
 
@@ -9,23 +9,19 @@
 define('ENVIRONMENT', 'testing');
 
 // Load framework paths from their config file
-require CONFIGPATH . 'Paths.php'; // @phpstan-ignore-line
+require CONFIGPATH . 'Paths.php';
 $paths = new Config\Paths();
 
 // Define necessary framework path constants
-defined('APPPATH')       || define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
-defined('WRITEPATH')     || define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
-defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
+defined('APPPATH')       || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('WRITEPATH')     || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/')) . DIRECTORY_SEPARATOR);
 defined('ROOTPATH')      || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 defined('CIPATH')        || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR);
-// @phpstan-ignore-next-line
 defined('FCPATH')        || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR);
-// @phpstan-ignore-next-line
 defined('TESTPATH')      || define('TESTPATH', realpath(HOMEPATH . 'tests/') . DIRECTORY_SEPARATOR);
 defined('SUPPORTPATH')   || define('SUPPORTPATH', realpath(TESTPATH . '_support/') . DIRECTORY_SEPARATOR);
-// @phpstan-ignore-next-line
 defined('COMPOSER_PATH') || define('COMPOSER_PATH', realpath(HOMEPATH . 'vendor/autoload.php'));
-// @phpstan-ignore-next-line
 defined('VENDORPATH')    || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR);
 
 // Load Common.php from App then System
@@ -61,11 +57,13 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 }
 
 // Launch the autoloader to gather namespaces (includes composer.json's "autoload-dev")
-$loader = \CodeIgniter\Services::autoloader();
+$loader = CodeIgniter\Services::autoloader();
 $loader->initialize(new Config\Autoload(), new Config\Modules());
-
-// Register the loader with the SPL autoloader stack.
-$loader->register();
+$loader->register(); // Register the loader with the SPL autoloader stack.
 
 require_once APPPATH . 'Config/Routes.php';
-$routes->getRoutes('*'); // @phpstan-ignore-line
+
+/**
+ * @var \CodeIgniter\Router\RouteCollection $routes
+ */
+$routes->getRoutes('*');

system/bootstrap.php

@@ -37,11 +37,6 @@
  * @filesource
  */
 
-namespace CodeIgniter;
-
-use CodeIgniter;
-use Config;
-
 /*
  * ---------------------------------------------------------------
  * SETUP OUR PATH CONSTANTS
@@ -52,48 +47,46 @@
  * so they are available in the config files that are loaded.
  */
 
-/**
- * The path to the application directory.
- */
+// The path to the application directory.
 if (! defined('APPPATH'))
 {
-	// @phpstan-ignore-next-line
-	define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the project root directory. Just above APPPATH.
- */
+// The path to the project root directory. Just above APPPATH.
 if (! defined('ROOTPATH'))
 {
 	define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the system directory.
- */
+// The path to the system directory.
 if (! defined('SYSTEMPATH'))
 {
-	// @phpstan-ignore-next-line
-	define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the writable directory.
- */
+// The path to the writable directory.
 if (! defined('WRITEPATH'))
 {
-	// @phpstan-ignore-next-line
-	define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the tests directory
- */
+// The path to the tests directory
 if (! defined('TESTPATH'))
 {
-	// @phpstan-ignore-next-line
-	define('TESTPATH', realpath($paths->testsDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -125,7 +118,7 @@
  * that the config files can use the path constants.
  */
 
-if (! class_exists(Config\Autoload::class, false))
+if (! class_exists('Config\Autoload', false))
 {
 	require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
 	require_once APPPATH . 'Config/Autoload.php';
@@ -146,12 +139,12 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 
 $loader = CodeIgniter\Services::autoloader();
 $loader->initialize(new Config\Autoload(), new Config\Modules());
-$loader->register();    // Register the loader with the SPL autoloader stack.
+$loader->register(); // Register the loader with the SPL autoloader stack.
 
 // Now load Composer's if it's available
 if (is_file(COMPOSER_PATH))
 {
-	/**
+	/*
 	 * The path to the vendor directory.
 	 *
 	 * We do not want to enforce this, so set the constant if Composer was used.
@@ -185,7 +178,7 @@ class_alias('Config\Services', 'CodeIgniter\Services');
  * the pieces all working together.
  */
 
-$appConfig = config(Config\App::class);
+$appConfig = config('Config\App');
 $app       = new CodeIgniter\CodeIgniter($appConfig);
 $app->initialize();