mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-16 21:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #12 - fixed code standard problems preventing Travis to build.

Browse Source
This commit is contained in:
Daniel Thee Roperto
2016-09-02 15:38:19 +10:00
parent 6ceb328aa4
commit 18e0583ba5
7 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auth.php
View File

@@ -46,7 +46,7 @@ class auth_plugin_outage extends auth_plugin_base
* Do not authenticate users.
* @return bool False
*/
public function user_login($username, $password) {
public function user_login() {
return false;
}
}

1
classes/forms/outage/delete.php
View File

@@ -53,7 +53,6 @@ class delete extends \moodleform {
*/
public function validation($data, $files) {
$errors = parent::validation($data, $files);
$mform = $this->_form;
return $errors;
}

1
classes/forms/outage/edit.php
View File

@@ -64,7 +64,6 @@ class edit extends \moodleform {
*/
public function validation($data, $files) {
$errors = parent::validation($data, $files);
$mform = $this->_form;
return $errors;
}

12
classes/outagelib.php
View File

@@ -47,9 +47,8 @@ class outagelib
*
* @param $data mixed An object or array.
* @param $obj object Destination object to write the properties.
* @param $strict bool All data fields must be used in the destination object or an exception will be thrown.
*/
public static function data2object($data, $obj, $strict = false) {
public static function data2object($data, $obj) {
if (is_object($data)) {
$data = get_object_vars($data);
}
@@ -59,16 +58,9 @@ class outagelib
if (!is_object($obj)) {
throw new \InvalidArgumentException('$obj must be an object.');
}
if (!is_bool($strict)) {
throw new \InvalidArgumentException('$strict must be a bool.');
}
foreach ($data as $k => $v) {
if (!property_exists($obj, $k)) {
if ($strict) {
throw new \InvalidArgumentException('$obj does not have a property called ' . $k);
}
} else {
if (property_exists($obj, $k)) {
if (method_exists($obj, $k)) {
throw new \InvalidArgumentException('$obj has a method called ' . $k);
}

4
renderer.php
View File

@@ -32,7 +32,9 @@ if (!defined('MOODLE_INTERNAL')) {
class auth_outage_renderer extends plugin_renderer_base
{
public function rendersubtitle($subtitlekey) {
if (!is_string($subtitlekey)) throw new \InvalidArgumentException('$subtitle is not a string.');
if (!is_string($subtitlekey)) {
throw new \InvalidArgumentException('$subtitle is not a string.');
}
return html_writer::tag('h2', get_string($subtitlekey, 'auth_outage'));
}

2
tests/outage_test.php
View File

@@ -35,7 +35,7 @@ class outage_test extends basic_testcase
// Very important, this should never change.
self::assertNull($outage->id, 'New empty outage can never have an id set.');
// Ensure all other fields are also null.
foreach ($outage as $k=>$v) {
foreach ($outage as $v) {
self::assertNull($v);
}
}

30
tests/outagelib_test.php
View File

@@ -31,44 +31,22 @@ defined('MOODLE_INTERNAL') || die();
class outagelib_test extends basic_testcase
{
public function test_data2object() {
// Using object data, no new fields, not strict.
// Using object data, no new fields.
$obj = new stdClass();
$obj->foo = 'bar';
$obj->number = 42;
$data = new stdClass();
$data->foo = 'not bar';
outagelib::data2object($data, $obj, false);
outagelib::data2object($data, $obj);
self::assertEquals(get_object_vars($obj), ['foo' => 'not bar', 'number' => 42], 'Invalid result.');
self::assertEquals(get_object_vars($data), ['foo' => 'not bar'], 'Data should not change.');
// Using array data, with new fields, not strict.
// Using array data, with new fields.
$obj = new stdClass();
$obj->foo = 'bar';
$obj->number = 42;
$data = ['foo' => 'foobar', 'flag' => false];
outagelib::data2object($data, $obj, false);
outagelib::data2object($data, $obj);
self::assertEquals(get_object_vars($obj), ['foo' => 'foobar', 'number' => 42], 'Invalid result.');
// Using object data, no new fields, strict.
$obj = new stdClass();
$obj->foo = 'bar';
$obj->number = 42;
$data = new stdClass();
$data->foo = 'not bar';
outagelib::data2object($data, $obj, true);
self::assertEquals(get_object_vars($obj), ['foo' => 'not bar', 'number' => 42], 'Invalid result.');
self::assertEquals(get_object_vars($data), ['foo' => 'not bar'], 'Data should not change.');
// Using array data, with new fields, strict.
$obj = new stdClass();
$obj->foo = 'bar';
$obj->number = 42;
$data = ['foo' => 'foobar', 'flag' => false];
try {
outagelib::data2object($data, $obj, true);
$this->fail('Exception was expected.');
}
catch (InvalidArgumentException $e){
}
}
}