Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' into 'main'
Browse files Browse the repository at this point in the history
Develop

See merge request fluxfw/SrUserEnrolmentCron!17
  • Loading branch information
fluxfw committed Jul 20, 2021
2 parents fac0c98 + 1384367 commit 34b2061
Show file tree
Hide file tree
Showing 29 changed files with 103 additions and 1,109 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FluxPublishUtils:
script:
- "false"
only:
- /^master$/
- /^main$/
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [1.2.0]
- Switched to main branch
- ILIAS 7 support
- Remove ILIAS 5.4 support
- Min PHP 7.2

## [1.1.8]
- Change utils url

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<!-- Autogenerated from composer.json - All changes will be overridden if generated again! -->

# SrUserEnrolmentCron ILIAS Plugin

Cron jobs for enrol by rule and enrolment workflow
Expand All @@ -8,8 +6,8 @@ This project is licensed under the GPL-3.0-only license

## Requirements

* ILIAS 5.4.0 - 6.999
* PHP >=7.0
* ILIAS 6.0 - 7.999
* PHP >=7.2

## Installation

Expand Down
2 changes: 1 addition & 1 deletion classes/class.ilSrUserEnrolmentCronPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static function getInstance() : self
/**
* @inheritDoc
*/
public function getCronJobInstance(/*string*/ $a_job_id)/*: ?ilCronJob*/
public function getCronJobInstance(/*string*/ $a_job_id) : ?ilCronJob
{
return self::srUserEnrolment()->jobs()->factory()->newInstanceById($a_job_id);
}
Expand Down
19 changes: 7 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
{
"name": "srag/sruserenrolmentcron",
"description": "Cron jobs for enrol by rule and enrolment workflow",
"version": "1.1.8",
"version": "1.2.0",
"extra": {
"ilias_plugin": {
"id": "srusrenrcron",
"name": "SrUserEnrolmentCron",
"ilias_min_version": "5.4.0",
"ilias_max_version": "6.999",
"slot": "Services/Cron/CronHook",
"supports_cli_setup": true
},
"generate_plugin_readme_template": "ILIAS_PLUGIN",
"long_description_template": "src/LONG_DESCRIPTION.md"
"ilias_min_version": "6.0",
"ilias_max_version": "7.999",
"slot": "Services/Cron/CronHook"
}
},
"type": "project",
"keywords": [
Expand All @@ -32,7 +29,7 @@
}
],
"require": {
"php": ">=7.0",
"php": ">=7.2",
"srag/generateplugininfoshelper": ">=0.1.0",
"srag/librariesnamespacechanger": ">=0.1.0"
},
Expand All @@ -55,9 +52,7 @@
"scripts": {
"pre-autoload-dump": [
"srag\\LibrariesNamespaceChanger\\LibrariesNamespaceChanger::rewriteLibrariesNamespaces",
"srag\\LibrariesNamespaceChanger\\PHP72Backport::PHP72Backport",
"srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginPhpAndXml::generatePluginPhpAndXml",
"srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginReadme::generatePluginReadme"
"srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\GeneratePluginPhpAndXml::generatePluginPhpAndXml"
],
"update-version": [
"srag\\GeneratePluginInfosHelper\\SrUserEnrolmentCron\\UpdateVersion::updateVersion"
Expand Down
36 changes: 14 additions & 22 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
require_once __DIR__ . "/vendor/autoload.php";

$id = "srusrenrcron";
$version = "1.1.8";
$ilias_min_version = "5.4.0";
$ilias_max_version = "6.999";
$version = "1.2.0";
$ilias_min_version = "6.0";
$ilias_max_version = "7.999";
$responsible = "fluxlabs";
$responsible_mail = "support@fluxlabs.ch";
$supports_cli_setup = true;
7 changes: 0 additions & 7 deletions src/LONG_DESCRIPTION.md

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,4 @@
'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',
'srag\\LibrariesNamespaceChanger\\PHP72Backport' => $vendorDir . '/srag/librariesnamespacechanger/src/PHP72Backport.php',
'srag\\LibrariesNamespaceChanger\\PHP7Backport' => $vendorDir . '/srag/librariesnamespacechanger/src/PHP7Backport.php',
'srag\\LibrariesNamespaceChanger\\RemovePHP72Backport' => $vendorDir . '/srag/librariesnamespacechanger/src/RemovePHP72Backport.php',
);
3 changes: 0 additions & 3 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ class ComposerStaticInit44a45322a214a2f83ec68cbe7753e9f8
'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',
'srag\\LibrariesNamespaceChanger\\PHP72Backport' => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src/PHP72Backport.php',
'srag\\LibrariesNamespaceChanger\\PHP7Backport' => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src/PHP7Backport.php',
'srag\\LibrariesNamespaceChanger\\RemovePHP72Backport' => __DIR__ . '/..' . '/srag/librariesnamespacechanger/src/RemovePHP72Backport.php',
);

