Refactor for MOODLE41 & PHP 7.4

Lesterhuis-Training-en-Consultancy · Dec 18, 2023 · 4ac64a4 · 4ac64a4
1 parent 79d03ac
commit 4ac64a4
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 36 deletions.
diff --git a/block_configurable_reports.php b/block_configurable_reports.php
@@ -15,6 +15,17 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
+ * Configurable Reports a Moodle block for creating customizable reports
+ *
+ * @copyright  2020 Juan Leyva <[email protected]>
+ * @package    block_configurable_reports
+ * @author     Juan leyva <http://www.twitter.com/jleyvadelgado>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Class block_configurable_reports
+ *
  * @package   block_configurable_reports
  * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
  */
@@ -160,6 +171,8 @@ public function get_content() {
     }
 
     /**
+     * Cron
+     *
      * @return bool
      */
     public function cron(): bool {

diff --git a/classes/github.php b/classes/github.php
@@ -15,11 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Github helper class
+ * GitHub helper class
  *
- * @package   block_configurable_reports
- * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright  2020 Juan Leyva <[email protected]>
+ * @package    block_configurable_reports
+ * @author     Juan leyva <http://www.twitter.com/jleyvadelgado>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 namespace block_configurable_reports;

diff --git a/component.class.php b/component.class.php
@@ -15,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package block_configurablereports
- * @author  Juan leyva <http://www.twitter.com/jleyvadelgado>
- * @date    2009
+ * Configurable Reports a Moodle block for creating customizable reports
+ *
+ * @copyright  2020 Juan Leyva <[email protected]>
+ * @package    block_configurable_reports
+ * @author     Juan leyva <http://www.twitter.com/jleyvadelgado>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * Class component_base
  *
- * @package block_configurablereports
+ * @package block_configurable_reports
  * @author  Juan leyva <http://www.twitter.com/jleyvadelgado>
- * @date    2009
  */
 abstract class component_base {
 

diff --git a/components/calcs/average/form.php b/components/calcs/average/form.php
@@ -15,6 +15,8 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
+ * Configurable Reports a Moodle block for creating customizable reports
+ *
  * @package   block_configurable_reports
  * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +30,6 @@
  * Class average_form
  *
  * @package   block_configurable_reports
- *
  * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
  */
 class average_form extends moodleform {

diff --git a/components/calcs/average/plugin.class.php b/components/calcs/average/plugin.class.php
@@ -15,9 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   block_configurable_reports
- * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Configurable Reports a Moodle block for creating customizable reports
+ *
+ * @copyright  2020 Juan Leyva <[email protected]>
+ * @package    block_configurable_reports
+ * @author     Juan leyva <http://www.twitter.com/jleyvadelgado>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -70,7 +73,7 @@ public function summary(object $data): string {
             $reportclass = new $reportclassname($this->report);
 
             $components = cr_unserialize($this->report->components);
-            $config = (isset($components['customsql']['config'])) ? $components['customsql']['config'] : new stdclass;
+            $config = $components['customsql']['config'] ?? new stdclass;
 
             if (isset($config->querysql)) {
 
@@ -96,6 +99,8 @@ public function summary(object $data): string {
     }
 
     /**
+     * Execute
+     *
      * @param $rows
      * @return float
      */

diff --git a/components/calcs/component.class.php b/components/calcs/component.class.php
@@ -15,9 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   block_configurable_reports
- * @author    Juan leyva <http://www.twitter.com/jleyvadelgado>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * Configurable Reports a Moodle block for creating customizable reports
+ *
+ * @copyright  2020 Juan Leyva <[email protected]>
+ * @package    block_configurable_reports
+ * @author     Juan leyva <http://www.twitter.com/jleyvadelgado>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**

diff --git a/components/calcs/max/plugin.class.php b/components/calcs/max/plugin.class.php
@@ -105,7 +105,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $rows
+     * @param array $rows
      * @return float|int|string
      */
     public function execute($rows) {

diff --git a/components/calcs/percent/form.php b/components/calcs/percent/form.php
@@ -20,6 +20,7 @@
  * @copyright  2020 Juan Leyva <[email protected]>
  * @package    block_configurable_reports
  * @author     David Pesce <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
@@ -31,7 +32,6 @@
  *
  * @package block_configurable_reports
  * @author  David Pesce <[email protected]>
- * /
  */
 class percent_form extends moodleform {
 

diff --git a/components/calcs/sum/plugin.class.php b/components/calcs/sum/plugin.class.php
@@ -50,7 +50,7 @@ public function init(): void {
      * @return string
      */
     public function summary(object $data): string {
-        global $DB, $CFG;
+        global $CFG;
 
         if ($this->report->type !== 'sql') {
             $components = cr_unserialize($this->report->components);
@@ -102,7 +102,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $rows
+     * @param array $rows
      * @return float|int|string
      */
     public function execute($rows) {

diff --git a/components/cohorts/plugin.class.php b/components/cohorts/plugin.class.php
@@ -57,7 +57,7 @@ public function summary(object $data): string {
     /**
      * execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|string|string[]
      */

diff --git a/components/competencyframeworks/plugin.class.php b/components/competencyframeworks/plugin.class.php
@@ -60,7 +60,7 @@ public function summary(object $data): string {
     /**
      * execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|string|string[]
      */

diff --git a/components/filters/coursecategories/plugin.class.php b/components/filters/coursecategories/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return mixed
      */

diff --git a/components/filters/coursemodules/plugin.class.php b/components/filters/coursemodules/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|mixed|string|string[]
      */
     public function execute($finalelements) {

diff --git a/components/filters/courses/plugin.class.php b/components/filters/courses/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|string|string[]
      */
     public function execute($finalelements) {

diff --git a/components/filters/fcoursefield/plugin.class.php b/components/filters/fcoursefield/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return int[]|mixed|string[]
      */

diff --git a/components/filters/fsearchuserfield/plugin.class.php b/components/filters/fsearchuserfield/plugin.class.php
@@ -55,7 +55,7 @@ public function summary(object $data): string {
     /**
      * execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|int[]|mixed|string|string[]
      */
@@ -68,7 +68,7 @@ public function execute($finalelements, $data) {
     }
 
     /**
-     * @param $finalelements
+     * @param string $finalelements
      * @param object $data
      * @return array|string|string[]
      */

diff --git a/components/filters/fuserfield/plugin.class.php b/components/filters/fuserfield/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|int[]|mixed|string|string[]
      */
@@ -73,7 +73,7 @@ public function execute($finalelements, $data) {
     /**
      * execute_sql
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|mixed|string|string[]
      */
@@ -96,7 +96,7 @@ private function execute_sql($finalelements, $data) {
     /**
      * execute_users
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @param $data
      * @return array|int[]|mixed|string[]
      */
@@ -219,7 +219,7 @@ public function print_filter(MoodleQuickForm $mform, $formdata = false): void {
      *
      * @param $filtersearchtext
      * @param $filterstrmatch
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|mixed|string|string[]
      */
     private function sql_replace($filtersearchtext, $filterstrmatch, $finalelements) {

diff --git a/components/filters/searchtext/plugin.class.php b/components/filters/searchtext/plugin.class.php
@@ -118,7 +118,7 @@ public function print_filter(MoodleQuickForm $mform, $formdata = false): void {
      *
      * @param $filtersearchtext
      * @param $filterstrmatch
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|mixed|string|string[]
      */
     private function sql_replace($filtersearchtext, $filterstrmatch, $finalelements) {

diff --git a/components/filters/yearhebrew/plugin.class.php b/components/filters/yearhebrew/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|string|string[]
      */
     public function execute($finalelements) {

diff --git a/components/filters/yearnumeric/plugin.class.php b/components/filters/yearnumeric/plugin.class.php
@@ -58,7 +58,7 @@ public function summary(object $data): string {
     /**
      * Execute
      *
-     * @param $finalelements
+     * @param string $finalelements
      * @return array|string|string[]
      */
     public function execute($finalelements) {