Merge branch 'cleanup' into 'main'

Clean up

See merge request fluxfw/SrUserEnrolmentCron!19

.gitignore

@@ -1,9 +1,3 @@
 .idea
-**/lang/*
-!**/lang/ilias_de.lang
-!**/lang/ilias_en.lang
-#LuceneObjectDefinition.xml
 #node_modules
-#plugin.php
-#plugin.xml
 #vendor

.gitlab-ci.yml

@@ -1,7 +1,15 @@
-FluxPublishUtils:
-  stage: build
-  image: docker-registry.fluxpublisher.ch/flux-publish-utils:latest
-  script:
-    - "false"
-  only:
-    - /^main$/
+stages:
+    - publish-utils
+
+publish-utils:
+    stage: publish-utils
+    image: php:cli-alpine
+    script:
+        - (if [ ! -d flux-publish-utils ]; then mkdir -p flux-publish-utils && cd flux-publish-utils && wget -O - https://github.com/fluxfw/flux-publish-utils/releases/download/v2022-07-12-1/flux-publish-utils-v2022-07-12-1-build.tar.gz | tar -xz --strip-components=1; fi)
+        - flux-publish-utils/bin/publish-utils.php
+    cache:
+        key: publish-utils
+        paths:
+            - flux-publish-utils
+    only:
+        - main

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.3.0]
+- Clean up
+
 ## [1.2.0]
 - Switched to main branch
 - ILIAS 7 support

README.md

@@ -16,7 +16,7 @@ Start at your ILIAS root directory
 ```bash
 mkdir -p Customizing/global/plugins/Services/Cron/CronHook
 cd Customizing/global/plugins/Services/Cron/CronHook
-git clone https://github.com/fluxapps/SrUserEnrolmentCron.git SrUserEnrolmentCron
+git clone https://github.com/fluxfw/SrUserEnrolmentCron.git SrUserEnrolmentCron
 ```
 
 Update, activate and config the plugin in the ILIAS Plugin Administration
@@ -25,7 +25,7 @@ Update, activate and config the plugin in the ILIAS Plugin Administration
 
 ### Base plugin
 
