+ + + + Sorry! Cannot seem to find the page you were looking for. + +
++ getMessage() ?> + getMessage())) ?>" + rel="noreferrer" target="_blank">search → +
+at line
+ + ++ + + + + {PHP internal code} + + + + + — + + + ( arguments ) +
name : "#$key", ENT_SUBSTITUTE, 'UTF-8') ?> |
+ + |
| Key | +Value | +
|---|---|
| + | + + + + ' . print_r($value, true) ?> + + | +
| Key | +Value | +
|---|---|
| + | + + + + ' . print_r($value, true) ?> + + | +
| Path | +uri ?> | +
| HTTP Method | +getMethod(true) ?> | +
| IP Address | +getIPAddress() ?> | +
| Is AJAX Request? | +isAJAX() ? 'yes' : 'no' ?> | +
| Is CLI Request? | +isCLI() ? 'yes' : 'no' ?> | +
| Is Secure Request? | +isSecure() ? 'yes' : 'no' ?> | +
| User Agent | +getUserAgent()->getAgentString() ?> | +
| Key | +Value | +
|---|---|
| + | + + + + ' . print_r($value, true) ?> + + | +
| Header | +Value | +
|---|---|
| getName(), 'html') ?> | +getValueLine(), 'html') ?> | +
| Response Status | +getStatusCode() . ' - ' . $response->getReason() ?> | +
| Header | +Value | +
|---|---|
| + | getHeaderLine($name), 'html') ?> | +
| Memory Usage | ++ |
| Peak Memory Usage: | ++ |
| Memory Limit: | ++ |
We seem to have hit a snag. Please try again later...
+ +version
+ +The page you are looking at is being generated dynamically by CodeIgniter.
+ +If you would like to edit this page you'll find it located at:
+ +
+
+ application/Views/welcome_message.php
+
+
+
+ The corresponding controller for this page is found at:
+ +
+
+ application/Controllers/Home.php
+
+
+
+ If you are exploring CodeIgniter for the very first time, you + should start by reading the + User Guide.
+ +Directory access is forbidden.
+ + + diff --git a/composer.json b/composer.json index d51327b..672c5f1 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "ext-curl": "*", "ext-intl": "*", "kint-php/kint": "^2.1", + "psr/log": "^1.1", "zendframework/zend-escaper": "^2.5" }, "require-dev": { @@ -19,15 +20,13 @@ }, "autoload": { "psr-4": { - "CodeIgniter\\": "system/", - "Psr\\Log\\": "system/ThirdParty/PSR/Log/" + "CodeIgniter\\": "system/" } }, "scripts": { "post-update-cmd": [ "composer dump-autoload", - "CodeIgniter\\ComposerScripts::postUpdate", - "bash admin/setup.sh" + "CodeIgniter\\ComposerScripts::postUpdate" ] }, "support": { diff --git a/public/index.php b/public/index.php index 86d06ed..cd38b91 100644 --- a/public/index.php +++ b/public/index.php @@ -13,7 +13,7 @@ // Location of the Paths config file. // This is the line that might need to be changed, depending on your folder structure. -$pathsPath = FCPATH . '../application/Config/Paths.php'; +$pathsPath = FCPATH . '../app/Config/Paths.php'; /* *--------------------------------------------------------------- @@ -32,7 +32,7 @@ $paths = new Config\Paths(); // Location of the framework bootstrap file. -$app = require FCPATH . '../' . rtrim($paths->systemDirectory, '/ ') . '/bootstrap.php'; +$app = require rtrim($paths->systemDirectory, '/ ') . '/bootstrap.php'; /* *--------------------------------------------------------------- diff --git a/spark b/spark index 7ce369b..8437468 100755 --- a/spark +++ b/spark @@ -29,20 +29,16 @@ die("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n"); } -// Location to the Paths config file. -$pathsPath = 'application/Config/Paths.php'; +// Path to the front controller +define('FCPATH', __DIR__ . '/public' . DIRECTORY_SEPARATOR); // Load our paths config file -require $pathsPath; +require 'app/Config/Paths.php'; + $paths = new Config\Paths(); -$public = trim($paths->publicDirectory, '/'); - -// Path to the front controller -define('FCPATH', realpath($public) . DIRECTORY_SEPARATOR); - // Ensure the current directory is pointing to the front controller's directory -chdir($public); +chdir(FCPATH); $app = require rtrim($paths->systemDirectory, '/ ') . '/bootstrap.php'; diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 4735119..3baf97f 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -76,7 +76,6 @@ */ class Autoloader { - /** * Stores namespaces as key, and path as values. * @@ -98,6 +97,8 @@ * the valid parts that we'll need. * * @param \Config\Autoload $config + * + * @return $this */ public function initialize(\Config\Autoload $config) { @@ -110,7 +111,7 @@ if (isset($config->psr4)) { - $this->prefixes = $config->psr4; + $this->addNamespace($config->psr4); } if (isset($config->classmap)) @@ -119,14 +120,14 @@ } unset($config); + + return $this; } //-------------------------------------------------------------------- /** * Register the loader with the SPL autoloader stack. - * - * @codeCoverageIgnore */ public function register() { @@ -144,41 +145,51 @@ $config = is_array($this->classmap) ? $this->classmap : []; spl_autoload_register(function ($class) use ($config) { - if (! array_key_exists($class, $config)) + if (empty($config[$class])) { return false; } include_once $config[$class]; }, true, // Throw exception - true // Prepend + true // Prepend ); } //-------------------------------------------------------------------- /** - * Registers a namespace with the autoloader. + * Registers namespaces with the autoloader. * - * @param string $namespace - * @param string $path + * @param array|string $namespace + * @param string $path * * @return Autoloader */ - public function addNamespace(string $namespace, string $path) + public function addNamespace($namespace, string $path = null) { - if (isset($this->prefixes[$namespace])) + if (is_array($namespace)) { - if (is_string($this->prefixes[$namespace])) + foreach ($namespace as $prefix => $path) { - $this->prefixes[$namespace] = [$this->prefixes[$namespace]]; - } + $prefix = trim($prefix, '\\'); - $this->prefixes[$namespace] = array_merge($this->prefixes[$namespace], [$path]); + if (is_array($path)) + { + foreach ($path as $dir) + { + $this->prefixes[$prefix][] = rtrim($dir, '/') . '/'; + } + + continue; + } + + $this->prefixes[$prefix][] = rtrim($path, '/') . '/'; + } } else { - $this->prefixes[$namespace] = [$path]; + $this->prefixes[trim($namespace, '\\')][] = rtrim($path, '/') . '/'; } return $this; @@ -187,6 +198,27 @@ //-------------------------------------------------------------------- /** + * Get namespaces with prefixes as keys and paths as values. + * + * If a prefix param is set, returns only paths to the given prefix. + * + * @var string|null $prefix + * + * @return array + */ + public function getNamespace(string $prefix = null) + { + if ($prefix === null) + { + return $this->prefixes; + } + + return $this->prefixes[trim($prefix, '\\')] ?? []; + } + + //-------------------------------------------------------------------- + + /** * Removes a single namespace from the psr4 settings. * * @param string $namespace @@ -195,7 +227,7 @@ */ public function removeNamespace(string $namespace) { - unset($this->prefixes[$namespace]); + unset($this->prefixes[trim($namespace, '\\')]); return $this; } @@ -207,7 +239,7 @@ * * @param string $class The fully qualified class name. * - * @return mixed The mapped file on success, or boolean false + * @return string|false The mapped file on success, or boolean false * on failure. */ public function loadClass(string $class) @@ -234,7 +266,7 @@ * * @param string $class The fully-qualified class name * - * @return mixed The mapped file name on success, or boolean false on fail + * @return string|false The mapped file name on success, or boolean false on fail */ protected function loadInNamespace(string $class) { @@ -245,18 +277,14 @@ foreach ($this->prefixes as $namespace => $directories) { - if (is_string($directories)) - { - $directories = [$directories]; - } - foreach ($directories as $directory) { $directory = rtrim($directory, '/'); if (strpos($class, $namespace) === 0) { - $filePath = $directory . str_replace('\\', '/', substr($class, strlen($namespace))) . '.php'; + $filePath = $directory . str_replace('\\', '/', + substr($class, strlen($namespace))) . '.php'; $filename = $this->requireFile($filePath); if ($filename) @@ -316,11 +344,9 @@ * A central way to require a file is loaded. Split out primarily * for testing purposes. * - * @codeCoverageIgnore - * * @param string $file * - * @return boolean + * @return string|false The filename on success, false if the file is not loaded */ protected function requireFile(string $file) { @@ -365,6 +391,5 @@ return $filename; } - //-------------------------------------------------------------------- } diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php index fb2893f..9cc714a 100644 --- a/system/Autoloader/FileLocator.php +++ b/system/Autoloader/FileLocator.php @@ -36,10 +36,8 @@ * @filesource */ -use Config\Autoload; - /** - * Class Loader + * Class FileLocator * * Allows loading non-class files in a namespaced manner. * Works with Helpers, Views, etc. @@ -48,29 +46,21 @@ */ class FileLocator { - /** - * Stores our namespaces - * - * @var array + * @var \CodeIgniter\Autoloader\Autoloader */ - protected $namespaces; + protected $autoloader; //-------------------------------------------------------------------- /** * Constructor * - * @param Autoload $autoload + * @param Autoloader $autoloader */ - public function __construct(Autoload $autoload) + public function __construct(Autoloader $autoloader) { - $this->namespaces = $autoload->psr4; - - unset($autoload); - - // Always keep the Application directory as a "package". - array_unshift($this->namespaces, APPPATH); + $this->autoloader = $autoloader; } //-------------------------------------------------------------------- @@ -83,27 +73,26 @@ * @param string $folder The folder within the namespace that we should look for the file. * @param string $ext The file extension the file should have. * - * @return string The path to the file if found, or an empty string. + * @return string|false The path to the file, or false if not found. */ - public function locateFile(string $file, string $folder = null, string $ext = 'php'): string + public function locateFile(string $file, string $folder = null, string $ext = 'php') { - // Ensure the extension is on the filename - $file = strpos($file, '.' . $ext) !== false ? $file : $file . '.' . $ext; + $file = $this->ensureExt($file, $ext); - // Clean the folder name from the filename - if (! empty($folder)) + // Clears the folder name if it is at the beginning of the filename + if (! empty($folder) && ($pos = strpos($file, $folder)) === 0) { - $file = str_replace($folder . '/', '', $file); + $file = substr($file, strlen($folder . '/')); } - // No namespaceing? Try the application folder. + // Is not namespaced? Try the application folder. if (strpos($file, '\\') === false) { return $this->legacyLocate($file, $folder); } // Standardize slashes to handle nested directories. - $file = str_replace('/', '\\', $file); + $file = strtr($file, '/', '\\'); $segments = explode('\\', $file); @@ -117,16 +106,20 @@ $prefix = ''; $filename = ''; + // Namespaces always comes with arrays of paths + $namespaces = $this->autoloader->getNamespace(); + while (! empty($segments)) { - $prefix .= empty($prefix) ? ucfirst(array_shift($segments)) : '\\' . ucfirst(array_shift($segments)); + $prefix .= empty($prefix) + ? ucfirst(array_shift($segments)) + : '\\' . ucfirst(array_shift($segments)); - if (! array_key_exists($prefix, $this->namespaces)) + if (empty($namespaces[$prefix])) { continue; } - - $path = $this->namespaces[$prefix] . '/'; + $path = $this->getNamespaces($prefix); $filename = implode('/', $segments); break; } @@ -134,19 +127,14 @@ // IF we have a folder name, then the calling function // expects this file to be within that folder, like 'Views', // or 'libraries'. - if (! empty($folder) && strpos($filename, $folder) === false) + if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false) { $filename = $folder . '/' . $filename; } $path .= $filename; - if (! $this->requireFile($path)) - { - $path = ''; - } - - return $path; + return is_file($path) ? $path : false; } //-------------------------------------------------------------------- @@ -224,18 +212,15 @@ */ public function search(string $path, string $ext = 'php'): array { + $path = $this->ensureExt($path, $ext); + $foundPaths = []; - // Ensure the extension is on the filename - $path = strpos($path, '.' . $ext) !== false ? $path : $path . '.' . $ext; - - foreach ($this->namespaces as $name => $folder) + foreach ($this->getNamespaces() as $namespace) { - $folder = rtrim($folder, '/') . '/'; - - if (is_file($folder . $path) === true) + if (is_file($namespace['path'] . $path)) { - $foundPaths[] = $folder . $path; + $foundPaths[] = $namespace['path'] . $path; } } @@ -248,13 +233,69 @@ //-------------------------------------------------------------------- /** - * Attempts to load a file and instantiate a new class by looking - * at its full path and comparing that to our existing psr4 namespaces - * in Autoloader config file. + * Ensures a extension is at the end of a filename + * + * @param string $path + * @param string $ext + * + * @return string + */ + protected function ensureExt(string $path, string $ext): string + { + if ($ext) + { + $ext = '.' . $ext; + + if (substr($path, -strlen($ext)) !== $ext) + { + $path .= $ext; + } + } + + return $path; + } + + //-------------------------------------------------------------------- + + /** + * @param string|null $prefix + * + * @return array|string + */ + protected function getNamespaces(string $prefix = null) + { + if ($prefix) + { + $path = $this->autoloader->getNamespace($prefix); + + return isset($path[0]) ? $path[0] : ''; + } + + $namespaces = []; + + foreach ($this->autoloader->getNamespace() as $prefix => $paths) + { + foreach ($paths as $path) + { + $namespaces[] = [ + 'prefix' => $prefix, + 'path' => $path, + ]; + } + } + + return $namespaces; + } + + //-------------------------------------------------------------------- + + /** + * Find the qualified name of a file according to + * the namespace of the first matched namespace path. * * @param string $path * - * @return string|void + * @return string|false The qualified name or false if the path is not found */ public function findQualifiedNameFromPath(string $path) { @@ -262,34 +303,39 @@ if (! $path) { - return; + return false; } - foreach ($this->namespaces as $namespace => $nsPath) + foreach ($this->getNamespaces() as $namespace) { - $nsPath = realpath($nsPath); - if (is_numeric($namespace) || empty($nsPath)) + $namespace['path'] = realpath($namespace['path']); + + if (empty($namespace['path'])) { continue; } - if (mb_strpos($path, $nsPath) === 0) + if (mb_strpos($path, $namespace['path']) === 0) { - $className = '\\' . $namespace . '\\' . - ltrim(str_replace('/', '\\', mb_substr($path, mb_strlen($nsPath))), '\\'); + $className = '\\' . $namespace['prefix'] . '\\' . + ltrim(str_replace('/', '\\', mb_substr( + $path, mb_strlen($namespace['path'])) + ), '\\'); // Remove the file extension (.php) $className = mb_substr($className, 0, -4); return $className; } } + + return false; } //-------------------------------------------------------------------- /** * Scans the defined namespaces, returning a list of all files - * that are contained within the subpath specifed by $path. + * that are contained within the subpath specified by $path. * * @param string $path * @@ -305,9 +351,9 @@ $files = []; helper('filesystem'); - foreach ($this->namespaces as $namespace => $nsPath) + foreach ($this->getNamespaces() as $namespace) { - $fullPath = realpath(rtrim($nsPath, '/') . '/' . $path); + $fullPath = realpath($namespace['path'] . $path); if (! is_dir($fullPath)) { @@ -325,6 +371,8 @@ return $files; } + //-------------------------------------------------------------------- + /** * Checks the application folder to see if the file can be found. * Only for use with filenames that DO NOT include namespacing. @@ -332,44 +380,25 @@ * @param string $file * @param string|null $folder * - * @return string - * @internal param string $ext + * @return string|false The path to the file, or false if not found. */ - protected function legacyLocate(string $file, string $folder = null): string + protected function legacyLocate(string $file, string $folder = null) { $paths = [ APPPATH, - BASEPATH, + SYSTEMPATH, ]; foreach ($paths as $path) { $path .= empty($folder) ? $file : $folder . '/' . $file; - if ($this->requireFile($path) === true) + if (is_file($path)) { return $path; } } - return ''; + return false; } - - //-------------------------------------------------------------------- - - /** - * Checks to see if a file exists on the file system. This is split - * out to it's own method to make testing simpler. - * - * @codeCoverageIgnore - * @param string $path - * - * @return boolean - */ - protected function requireFile(string $path): bool - { - return is_file($path); - } - - //-------------------------------------------------------------------- } diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php index 7585aa9..bca0980 100644 --- a/system/CLI/CommandRunner.php +++ b/system/CLI/CommandRunner.php @@ -37,6 +37,7 @@ * @filesource */ +use CodeIgniter\Config\Services; use CodeIgniter\Controller; class CommandRunner extends Controller @@ -109,7 +110,7 @@ { if (! isset($this->commands[$command])) { - CLI::error('Command \'' . $command . '\' not found'); + CLI::error(lang('CLI.commandNotFound', [$command])); CLI::newLine(); return; } @@ -127,12 +128,10 @@ /** * Scans all Commands directories and prepares a list * of each command with it's group and file. - * - * @return null|void */ protected function createCommandList() { - $files = service('locator')->listFiles('Commands/'); + $files = Services::locator()->listFiles('Commands/'); // If no matching command files were found, bail if (empty($files)) @@ -144,7 +143,7 @@ // alias exists in the class. If so, return it. Otherwise, try the next. foreach ($files as $file) { - $className = service('locator')->findQualifiedNameFromPath($file); + $className = Services::locator()->findQualifiedNameFromPath($file); if (empty($className) || ! class_exists($className)) { continue; diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index ad0fe18..81d4acb 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -61,7 +61,7 @@ /** * The current version of CodeIgniter Framework */ - const CI_VERSION = '4.0.0-alpha.3'; + const CI_VERSION = '4.0.0-alpha.4'; /** * App startup time. @@ -182,7 +182,7 @@ if (CI_DEBUG) { - require_once BASEPATH . 'ThirdParty/Kint/kint.php'; + require_once SYSTEMPATH . 'ThirdParty/Kint/kint.php'; } } @@ -303,7 +303,7 @@ $possibleRedirect = $filters->run($uri, 'before'); if ($possibleRedirect instanceof RedirectResponse) { - return $possibleRedirect; + return $possibleRedirect->send(); } // If a Response instance is returned, the Response will be sent back to the client and script execution will stop if ($possibleRedirect instanceof ResponseInterface) diff --git a/system/Common.php b/system/Common.php index 1814c88..7cda2ee 100644 --- a/system/Common.php +++ b/system/Common.php @@ -69,7 +69,7 @@ */ function cache(string $key = null) { - $cache = \Config\Services::cache(); + $cache = Services::cache(); // No params - return cache object if (is_null($key)) @@ -199,7 +199,7 @@ case 'empty': return ''; case 'null': - return; + return null; } return $value; @@ -298,7 +298,7 @@ */ function session($val = null) { - $session = \Config\Services::session(); + $session = Services::session(); // Returning a single item? if (is_string($val)) @@ -325,7 +325,7 @@ */ function timer(string $name = null) { - $timer = \Config\Services::timer(); + $timer = Services::timer(); if (empty($name)) { @@ -488,9 +488,7 @@ */ function route_to(string $method, ...$params): string { - $routes = Services::routes(); - - return $routes->reverseRoute($method, ...$params); + return Services::routes()->reverseRoute($method, ...$params); } } @@ -581,9 +579,11 @@ { if (strpos($path, APPPATH) === 0) { + // @codeCoverageIgnoreStart $appHelper = $path; + // @codeCoverageIgnoreEnd } - elseif (strpos($path, BASEPATH) === 0) + elseif (strpos($path, SYSTEMPATH) === 0) { $systemHelper = $path; } @@ -597,7 +597,9 @@ // App-level helpers should override all others if (! empty($appHelper)) { + // @codeCoverageIgnoreStart $includes[] = $appHelper; + // @codeCoverageIgnoreEnd } // All namespaced files get added in next @@ -688,9 +690,9 @@ * * @return string */ - function csrf_field() + function csrf_field(string $id = null) { - return ''; + return ''; } } @@ -713,7 +715,7 @@ * * Not testable, as it will exit! * - * @throws \CodeIgniter\HTTP\RedirectException + * @throws \CodeIgniter\HTTP\Exceptions\HTTPException * @codeCoverageIgnore */ function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null) diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php index 87bbc2e..7cd91e3 100644 --- a/system/ComposerScripts.php +++ b/system/ComposerScripts.php @@ -49,7 +49,7 @@ */ class ComposerScripts { - protected static $basePath = 'system/ThirdParty/'; + protected static $basePath = 'ThirdParty/'; /** * After composer install/update, this is called to move @@ -144,7 +144,7 @@ { if (class_exists('\\Zend\\Escaper\\Escaper') && is_file(static::getClassFilePath('\\Zend\\Escaper\\Escaper'))) { - $base = static::$basePath . 'ZendEscaper'; + $base = basename(__DIR__) . '/' . static::$basePath . 'ZendEscaper'; foreach ([$base, $base . '/Exception'] as $path) { @@ -183,7 +183,7 @@ if (is_file($filename)) { - $base = static::$basePath . 'Kint'; + $base = basename(__DIR__) . '/' . static::$basePath . 'Kint'; // Remove the contents of the previous Kint folder, if any. if (is_dir($base)) diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php index 1ec59d0..61ef260 100644 --- a/system/Config/AutoloadConfig.php +++ b/system/Config/AutoloadConfig.php @@ -88,7 +88,7 @@ * `]; */ $this->psr4 = [ - 'CodeIgniter' => realpath(BASEPATH), + 'CodeIgniter' => realpath(SYSTEMPATH), ]; if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing') @@ -113,74 +113,78 @@ * ]; */ $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\CodeIgniter' => SYSTEMPATH . 'CodeIgniter.php', + 'CodeIgniter\CLI\CLI' => SYSTEMPATH . 'CLI/CLI.php', + 'CodeIgniter\Cache\CacheFactory' => SYSTEMPATH . 'Cache/CacheFactory.php', + 'CodeIgniter\Cache\CacheInterface' => SYSTEMPATH . 'Cache/CacheInterface.php', + 'CodeIgniter\Cache\Handlers\DummyHandler' => SYSTEMPATH . 'Cache/Handlers/DummyHandler.php', + 'CodeIgniter\Cache\Handlers\FileHandler' => SYSTEMPATH . 'Cache/Handlers/FileHandler.php', + 'CodeIgniter\Cache\Handlers\MemcachedHandler' => SYSTEMPATH . 'Cache/Handlers/MemcachedHandler.php', + 'CodeIgniter\Cache\Handlers\PredisHandler' => SYSTEMPATH . 'Cache/Handlers/PredisHandler.php', + 'CodeIgniter\Cache\Handlers\RedisHandler' => SYSTEMPATH . 'Cache/Handlers/RedisHandler.php', + 'CodeIgniter\Cache\Handlers\WincacheHandler' => SYSTEMPATH . 'Cache/Handlers/WincacheHandler.php', + 'CodeIgniter\Controller' => SYSTEMPATH . 'Controller.php', + 'CodeIgniter\Config\AutoloadConfig' => SYSTEMPATH . 'Config/Autoload.php', + 'CodeIgniter\Config\BaseConfig' => SYSTEMPATH . 'Config/BaseConfig.php', + 'CodeIgniter\Config\Database' => SYSTEMPATH . 'Config/Database.php', + 'CodeIgniter\Config\Database\Connection' => SYSTEMPATH . 'Config/Database/Connection.php', + 'CodeIgniter\Config\Database\Connection\MySQLi' => SYSTEMPATH . 'Config/Database/Connection/MySQLi.php', + 'CodeIgniter\Config\DotEnv' => SYSTEMPATH . 'Config/DotEnv.php', + 'CodeIgniter\Database\BaseBuilder' => SYSTEMPATH . 'Database/BaseBuilder.php', + 'CodeIgniter\Database\BaseConnection' => SYSTEMPATH . 'Database/BaseConnection.php', + 'CodeIgniter\Database\BaseResult' => SYSTEMPATH . 'Database/BaseResult.php', + 'CodeIgniter\Database\Config' => SYSTEMPATH . 'Database/Config.php', + 'CodeIgniter\Database\ConnectionInterface' => SYSTEMPATH . 'Database/ConnectionInterface.php', + 'CodeIgniter\Database\Database' => SYSTEMPATH . 'Database/Database.php', + 'CodeIgniter\Database\Query' => SYSTEMPATH . 'Database/Query.php', + 'CodeIgniter\Database\QueryInterface' => SYSTEMPATH . 'Database/QueryInterface.php', + 'CodeIgniter\Database\ResultInterface' => SYSTEMPATH . 'Database/ResultInterface.php', + 'CodeIgniter\Database\Migration' => SYSTEMPATH . 'Database/Migration.php', + 'CodeIgniter\Database\MigrationRunner' => SYSTEMPATH . 'Database/MigrationRunner.php', + 'CodeIgniter\Debug\Exceptions' => SYSTEMPATH . 'Debug/Exceptions.php', + 'CodeIgniter\Debug\Timer' => SYSTEMPATH . 'Debug/Timer.php', + 'CodeIgniter\Debug\Iterator' => SYSTEMPATH . 'Debug/Iterator.php', + 'CodeIgniter\Events\Events' => SYSTEMPATH . 'Events/Events.php', + 'CodeIgniter\HTTP\CLIRequest' => SYSTEMPATH . 'HTTP/CLIRequest.php', + 'CodeIgniter\HTTP\ContentSecurityPolicy' => SYSTEMPATH . 'HTTP/ContentSecurityPolicy.php', + 'CodeIgniter\HTTP\CURLRequest' => SYSTEMPATH . 'HTTP/CURLRequest.php', + 'CodeIgniter\HTTP\IncomingRequest' => SYSTEMPATH . 'HTTP/IncomingRequest.php', + 'CodeIgniter\HTTP\Message' => SYSTEMPATH . 'HTTP/Message.php', + 'CodeIgniter\HTTP\Negotiate' => SYSTEMPATH . 'HTTP/Negotiate.php', + 'CodeIgniter\HTTP\Request' => SYSTEMPATH . 'HTTP/Request.php', + 'CodeIgniter\HTTP\RequestInterface' => SYSTEMPATH . 'HTTP/RequestInterface.php', + 'CodeIgniter\HTTP\Response' => SYSTEMPATH . 'HTTP/Response.php', + 'CodeIgniter\HTTP\ResponseInterface' => SYSTEMPATH . 'HTTP/ResponseInterface.php', + 'CodeIgniter\HTTP\URI' => SYSTEMPATH . 'HTTP/URI.php', + 'CodeIgniter\Log\Logger' => SYSTEMPATH . 'Log/Logger.php', + 'Psr\Log\AbstractLogger' => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php', + 'Psr\Log\InvalidArgumentException' => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php', + 'Psr\Log\LoggerAwareInterface' => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php', + 'Psr\Log\LoggerAwareTrait' => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php', + 'Psr\Log\LoggerInterface' => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php', + 'Psr\Log\LoggerTrait' => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php', + 'Psr\Log\LogLevel' => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php', + 'Psr\Log\NullLogger' => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php', + 'CodeIgniter\Log\Handlers\BaseHandler' => SYSTEMPATH . 'Log/Handlers/BaseHandler.php', + 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => SYSTEMPATH . 'Log/Handlers/ChromeLoggerHandler.php', + 'CodeIgniter\Log\Handlers\FileHandler' => SYSTEMPATH . 'Log/Handlers/FileHandler.php', + 'CodeIgniter\Log\Handlers\HandlerInterface' => SYSTEMPATH . 'Log/Handlers/HandlerInterface.php', + 'CodeIgniter\Router\RouteCollection' => SYSTEMPATH . 'Router/RouteCollection.php', + 'CodeIgniter\Router\RouteCollectionInterface' => SYSTEMPATH . 'Router/RouteCollectionInterface.php', + 'CodeIgniter\Router\Router' => SYSTEMPATH . 'Router/Router.php', + 'CodeIgniter\Router\RouterInterface' => SYSTEMPATH . 'Router/RouterInterface.php', + 'CodeIgniter\Security\Security' => SYSTEMPATH . 'Security/Security.php', + 'CodeIgniter\Session\Session' => SYSTEMPATH . 'Session/Session.php', + 'CodeIgniter\Session\SessionInterface' => SYSTEMPATH . 'Session/SessionInterface.php', + 'CodeIgniter\Session\Handlers\BaseHandler' => SYSTEMPATH . 'Session/Handlers/BaseHandler.php', + 'CodeIgniter\Session\Handlers\FileHandler' => SYSTEMPATH . 'Session/Handlers/FileHandler.php', + 'CodeIgniter\Session\Handlers\MemcachedHandler' => SYSTEMPATH . 'Session/Handlers/MemcachedHandler.php', + 'CodeIgniter\Session\Handlers\RedisHandler' => SYSTEMPATH . 'Session/Handlers/RedisHandler.php', + 'CodeIgniter\View\RendererInterface' => SYSTEMPATH . 'View/RendererInterface.php', + 'CodeIgniter\View\View' => SYSTEMPATH . 'View/View.php', + 'CodeIgniter\View\Parser' => SYSTEMPATH . 'View/Parser.php', + 'CodeIgniter\View\Cell' => SYSTEMPATH . 'View/Cell.php', + 'Zend\Escaper\Escaper' => SYSTEMPATH . 'ThirdParty/ZendEscaper/Escaper.php', ]; if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing') diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index 4da1518..a9e5bba 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -119,6 +119,31 @@ //-------------------------------------------------------------------- /** + * The Autoloader class is the central class that handles our + * spl_autoload_register method, and helper methods. + * + * @param boolean $getShared + * + * @return \CodeIgniter\Autoloader\Autoloader + */ + public static function autoloader(bool $getShared = true) + { + if ($getShared) + { + if (empty(static::$instances['autoloader'])) + { + static::$instances['autoloader'] = new \CodeIgniter\Autoloader\Autoloader(); + } + + return static::$instances['autoloader']; + } + + return new \CodeIgniter\Autoloader\Autoloader(); + } + + //-------------------------------------------------------------------- + + /** * The file locator provides utility methods for looking for non-classes * within namespaced folders, as well as convenience methods for * loading 'helpers', and 'libraries'. @@ -131,10 +156,17 @@ { if ($getShared) { - return static::getSharedInstance('locator'); + if (empty(static::$instances['locator'])) + { + static::$instances['locator'] = new \CodeIgniter\Autoloader\FileLocator( + static::autoloader() + ); + } + + return static::$instances['locator']; } - return new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload()); + return new \CodeIgniter\Autoloader\FileLocator(static::autoloader()); } //-------------------------------------------------------------------- @@ -164,12 +196,19 @@ /** * Reset shared instances and mocks for testing. + * + * @param boolean $init_autoloader Initializes autoloader instance */ - public static function reset() + public static function reset(bool $init_autoloader = false) { static::$mocks = []; static::$instances = []; + + if ($init_autoloader) + { + static::autoloader()->initialize(new \Config\Autoload()); + } } //-------------------------------------------------------------------- @@ -196,6 +235,8 @@ * * @param string $name * @param array $arguments + * + * @return mixed */ protected static function discoverServices(string $name, array $arguments) { @@ -210,7 +251,7 @@ if (empty($files)) { - return; + return null; } // Get instances of all service classes and cache them locally. @@ -230,7 +271,7 @@ if (! static::$services) { - return; + return null; } // Try to find the desired service method @@ -241,5 +282,7 @@ return $class::$name(...$arguments); } } + + return null; } } diff --git a/system/Config/Services.php b/system/Config/Services.php index 7f72403..3815d80 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -61,26 +61,6 @@ class Services extends BaseService { /** - * The Autoloader class is the central class that handles our - * spl_autoload_register method, and helper methods. - * - * @param boolean $getShared - * - * @return \CodeIgniter\Autoloader\Autoloader - */ - public static function autoloader(bool $getShared = true) - { - if ($getShared) - { - return static::getSharedInstance('autoloader'); - } - - return new \CodeIgniter\Autoloader\Autoloader(); - } - - //-------------------------------------------------------------------- - - /** * The cache class provides a simple way to store and retrieve * complex data for later. * @@ -742,12 +722,12 @@ //-------------------------------------------------------------------- /** - * @param \Config\App $config - * @param boolean $getShared + * @param \Config\Toolbar $config + * @param boolean $getShared * * @return \CodeIgniter\Debug\Toolbar */ - public static function toolbar(\Config\App $config = null, bool $getShared = true) + public static function toolbar(\Config\Toolbar $config = null, bool $getShared = true) { if ($getShared) { @@ -756,7 +736,7 @@ if (! is_object($config)) { - $config = config(App::class); + $config = config(\Config\Toolbar::class); } return new \CodeIgniter\Debug\Toolbar($config); diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 4e90e5e..fbfa3ed 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -36,7 +36,7 @@ * @filesource */ -use \CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * Class BaseBuilder @@ -1428,6 +1428,9 @@ if ($reset === true) { $this->resetSelect(); + + // Clear our binds so we don't eat up memory + $this->binds = []; } return $result; @@ -1776,7 +1779,12 @@ { $this->resetWrite(); - return $this->db->query($sql, $this->binds); + $result = $this->db->query($sql, $this->binds); + + // Clear our binds so we don't eat up memory + $this->binds = []; + + return $result; } } @@ -1975,6 +1983,9 @@ if ($this->db->query($sql, $this->binds)) { + // Clear our binds so we don't eat up memory + $this->binds = []; + return true; } diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php index 4efa53e..81fe474 100644 --- a/system/Database/BaseUtils.php +++ b/system/Database/BaseUtils.php @@ -36,7 +36,7 @@ * @filesource */ -use \CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * Class BaseUtils diff --git a/system/Database/Forge.php b/system/Database/Forge.php index d2f4504..88cc304 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -36,7 +36,7 @@ * @filesource */ -use \CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * Class Forge diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index c190b1e..be7c50a 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -179,14 +179,14 @@ * Calls each migration step required to get to the schema version of * choice * - * @param integer $targetVersion Target schema version + * @param string $targetVersion Target schema version * @param string|null $namespace * @param string|null $group * * @return mixed TRUE if no migrations are found, current version string on success, FALSE on failure * @throws ConfigException */ - public function version(int $targetVersion, string $namespace = null, string $group = null) + public function version(string $targetVersion, string $namespace = null, string $group = null) { if (! $this->enabled) { @@ -277,12 +277,12 @@ /** * Sets the schema to the latest migration * - * @param string $namespace - * @param string $group + * @param string|null $namespace + * @param string|null $group * * @return mixed Current version string on success, FALSE on failure */ - public function latest($namespace = null, $group = null) + public function latest(string $namespace = null, string $group = null) { // Set Namespace if not null if (! is_null($namespace)) @@ -309,11 +309,11 @@ /** * Sets the schema to the latest migration for all namespaces * - * @param string $group + * @param string|null $group * * @return boolean */ - public function latestAll($group = null) + public function latestAll(string $group = null) { // Set database group if not null if (! is_null($group)) @@ -355,11 +355,11 @@ /** * Sets the (APP_NAMESPACE) schema to $currentVersion in migration config file * - * @param string $group + * @param string|null $group * * @return mixed TRUE if no migrations are found, current version string on success, FALSE on failure */ - public function current($group = null) + public function current(string $group = null) { // Set database group if not null if (! is_null($group)) @@ -417,13 +417,13 @@ * if sequential check if no gaps and check if all consistent with migrations table if downgrading * if timestamp check if consistent with migrations table if downgrading * - * @param array $migrations - * @param string $method - * @param integer $targetversion + * @param array $migrations + * @param string $method + * @param string $targetversion * * @return boolean */ - protected function checkMigrations(array $migrations, string $method, int $targetversion) + protected function checkMigrations(array $migrations, string $method, string $targetversion) { // Check if no migrations found if (empty($migrations)) @@ -436,7 +436,7 @@ } // Check if $targetversion file is found - if ($targetversion !== 0 && ! array_key_exists($targetversion, $migrations)) + if ($targetversion !== '0' && ! array_key_exists($targetversion, $migrations)) { if ($this->silent) { @@ -529,7 +529,7 @@ * * @return array */ - public function getHistory($group = 'default') + public function getHistory(string $group = 'default') { $query = $this->db->table($this->table) ->where('group', $group) @@ -571,7 +571,7 @@ * * @return string Numeric portion of a migration filename */ - protected function getMigrationNumber($migration) + protected function getMigrationNumber(string $migration) { return sscanf($migration, '%[0-9]+', $number) ? $number : '0'; } @@ -585,7 +585,7 @@ * * @return string text portion of a migration filename */ - protected function getMigrationName($migration) + protected function getMigrationName(string $migration) { $parts = explode('_', $migration); array_shift($parts); @@ -633,7 +633,7 @@ * * @internal param string $migration Migration reached */ - protected function addHistory($version) + protected function addHistory(string $version) { $this->db->table($this->table) ->insert([ @@ -656,7 +656,7 @@ * * @param string $version */ - protected function removeHistory($version) + protected function removeHistory(string $version) { $this->db->table($this->table) ->where('version', $version) diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index 96c2632..3fc4968 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -38,7 +38,7 @@ use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\ConnectionInterface; -use \CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * Connection for MySQLi @@ -170,42 +170,56 @@ } } - if ($this->mysqli->real_connect($hostname, $this->username, $this->password, - $this->database, $port, $socket, $client_flags) - ) + try { - // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails - if (($client_flags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=') && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'") - ->fetch_object()->Value) + if ($this->mysqli->real_connect($hostname, $this->username, $this->password, + $this->database, $port, $socket, $client_flags) ) { - $this->mysqli->close(); - $message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!'; - log_message('error', $message); - - if ($this->DBDebug) + // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails + if (($client_flags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=') + && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'") + ->fetch_object()->Value) + ) { - throw new DatabaseException($message); + $this->mysqli->close(); + $message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!'; + log_message('error', $message); + + if ($this->DBDebug) + { + throw new DatabaseException($message); + } + + return false; } - return false; - } - - if (! $this->mysqli->set_charset($this->charset)) - { - log_message('error', - "Database: Unable to set the configured connection charset ('{$this->charset}')."); - $this->mysqli->close(); - - if ($this->db->debug) + if (! $this->mysqli->set_charset($this->charset)) { - throw new DatabaseException('Unable to set client connection character set: ' . $this->charset); + log_message('error', + "Database: Unable to set the configured connection charset ('{$this->charset}')."); + $this->mysqli->close(); + + if ($this->db->debug) + { + throw new DatabaseException('Unable to set client connection character set: ' . $this->charset); + } + + return false; } - return false; + return $this->mysqli; } + } + catch (\Throwable $e) + { + // Clean sensitive information from errors. + $msg = $e->getMessage(); - return $this->mysqli; + $msg = str_replace($this->username, '****', $msg); + $msg = str_replace($this->password, '****', $msg); + + throw new \mysqli_sql_exception($msg, $e->getCode(), $e); } return false; @@ -343,7 +357,7 @@ */ public function affectedRows(): int { - return $this->connID->affected_rows; + return $this->connID->affected_rows ?? 0; } //-------------------------------------------------------------------- diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php index f9f07dd..c470a15 100644 --- a/system/Database/MySQLi/PreparedQuery.php +++ b/system/Database/MySQLi/PreparedQuery.php @@ -37,7 +37,7 @@ */ use CodeIgniter\Database\PreparedQueryInterface; -use \CodeIgniter\Database\BasePreparedQuery; +use CodeIgniter\Database\BasePreparedQuery; class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface { diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php index c697c6f..0cb11b9 100644 --- a/system/Database/Postgre/Builder.php +++ b/system/Database/Postgre/Builder.php @@ -37,7 +37,7 @@ */ use CodeIgniter\Database\BaseBuilder; -use \CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * Builder for Postgre diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php index 874dc53..d28de33 100644 --- a/system/Database/Postgre/PreparedQuery.php +++ b/system/Database/Postgre/PreparedQuery.php @@ -37,7 +37,7 @@ */ use CodeIgniter\Database\PreparedQueryInterface; -use \CodeIgniter\Database\BasePreparedQuery; +use CodeIgniter\Database\BasePreparedQuery; class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface { diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php index 0ad54ba..b0dd1a9 100644 --- a/system/Database/SQLite3/PreparedQuery.php +++ b/system/Database/SQLite3/PreparedQuery.php @@ -37,7 +37,7 @@ */ use CodeIgniter\Database\PreparedQueryInterface; -use \CodeIgniter\Database\BasePreparedQuery; +use CodeIgniter\Database\BasePreparedQuery; class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface { diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index b87fbd7..cb69f49 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -36,12 +36,14 @@ * @filesource */ +use CodeIgniter\API\ResponseTrait; + /** * Exceptions manager */ class Exceptions { - use \CodeIgniter\API\ResponseTrait; + use ResponseTrait; /** * Nesting level of the output buffering mechanism @@ -174,7 +176,8 @@ */ public function errorHandler(int $severity, string $message, string $file = null, int $line = null, $context = null) { - if (! (\error_reporting() & $severity)) { + if (! (\error_reporting() & $severity)) + { return; } @@ -357,9 +360,9 @@ { $file = 'APPPATH/' . substr($file, strlen(APPPATH)); } - elseif (strpos($file, BASEPATH) === 0) + elseif (strpos($file, SYSTEMPATH) === 0) { - $file = 'BASEPATH/' . substr($file, strlen(BASEPATH)); + $file = 'SYSTEMPATH/' . substr($file, strlen(SYSTEMPATH)); } elseif (strpos($file, FCPATH) === 0) { diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 041e860..b4ecf54 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -36,7 +36,8 @@ * @filesource */ -use Config\App; +use CodeIgniter\Debug\Toolbar\Collectors\History; +use CodeIgniter\Format\JSONFormatter; use Config\Services; use CodeIgniter\Config\BaseConfig; use CodeIgniter\Format\XMLFormatter; @@ -52,21 +53,18 @@ */ class Toolbar { + /** + * @var BaseConfig + */ + protected $config; /** * Collectors to be used and displayed. * - * @var array + * @var \CodeIgniter\Debug\Toolbar\Collectors\BaseCollector[] */ protected $collectors = []; - /** - * Incoming Request - * - * @var \CodeIgniter\HTTP\IncomingRequest - */ - protected static $request; - //-------------------------------------------------------------------- /** @@ -76,12 +74,14 @@ */ public function __construct(BaseConfig $config) { - foreach ($config->toolbarCollectors as $collector) + $this->config = $config; + + foreach ($config->collectors as $collector) { if (! class_exists($collector)) { log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' . - 'please check $toolbarCollectors in the Config\App.php file.'); + 'please check $collectors in the Config\Toolbar.php file.'); continue; } @@ -117,19 +117,7 @@ foreach ($this->collectors as $collector) { - $data['collectors'][] = [ - 'title' => $collector->getTitle(), - 'titleSafe' => $collector->getTitle(true), - 'titleDetails' => $collector->getTitleDetails(), - 'display' => $collector->display(), - 'badgeValue' => $collector->getBadgeValue(), - 'isEmpty' => $collector->isEmpty(), - 'hasTabContent' => $collector->hasTabContent(), - 'hasLabel' => $collector->hasLabel(), - 'icon' => $collector->icon(), - 'hasTimelineData' => $collector->hasTimelineData(), - 'timelineData' => $collector->timelineData(), - ]; + $data['collectors'][] = $collector->getAsArray(); } foreach ($this->collectVarData() as $heading => $items) @@ -208,98 +196,6 @@ //-------------------------------------------------------------------- - /** - * Format output - * - * @param string $data JSON encoded Toolbar data - * @param string $format html, json, xml - * - * @return string - */ - protected static function format(string $data, string $format = 'html') - { - $data = json_decode($data, true); - - // History must be loaded on the fly - $filenames = glob(WRITEPATH . 'debugbar/debugbar_*'); - $total = count($filenames); - rsort($filenames); - - $files = []; - - $current = static::$request->getGet('debugbar_time'); - $app = config(App::class); - - for ($i = 0; $i < $total; $i++) - { - // Oldest files will be deleted - if ($app->toolbarMaxHistory >= 0 && $i + 1 > $app->toolbarMaxHistory) - { - unlink($filenames[$i]); - continue; - } - - // Get the contents of this specific history request - ob_start(); - include($filenames[$i]); - $contents = ob_get_contents(); - ob_end_clean(); - - $file = json_decode($contents, true); - - // Debugbar files shown in History Collector - $files[] = [ - 'time' => (int)$time = substr($filenames[$i], -10), - 'datetime' => date('Y-m-d H:i:s', $time), - 'active' => (int)($time === $current), - 'status' => $file['vars']['response']['statusCode'], - 'method' => $file['method'], - 'url' => $file['url'], - 'isAJAX' => $file['isAJAX'] ? 'Yes' : 'No', - 'contentType' => $file['vars']['response']['contentType'], - ]; - } - - // Set the History here. Class is not necessary - $data['collectors'][] = [ - 'title' => 'History', - 'titleSafe' => 'history', - 'titleDetails' => '', - 'display' => ['files' => $files], - 'badgeValue' => $count = count($files), - 'isEmpty' => ! (bool)$count, - 'hasTabContent' => true, - 'hasLabel' => true, - 'icon' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJySURBVEhL3ZU7aJNhGIVTpV6i4qCIgkIHxcXLErS4FBwUFNwiCKGhuTYJGaIgnRoo4qRu6iCiiIuIXXTTIkIpuqoFwaGgonUQlC5KafU5ycmNP0lTdPLA4fu+8573/a4/f6hXpFKpwUwmc9fDfweKbk+n07fgEv33TLSbtt/hvwNFT1PsG/zdTE0Gp+GFfD6/2fbVIxqNrqPIRbjg4t/hY8aztcngfDabHXbKyiiXy2vcrcPH8oDCry2FKDrA+Ar6L01E/ypyXzXaARjDGGcoeNxSDZXE0dHRA5VRE5LJ5CFy5jzJuOX2wHRHRnjbklZ6isQ3tIctBaAd4vlK3jLtkOVWqABBXd47jGHLmjTmSScttQV5J+SjfcUweFQEbsjAas5aqoCLXutJl7vtQsAzpRowYqkBinyCC8Vicb2lOih8zoldd0F8RD7qTFiqAnGrAy8stUAvi/hbqDM+YzkAFrLPdR5ZqoLXsd+Bh5YCIH7JniVdquUWxOPxDfboHhrI5XJ7HHhiqQXox+APe/Qk64+gGYVCYZs8cMpSFQj9JOoFzVqqo7k4HIvFYpscCoAjOmLffUsNUGRaQUwDlmofUa34ecsdgXdcXo4wbakBgiUFafXJV8A4DJ/2UrxUKm3E95H8RbjLcgOJRGILhnmCP+FBy5XvwN2uIPcy1AJvWgqC4xm2aU4Xb3lF4I+Tpyf8hRe5w3J7YLymSeA8Z3nSclv4WLRyFdfOjzrUFX0klJUEtZtntCNc+F69cz/FiDzEPtjzmcUMOr83kDQEX6pAJxJfpL3OX22n01YN7SZCoQnaSdoZ+Jz+PZihH3wt/xlCoT9M6nEtmRSPCQAAAABJRU5ErkJggg==', - 'hasTimelineData' => false, - 'timelineData' => [], - ]; - - $output = ''; - - switch ($format) - { - case 'html': - $data['styles'] = []; - extract($data); - $parser = Services::parser(BASEPATH . 'Debug/Toolbar/Views/', null, false); - ob_start(); - include(__DIR__ . '/Toolbar/Views/toolbar.tpl.php'); - $output = ob_get_contents(); - ob_end_clean(); - break; - case 'json': - $output = json_encode($data); - break; - case 'xml': - $formatter = new XMLFormatter; - $output = $formatter->format($data); - break; - } - - return $output; - } - //-------------------------------------------------------------------- /** @@ -312,10 +208,10 @@ * * @return string */ - protected static function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration, array& $styles): string + protected function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration, array& $styles): string { $displayTime = $segmentCount * $segmentDuration; - $rows = static::collectTimelineData($collectors); + $rows = $this->collectTimelineData($collectors); $output = ''; $styleCount = 0; @@ -349,7 +245,7 @@ * * @return array */ - protected static function collectTimelineData($collectors): array + protected function collectTimelineData($collectors): array { $data = []; @@ -413,60 +309,174 @@ //-------------------------------------------------------------------- + public function prepare() + { + if (CI_DEBUG && ! is_cli()) + { + global $app; + + $request = Services::request(); + $response = Services::response(); + + $toolbar = Services::toolbar(config(Toolbar::class)); + $stats = $app->getPerformanceStats(); + $data = $toolbar->run( + $stats['startTime'], + $stats['totalTime'], + $request, + $response + ); + + helper('filesystem'); + + // Updated to time() so we can get history + $time = time(); + + if (! is_dir(WRITEPATH . 'debugbar')) + { + mkdir(WRITEPATH . 'debugbar', 0777); + } + + write_file(WRITEPATH . 'debugbar/' . 'debugbar_' . $time . '.json', $data, 'w+'); + + $format = $response->getHeaderLine('content-type'); + + // Non-HTML formats should not include the debugbar + // then we send headers saying where to find the debug data + // for this response + if ($request->isAJAX() || strpos($format, 'html') === false) + { + $response->setHeader('Debugbar-Time', $time) + ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}")) + ->getBody(); + + return; + } + + $script = PHP_EOL + . '' + . '' + . '' + . PHP_EOL; + + if (strpos($response->getBody(), '