From 6fb64a4ec04fa66ecb57584f963e9c35b46270e9 Mon Sep 17 00:00:00 2001 From: Thom Rawson Date: Wed, 21 Mar 2018 18:09:46 +0800 Subject: [PATCH] MDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace --- .../contextmemberships.php | 2 +- .../linkmemberships.php | 2 +- .../classes/local/service/memberships.php | 4 +-- .../service/memberships/db/renamedclasses.php | 34 ++++++++++++++++++ .../local/{resource => resources}/profile.php | 4 +-- .../profile/classes/local/service/profile.php | 2 +- mod/lti/service/profile/db/renamedclasses.php | 33 +++++++++++++++++ .../{resource => resources}/toolproxy.php | 4 +-- .../classes/local/service/toolproxy.php | 2 +- .../service/toolproxy/db/renamedclasses.php | 33 +++++++++++++++++ .../contextsettings.php | 6 ++-- .../{resource => resources}/linksettings.php | 8 ++--- .../systemsettings.php | 2 +- .../classes/local/service/toolsettings.php | 6 ++-- .../toolsettings/db/renamedclasses.php | 35 +++++++++++++++++++ 15 files changed, 156 insertions(+), 21 deletions(-) rename mod/lti/service/memberships/classes/local/{resource => resources}/contextmemberships.php (99%) rename mod/lti/service/memberships/classes/local/{resource => resources}/linkmemberships.php (98%) create mode 100644 mod/lti/service/memberships/db/renamedclasses.php rename mod/lti/service/profile/classes/local/{resource => resources}/profile.php (98%) create mode 100644 mod/lti/service/profile/db/renamedclasses.php rename mod/lti/service/toolproxy/classes/local/{resource => resources}/toolproxy.php (98%) create mode 100644 mod/lti/service/toolproxy/db/renamedclasses.php rename mod/lti/service/toolsettings/classes/local/{resource => resources}/contextsettings.php (97%) rename mod/lti/service/toolsettings/classes/local/{resource => resources}/linksettings.php (96%) rename mod/lti/service/toolsettings/classes/local/{resource => resources}/systemsettings.php (99%) create mode 100644 mod/lti/service/toolsettings/db/renamedclasses.php diff --git a/mod/lti/service/memberships/classes/local/resource/contextmemberships.php b/mod/lti/service/memberships/classes/local/resources/contextmemberships.php similarity index 99% rename from mod/lti/service/memberships/classes/local/resource/contextmemberships.php rename to mod/lti/service/memberships/classes/local/resources/contextmemberships.php index 88896581b89..7afb386fc07 100644 --- a/mod/lti/service/memberships/classes/local/resource/contextmemberships.php +++ b/mod/lti/service/memberships/classes/local/resources/contextmemberships.php @@ -24,7 +24,7 @@ */ -namespace ltiservice_memberships\local\resource; +namespace ltiservice_memberships\local\resources; use \mod_lti\local\ltiservice\service_base; use ltiservice_memberships\local\service\memberships; diff --git a/mod/lti/service/memberships/classes/local/resource/linkmemberships.php b/mod/lti/service/memberships/classes/local/resources/linkmemberships.php similarity index 98% rename from mod/lti/service/memberships/classes/local/resource/linkmemberships.php rename to mod/lti/service/memberships/classes/local/resources/linkmemberships.php index f93566234bd..10efc244ec3 100644 --- a/mod/lti/service/memberships/classes/local/resource/linkmemberships.php +++ b/mod/lti/service/memberships/classes/local/resources/linkmemberships.php @@ -24,7 +24,7 @@ */ -namespace ltiservice_memberships\local\resource; +namespace ltiservice_memberships\local\resources; use \mod_lti\local\ltiservice\service_base; use ltiservice_memberships\local\service\memberships; diff --git a/mod/lti/service/memberships/classes/local/service/memberships.php b/mod/lti/service/memberships/classes/local/service/memberships.php index fbbec969d0e..8066d1be30c 100644 --- a/mod/lti/service/memberships/classes/local/service/memberships.php +++ b/mod/lti/service/memberships/classes/local/service/memberships.php @@ -67,8 +67,8 @@ class memberships extends \mod_lti\local\ltiservice\service_base { if (empty($this->resources)) { $this->resources = array(); - $this->resources[] = new \ltiservice_memberships\local\resource\contextmemberships($this); - $this->resources[] = new \ltiservice_memberships\local\resource\linkmemberships($this); + $this->resources[] = new \ltiservice_memberships\local\resources\contextmemberships($this); + $this->resources[] = new \ltiservice_memberships\local\resources\linkmemberships($this); } return $this->resources; diff --git a/mod/lti/service/memberships/db/renamedclasses.php b/mod/lti/service/memberships/db/renamedclasses.php new file mode 100644 index 00000000000..d38e9901372 --- /dev/null +++ b/mod/lti/service/memberships/db/renamedclasses.php @@ -0,0 +1,34 @@ +. + +/** + * Lists renamed classes so that the autoloader can make the old names still work. + * + * @package mod_lti + * @copyright 2018 Thom Rawson + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// Array 'old_class_name' => 'new\class_name'. +$renamedclasses = array( + + // Changed for PHP 7.0 which now has the word "resource" as a reserved word. + 'ltiservice_memberships\local\resource\linkmemberships' => 'ltiservice_memberships\local\resources\linkmemberships', + 'ltiservice_memberships\local\resource\contextmemberships' => 'ltiservice_memberships\local\resources\contextmemberships', + +); diff --git a/mod/lti/service/profile/classes/local/resource/profile.php b/mod/lti/service/profile/classes/local/resources/profile.php similarity index 98% rename from mod/lti/service/profile/classes/local/resource/profile.php rename to mod/lti/service/profile/classes/local/resources/profile.php index 529a951a0bc..e636b29efdb 100644 --- a/mod/lti/service/profile/classes/local/resource/profile.php +++ b/mod/lti/service/profile/classes/local/resources/profile.php @@ -24,7 +24,7 @@ */ -namespace ltiservice_profile\local\resource; +namespace ltiservice_profile\local\resources; use \mod_lti\local\ltiservice\service_base; @@ -43,7 +43,7 @@ class profile extends \mod_lti\local\ltiservice\resource_base { /** * Class constructor. * - * @param ltiservice_profile\local\resource\profile $service Service instance + * @param ltiservice_profile\local\resources\profile $service Service instance */ public function __construct($service) { diff --git a/mod/lti/service/profile/classes/local/service/profile.php b/mod/lti/service/profile/classes/local/service/profile.php index dcea867d2d9..55830e9874e 100644 --- a/mod/lti/service/profile/classes/local/service/profile.php +++ b/mod/lti/service/profile/classes/local/service/profile.php @@ -59,7 +59,7 @@ class profile extends \mod_lti\local\ltiservice\service_base { if (empty($this->resources)) { $this->resources = array(); - $this->resources[] = new \ltiservice_profile\local\resource\profile($this); + $this->resources[] = new \ltiservice_profile\local\resources\profile($this); } return $this->resources; diff --git a/mod/lti/service/profile/db/renamedclasses.php b/mod/lti/service/profile/db/renamedclasses.php new file mode 100644 index 00000000000..866e70ab03b --- /dev/null +++ b/mod/lti/service/profile/db/renamedclasses.php @@ -0,0 +1,33 @@ +. + +/** + * Lists renamed classes so that the autoloader can make the old names still work. + * + * @package mod_lti + * @copyright 2018 Thom Rawson + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// Array 'old_class_name' => 'new\class_name'. +$renamedclasses = array( + + // Changed for PHP 7.0 which now has the word "resource" as a reserved word. + 'ltiservice_profile\local\resource\profile' => 'ltiservice_profile\local\resources\profile', +); + diff --git a/mod/lti/service/toolproxy/classes/local/resource/toolproxy.php b/mod/lti/service/toolproxy/classes/local/resources/toolproxy.php similarity index 98% rename from mod/lti/service/toolproxy/classes/local/resource/toolproxy.php rename to mod/lti/service/toolproxy/classes/local/resources/toolproxy.php index 79f59e08be9..ccb2e055e28 100644 --- a/mod/lti/service/toolproxy/classes/local/resource/toolproxy.php +++ b/mod/lti/service/toolproxy/classes/local/resources/toolproxy.php @@ -24,7 +24,7 @@ */ -namespace ltiservice_toolproxy\local\resource; +namespace ltiservice_toolproxy\local\resources; defined('MOODLE_INTERNAL') || die(); @@ -47,7 +47,7 @@ class toolproxy extends \mod_lti\local\ltiservice\resource_base { /** * Class constructor. * - * @param ltiservice_toolproxy\local\resource\toolproxy $service Service instance + * @param ltiservice_toolproxy\local\resources\toolproxy $service Service instance */ public function __construct($service) { diff --git a/mod/lti/service/toolproxy/classes/local/service/toolproxy.php b/mod/lti/service/toolproxy/classes/local/service/toolproxy.php index 1d4276163cf..ab69e08443a 100644 --- a/mod/lti/service/toolproxy/classes/local/service/toolproxy.php +++ b/mod/lti/service/toolproxy/classes/local/service/toolproxy.php @@ -58,7 +58,7 @@ class toolproxy extends \mod_lti\local\ltiservice\service_base { if (empty($this->resources)) { $this->resources = array(); - $this->resources[] = new \ltiservice_toolproxy\local\resource\toolproxy($this); + $this->resources[] = new \ltiservice_toolproxy\local\resources\toolproxy($this); } return $this->resources; diff --git a/mod/lti/service/toolproxy/db/renamedclasses.php b/mod/lti/service/toolproxy/db/renamedclasses.php new file mode 100644 index 00000000000..0fa7548f80f --- /dev/null +++ b/mod/lti/service/toolproxy/db/renamedclasses.php @@ -0,0 +1,33 @@ +. + +/** + * Lists renamed classes so that the autoloader can make the old names still work. + * + * @package mod_lti + * @copyright 2018 Thom Rawson + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// Array 'old_class_name' => 'new\class_name'. +$renamedclasses = array( + + // Changed for PHP 7.0 which now has the word "resource" as a reserved word. + 'ltiservice_toolproxy\local\resource\toolproxy' => 'ltiservice_toolproxy\local\resources\toolproxy', +); + diff --git a/mod/lti/service/toolsettings/classes/local/resource/contextsettings.php b/mod/lti/service/toolsettings/classes/local/resources/contextsettings.php similarity index 97% rename from mod/lti/service/toolsettings/classes/local/resource/contextsettings.php rename to mod/lti/service/toolsettings/classes/local/resources/contextsettings.php index 28e320ae14d..bbe9b2d47f3 100644 --- a/mod/lti/service/toolsettings/classes/local/resource/contextsettings.php +++ b/mod/lti/service/toolsettings/classes/local/resources/contextsettings.php @@ -24,9 +24,9 @@ */ -namespace ltiservice_toolsettings\local\resource; +namespace ltiservice_toolsettings\local\resources; -use ltiservice_toolsettings\local\resource\systemsettings; +use ltiservice_toolsettings\local\resources\systemsettings; use ltiservice_toolsettings\local\service\toolsettings; defined('MOODLE_INTERNAL') || die(); @@ -44,7 +44,7 @@ class contextsettings extends \mod_lti\local\ltiservice\resource_base { /** * Class constructor. * - * @param ltiservice_toolsettings\local\resource\contextsettings $service Service instance + * @param ltiservice_toolsettings\local\resources\contextsettings $service Service instance */ public function __construct($service) { diff --git a/mod/lti/service/toolsettings/classes/local/resource/linksettings.php b/mod/lti/service/toolsettings/classes/local/resources/linksettings.php similarity index 96% rename from mod/lti/service/toolsettings/classes/local/resource/linksettings.php rename to mod/lti/service/toolsettings/classes/local/resources/linksettings.php index 31b30dcab65..595dd576d50 100644 --- a/mod/lti/service/toolsettings/classes/local/resource/linksettings.php +++ b/mod/lti/service/toolsettings/classes/local/resources/linksettings.php @@ -24,10 +24,10 @@ */ -namespace ltiservice_toolsettings\local\resource; +namespace ltiservice_toolsettings\local\resources; -use ltiservice_toolsettings\local\resource\systemsettings; -use ltiservice_toolsettings\local\resource\contextsettings; +use ltiservice_toolsettings\local\resources\systemsettings; +use ltiservice_toolsettings\local\resources\contextsettings; use ltiservice_toolsettings\local\service\toolsettings; defined('MOODLE_INTERNAL') || die(); @@ -45,7 +45,7 @@ class linksettings extends \mod_lti\local\ltiservice\resource_base { /** * Class constructor. * - * @param ltiservice_toolsettings\local\resource\linksettings $service Service instance + * @param ltiservice_toolsettings\local\resources\linksettings $service Service instance */ public function __construct($service) { diff --git a/mod/lti/service/toolsettings/classes/local/resource/systemsettings.php b/mod/lti/service/toolsettings/classes/local/resources/systemsettings.php similarity index 99% rename from mod/lti/service/toolsettings/classes/local/resource/systemsettings.php rename to mod/lti/service/toolsettings/classes/local/resources/systemsettings.php index 8a381c55025..28268413565 100644 --- a/mod/lti/service/toolsettings/classes/local/resource/systemsettings.php +++ b/mod/lti/service/toolsettings/classes/local/resources/systemsettings.php @@ -24,7 +24,7 @@ */ -namespace ltiservice_toolsettings\local\resource; +namespace ltiservice_toolsettings\local\resources; use ltiservice_toolsettings\local\service\toolsettings; diff --git a/mod/lti/service/toolsettings/classes/local/service/toolsettings.php b/mod/lti/service/toolsettings/classes/local/service/toolsettings.php index 5626e217252..f7969a9be61 100644 --- a/mod/lti/service/toolsettings/classes/local/service/toolsettings.php +++ b/mod/lti/service/toolsettings/classes/local/service/toolsettings.php @@ -58,9 +58,9 @@ class toolsettings extends \mod_lti\local\ltiservice\service_base { if (empty($this->resources)) { $this->resources = array(); - $this->resources[] = new \ltiservice_toolsettings\local\resource\systemsettings($this); - $this->resources[] = new \ltiservice_toolsettings\local\resource\contextsettings($this); - $this->resources[] = new \ltiservice_toolsettings\local\resource\linksettings($this); + $this->resources[] = new \ltiservice_toolsettings\local\resources\systemsettings($this); + $this->resources[] = new \ltiservice_toolsettings\local\resources\contextsettings($this); + $this->resources[] = new \ltiservice_toolsettings\local\resources\linksettings($this); } return $this->resources; diff --git a/mod/lti/service/toolsettings/db/renamedclasses.php b/mod/lti/service/toolsettings/db/renamedclasses.php new file mode 100644 index 00000000000..4e8d4dadbb6 --- /dev/null +++ b/mod/lti/service/toolsettings/db/renamedclasses.php @@ -0,0 +1,35 @@ +. + +/** + * Lists renamed classes so that the autoloader can make the old names still work. + * + * @package mod_lti + * @copyright 2018 Thom Rawson + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// Array 'old_class_name' => 'new\class_name'. +$renamedclasses = array( + + // Changed for PHP 7.0 which now has the word "resource" as a reserved word. + 'ltiservice_toolsettings\local\resource\contextsettings' => 'ltiservice_toolsettings\local\resources\contextsettings', + 'ltiservice_toolsettings\local\resource\linksettings' => 'ltiservice_toolsettings\local\resources\linksettings', + 'ltiservice_toolsettings\local\resource\systemsettings' => 'ltiservice_toolsettings\local\resources\systemsettings', +); +