mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-07-02 11:06:27 -04:00
CodeIgniter 4.4.5 version bump
- Corrected syntax to allow all 8.x versions of PHP in composer.json - Bumped CodeIgniter from 4.4.3 to 4.4.5 - Bumped Code from 4.4.3 format to 4.4.4 format
This commit is contained in:
@@ -47,15 +47,10 @@ class App extends BaseConfig
|
||||
* Base Site URL
|
||||
* --------------------------------------------------------------------------
|
||||
*
|
||||
* URL to your CodeIgniter root. Typically this will be your base URL,
|
||||
* URL to your CodeIgniter root. Typically, this will be your base URL,
|
||||
* WITH a trailing slash:
|
||||
*
|
||||
* http://example.com/
|
||||
*
|
||||
* If this is not set then CodeIgniter will try guess the protocol, domain
|
||||
* and path to your installation. However, you should always configure this
|
||||
* explicitly and never rely on auto-guessing, especially in production
|
||||
* environments.
|
||||
*/
|
||||
public string $baseURL; //Defined in the constructor
|
||||
|
||||
@@ -68,8 +63,7 @@ class App extends BaseConfig
|
||||
* 'http://accounts.example.com/':
|
||||
* ['media.example.com', 'accounts.example.com']
|
||||
*
|
||||
* @var string[]
|
||||
* @phpstan-var list<string>
|
||||
* @var list<string>
|
||||
*/
|
||||
public array $allowedHostnames = [];
|
||||
|
||||
@@ -134,6 +128,8 @@ class App extends BaseConfig
|
||||
* by the application in descending order of priority. If no match is
|
||||
* found, the first locale will be used.
|
||||
*
|
||||
* IncomingRequest::setLocale() also uses this list.
|
||||
*
|
||||
* @var string[]
|
||||
*/
|
||||
public array $supportedLocales = [
|
||||
|
||||
@@ -41,8 +41,7 @@ class Autoload extends AutoloadConfig
|
||||
* 'App' => APPPATH
|
||||
* ];
|
||||
*
|
||||
* @var array<string, array<int, string>|string>
|
||||
* @phpstan-var array<string, string|list<string>>
|
||||
* @var array<string, list<string>|string>
|
||||
*/
|
||||
public $psr4 = [
|
||||
APP_NAMESPACE => APPPATH, // For custom app namespace
|
||||
@@ -190,8 +189,7 @@ class Autoload extends AutoloadConfig
|
||||
* '/path/to/my/file.php',
|
||||
* ];
|
||||
*
|
||||
* @var string[]
|
||||
* @phpstan-var list<string>
|
||||
* @var list<string>
|
||||
*/
|
||||
public $files = [];
|
||||
|
||||
@@ -204,8 +202,7 @@ class Autoload extends AutoloadConfig
|
||||
* 'form',
|
||||
* ];
|
||||
*
|
||||
* @var string[]
|
||||
* @phpstan-var list<string>
|
||||
* @var list<string>
|
||||
*/
|
||||
public $helpers = [
|
||||
'form',
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
|
||||
| If you set 'display_errors' to '1', CI4's detailed error report will show.
|
||||
*/
|
||||
error_reporting(-1);
|
||||
error_reporting(E_ALL);
|
||||
ini_set('display_errors', '1');
|
||||
|
||||
/*
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
| make sure they don't make it to production. And save us hours of
|
||||
| painful debugging.
|
||||
*/
|
||||
error_reporting(-1);
|
||||
error_reporting(E_ALL);
|
||||
ini_set('display_errors', '1');
|
||||
|
||||
/*
|
||||
|
||||
@@ -158,8 +158,7 @@ class Cache extends BaseConfig
|
||||
* This is an array of cache engine alias' and class names. Only engines
|
||||
* that are listed here are allowed to be used.
|
||||
*
|
||||
* @var array<string, string>
|
||||
* @phpstan-var array<string, class-string<CacheInterface>>
|
||||
* @var array<string, class-string<CacheInterface>>
|
||||
*/
|
||||
public array $validHandlers = [
|
||||
'dummy' => DummyHandler::class,
|
||||
|
||||
@@ -26,7 +26,7 @@ class Email extends BaseConfig
|
||||
public string $mailPath = '/usr/sbin/sendmail';
|
||||
|
||||
/**
|
||||
* SMTP Server Address
|
||||
* SMTP Server Hostname
|
||||
*/
|
||||
public string $SMTPHost = 'mail.mxserver.com';
|
||||
|
||||
|
||||
@@ -15,9 +15,8 @@ class Filters extends BaseConfig
|
||||
* Configures aliases for Filter classes to
|
||||
* make reading things nicer and simpler.
|
||||
*
|
||||
* @var array<string, array<int, string>|string> [filter_name => classname]
|
||||
* or [filter_name => [classname1, classname2, ...]]
|
||||
* @phpstan-var array<string, class-string|list<class-string>>
|
||||
* @var array<string, class-string|list<class-string>> [filter_name => classname]
|
||||
* or [filter_name => [classname1, classname2, ...]]
|
||||
*/
|
||||
public array $aliases = [
|
||||
'csrf' => CSRF::class,
|
||||
@@ -31,8 +30,7 @@ class Filters extends BaseConfig
|
||||
* List of filter aliases that are always
|
||||
* applied before and after every request.
|
||||
*
|
||||
* @var array<string, array<string, array<string, string>>>|array<string, array<string>>
|
||||
* @phpstan-var array<string, list<string>>|array<string, array<string, array<string, string>>>
|
||||
* @var array<string, array<string, array<string, string>>>|array<string, list<string>>
|
||||
*/
|
||||
public array $globals = [
|
||||
'before' => [
|
||||
|
||||
@@ -27,8 +27,7 @@ class Kint extends BaseConfig
|
||||
*/
|
||||
|
||||
/**
|
||||
* @var array<int, ConstructablePluginInterface|string>
|
||||
* @phpstan-var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
|
||||
* @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>|null
|
||||
*/
|
||||
public $plugins;
|
||||
|
||||
@@ -46,14 +45,12 @@ class Kint extends BaseConfig
|
||||
public int $richSort = AbstractRenderer::SORT_FULL;
|
||||
|
||||
/**
|
||||
* @var array<string, string>
|
||||
* @phpstan-var array<string, class-string<ValuePluginInterface>>
|
||||
* @var array<string, class-string<ValuePluginInterface>>|null
|
||||
*/
|
||||
public $richObjectPlugins;
|
||||
|
||||
/**
|
||||
* @var array<string, string>
|
||||
* @phpstan-var array<string, class-string<TabPluginInterface>>
|
||||
* @var array<string, class-string<TabPluginInterface>>|null
|
||||
*/
|
||||
public $richTabPlugins;
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ class Modules extends BaseModules
|
||||
* ],
|
||||
* ]
|
||||
*
|
||||
* @var array
|
||||
* @var array{only?: list<string>, exclude?: list<string>}
|
||||
*/
|
||||
public $composerPackages = [];
|
||||
|
||||
@@ -72,7 +72,7 @@ class Modules extends BaseModules
|
||||
*
|
||||
* If it is not listed, only the base application elements will be used.
|
||||
*
|
||||
* @var string[]
|
||||
* @var list<string>
|
||||
*/
|
||||
public $aliases = [
|
||||
'events',
|
||||
|
||||
@@ -19,7 +19,7 @@ class Publisher extends BasePublisher
|
||||
* result in a PublisherException. Files that do no fit the
|
||||
* pattern will cause copy/merge to fail.
|
||||
*
|
||||
* @var array<string,string>
|
||||
* @var array<string, string>
|
||||
*/
|
||||
public $restrictions = [
|
||||
ROOTPATH => '*',
|
||||
|
||||
@@ -19,7 +19,7 @@ class Session extends BaseConfig
|
||||
* - `CodeIgniter\Session\Handlers\MemcachedHandler`
|
||||
* - `CodeIgniter\Session\Handlers\RedisHandler`
|
||||
*
|
||||
* @phpstan-var class-string<BaseHandler>
|
||||
* @var class-string<BaseHandler>
|
||||
*/
|
||||
public string $driver = DatabaseHandler::class;
|
||||
|
||||
|
||||
@@ -6,17 +6,26 @@
|
||||
use CodeIgniter\CLI\CLI;
|
||||
|
||||
// The main Exception
|
||||
CLI::newLine();
|
||||
CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
|
||||
CLI::newLine();
|
||||
CLI::write($message);
|
||||
CLI::newLine();
|
||||
CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
|
||||
CLI::newLine();
|
||||
|
||||
$last = $exception;
|
||||
|
||||
while ($prevException = $last->getPrevious()) {
|
||||
$last = $prevException;
|
||||
|
||||
CLI::write(' Caused by:');
|
||||
CLI::write(' [' . get_class($prevException) . ']', 'red');
|
||||
CLI::write(' ' . $prevException->getMessage());
|
||||
CLI::write(' at ' . CLI::color(clean_path($prevException->getFile()) . ':' . $prevException->getLine(), 'green'));
|
||||
CLI::newLine();
|
||||
}
|
||||
|
||||
// The backtrace
|
||||
if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
|
||||
$backtraces = $exception->getTrace();
|
||||
$backtraces = $last->getTrace();
|
||||
|
||||
if ($backtraces) {
|
||||
CLI::write('Backtrace:', 'green');
|
||||
|
||||
@@ -53,6 +53,29 @@ $errorId = uniqid('error', true);
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<?php
|
||||
$last = $exception;
|
||||
|
||||
while ($prevException = $last->getPrevious()) {
|
||||
$last = $prevException;
|
||||
?>
|
||||
|
||||
<pre>
|
||||
Caused by:
|
||||
<?= esc(get_class($prevException)), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
|
||||
|
||||
<?= nl2br(esc($prevException->getMessage())) ?>
|
||||
<a href="https://www.duckduckgo.com/?q=<?= urlencode(get_class($prevException) . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
|
||||
rel="noreferrer" target="_blank">search →</a>
|
||||
<?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
|
||||
</pre>
|
||||
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
||||
<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
|
||||
<div class="container">
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
],
|
||||
"homepage": "https://github.com/opensourcepos/opensourcepos",
|
||||
"require": {
|
||||
"php": "^7.4||^8.3",
|
||||
"codeigniter4/framework": "4.4.3",
|
||||
"php": "^7.4||^8.0",
|
||||
"codeigniter4/framework": "4.4.5",
|
||||
"dompdf/dompdf": "^2.0.3",
|
||||
"laminas/laminas-escaper": "2.12",
|
||||
"paragonie/random_compat": "^2.0.21",
|
||||
@@ -33,10 +33,10 @@
|
||||
"tamtamchik/namecase": "^1.0.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"codeigniter/coding-standard": "^1.5",
|
||||
"codeigniter/coding-standard": "^1.7",
|
||||
"codeigniter4/devkit": "v1.1.0",
|
||||
"fakerphp/faker": "^1.23.0",
|
||||
"friendsofphp/php-cs-fixer": "3.13.0",
|
||||
"friendsofphp/php-cs-fixer": "3.47.1",
|
||||
"kint-php/kint": "^5.0.4",
|
||||
"mikey179/vfsstream": "^1.6",
|
||||
"nexusphp/cs-config": "^3.6",
|
||||
|
||||
870
composer.lock
generated
870
composer.lock
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user