-First you need to install the [SrUserEnrolment](https://github.com/fluxapps/SrUserEnrolment) plugin
+First you need to install the [SrUserEnrolment](https://github.com/fluxfw/SrUserEnrolment) plugin
 
 ### Cron jobs
 

composer.json

@@ -1,36 +1,17 @@
 {
   "name": "srag/sruserenrolmentcron",
   "description": "Cron jobs for enrol by rule and enrolment workflow",
-  "version": "1.2.0",
-  "extra": {
-    "ilias_plugin": {
-      "id": "srusrenrcron",
-      "name": "SrUserEnrolmentCron",
-      "ilias_min_version": "6.0",
-      "ilias_max_version": "7.999",
-      "slot": "Services/Cron/CronHook"
-    }
-  },
+  "version": "1.3.0",
   "type": "project",
   "keywords": [
     "cron",
     "ilias",
     "job",
     "plugin"
   ],
-  "homepage": "https://github.com/fluxapps/SrUserEnrolmentCron",
   "license": "GPL-3.0-only",
-  "authors": [
-    {
-      "name": "fluxlabs",
-      "email": "[email protected]",
-      "homepage": "https://fluxlabs.ch",
-      "role": "Developer"
-    }
-  ],
   "require": {
     "php": ">=7.2",
-    "srag/generateplugininfoshelper": ">=0.1.0",
     "srag/librariesnamespacechanger": ">=0.1.0"
   },
   "autoload": {
@@ -51,11 +32,7 @@
   },
   "scripts": {
     "pre-autoload-dump": [
-      "srag\\LibrariesNamespaceChanger\\LibrariesNamespaceChanger::rewriteLibrariesNamespaces",
-      "srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginPhpAndXml::generatePluginPhpAndXml"
-    ],
-    "update-version": [
-      "srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\UpdateVersion::updateVersion"
+      "srag\\LibrariesNamespaceChanger\\LibrariesNamespaceChanger::rewriteLibrariesNamespaces"
     ]
   }
 }

plugin.php

@@ -1,11 +1,10 @@
 <?php
-// Autogenerated from composer.json - All changes will be overridden if generated again!
-
 require_once __DIR__ . "/vendor/autoload.php";
 
 $id = "srusrenrcron";
-$version = "1.2.0";
+$version = "1.3.0";
 $ilias_min_version = "6.0";
 $ilias_max_version = "7.999";
-$responsible = "fluxlabs";
-$responsible_mail = "[email protected]";
+$responsible = "";
+$responsible_mail = "";
+$supports_cli_setup = false;

vendor/composer/autoload_classmap.php

@@ -7,8 +7,5 @@
 
 return array(
     'ilSrUserEnrolmentCronPlugin' => $baseDir . '/classes/class.ilSrUserEnrolmentCronPlugin.php',
-    'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginPhpAndXml' => $vendorDir . '/srag/generateplugininfoshelper/src/GeneratePluginPhpAndXml.php',
-    'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginReadme' => $vendorDir . '/srag/generateplugininfoshelper/src/GeneratePluginReadme.php',
-    'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\UpdateVersion' => $vendorDir . '/srag/generateplugininfoshelper/src/UpdateVersion.php',
     'srag\\LibrariesNamespaceChanger\\LibrariesNamespaceChanger' => $vendorDir . '/srag/librariesnamespacechanger/src/LibrariesNamespaceChanger.php',
 );

vendor/composer/autoload_psr4.php

@@ -8,5 +8,4 @@
 return array(
     'srag\\Plugins\\SrUserEnrolmentCron\\' => array($baseDir . '/src'),
     'srag\\LibrariesNamespaceChanger\\' => array($vendorDir . '/srag/librariesnamespacechanger/src'),
-    'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\' => array($vendorDir . '/srag/generateplugininfoshelper/src'),
 );

vendor/composer/autoload_static.php

@@ -15,7 +15,6 @@ class ComposerStaticInit44a45322a214a2f83ec68cbe7753e9f8
         array (
             'srag\\Plugins\\SrUserEnrolmentCron\\' => 33,
             'srag\\LibrariesNamespaceChanger\\' => 31,
-            'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\' => 51,
         ),
     );
 
@@ -28,17 +27,10 @@ class ComposerStaticInit44a45322a214a2f83ec68cbe7753e9f8
         array (
             0 => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src',
         ),
-        'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/srag/generateplugininfoshelper/src',
-        ),
     );
 
     public static $classMap = array (
         'ilSrUserEnrolmentCronPlugin' => __DIR__ . '/../..' . '/classes/class.ilSrUserEnrolmentCronPlugin.php',
-        'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginPhpAndXml' => __DIR__ . '/..' . '/srag/generateplugininfoshelper/src/GeneratePluginPhpAndXml.php',
-        'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginReadme' => __DIR__ . '/..' . '/srag/generateplugininfoshelper/src/GeneratePluginReadme.php',
-        'srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\UpdateVersion' => __DIR__ . '/..' . '/srag/generateplugininfoshelper/src/UpdateVersion.php',
         'srag\\LibrariesNamespaceChanger\\LibrariesNamespaceChanger' => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src/LibrariesNamespaceChanger.php',
     );
 

vendor/composer/installed.json

@@ -1,51 +1,4 @@
 [
-    {
-        "name": "srag/generateplugininfoshelper",
-        "version": "2.12.0",
-        "version_normalized": "2.12.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fluxapps/GeneratePluginInfosHelper.git",
-            "reference": "ac48769122303e52c757f581c1b7d68a03acc640"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fluxapps/GeneratePluginInfosHelper/zipball/ac48769122303e52c757f581c1b7d68a03acc640",
-            "reference": "ac48769122303e52c757f581c1b7d68a03acc640",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2"
-        },
-        "time": "2021-07-20T08:32:36+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "GPL-3.0-only"
-        ],
-        "authors": [
-            {
-                "name": "fluxlabs",
-                "email": "[email protected]",
-                "homepage": "https://fluxlabs.ch",
-                "role": "Developer"
-            }
-        ],
-        "description": "Automatic generate plugin infos such README.md, plugin.php, plugin.xml, ... from composer.json",
-        "homepage": "https://github.com/fluxapps/GeneratePluginInfosHelper",
-        "keywords": [
-            "Infos",
-            "generate",
-            "helper",
-            "plugin"
-        ]
-    },
     {
         "name": "srag/librariesnamespacechanger",
         "version": "0.16.1",