L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace

Browse Source
This commit is contained in:
Thom Rawson
2018-04-01 12:39:54 +09:00
parent a15c745936
commit 6fb64a4ec0
15 changed files with 156 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lti/service/memberships/classes/local/resource/contextmemberships.php → mod/lti/service/memberships/classes/local/resources/contextmemberships.php
+1 -1
View File
@@ -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;
mod/lti/service/memberships/classes/local/resource/linkmemberships.php → mod/lti/service/memberships/classes/local/resources/linkmemberships.php
+1 -1
View File
@@ -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;
mod/lti/service/memberships/classes/local/service/memberships.php
+2 -2
View File
@@ -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;
mod/lti/service/memberships/db/renamedclasses.php
+34
View File
@@ -0,0 +1,34 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* 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',
);
mod/lti/service/profile/classes/local/resource/profile.php → mod/lti/service/profile/classes/local/resources/profile.php
+2 -2
View File
@@ -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) {
mod/lti/service/profile/classes/local/service/profile.php
+1 -1
View File
@@ -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;
mod/lti/service/profile/db/renamedclasses.php
+33
View File
@@ -0,0 +1,33 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* 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',
);
mod/lti/service/toolproxy/classes/local/resource/toolproxy.php → mod/lti/service/toolproxy/classes/local/resources/toolproxy.php
+2 -2
View File
@@ -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) {
mod/lti/service/toolproxy/classes/local/service/toolproxy.php
+1 -1
View File
@@ -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;
mod/lti/service/toolproxy/db/renamedclasses.php
+33
View File
@@ -0,0 +1,33 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* 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',
);
mod/lti/service/toolsettings/classes/local/resource/contextsettings.php → mod/lti/service/toolsettings/classes/local/resources/contextsettings.php
+3 -3
View File
@@ -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) {
mod/lti/service/toolsettings/classes/local/resource/linksettings.php → mod/lti/service/toolsettings/classes/local/resources/linksettings.php
+4 -4
View File
@@ -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) {
mod/lti/service/toolsettings/classes/local/resource/systemsettings.php → mod/lti/service/toolsettings/classes/local/resources/systemsettings.php
+1 -1
View File
@@ -24,7 +24,7 @@
*/
namespace ltiservice_toolsettings\local\resource;
namespace ltiservice_toolsettings\local\resources;
use ltiservice_toolsettings\local\service\toolsettings;
mod/lti/service/toolsettings/classes/local/service/toolsettings.php
+3 -3
View File
@@ -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;
mod/lti/service/toolsettings/db/renamedclasses.php
+35
View File
@@ -0,0 +1,35 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* 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',
);