Skip to content
Snippets Groups Projects
Commit 33fd1358 authored by Marcus Eibrink-Lunzenauer's avatar Marcus Eibrink-Lunzenauer
Browse files

Deprecate `StudipAutoloader` and use composer's `autoload`

Closes #4282

Merge request !3099
parent 42d46671
No related branches found
No related tags found
No related merge requests found
Showing
with 675 additions and 586 deletions
<?php
require_once 'lib/classes/QuestionType.interface.php';
class QuestionnaireController extends AuthenticatedController
{
protected $allow_nobody = true; //nobody is allowed
......
......@@ -7,6 +7,65 @@
"php": "8.1"
}
},
"autoload": {
"psr-4": {
"exTpl\\": "lib/exTpl/",
"Flexi\\": "lib/flexi/",
"Studip\\Activity\\": "lib/activities/",
"Studip\\Cache\\": "lib/classes/cache/",
"Studip\\Calendar\\": "lib/classes/calendar/",
"Studip\\": "lib/classes/",
"Trails\\": "lib/trails/",
"": [
"lib/calendar/",
"lib/calendar/lib/",
"lib/classes/",
"lib/classes/admission/",
"lib/classes/admission/userfilter/",
"lib/classes/auth_plugins/",
"lib/classes/calendar/",
"lib/classes/coursewizardsteps/",
"lib/classes/exportdocument/",
"lib/classes/forms/",
"lib/classes/globalsearch/",
"lib/classes/helpbar/",
"lib/classes/librarysearch/",
"lib/classes/librarysearch/resultparsers/",
"lib/classes/librarysearch/searchmodules/",
"lib/classes/searchtypes/",
"lib/classes/sidebar/",
"lib/classes/visibility/",
"lib/classes/wiki/",
"lib/elearning/",
"lib/exTpl', 'exTpl/",
"lib/exceptions/",
"lib/exceptions/resources/",
"lib/extern/",
"lib/filesystem/",
"lib/ilias_interface",
"lib/migrations/",
"lib/models/",
"lib/models/calendar/",
"lib/models/resources/",
"lib/modules/",
"lib/navigation/",
"lib/phplib/",
"lib/plugins/core/",
"lib/plugins/db/",
"lib/plugins/engine/",
"lib/raumzeit/",
"lib/resources/"
]
},
"classmap": [
"lib/phplib/email_validation.php",
"lib/messaging.inc.php",
"lib/plugins/core/StudIPPlugin.php",
"app/controllers/module/mvv_controller.php",
"vendor/phpass/PasswordHash.php",
"composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc"
]
},
"require-dev": {
"woohoolabs/yang": "3.0.0",
"codeception/codeception": "5.1.2",
......@@ -14,7 +73,8 @@
"overtrue/phplint": "9.3.0",
"phpstan/phpstan": "1.11.0",
"symfony/var-dumper": "6.4.7",
"maximebf/debugbar": "1.22.3"
"maximebf/debugbar": "1.22.3",
"codeception/specify": "^2.0"
},
"require": {
"php": "^8.1",
......
This diff is collapsed.
......@@ -63,7 +63,7 @@ class Step102Datenfeldtypen extends Migration {
return;
}
require_once 'lib/classes/DataFieldStructure.class.php';
require_once 'lib/classes/DataFieldStructure.php';
$ids = array_keys(DataFieldStructure::getDataFieldStructures());
......
......@@ -55,8 +55,8 @@ class Step25RaumzeitDbConversion extends Migration
// include business logic
require_once('lib/classes/Seminar.class.php');
require_once('lib/resources/lib/VeranstaltungResourcesAssign.class.php');
require_once('lib/classes/Seminar.php');
require_once('lib/resources/lib/VeranstaltungResourcesAssign.php');
......
......@@ -3,102 +3,21 @@
require 'lib/classes/StudipAutoloader.php';
StudipAutoloader::register();
// General classes folders
StudipAutoloader::addAutoloadPath('lib/models');
StudipAutoloader::addAutoloadPath('lib/models/calendar');
StudipAutoloader::addAutoloadPath('lib/models/resources');
StudipAutoloader::addAutoloadPath('lib/classes');
StudipAutoloader::addAutoloadPath('lib/classes', 'Studip');
// Plugins
StudipAutoloader::addAutoloadPath('lib/plugins/core');
StudipAutoloader::addAutoloadPath('lib/plugins/db');
StudipAutoloader::addAutoloadPath('lib/plugins/engine');
// Specialized folders
StudipAutoloader::addAutoloadPath('lib/classes/admission');
StudipAutoloader::addAutoloadPath('lib/classes/admission/userfilter');
StudipAutoloader::addAutoloadPath('lib/classes/auth_plugins');
StudipAutoloader::addAutoloadPath('lib/classes/calendar');
StudipAutoloader::addAutoloadPath('lib/classes/cache', 'Studip\\Cache');
class_alias(\Studip\Cache\Factory::class, 'StudipCacheFactory');
class_alias(\Studip\Cache\Cache::class, 'StudipCache');
StudipAutoloader::addAutoloadPath('lib/classes/exportdocument');
StudipAutoloader::addAutoloadPath('lib/classes/forms');
StudipAutoloader::addAutoloadPath('lib/classes/globalsearch');
StudipAutoloader::addAutoloadPath('lib/classes/helpbar');
StudipAutoloader::addAutoloadPath('lib/classes/librarysearch/resultparsers');
StudipAutoloader::addAutoloadPath('lib/classes/librarysearch/searchmodules');
StudipAutoloader::addAutoloadPath('lib/classes/librarysearch');
StudipAutoloader::addAutoloadPath('lib/classes/searchtypes');
StudipAutoloader::addAutoloadPath('lib/classes/sidebar');
StudipAutoloader::addAutoloadPath('lib/classes/visibility');
StudipAutoloader::addAutoloadPath('lib/classes/coursewizardsteps');
StudipAutoloader::addAutoloadPath('lib/classes/wiki');
StudipAutoloader::addAutoloadPath('lib/calendar');
StudipAutoloader::addAutoloadPath('lib/calendar', 'Studip\\Calendar');
StudipAutoloader::addAutoloadPath('lib/exceptions');
StudipAutoloader::addAutoloadPath('lib/exceptions/resources');
StudipAutoloader::addAutoloadPath('lib/exTpl', 'exTpl');
StudipAutoloader::addAutoloadPath('lib/filesystem');
StudipAutoloader::addAutoloadPath('lib/migrations');
StudipAutoloader::addAutoloadPath('lib/modules');
StudipAutoloader::addAutoloadPath('lib/navigation');
StudipAutoloader::addAutoloadPath('lib/phplib');
StudipAutoloader::addAutoloadPath('lib/raumzeit');
StudipAutoloader::addAutoloadPath('lib/resources');
StudipAutoloader::addAutoloadPath('lib/activities', 'Studip\\Activity');
StudipAutoloader::addAutoloadPath('lib/calendar/lib');
StudipAutoloader::addAutoloadPath('lib/elearning');
StudipAutoloader::addAutoloadPath('lib/extern');
StudipAutoloader::addAutoloadPath('lib/ilias_interface');
// Flexi
StudipAutoloader::addAutoloadPath('lib/flexi', 'Flexi');
class_alias(Flexi\PhpTemplate::class, 'Flexi_PhpTemplate');
class_alias(Flexi\Template::class, 'Flexi_Template');
class_alias(Flexi\Factory::class, 'Flexi_TemplateFactory');
class_alias(Flexi\TemplateNotFoundException::class, 'Flexi_TemplateNotFoundException');
// Trails
StudipAutoloader::addAutoloadPath('lib/trails', 'Trails');
class_alias(Trails\Controller::class, 'Trails_Controller');
class_alias(Trails\Dispatcher::class, 'Trails_Dispatcher');
class_alias(Trails\Exception::class, 'Trails_Exception');
class_alias(Trails\Flash::class, 'Trails_Flash');
class_alias(Trails\Inflector::class, 'Trails_Inflector');
class_alias(Trails\Response::class, 'Trails_Response');
class_alias(Trails\Exceptions\DoubleRenderError::class, 'Trails_DoubleRenderError');
class_alias(Trails\Exceptions\MissingFile::class, 'Trails_MissingFile');
class_alias(Trails\Exceptions\RoutingError::class, 'Trails_RoutingError');
class_alias(Trails\Exceptions\SessionRequiredException::class, 'Trails_SessionRequiredException');
class_alias(Trails\Exceptions\UnknownAction::class, 'Trails_UnknownAction');
class_alias(Trails\Exceptions\UnknownController::class, 'Trails_UnknownController');
// Messy file names
StudipAutoloader::addClassLookups([
'email_validation_class' => 'lib/phplib/email_validation.class.php',
'messaging' => 'lib/messaging.inc.php',
'StudipPlugin' => 'lib/plugins/core/StudIPPlugin.class.php',
'MVVController' => 'app/controllers/module/mvv_controller.php'
]);
// Vendor
StudipAutoloader::addClassLookups([
'PasswordHash' => 'vendor/phpass/PasswordHash.php',
]);
// XMLRpc
StudipAutoloader::addClassLookup(
['xmlrpcval', 'xmlrpcmsg', 'xmlrpcresp', 'xmlrpc_client'],
'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpc.inc'
);
StudipAutoloader::addClassLookup(
['xmlrpc_server'],
'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpcs.inc'
);
......@@ -224,7 +224,7 @@ if (Config::get()->CALENDAR_ENABLE) {
}
if (Config::get()->SOAP_ENABLE) {
require_once 'lib/soap/StudipSoapClient' . (Config::get()->SOAP_USE_PHP5 ? '_PHP5' : '' ) . '.class.php';
require_once 'lib/soap/StudipSoapClient' . (Config::get()->SOAP_USE_PHP5 ? '_PHP5' : '' ) . '.php';
}
if (Config::Get()->ILIAS_INTERFACE_ENABLE) {
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment