add remaining class filename and add migration to fix the cronjobs, re #4282

Merge request !3136

app/controllers/loncapa.php

@@ -13,8 +13,8 @@ class LoncapaController extends AuthenticatedController
         if ($GLOBALS['perm']->have_studip_perm('user', $course_id)
             && isset($GLOBALS['ELEARNING_INTERFACE_MODULES'][$cms_type]))
         {
-            require_once 'lib/elearning/ELearningUtils.class.php';
-            require_once 'lib/elearning/ObjectConnections.class.php';
+            require_once 'lib/elearning/ELearningUtils.php';
+            require_once 'lib/elearning/ObjectConnections.php';
 
             $object_connections = new ObjectConnections($course_id);
             $connected_modules = $object_connections->getConnections();

app/controllers/quicksearch.php

@@ -14,7 +14,7 @@
 
 /**
  * Controller for the ajax-response of the QuickSearch class found in
- * lib/classes/QuickSearch.class.php
+ * lib/classes/QuickSearch.php
  */
 class QuicksearchController extends AuthenticatedController
 {

cli/Commands/CleanupAdmissionRules.php

@@ -18,7 +18,7 @@ class CleanupAdmissionRules extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
 
         $course_set = new \CourseSet();
 

cli/Commands/Plugins/PluginInfo.php

@@ -65,11 +65,11 @@ class PluginInfo extends AbstractPluginCommand
 
     private function pluginClassExists(string $plugindir, array $plugin)
     {
-        $pluginfile = $plugindir . $plugin['class'] . '.class.php';
+        $pluginfile = $plugindir . $plugin['class'] . '.php';
         if (file_exists($pluginfile)) {
             return 1;
         } else {
-            $pluginfile = $plugindir . $plugin['class'] . '.php';
+            $pluginfile = $plugindir . $plugin['class'] . '.class.php';
             if (file_exists($pluginfile)) {
                 return 1;
             }

composer.json

@@ -19,7 +19,6 @@
             "Trails\\": "lib/trails/",
             "": [
                 "lib/calendar/",
-                "lib/calendar/lib/",
                 "lib/classes/",
                 "lib/classes/admission/",
                 "lib/classes/admission/userfilter/",

config/config_develop.inc.php

@@ -329,7 +329,7 @@ $INST_ADMIN_DATAFIELDS_VIEW = [
 /*
  * Fields that may not be hidden by users in their privacy settings.
  * Can be configured per permission level.
- * @see lib/models/User.class.php in function getHomepageElements for
+ * @see lib/models/User.php in function getHomepageElements for
  * available fields.
  * Entries look like "'field_name' => true".
  */

db/migrations/1.128_step00240_coursesets.php

 <?php
 require_once 'vendor/phpass/PasswordHash.php';
-require_once 'lib/classes/admission/CourseSet.class.php';
+require_once 'lib/classes/admission/CourseSet.php';
 
 class Step00240CourseSets extends Migration
 {

db/migrations/1.12_step_120_userpic.php

@@ -10,7 +10,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/classes/Avatar.class.php';
+require_once 'lib/classes/Avatar.php';
 
 class Step120Userpic extends Migration {
 

db/migrations/6.0.11_adjust_cronjobs.php

+<?php
+return new class extends Migration
+{
+    private const ADJUSTMENTS = [
+        'lib/cronjobs/purge_cache',
+        'lib/cronjobs/check_admission',
+        'lib/cronjobs/session_gc',
+        'lib/cronjobs/cleanup_log',
+        'lib/cronjobs/garbage_collector',
+        'lib/cronjobs/send_mail_queue',
+        'lib/cronjobs/remind_oer_upload',
+        'lib/cronjobs/send_mail_notifications',
+    ];
+
+    public function description()
+    {
+        return 'Adjusts the class names for core cronjobs by losing the .class suffix';
+    }
+
+    protected function up()
+    {
+        $this->changeCronjobFilenames('.class.php', '.php');
+    }
+
+    protected function down()
+    {
+        $this->changeCronjobFilenames('.php', '.class.php');
+    }
+
+    private function changeCronjobFilenames(string $fromExtension, string $toExtension): void
+    {
+        $query = "UPDATE `cronjobs_tasks`
+                  SET `filename` = :new
+                  WHERE `filename` = :old";
+        $statement = DBManager::get()->prepare($query);
+
+        foreach (self::ADJUSTMENTS as $filename) {
+            $statement->bindValue(':new', $filename . $toExtension);
+            $statement->bindValue(':old', $filename . $fromExtension);
+            $statement->execute();
+        }
+    }
+};

lib/admissionrules/conditionaladmission/ConditionalAdmission.php

 <?php
 
 /**
- * ConditionalAdmission.class.php
+ * ConditionalAdmission.php
  *
  * An admission rule that specifies conditions for course admission, like
  * degree, study course or semester.

lib/admissionrules/coursememberadmission/CourseMemberAdmission.php

 <?php
 
 /**
- * CourseMemberAdmission.class.php
+ * CourseMemberAdmission.php
  *
  * Specifies a mandatory course membership for course admission.
  *

lib/admissionrules/limitedadmission/LimitedAdmission.php

 <?php
 
 /**
- * LimitedAdmission.class.php
+ * LimitedAdmission.php
  *
  * Represents rules for admission to a limited number of courses.
  *

lib/admissionrules/lockedadmission/LockedAdmission.php

 <?php
 
 /**
- * LockedAdmission.class.php
+ * LockedAdmission.php
  * 
  * Represents a rule for completely locking courses for admission.
  *

lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php

 <?php
 
 /**
- * ParticipantRestrictedAdmission.class.php
+ * ParticipantRestrictedAdmission.php
  *
  * Specifies restricted number of participants for course admission.
  *

lib/admissionrules/passwordadmission/PasswordAdmission.php

 <?php
 
 /**
- * PasswordAdmission.class.php
+ * PasswordAdmission.php
  *
  * Represents a rule for course access with a given password.
  *

lib/admissionrules/preferentialadmission/PreferentialAdmission.php

 <?php
 
 /**
- * PreferentialAdmission.class.php
+ * PreferentialAdmission.php
  *
  * An admission rule that favors selected courses of study or semesters of study.
  *

lib/admissionrules/termsadmission/TermsAdmission.php

 <?php
 /**
- * TermsAdmission.class.php
+ * TermsAdmission.php
  *
  * Represents a rule for course access with conditions of admission to be accepted.
  *

lib/admissionrules/timedadmission/TimedAdmission.php

 <?php
 
 /**
- * TimedAdmission.class.php
+ * TimedAdmission.php
  *
  * Specifies a time frame for course admission.
  *

lib/calendar/CalendarColumn.php

 <?php
 # Lifter010: TODO
 /**
- * CalendarColumn.class.php - a column for a CalendarView
+ * CalendarColumn.php - a column for a CalendarView
  *
  * This class represents an entry-column like "monday" in the calendar
  *

lib/calendar/CalendarView.php

@@ -2,7 +2,7 @@
 # Lifter010: TODO
 
  /**
- * CalendarView.class.php - generates a calendar
+ * CalendarView.php - generates a calendar
  *
  * This class takes and checks all necessary parameters to display a calendar/schedule/time-table.
  *