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 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'classes/local/api.php')

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')) {
-- 
cgit v1.2.3