From 02dde17ca8c155f18f1fec142cd7f68132447ebf Mon Sep 17 00:00:00 2001 From: Stephan Kasdorf Date: Thu, 5 Nov 2020 18:39:00 +0100 Subject: [PATCH] Version 0.9.5 beta - Autoloader Warning messages suppressed fix. --- core/c/autoloader.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/core/c/autoloader.php b/core/c/autoloader.php index f43cac3..0cde51b 100644 --- a/core/c/autoloader.php +++ b/core/c/autoloader.php @@ -268,7 +268,7 @@ class Autoloader foreach($modulesTraitsNames as $traitsName) { $iterator = self::folderContent(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::TRAIT_FOLDER], $traitsName ); - if($iterator!=null) + if($iterator!=null || is_array($iterator) || is_object($iterator)) { foreach ( $iterator as $item ) { @@ -298,7 +298,7 @@ class Autoloader foreach($modulesClassNames as $className) { $iterator = self::folderContent(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::MODULE_FOLDER], $className ); - if($iterator!=null) + if($iterator!=null || is_array($iterator) || is_object($iterator)) { foreach ( $iterator as $item ) { @@ -332,17 +332,21 @@ class Autoloader $iterator = self::folderContent(__DIR__ . Config::getInstance()->getConfig()[View::NIBIRU_SETTINGS][self::PLUGINS_FOLDER], $pluginsName ); foreach($pluginNames as $pluginName) { - foreach ($iterator as $item) + if(is_array($iterator) || is_object($iterator)) { - if(!empty($pluginName)) + foreach ($iterator as $item) { - if(strstr($item->getFilename(), $pluginName)) + if (!empty($pluginName)) { - if ($item->getFileName() != self::MY_FILE_NAME && $item->getFileName() != "." && $item->getFileName() != ".." && strstr($item->getFileName(), self::PHP_FILE_EXTENSION)) { - $plugins[] = array( - 'nfilename' => str_replace('.php', '', $item->getFileName()), - 'filepathname' => $item->getPath() . '/' . $item->getFileName() - ); + if (strstr($item->getFilename(), $pluginName)) + { + if ($item->getFileName() != self::MY_FILE_NAME && $item->getFileName() != "." && $item->getFileName() != ".." && strstr($item->getFileName(), self::PHP_FILE_EXTENSION)) + { + $plugins[] = array( + 'nfilename' => str_replace('.php', '', $item->getFileName()), + 'filepathname' => $item->getPath() . '/' . $item->getFileName() + ); + } } } }