From c42e13d182855d20af534bf8d84a5c142e48f851 Mon Sep 17 00:00:00 2001
From: Valentin Popov <info@valentineus.link>
Date: Sat, 11 May 2019 13:49:04 +0400
Subject: Fixed violations CI

Signed-off-by: Valentin Popov <info@valentineus.link>
---
 classes/local/api.php    | 15 ++++++---------
 classes/local/record.php | 44 +++++++-------------------------------------
 tests/api_test.php       |  2 +-
 3 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/classes/local/api.php b/classes/local/api.php
index eb713e4..034b12b 100644
--- a/classes/local/api.php
+++ b/classes/local/api.php
@@ -250,14 +250,14 @@ final class api {
         $CFG->debugdisplay = false;
 
         $directory = $CFG->libdir . '/classes/event';
+        $events = [];
         $files = self::get_file_list($directory);
 
         if (isset($files['unknown_logged'])) {
             unset($files['unknown_logged']);
         }
 
-        $events = [];
-        foreach ($files as $file => $location) {
+        foreach (array_keys($files) as $file) {
             $name = '\\core\\event\\' . $file;
 
             if (method_exists($name, 'get_static_info')) {
@@ -286,18 +286,14 @@ final class api {
     private static function get_file_list(string $directory): array {
         global $CFG;
 
+        $files = [];
         $root = $CFG->dirroot;
 
-        $files = [];
         if (is_dir($directory) && is_readable($directory)) {
             $handle = opendir($directory);
 
             if ($handle) {
                 foreach (scandir($directory, SCANDIR_SORT_NONE) as $file) {
-                    if (!is_string($file)) {
-                        continue;
-                    }
-
                     if ($file !== '.' && $file !== '..' && strrpos($directory, $root) !== false) {
                         $location = substr($directory, strlen($root));
                         $eventname = substr($file, 0, -4);
@@ -332,7 +328,8 @@ final class api {
         $CFG->debugdisplay = false;
 
         $events = [];
-        foreach (core_component::get_plugin_types() as $type => $unused) {
+
+        foreach (array_keys(core_component::get_plugin_types()) as $type) {
             foreach (core_component::get_plugin_list($type) as $plugin => $directory) {
                 $directory .= '/classes/event';
                 $files = self::get_file_list($directory);
@@ -341,7 +338,7 @@ final class api {
                     unset($files['unknown_logged']);
                 }
 
-                foreach ($files as $file => $location) {
+                foreach (array_keys($files) as $file) {
                     $name = '\\' . $type . '_' . $plugin . '\\event\\' . $file;
 
                     if (method_exists($name, 'get_static_info')) {
diff --git a/classes/local/record.php b/classes/local/record.php
index 3e74571..36b63c1 100644
--- a/classes/local/record.php
+++ b/classes/local/record.php
@@ -20,10 +20,6 @@ defined('MOODLE_INTERNAL') || die();
 
 use stdClass;
 use function defined;
-use function is_array;
-use function is_bool;
-use function is_int;
-use function is_string;
 
 /**
  * It's a class description record.
@@ -88,38 +84,12 @@ final class record extends stdClass {
      * @param array|null $conditions
      */
     public function __construct(array $conditions = null) {
-        if (isset($conditions['events']) && is_array($conditions['events'])) {
-            $this->events = [];
-
-            foreach ($conditions['events'] as $event) {
-                if (is_string($event)) {
-                    $this->events[] = $event;
-                }
-            }
-        }
-
-        if (isset($conditions['header']) && is_string($conditions['header'])) {
-            $this->header = $conditions['header'];
-        }
-
-        if (isset($conditions['id']) && is_int($conditions['id'])) {
-            $this->id = $conditions['id'];
-        }
-
-        if (isset($conditions['name']) && is_string($conditions['name'])) {
-            $this->name = $conditions['name'];
-        }
-
-        if (isset($conditions['point']) && is_string($conditions['point'])) {
-            $this->point = $conditions['point'];
-        }
-
-        if (isset($conditions['status']) && is_bool($conditions['status'])) {
-            $this->status = $conditions['status'];
-        }
-
-        if (isset($conditions['token']) && is_string($conditions['token'])) {
-            $this->token = $conditions['token'];
-        }
+        $this->events = $conditions['events'] ?? null;
+        $this->header = $conditions['header'] ?? null;
+        $this->id = $conditions['id'] ?? null;
+        $this->name = $conditions['name'] ?? null;
+        $this->point = $conditions['point'] ?? null;
+        $this->status = $conditions['status'] ?? null;
+        $this->token = $conditions['token'] ?? null;
     }
 }
\ No newline at end of file
diff --git a/tests/api_test.php b/tests/api_test.php
index 5bca6ab..210c58f 100644
--- a/tests/api_test.php
+++ b/tests/api_test.php
@@ -150,7 +150,7 @@ final class local_webhooks_api_testcase extends advanced_testcase {
 
         self::assertNotCount(0, $events);
 
-        foreach ($events as $name => $event) {
+        foreach ($events as $event) {
             self::assertInternalType('array', $event);
 
             self::assertEquals([
-- 
cgit v1.2.3