public static function getInitializer(ClassLoader $loader)
Expand Down
36 changes: 14 additions & 22 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
[
{
"name": "srag/generateplugininfoshelper",
"version": "2.10.4",
"version_normalized": "2.10.4.0",
"version": "2.12.0",
"version_normalized": "2.12.0.0",
"source": {
"type": "git",
"url": "https://github.com/fluxapps/GeneratePluginInfosHelper.git",
"reference": "fe5871f8f3881aea30ad290819a724824e304792"
"reference": "ac48769122303e52c757f581c1b7d68a03acc640"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fluxapps/GeneratePluginInfosHelper/zipball/fe5871f8f3881aea30ad290819a724824e304792",
"reference": "fe5871f8f3881aea30ad290819a724824e304792",
"url": "https://api.github.com/repos/fluxapps/GeneratePluginInfosHelper/zipball/ac48769122303e52c757f581c1b7d68a03acc640",
"reference": "ac48769122303e52c757f581c1b7d68a03acc640",
"shasum": ""
},
"require": {
"php": ">=7.0"
"php": ">=7.2"
},
"time": "2021-06-04T08:21:59+00:00",
"time": "2021-07-20T08:32:36+00:00",
"type": "library",
"extra": {
"generate_plugin_readme_template": "LIBRARY",
"long_description_template": "src/LONG_DESCRIPTION.md"
},
"installation-source": "dist",
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -52,31 +48,27 @@
},
{
"name": "srag/librariesnamespacechanger",
"version": "0.15.4",
"version_normalized": "0.15.4.0",
"version": "0.16.1",
"version_normalized": "0.16.1.0",
"source": {
"type": "git",
"url": "https://github.com/fluxapps/LibrariesNamespaceChanger.git",
"reference": "c9dba49e7f13cc2bd4d3b0ff3d5016c756212a97"
"reference": "186c543c88544ecf3907767e1645d4faf37dede0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fluxapps/LibrariesNamespaceChanger/zipball/c9dba49e7f13cc2bd4d3b0ff3d5016c756212a97",
"reference": "c9dba49e7f13cc2bd4d3b0ff3d5016c756212a97",
"url": "https://api.github.com/repos/fluxapps/LibrariesNamespaceChanger/zipball/186c543c88544ecf3907767e1645d4faf37dede0",
"reference": "186c543c88544ecf3907767e1645d4faf37dede0",
"shasum": ""
},
"require": {
"php": ">=7.0"
"php": ">=7.2"
},
"require-dev": {
"srag/generateplugininfoshelper": ">=0.1.0"
},
"time": "2021-06-04T08:23:01+00:00",
"time": "2021-07-20T08:31:26+00:00",
"type": "library",
"extra": {
"generate_plugin_readme_template": "LIBRARY",
"long_description_template": "src/LONG_DESCRIPTION.md"
},
"installation-source": "dist",
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/srag/generateplugininfoshelper/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FluxPublishUtils:
script:
- "false"
only:
- /^master$/
- /^main$/
6 changes: 6 additions & 0 deletions vendor/srag/generateplugininfoshelper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [2.12.0]
- Deprecate GeneratePluginReadme

## [2.11.0]
- Min PHP 7.2

## [2.10.4]
- Change utils url

Expand Down
Loading

0 comments on commit 34b2061

Please sign in to comment.