Commits vergleichen
3 Commits
2e386d7c41
...
dd79ad7e59
Autor | SHA1 | Datum |
---|---|---|
|
dd79ad7e59 | |
|
05327f3518 | |
|
46c1c1c3c3 |
|
@ -134,5 +134,3 @@ match ($iStep) {
|
||||||
'doinstall' => checkAndInclude('steps/setup/doinstall.php'),
|
'doinstall' => checkAndInclude('steps/setup/doinstall.php'),
|
||||||
default => checkAndInclude('steps/languagechooser.php'),
|
default => checkAndInclude('steps/languagechooser.php'),
|
||||||
};
|
};
|
||||||
|
|
||||||
?>
|
|
|
@ -32,7 +32,7 @@ if (!defined('CON_FRAMEWORK')) {
|
||||||
die('Illegal call');
|
die('Illegal call');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @todo move to enum */
|
||||||
define("E_EXTENSION_AVAILABLE", 1);
|
define("E_EXTENSION_AVAILABLE", 1);
|
||||||
define("E_EXTENSION_UNAVAILABLE", 2);
|
define("E_EXTENSION_UNAVAILABLE", 2);
|
||||||
define("E_EXTENSION_CANTCHECK", 3);
|
define("E_EXTENSION_CANTCHECK", 3);
|
||||||
|
@ -41,52 +41,52 @@ define("E_EXTENSION_CANTCHECK", 3);
|
||||||
* canPHPurlfopen: Checks if PHP is able to use
|
* canPHPurlfopen: Checks if PHP is able to use
|
||||||
* allow_url_fopen.
|
* allow_url_fopen.
|
||||||
*/
|
*/
|
||||||
function canPHPurlfopen(): bool|string
|
function canPHPurlfopen(): bool
|
||||||
{
|
{
|
||||||
return ini_get("allow_url_fopen");
|
return ini_get("allow_url_fopen");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPDisplayErrorSetting(): bool|string
|
function getPHPDisplayErrorSetting(): bool
|
||||||
{
|
{
|
||||||
return ini_get("display_errors");
|
return ini_get("display_errors");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPFileUploadSetting(): bool|string
|
function getPHPFileUploadSetting(): bool
|
||||||
{
|
{
|
||||||
return ini_get("file_uploads");
|
return ini_get("file_uploads");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPGPCOrder(): bool|string
|
function getPHPGPCOrder(): bool
|
||||||
{
|
{
|
||||||
return ini_get("gpc_order");
|
return ini_get("gpc_order");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPMagicQuotesRuntime(): bool|string
|
function getPHPMagicQuotesRuntime(): bool
|
||||||
{
|
{
|
||||||
return ini_get("magic_quotes_runtime");
|
return ini_get("magic_quotes_runtime");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPMagicQuotesSybase(): bool|string
|
function getPHPMagicQuotesSybase(): bool
|
||||||
{
|
{
|
||||||
return ini_get("magic_quotes_sybase");
|
return ini_get("magic_quotes_sybase");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPMaxExecutionTime(): bool|string
|
function getPHPMaxExecutionTime(): bool
|
||||||
{
|
{
|
||||||
return ini_get("max_execution_time");
|
return ini_get("max_execution_time");
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPHPOpenBasedirSetting(): bool|string
|
function getPHPOpenBasedirSetting(): bool
|
||||||
{
|
{
|
||||||
return ini_get("open_basedir");
|
return ini_get("open_basedir");
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkPHPSQLSafeMode(): bool|string
|
function checkPHPSQLSafeMode(): bool
|
||||||
{
|
{
|
||||||
return ini_get("sql.safe_mode");
|
return ini_get("sql.safe_mode");
|
||||||
}
|
}
|
||||||
|
|
||||||
function return_bytes($val): float|int|string
|
function return_bytes($val): float|int
|
||||||
{
|
{
|
||||||
if (strlen($val) == 0) {
|
if (strlen($val) == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -94,13 +94,14 @@ function return_bytes($val): float|int|string
|
||||||
$val = trim($val);
|
$val = trim($val);
|
||||||
$last = $val[strlen($val) - 1];
|
$last = $val[strlen($val) - 1];
|
||||||
return match ($last) {
|
return match ($last) {
|
||||||
'k', 'K' => (int) $val * 1024,
|
'k', 'K' => (int)$val * 1024,
|
||||||
'm', 'M' => (int) $val * 1_048_576,
|
'm', 'M' => (int)$val * 1_048_576,
|
||||||
default => $val,
|
default => $val,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function isPHPExtensionLoaded($extension) {
|
function isPHPExtensionLoaded($extension)
|
||||||
|
{
|
||||||
$value = extension_loaded($extension);
|
$value = extension_loaded($extension);
|
||||||
|
|
||||||
if ($value === true) {
|
if ($value === true) {
|
||||||
|
@ -120,7 +121,6 @@ function isPHPExtensionLoaded($extension) {
|
||||||
* Test for PHP compatibility
|
* Test for PHP compatibility
|
||||||
*
|
*
|
||||||
* @param string $sVersion phpversion to test
|
* @param string $sVersion phpversion to test
|
||||||
* @return boolean
|
|
||||||
*/
|
*/
|
||||||
function isPHPCompatible($sVersion = "8.0.0"): bool
|
function isPHPCompatible($sVersion = "8.0.0"): bool
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,11 +2,6 @@
|
||||||
|
|
||||||
// autoload.php @generated by Composer
|
// autoload.php @generated by Composer
|
||||||
|
|
||||||
if (PHP_VERSION_ID < 50600) {
|
|
||||||
echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once __DIR__ . '/composer/autoload_real.php';
|
require_once __DIR__ . '/composer/autoload_real.php';
|
||||||
|
|
||||||
return ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00::getLoader();
|
return ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00::getLoader();
|
||||||
|
|
|
@ -21,14 +21,12 @@ use Composer\Semver\VersionParser;
|
||||||
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
|
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
|
||||||
*
|
*
|
||||||
* To require its presence, you can require `composer-runtime-api ^2.0`
|
* To require its presence, you can require `composer-runtime-api ^2.0`
|
||||||
*
|
|
||||||
* @final
|
|
||||||
*/
|
*/
|
||||||
class InstalledVersions
|
class InstalledVersions
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var mixed[]|null
|
* @var mixed[]|null
|
||||||
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
|
* @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
|
||||||
*/
|
*/
|
||||||
private static $installed;
|
private static $installed;
|
||||||
|
|
||||||
|
@ -39,7 +37,7 @@ class InstalledVersions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array[]
|
* @var array[]
|
||||||
* @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
|
* @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
|
||||||
*/
|
*/
|
||||||
private static $installedByVendor = array();
|
private static $installedByVendor = array();
|
||||||
|
|
||||||
|
@ -243,7 +241,7 @@ class InstalledVersions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
* @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
|
* @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
|
||||||
*/
|
*/
|
||||||
public static function getRootPackage()
|
public static function getRootPackage()
|
||||||
{
|
{
|
||||||
|
@ -257,7 +255,7 @@ class InstalledVersions
|
||||||
*
|
*
|
||||||
* @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
|
* @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
|
* @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
|
||||||
*/
|
*/
|
||||||
public static function getRawData()
|
public static function getRawData()
|
||||||
{
|
{
|
||||||
|
@ -280,7 +278,7 @@ class InstalledVersions
|
||||||
* Returns the raw data of all installed.php which are currently loaded for custom implementations
|
* Returns the raw data of all installed.php which are currently loaded for custom implementations
|
||||||
*
|
*
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
|
* @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
|
||||||
*/
|
*/
|
||||||
public static function getAllRawData()
|
public static function getAllRawData()
|
||||||
{
|
{
|
||||||
|
@ -303,7 +301,7 @@ class InstalledVersions
|
||||||
* @param array[] $data A vendor/composer/installed.php data set
|
* @param array[] $data A vendor/composer/installed.php data set
|
||||||
* @return void
|
* @return void
|
||||||
*
|
*
|
||||||
* @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
|
* @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
|
||||||
*/
|
*/
|
||||||
public static function reload($data)
|
public static function reload($data)
|
||||||
{
|
{
|
||||||
|
@ -313,7 +311,7 @@ class InstalledVersions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array[]
|
* @return array[]
|
||||||
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
|
* @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
|
||||||
*/
|
*/
|
||||||
private static function getInstalled()
|
private static function getInstalled()
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
// autoload_classmap.php @generated by Composer
|
// autoload_classmap.php @generated by Composer
|
||||||
|
|
||||||
$vendorDir = dirname(__DIR__);
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
$baseDir = dirname($vendorDir);
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
// autoload_namespaces.php @generated by Composer
|
// autoload_namespaces.php @generated by Composer
|
||||||
|
|
||||||
$vendorDir = dirname(__DIR__);
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
$baseDir = dirname($vendorDir);
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
// autoload_psr4.php @generated by Composer
|
// autoload_psr4.php @generated by Composer
|
||||||
|
|
||||||
$vendorDir = dirname(__DIR__);
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
$baseDir = dirname($vendorDir);
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
|
|
|
@ -25,11 +25,30 @@ class ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00
|
||||||
require __DIR__ . '/platform_check.php';
|
require __DIR__ . '/platform_check.php';
|
||||||
|
|
||||||
spl_autoload_register(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'), true, true);
|
spl_autoload_register(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'), true, true);
|
||||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
|
||||||
spl_autoload_unregister(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'));
|
spl_autoload_unregister(array('ComposerAutoloaderInit030320213c853f2cfb8481e1bb7caf00', 'loadClassLoader'));
|
||||||
|
|
||||||
|
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
||||||
|
if ($useStaticLoader) {
|
||||||
require __DIR__ . '/autoload_static.php';
|
require __DIR__ . '/autoload_static.php';
|
||||||
|
|
||||||
call_user_func(\Composer\Autoload\ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::getInitializer($loader));
|
call_user_func(\Composer\Autoload\ComposerStaticInit030320213c853f2cfb8481e1bb7caf00::getInitializer($loader));
|
||||||
|
} else {
|
||||||
|
$map = require __DIR__ . '/autoload_namespaces.php';
|
||||||
|
foreach ($map as $namespace => $path) {
|
||||||
|
$loader->set($namespace, $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
$map = require __DIR__ . '/autoload_psr4.php';
|
||||||
|
foreach ($map as $namespace => $path) {
|
||||||
|
$loader->setPsr4($namespace, $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
$classMap = require __DIR__ . '/autoload_classmap.php';
|
||||||
|
if ($classMap) {
|
||||||
|
$loader->addClassMap($classMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$loader->register(true);
|
$loader->register(true);
|
||||||
|
|
||||||
|
|
|
@ -1,31 +1,31 @@
|
||||||
<?php return array(
|
<?php return array(
|
||||||
'root' => array(
|
'root' => array(
|
||||||
'name' => 'org.conlite/conlite',
|
|
||||||
'pretty_version' => 'dev-develop',
|
'pretty_version' => 'dev-develop',
|
||||||
'version' => 'dev-develop',
|
'version' => 'dev-develop',
|
||||||
'reference' => '8798c805f60d265de3beef0209d06a80ee44266a',
|
|
||||||
'type' => 'library',
|
'type' => 'library',
|
||||||
'install_path' => __DIR__ . '/../../',
|
'install_path' => __DIR__ . '/../../',
|
||||||
'aliases' => array(),
|
'aliases' => array(),
|
||||||
|
'reference' => '46c1c1c3c36cf82a9e748d61bca3439d0d14e7b9',
|
||||||
|
'name' => 'org.conlite/conlite',
|
||||||
'dev' => false,
|
'dev' => false,
|
||||||
),
|
),
|
||||||
'versions' => array(
|
'versions' => array(
|
||||||
'org.conlite/conlite' => array(
|
'org.conlite/conlite' => array(
|
||||||
'pretty_version' => 'dev-develop',
|
'pretty_version' => 'dev-develop',
|
||||||
'version' => 'dev-develop',
|
'version' => 'dev-develop',
|
||||||
'reference' => '8798c805f60d265de3beef0209d06a80ee44266a',
|
|
||||||
'type' => 'library',
|
'type' => 'library',
|
||||||
'install_path' => __DIR__ . '/../../',
|
'install_path' => __DIR__ . '/../../',
|
||||||
'aliases' => array(),
|
'aliases' => array(),
|
||||||
|
'reference' => '46c1c1c3c36cf82a9e748d61bca3439d0d14e7b9',
|
||||||
'dev_requirement' => false,
|
'dev_requirement' => false,
|
||||||
),
|
),
|
||||||
'phpmailer/phpmailer' => array(
|
'phpmailer/phpmailer' => array(
|
||||||
'pretty_version' => 'v6.8.0',
|
'pretty_version' => 'v6.8.0',
|
||||||
'version' => '6.8.0.0',
|
'version' => '6.8.0.0',
|
||||||
'reference' => 'df16b615e371d81fb79e506277faea67a1be18f1',
|
|
||||||
'type' => 'library',
|
'type' => 'library',
|
||||||
'install_path' => __DIR__ . '/../phpmailer/phpmailer',
|
'install_path' => __DIR__ . '/../phpmailer/phpmailer',
|
||||||
'aliases' => array(),
|
'aliases' => array(),
|
||||||
|
'reference' => 'df16b615e371d81fb79e506277faea67a1be18f1',
|
||||||
'dev_requirement' => false,
|
'dev_requirement' => false,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
Laden…
In neuem Issue referenzieren