From 37dba50a41a6d1cc95f691421fa11f4ecba1c0df Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 15:51:24 +0100 Subject: [PATCH 01/13] fix typo in declaration --- .../base/renderdecorators/cacherenderdecorator.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/core/controller/base/renderdecorators/cacherenderdecorator.cls.php b/gyro/core/controller/base/renderdecorators/cacherenderdecorator.cls.php index 6f9fe31d..10b7cb43 100644 --- a/gyro/core/controller/base/renderdecorators/cacherenderdecorator.cls.php +++ b/gyro/core/controller/base/renderdecorators/cacherenderdecorator.cls.php @@ -13,7 +13,7 @@ class CacheRenderDecorator extends RenderDecoratorBase { * * @var ICacheManager */ - private $chache_manager = null; + private $cache_manager = null; /** * Constructor From 688c6358b2e78829eca72311b38e57be9eea67d8 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 15:56:36 +0100 Subject: [PATCH 02/13] fix case in class name --- gyro/core/lib/interfaces/idbwhere.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/core/lib/interfaces/idbwhere.cls.php b/gyro/core/lib/interfaces/idbwhere.cls.php index 02b2ab27..8cddc661 100644 --- a/gyro/core/lib/interfaces/idbwhere.cls.php +++ b/gyro/core/lib/interfaces/idbwhere.cls.php @@ -7,7 +7,7 @@ * @author Gerd Riesselmann * @ingroup Interfaces */ -interface IDBWhere extends IDBSQLBuilder { +interface IDBWhere extends IDBSqlBuilder { const LOGIC_AND = 'AND'; const LOGIC_OR = 'OR'; From bf843d5c41322e397c6abb6936b6ff19f3eb4555 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 15:58:15 +0100 Subject: [PATCH 03/13] use correct case for Arr:: --- gyro/core/view/widgets/input/base/base.input.widget.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gyro/core/view/widgets/input/base/base.input.widget.php b/gyro/core/view/widgets/input/base/base.input.widget.php index 37a3ead9..e72691e2 100644 --- a/gyro/core/view/widgets/input/base/base.input.widget.php +++ b/gyro/core/view/widgets/input/base/base.input.widget.php @@ -76,7 +76,7 @@ protected function input_build_widget($params, $name, $title, $value, $policy) { * Create default attribute array */ protected function create_default_attributes($params, $name, $policy) { - $id = strtr(arr::get_item($params, 'id', $name), '[]', '__'); + $id = strtr(Arr::get_item($params, 'id', $name), '[]', '__'); $attrs = array( 'id' => $id ); @@ -110,7 +110,7 @@ protected function render_label($widget, $html_attrs, $params, $name, $title, $v $lbl_class = Arr::get_item($params, 'label:class', ''); $label = ''; if ($title) { - $notes = Cast::int(arr::get_item($params, 'notes', 0)); + $notes = Cast::int(Arr::get_item($params, 'notes', 0)); if ($notes > 0) { $title .= ' '. html::span(str_repeat('*', $notes), 'notes'); } From acc8cf82fcf5b596e501fb89953156b68228face Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 16:01:33 +0100 Subject: [PATCH 04/13] remove not existing page_data --- gyro/core/view/widgets/list.simple.widget.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gyro/core/view/widgets/list.simple.widget.php b/gyro/core/view/widgets/list.simple.widget.php index 8deda884..3a1ae0b1 100644 --- a/gyro/core/view/widgets/list.simple.widget.php +++ b/gyro/core/view/widgets/list.simple.widget.php @@ -23,14 +23,14 @@ public function render($policy = self::NONE) { $ret = ''; $items = Arr::force($this->items, false); $view = ViewFactory::create_view(IViewFactory::MESSAGE, 'widgets/list.simple'); - $view->assign('items', $this->render_items($this->page_data, $items, $policy)); + $view->assign('items', $this->render_items($items, $policy)); $view->assign('policy', $policy); $view->assign('empty_message', $this->empty_message); $ret = $view->render(); return trim($ret); } - protected function render_items($page_data, $items, $policy) { + protected function render_items($items, $policy) { $ret = array(); $i = 1; $c = count($items); From 76a424cbf8d3a36b0c62b0564105aec5771f74ba Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 16:05:15 +0100 Subject: [PATCH 05/13] encode correct variable in fallback --- gyro/modules/json/lib/helpers/converters/json.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/modules/json/lib/helpers/converters/json.cls.php b/gyro/modules/json/lib/helpers/converters/json.cls.php index 369af08b..7905c6c8 100644 --- a/gyro/modules/json/lib/helpers/converters/json.cls.php +++ b/gyro/modules/json/lib/helpers/converters/json.cls.php @@ -64,7 +64,7 @@ public function encode($data, $params = false) { include_once 'Services/JSON.php'; if (class_exists('Services_JSON')) { $json = new Services_JSON(); - return $json->encode($str); + return $json->encode($data); } throw new Exception(tr('No JSON implementation found', 'ajax')); } From 89350ee91ff4ab99fa09df4b43021397f2c716d8 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 18 Nov 2020 16:07:51 +0100 Subject: [PATCH 06/13] fix case in class name/docs --- gyro/modules/simpletest/3rdparty/simpletest/browser.php | 6 +++--- gyro/modules/simpletest/3rdparty/simpletest/web_tester.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gyro/modules/simpletest/3rdparty/simpletest/browser.php b/gyro/modules/simpletest/3rdparty/simpletest/browser.php index 68b2739b..f392798f 100644 --- a/gyro/modules/simpletest/3rdparty/simpletest/browser.php +++ b/gyro/modules/simpletest/3rdparty/simpletest/browser.php @@ -18,8 +18,8 @@ require_once dirname(__FILE__) . '/frames.php'; require_once dirname(__FILE__) . '/user_agent.php'; if (! SimpleTest::getParsers()) { - SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePHPPageBuilder())); - //SimpleTest::setParsers(array(new SimplePHPPageBuilder())); + SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePhpPageBuilder())); + //SimpleTest::setParsers(array(new SimplePhpPageBuilder())); } /**#@-*/ @@ -216,7 +216,7 @@ protected function createHistory() * Get the HTML parser to use. Can be overridden by * setParser. Otherwise scans through the available parsers and * uses the first one which is available. - * @return object SimplePHPPageBuilder or SimpleTidyPageBuilder + * @return object SimplePhpPageBuilder or SimpleTidyPageBuilder */ protected function getParser() { diff --git a/gyro/modules/simpletest/3rdparty/simpletest/web_tester.php b/gyro/modules/simpletest/3rdparty/simpletest/web_tester.php index 5a4fc505..38ac9843 100644 --- a/gyro/modules/simpletest/3rdparty/simpletest/web_tester.php +++ b/gyro/modules/simpletest/3rdparty/simpletest/web_tester.php @@ -523,7 +523,7 @@ public function setBrowser($browser) /** * Sets the HTML parser to use within this browser. - * @param object The parser, one of SimplePHPPageBuilder or + * @param object The parser, one of SimplePhpPageBuilder or * SimpleTidyPageBuilder. */ public function setParser($parser) From 3f54e2d4c56668da5d313ffb91d5956f17813814 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Mon, 14 Dec 2020 12:30:57 +0100 Subject: [PATCH 07/13] Revert "remove not existing page_data" This reverts commit acc8cf82fcf5b596e501fb89953156b68228face. --- gyro/core/view/widgets/list.simple.widget.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gyro/core/view/widgets/list.simple.widget.php b/gyro/core/view/widgets/list.simple.widget.php index 3a1ae0b1..8deda884 100644 --- a/gyro/core/view/widgets/list.simple.widget.php +++ b/gyro/core/view/widgets/list.simple.widget.php @@ -23,14 +23,14 @@ public function render($policy = self::NONE) { $ret = ''; $items = Arr::force($this->items, false); $view = ViewFactory::create_view(IViewFactory::MESSAGE, 'widgets/list.simple'); - $view->assign('items', $this->render_items($items, $policy)); + $view->assign('items', $this->render_items($this->page_data, $items, $policy)); $view->assign('policy', $policy); $view->assign('empty_message', $this->empty_message); $ret = $view->render(); return trim($ret); } - protected function render_items($items, $policy) { + protected function render_items($page_data, $items, $policy) { $ret = array(); $i = 1; $c = count($items); From 0d873b1a367c1c50d172fea7cc1758623612a745 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Sat, 26 Dec 2020 12:20:57 +0100 Subject: [PATCH 08/13] mysql_time only expects 1 parameter --- gyro/core/model/base/fields/dbfield.time.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/core/model/base/fields/dbfield.time.cls.php b/gyro/core/model/base/fields/dbfield.time.cls.php index 6aebdb49..c1b150c8 100644 --- a/gyro/core/model/base/fields/dbfield.time.cls.php +++ b/gyro/core/model/base/fields/dbfield.time.cls.php @@ -24,7 +24,7 @@ protected function get_db_now_constant() { * @return string */ protected function format_date_value($value) { - return $this->quote(GyroDate::mysql_time($value, false)); + return $this->quote(GyroDate::mysql_time($value)); } /** From 96e601a6ade650aa3562a7a93b767a6c1321232a Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Sat, 26 Dec 2020 12:26:57 +0100 Subject: [PATCH 09/13] args: modules as array --- gyro/modules/offline/enabled.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/modules/offline/enabled.inc.php b/gyro/modules/offline/enabled.inc.php index 4b77fae7..8f6fee5f 100644 --- a/gyro/modules/offline/enabled.inc.php +++ b/gyro/modules/offline/enabled.inc.php @@ -10,4 +10,4 @@ * compatabile with Apache web server (and Lighttpd, eventually) only. */ -Load::enable_module('console', 'systemupdate'); +Load::enable_module(['console', 'systemupdate']); From b1581e135f2420bad2c1f45b9f14921cf0e63ac9 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Sat, 26 Dec 2020 12:28:19 +0100 Subject: [PATCH 10/13] use tr() as expected --- gyro/core/lib/components/mailmessage.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/core/lib/components/mailmessage.cls.php b/gyro/core/lib/components/mailmessage.cls.php index 40b0d869..163d419b 100644 --- a/gyro/core/lib/components/mailmessage.cls.php +++ b/gyro/core/lib/components/mailmessage.cls.php @@ -262,7 +262,7 @@ protected function safety_check_exploit_strings(&$value, $type, $beginLineOnly = ); $temp = preg_replace($find, '**!HEADERINJECTION!**', $value); if (strpos($temp, '**!HEADERINJECTION!**') !== false) { - $err->append('%type: "To:", "Bcc:", "Subject:" and other reserved words are not allowed.', 'core', array('%type' => $type)); + $err->append(tr('%type: "To:", "Bcc:", "Subject:" and other reserved words are not allowed.', 'core', array('%type' => $type))); } return $err; From 4f657f5ca0727ac261223ae707aead4ea13bdd8f Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Fri, 16 Apr 2021 12:35:54 +0200 Subject: [PATCH 11/13] fix undefined warning in PHP 8 --- gyro/core/controller/base/routes/parameterizedroute.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyro/core/controller/base/routes/parameterizedroute.cls.php b/gyro/core/controller/base/routes/parameterizedroute.cls.php index 44458e4c..b7dc1a13 100644 --- a/gyro/core/controller/base/routes/parameterizedroute.cls.php +++ b/gyro/core/controller/base/routes/parameterizedroute.cls.php @@ -406,7 +406,7 @@ protected function build_url_path($params) { $path = $this->replace_path_variable($path, $v, $params->$func_name()); } } else { - $path = $this->replace_path_variable($path, $v, $params->$v); + $path = $this->replace_path_variable($path, $v, $params->$v ?? null); } } } else if (is_array($params)) { From 7348504027552ad44ce6389e321eb30e64a4d944 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Fri, 16 Apr 2021 12:38:33 +0200 Subject: [PATCH 12/13] remove not existing variable $page_data --- .../page.blocks/controller/base/templated.block.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributions/page.blocks/controller/base/templated.block.cls.php b/contributions/page.blocks/controller/base/templated.block.cls.php index 66a77032..c3a8ba04 100644 --- a/contributions/page.blocks/controller/base/templated.block.cls.php +++ b/contributions/page.blocks/controller/base/templated.block.cls.php @@ -38,7 +38,7 @@ public function __construct($name, $title, $template, $index = 1000, $position = * @return IView */ protected function create_view($template) { - $view = ViewFactory::create_view(IViewFactory::MESSAGE, $template, $page_data); + $view = ViewFactory::create_view(IViewFactory::MESSAGE, $template); $view->assign('block', $this); $this->configure_view($view); return $view; From d4a1be540164d612db083a29e2b7db0ecdf58d15 Mon Sep 17 00:00:00 2001 From: Heiko Weber Date: Wed, 21 Jul 2021 14:09:35 +0200 Subject: [PATCH 13/13] fix a warnings with php8 --- gyro/core/behaviour/base/commandbase.cls.php | 2 +- gyro/core/controller/tools/sorter.cls.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gyro/core/behaviour/base/commandbase.cls.php b/gyro/core/behaviour/base/commandbase.cls.php index 769159b5..e2e9f83f 100644 --- a/gyro/core/behaviour/base/commandbase.cls.php +++ b/gyro/core/behaviour/base/commandbase.cls.php @@ -179,7 +179,7 @@ protected function serialize_params($params) { $arr = array(); foreach($params as $key => $value) { $arr[] = $key; - $arr[] = $value; + $arr[] = is_array($value) ? serialize($value) : $value; } $ret = implode(GYRO_COMMAND_SEP, $arr); } diff --git a/gyro/core/controller/tools/sorter.cls.php b/gyro/core/controller/tools/sorter.cls.php index 54960c21..c8dcaabd 100644 --- a/gyro/core/controller/tools/sorter.cls.php +++ b/gyro/core/controller/tools/sorter.cls.php @@ -109,7 +109,7 @@ public function prepare_view($view) { } $this->sorter_data['columns'] = $arr_colums; - $this->sorter_data['current_column'] = $current_column; + $this->sorter_data['current_column'] = $current_column ?? null; $view->assign('sorter_data', $this->sorter_data); }