diff --git a/auth/cas/CAS/readme_moodle.txt b/auth/cas/CAS/readme_moodle.txt index 1c0d35aaa12..ef425eedc00 100644 --- a/auth/cas/CAS/readme_moodle.txt +++ b/auth/cas/CAS/readme_moodle.txt @@ -4,23 +4,27 @@ Last release can be found at https://github.com/apereo/phpCAS/releases NOTICE: * Before running composer command, make sure you have the composer version updated. - * Composer version 2.2.4 2022-01-08 12:30:42 + * Composer version 2.7.7 2024-06-16 19:06:42 STEPS: - * Make sure you're using the lowest supported PHP version for the given release (e.g. PHP 7.4 for Moodle 4.1) - * Create a temporary folder outside your Moodle installation - * Execute 'composer require apereo/phpcas:VERSION' + * Make sure you're using the lowest supported PHP version for the given release (e.g. PHP 8.1 for Moodle 4.5) + * Create a temporary folder outside your Moodle installation e.g. /tmp/phpcas + * Create a composer.json file with the following content inside the temporary folder (you will need to replace X.YY to the proper version to be upgraded): +{ + "require": { + "apereo/phpcas": "X.YY" + }, + "replace": { + "psr/log": "*" + } +} + * Execute 'composer require apereo/phpcas' inside the temporary folder. + * Check to make sure the following directory hasn't been created + - vendor/psr/log * Check any new libraries that have been added and make sure they do not exist in Moodle already. - * Remove the old 'vendor' directory in auth/cas/CAS/ - * Copy contents of 'vendor' directory + * Remove the 'vendor' directory in auth/cas/CAS/ + * Copy the '/tmp/phpcas/vendor' directory into auth/cas/CAS/ * Create a commit with only the library changes. - Note: Make sure to check the list of unversioned files and add any new files to the staging area. * Update auth/cas/thirdpartylibs.xml - * Apply the modifications described in the CHANGES section - * Create another commit with the previous two steps of changes - -CHANGES: - * Remove all the hidden folders and files in vendor/apereo/phpcas/ (find . -name ".*"): - - .codecov.yml - - .gitattributes - - .github \ No newline at end of file + * Create another commit with the previous change diff --git a/auth/cas/auth.php b/auth/cas/auth.php index 7378b4fa436..a7b76eb9b41 100644 --- a/auth/cas/auth.php +++ b/auth/cas/auth.php @@ -30,7 +30,6 @@ defined('MOODLE_INTERNAL') || die(); require_once($CFG->dirroot.'/auth/ldap/auth.php'); require_once($CFG->dirroot.'/auth/cas/CAS/vendor/autoload.php'); -require_once($CFG->dirroot.'/auth/cas/CAS/vendor/apereo/phpcas/source/CAS.php'); /** * CAS authentication plugin. diff --git a/auth/cas/thirdpartylibs.xml b/auth/cas/thirdpartylibs.xml index 7133c36e295..ab154811baa 100644 --- a/auth/cas/thirdpartylibs.xml +++ b/auth/cas/thirdpartylibs.xml @@ -4,7 +4,7 @@ CAS CAS phpCAS library to support CAS authentication plugin. - 1.6.0 + 1.6.1 Apache 2.0 https://github.com/apereo/phpCAS