composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unecessary require() calls in utils class

Browse Source 
We still need manual require() for LoginForm and associated
This commit is contained in:
Pierre Goiffon
2019-09-11 17:58:36 +02:00
parent 42d7901828
commit e9dee86b7c
7 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/utils.inc.php
View File

@@ -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);

7
composer.json
View File

@@ -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": {

24
core/metamodel.class.php
View File

@@ -17,13 +17,23 @@
// along with iTop. If not, see <http://www.gnu.org/licenses/>
//
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

4
lib/composer/ClassLoader.php
View File

@@ -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;
}
}

6
lib/composer/autoload_classmap.php
View File

@@ -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',

2
lib/composer/autoload_real.php
View File

@@ -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());

6
lib/composer/autoload_static.php
View File

@@ -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',