Merge pull request #83 from catalyst/more-ci

More ci fixes

Author: dmitriim

auth.php

@@ -112,7 +112,7 @@ public function loginpage_hook() {
      * @throws \moodle_exception If gets running via CLI or AJAX call.
      */
     protected function redirect($url) {
-        if (CLI_SCRIPT or AJAX_SCRIPT) {
+        if (CLI_SCRIPT || AJAX_SCRIPT) {
             throw new moodle_exception('redirecterrordetected', 'auth_userkey', '', $url);
         }
 

classes/core_userkey_manager.php

@@ -117,7 +117,7 @@ public function validate_key($keyvalue) {
             throw new \moodle_exception('invalidkey');
         }
 
-        if (!empty($key->validuntil) and $key->validuntil < time()) {
+        if (!empty($key->validuntil) && $key->validuntil < time()) {
             throw new \moodle_exception('expiredkey');
         }
 

tests/auth_plugin_test.php

@@ -26,6 +26,8 @@
 /**
  * Tests for auth_plugin_userkey class.
  *
+ * @covers \auth_plugin_userkey
+ *
  * @package    auth_userkey
  * @copyright  2016 Dmitrii Metelkin ([email protected])
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

tests/core_userkey_manager_test.php

@@ -22,6 +22,8 @@
  * Key validation is fully covered in auth_plugin_test.php file.
  * TODO: write tests for validate_key() function.
  *
+ * @covers \auth_userkey\core_userkey_manager
+ *
  * @package    auth_userkey
  * @copyright  2016 Dmitrii Metelkin ([email protected])
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

tests/externallib_test.php

@@ -27,6 +27,8 @@
 /**
  * Tests for externallib.php.
  *
+ * @covers \auth_userkey_external
+ *
  * @package    auth_userkey
  * @copyright  2016 Dmitrii Metelkin ([email protected])
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2022081900;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2022081900;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->release   = 2022081900;        // Match release exactly to version.
 $plugin->requires  = 2017051500;        // Requires Moodle 3.3 version.
 $plugin->component = 'auth_userkey';    // Full name of the plugin (used for diagnostics).