Implemented changes for 1.2.0-RC5
This commit is contained in:
parent
be915fa98a
commit
37472540d6
@ -403,9 +403,7 @@ class Configurator
|
|||||||
{
|
{
|
||||||
Logger::logDebug("Adding directories for '" . $component . "'");
|
Logger::logDebug("Adding directories for '" . $component . "'");
|
||||||
if (method_exists($container->{$component}, 'setDirectories'))
|
if (method_exists($container->{$component}, 'setDirectories'))
|
||||||
{
|
|
||||||
$container->{$component}->setDirectories($priorityArray);
|
$container->{$component}->setDirectories($priorityArray);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$container->initFactory();
|
$container->initFactory();
|
||||||
|
@ -115,9 +115,7 @@ class Plugins
|
|||||||
|
|
||||||
// If directory does not exist, skip it
|
// If directory does not exist, skip it
|
||||||
if (!file_exists($pluginPath) || !is_dir($pluginPath))
|
if (!file_exists($pluginPath) || !is_dir($pluginPath))
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch the contents of the path
|
// Fetch the contents of the path
|
||||||
$pluginPathContents = array_diff(scandir($pluginPath), array('..', '.'));
|
$pluginPathContents = array_diff(scandir($pluginPath), array('..', '.'));
|
||||||
@ -126,9 +124,7 @@ class Plugins
|
|||||||
foreach ($pluginPathContents as $pluginFolder) {
|
foreach ($pluginPathContents as $pluginFolder) {
|
||||||
// @codeCoverageIgnoreStart
|
// @codeCoverageIgnoreStart
|
||||||
if (!is_dir($pluginPath . DS . $pluginFolder))
|
if (!is_dir($pluginPath . DS . $pluginFolder))
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
// @codeCoverageIgnoreEnd
|
// @codeCoverageIgnoreEnd
|
||||||
|
|
||||||
// If a header file exists, use it
|
// If a header file exists, use it
|
||||||
@ -141,9 +137,7 @@ class Plugins
|
|||||||
require_once($file);
|
require_once($file);
|
||||||
$header = new $className();
|
$header = new $className();
|
||||||
if (!$header instanceof iPluginHeader)
|
if (!$header instanceof iPluginHeader)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// Load the header
|
// Load the header
|
||||||
$this->loadHeader($header);
|
$this->loadHeader($header);
|
||||||
@ -249,7 +243,6 @@ class Plugins
|
|||||||
$prefix = $header->getClassesPrefix();
|
$prefix = $header->getClassesPrefix();
|
||||||
$filePath = dirname($headerReflection->getFileName()) . (!empty($header->getSourceDirectory()) ? DS . $header->getSourceDirectory() : '');
|
$filePath = dirname($headerReflection->getFileName()) . (!empty($header->getSourceDirectory()) ? DS . $header->getSourceDirectory() : '');
|
||||||
$pluginClass = $header->getPluginClass();
|
$pluginClass = $header->getPluginClass();
|
||||||
|
|
||||||
if (!is_null($prefix) && !is_null($filePath))
|
if (!is_null($prefix) && !is_null($filePath))
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
@ -34,10 +34,8 @@
|
|||||||
* @version Version 1.2.0
|
* @version Version 1.2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
namespace FuzeWorks;
|
namespace FuzeWorks;
|
||||||
|
|
||||||
|
|
||||||
interface iComponent
|
interface iComponent
|
||||||
{
|
{
|
||||||
public function getName(): string;
|
public function getName(): string;
|
||||||
|
Loading…
Reference in New Issue
Block a user