Release version 1.2.3, changing the boot order.
This commit is contained in:
parent
6f2e941eb1
commit
d4bf138533
|
@ -347,18 +347,17 @@ class Configurator
|
||||||
// Then prepare the debugger
|
// Then prepare the debugger
|
||||||
$debug = ($this->parameters['debugEnabled'] && $this->parameters['debugMatch'] ? true : false);
|
$debug = ($this->parameters['debugEnabled'] && $this->parameters['debugMatch'] ? true : false);
|
||||||
|
|
||||||
// Define environment constants
|
// Then load the framework
|
||||||
|
$container = Core::init();
|
||||||
|
Logger::newLevel("Creating container...");
|
||||||
if ($debug == true)
|
if ($debug == true)
|
||||||
|
{
|
||||||
define('ENVIRONMENT', 'DEVELOPMENT');
|
define('ENVIRONMENT', 'DEVELOPMENT');
|
||||||
|
Logger::enable();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
define('ENVIRONMENT', 'PRODUCTION');
|
define('ENVIRONMENT', 'PRODUCTION');
|
||||||
|
|
||||||
// Load the Framework
|
|
||||||
$container = Core::init();
|
|
||||||
if ($debug)
|
|
||||||
Logger::enable();
|
|
||||||
|
|
||||||
Logger::newLevel("Creating container...");
|
|
||||||
|
|
||||||
// Load components
|
// Load components
|
||||||
foreach ($this->components as $componentSuperClass => $component)
|
foreach ($this->components as $componentSuperClass => $component)
|
||||||
|
@ -382,21 +381,6 @@ class Configurator
|
||||||
$component->onCreateContainer($container);
|
$component->onCreateContainer($container);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add directories to Components
|
|
||||||
foreach ($this->directories as $component => $priorityArray)
|
|
||||||
{
|
|
||||||
Logger::logDebug("Adding directories for '" . $component . "'");
|
|
||||||
if (method_exists($container->{$component}, 'setDirectories'))
|
|
||||||
$container->{$component}->setDirectories($priorityArray);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize all components
|
|
||||||
foreach ($container as $component)
|
|
||||||
{
|
|
||||||
if (method_exists($component, 'init'))
|
|
||||||
$component->init();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invoke deferredComponentClass on FuzeWorks\Core classes
|
// Invoke deferredComponentClass on FuzeWorks\Core classes
|
||||||
foreach ($this->deferredComponentClassMethods as $componentClass => $deferredComponentClasses)
|
foreach ($this->deferredComponentClassMethods as $componentClass => $deferredComponentClasses)
|
||||||
{
|
{
|
||||||
|
@ -414,6 +398,14 @@ class Configurator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add directories to Components
|
||||||
|
foreach ($this->directories as $component => $priorityArray)
|
||||||
|
{
|
||||||
|
Logger::logDebug("Adding directories for '" . $component . "'");
|
||||||
|
if (method_exists($container->{$component}, 'setDirectories'))
|
||||||
|
$container->{$component}->setDirectories($priorityArray);
|
||||||
|
}
|
||||||
|
|
||||||
$container->initFactory();
|
$container->initFactory();
|
||||||
Logger::stopLevel();
|
Logger::stopLevel();
|
||||||
return $container;
|
return $container;
|
||||||
|
|
|
@ -170,6 +170,13 @@ class Factory
|
||||||
if (!$cfg->get('enable_events'))
|
if (!$cfg->get('enable_events'))
|
||||||
Events::disable();
|
Events::disable();
|
||||||
|
|
||||||
|
// Initialize all components
|
||||||
|
foreach ($this as $component)
|
||||||
|
{
|
||||||
|
if (method_exists($component, 'init'))
|
||||||
|
$component->init();
|
||||||
|
}
|
||||||
|
|
||||||
// Initialize all plugins
|
// Initialize all plugins
|
||||||
$this->plugins->loadHeadersFromPluginPaths();
|
$this->plugins->loadHeadersFromPluginPaths();
|
||||||
|
|
||||||
|
|
|
@ -533,23 +533,36 @@ class Logger {
|
||||||
public static function getType($type): string
|
public static function getType($type): string
|
||||||
{
|
{
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case E_PARSE:
|
|
||||||
case E_CORE_ERROR:
|
|
||||||
case E_COMPILE_ERROR:
|
|
||||||
case E_USER_ERROR:
|
|
||||||
case E_STRICT:
|
|
||||||
case E_RECOVERABLE_ERROR:
|
|
||||||
case E_ERROR:
|
case E_ERROR:
|
||||||
return 'ERROR';
|
return 'ERROR';
|
||||||
case E_NOTICE:
|
|
||||||
case E_CORE_WARNING:
|
|
||||||
case E_COMPILE_WARNING:
|
|
||||||
case E_USER_WARNING:
|
|
||||||
case E_USER_NOTICE:
|
|
||||||
case E_USER_DEPRECATED:
|
|
||||||
case E_DEPRECATED:
|
|
||||||
case E_WARNING:
|
case E_WARNING:
|
||||||
return 'WARNING';
|
return 'WARNING';
|
||||||
|
case E_PARSE:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_NOTICE:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_CORE_ERROR:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_CORE_WARNING:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_COMPILE_ERROR:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_COMPILE_WARNING:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_USER_ERROR:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_USER_WARNING:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_USER_NOTICE:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_USER_DEPRECATED:
|
||||||
|
return 'WARNING';
|
||||||
|
case E_STRICT:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_RECOVERABLE_ERROR:
|
||||||
|
return 'ERROR';
|
||||||
|
case E_DEPRECATED:
|
||||||
|
return 'WARNING';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $type = 'Unknown error: ' . $type;
|
return $type = 'Unknown error: ' . $type;
|
||||||
|
|
Loading…
Reference in New Issue