Merge branch 'fix-test-warnings' into 'dev'

Fix test warnings

See merge request hubzilla/core!2134

3 files changed, 11 insertions, 7 deletions

diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index 5d52440a5..fd5cacee6 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -210,7 +210,8 @@ class Help extends \Zotlabs\Web\Controller {
 		$content = preg_replace_callback(
 			"/#include (.*?)\;/ism",
 			function ($matches) {
-				$sub_file_type = array_pop(explode('.', $matches[1]));
+				$parts = explode('.', $matches[1]);
+				$sub_file_type = array_pop($parts);
 				$included_content = $this->render_help_file($matches[1], $sub_file_type);
 				return str_replace($matches[0], $included_content, $matches[0]);
 			},
diff --git a/Zotlabs/Module/Rbmark.php b/Zotlabs/Module/Rbmark.php
index b1aea2590..df32a97c2 100644
--- a/Zotlabs/Module/Rbmark.php
+++ b/Zotlabs/Module/Rbmark.php
@@ -73,16 +73,17 @@ class Rbmark extends \Zotlabs\Web\Controller {
 			false,
 			'',
 			$this->get_bookmark_folders(intval($channel_id)),
+			null,
 		];
 
 		return replace_macros(get_markup_template('rbmark.tpl'), array(
 			'$header' => t('Save Bookmark'),
-			'$url' => array('url',t('URL of bookmark'),$_REQUEST['url']),
-			'$title' => array('title',t('Description'),$_REQUEST['title']),
+			'$url' => array('url',t('URL of bookmark'),$_REQUEST['url'], null, null, null),
+			'$title' => array('title',t('Description'),$_REQUEST['title'], null, null, null),
 			'$ischat' => ((x($_REQUEST,'ischat')) ? intval($_REQUEST['ischat']) : 0),
 			'$private' => ((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0),
 			'$submit' => t('Save'),
-			'$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'',''),
+			'$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'','', null, null),
 			'$menus' => $menu_select
 		));
 	}
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 647415385..7ca3f827c 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -46,9 +46,9 @@ class Setup extends \Zotlabs\Web\Controller {
 		}
 
 		if(x($_POST, 'pass')) {
-			$this->install_wizard_pass = intval($_POST['pass']);
+			self::$install_wizard_pass = intval($_POST['pass']);
 		} else {
-			$this->install_wizard_pass = 1;
+			self::$install_wizard_pass = 1;
 		}
 	}
 
@@ -215,9 +215,11 @@ class Setup extends \Zotlabs\Web\Controller {
 				$tpl = get_markup_template('install.tpl');
 				return replace_macros($tpl, array(
 					'$title' => $install_title,
+					'$icon' => null,
 					'$pass' => '',
 					'$status' => t('Permission denied.'),
 					'$text' => '',
+					'$what_next' => null,
 				));
 			}
 		}
@@ -237,7 +239,7 @@ class Setup extends \Zotlabs\Web\Controller {
 			));
 		}
 
-		switch ($this->install_wizard_pass){
+		switch (self::$install_wizard_pass){
 			case 1: { // System check
 
 				$checks = array();