From e9dee86b7c8f65b9d1820f3129aa809d538b5271 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 11 Sep 2019 17:58:36 +0200 Subject: [PATCH] Remove unecessary require() calls in utils class We still need manual require() for LoginForm and associated --- application/utils.inc.php | 13 ------------- composer.json | 7 ++++++- core/metamodel.class.php | 24 +++++++++++++++++------- lib/composer/ClassLoader.php | 4 ++-- lib/composer/autoload_classmap.php | 6 ------ lib/composer/autoload_real.php | 2 +- lib/composer/autoload_static.php | 6 ------ 7 files changed, 26 insertions(+), 36 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 9aba32ee0..c162ab0b1 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -27,19 +27,6 @@ use ScssPhp\ScssPhp\Compiler; * @copyright Copyright (C) 2010-2017 Combodo SARL * @license http://opensource.org/licenses/AGPL-3.0 */ -require_once(APPROOT.'core/metamodel.class.php'); -require_once(APPROOT.'core/config.class.inc.php'); -require_once(APPROOT.'application/transaction.class.inc.php'); -require_once(APPROOT.'application/Html2Text.php'); -require_once(APPROOT.'application/Html2TextException.php'); - -require_once(APPROOT.'application/applicationextension.inc.php'); -require_once(APPROOT.'application/loginform.class.inc.php'); -require_once(APPROOT.'application/loginbasic.class.inc.php'); -require_once(APPROOT.'application/logindefault.class.inc.php'); -require_once(APPROOT.'application/loginexternal.class.inc.php'); -require_once(APPROOT.'application/loginurl.class.inc.php'); - define('ITOP_CONFIG_FILE', 'config-itop.php'); define('ITOP_DEFAULT_CONFIG_FILE', APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE); diff --git a/composer.json b/composer.json index 751818e8d..a9d4aafc3 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,12 @@ "core/querybuildercontext.class.inc.php", "core/legacy/querybuildercontextlegacy.class.inc.php", "core/querybuilderexpressions.class.inc.php", - "core/legacy/querybuilderexpressionslegacy.class.inc.php" + "core/legacy/querybuilderexpressionslegacy.class.inc.php", + "application/loginform.class.inc.php", + "application/loginbasic.class.inc.php", + "application/logindefault.class.inc.php", + "application/loginexternal.class.inc.php", + "application/loginurl.class.inc.php" ] }, "conflict": { diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 4e0785ec1..0660c91b3 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -17,13 +17,23 @@ // along with iTop. If not, see // -require_once(APPROOT.'core/modulehandler.class.inc.php'); -require_once(APPROOT.'core/querymodifier.class.inc.php'); -require_once(APPROOT.'core/metamodelmodifier.inc.php'); -require_once(APPROOT.'core/computing.inc.php'); -require_once(APPROOT.'core/relationgraph.class.inc.php'); -require_once(APPROOT.'core/apc-compat.php'); -require_once(APPROOT.'core/expressioncache.class.inc.php'); +require_once APPROOT.'core/modulehandler.class.inc.php'; +require_once APPROOT.'core/querymodifier.class.inc.php'; +require_once APPROOT.'core/metamodelmodifier.inc.php'; +require_once APPROOT.'core/computing.inc.php'; +require_once APPROOT.'core/relationgraph.class.inc.php'; +require_once APPROOT.'core/apc-compat.php'; +require_once APPROOT.'core/expressioncache.class.inc.php'; + + +/** + * We need to have all iLoginFSMExtension/iLoginDataExtension impl loaded ! Cannot use autoloader... + */ +require_once APPROOT.'application/loginform.class.inc.php'; +require_once APPROOT.'application/loginbasic.class.inc.php'; +require_once APPROOT.'application/logindefault.class.inc.php'; +require_once APPROOT.'application/loginexternal.class.inc.php'; +require_once APPROOT.'application/loginurl.class.inc.php'; /** * Metamodel diff --git a/lib/composer/ClassLoader.php b/lib/composer/ClassLoader.php index 2c72175e7..dc02dfb11 100644 --- a/lib/composer/ClassLoader.php +++ b/lib/composer/ClassLoader.php @@ -379,9 +379,9 @@ class ClassLoader $subPath = substr($subPath, 0, $lastPos); $search = $subPath.'\\'; if (isset($this->prefixDirsPsr4[$search])) { + $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); foreach ($this->prefixDirsPsr4[$search] as $dir) { - $length = $this->prefixLengthsPsr4[$first][$search]; - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { + if (file_exists($file = $dir . $pathEnd)) { return $file; } } diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index d47a33c30..720522c68 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -257,15 +257,9 @@ return array( 'ListExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'ListOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php', 'LogAPI' => $baseDir . '/core/log.class.inc.php', - 'LoginBasic' => $baseDir . '/application/loginbasic.class.inc.php', 'LoginBlockData' => $baseDir . '/application/logintwig.class.inc.php', - 'LoginDefaultAfter' => $baseDir . '/application/logindefault.class.inc.php', - 'LoginDefaultBefore' => $baseDir . '/application/logindefault.class.inc.php', - 'LoginExternal' => $baseDir . '/application/loginexternal.class.inc.php', - 'LoginForm' => $baseDir . '/application/loginform.class.inc.php', 'LoginTwigContext' => $baseDir . '/application/logintwig.class.inc.php', 'LoginTwigData' => $baseDir . '/application/logintwig.class.inc.php', - 'LoginURL' => $baseDir . '/application/loginurl.class.inc.php', 'LoginWebPage' => $baseDir . '/application/loginwebpage.class.inc.php', 'MatchExpression' => $baseDir . '/core/oql/expression.class.inc.php', 'MatchOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php', diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php index 9e92a817d..e8c595bf1 100644 --- a/lib/composer/autoload_real.php +++ b/lib/composer/autoload_real.php @@ -24,7 +24,7 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b spl_autoload_unregister(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; - array_push($includePaths, get_include_path()); + $includePaths[] = get_include_path(); set_include_path(implode(PATH_SEPARATOR, $includePaths)); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index d558be72c..6d22cac04 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -478,15 +478,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'ListExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'ListOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php', 'LogAPI' => __DIR__ . '/../..' . '/core/log.class.inc.php', - 'LoginBasic' => __DIR__ . '/../..' . '/application/loginbasic.class.inc.php', 'LoginBlockData' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php', - 'LoginDefaultAfter' => __DIR__ . '/../..' . '/application/logindefault.class.inc.php', - 'LoginDefaultBefore' => __DIR__ . '/../..' . '/application/logindefault.class.inc.php', - 'LoginExternal' => __DIR__ . '/../..' . '/application/loginexternal.class.inc.php', - 'LoginForm' => __DIR__ . '/../..' . '/application/loginform.class.inc.php', 'LoginTwigContext' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php', 'LoginTwigData' => __DIR__ . '/../..' . '/application/logintwig.class.inc.php', - 'LoginURL' => __DIR__ . '/../..' . '/application/loginurl.class.inc.php', 'LoginWebPage' => __DIR__ . '/../..' . '/application/loginwebpage.class.inc.php', 'MatchExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php', 'MatchOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',