Prevent some type errors

dragomano · Jan 5, 2025 · f76a902 · f76a902
1 parent c552ff9
commit f76a902
Show file tree

Hide file tree

Showing 34 changed files with 284 additions and 176 deletions.
diff --git a/src/Sources/LightPortal/Plugins/ArticleList/ArticleList.php b/src/Sources/LightPortal/Plugins/ArticleList/ArticleList.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\ArticleList;
@@ -32,8 +32,10 @@
 use Bugo\LightPortal\UI\Partials\PageSelect;
 use Bugo\LightPortal\UI\Partials\TopicSelect;
 use Bugo\LightPortal\Utils\Content;
+use Bugo\LightPortal\Utils\ParamWrapper;
 use Bugo\LightPortal\Utils\Setting;
 use Bugo\LightPortal\Utils\Str;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -101,7 +103,7 @@ public function prepareBlockFields(Event $e): void
 			->setValue($options['seek_images']);
 	}
 
-	public function getTopics(array $parameters): array
+	public function getTopics(ParamWrapper $parameters): array
 	{
 		if (empty($parameters['include_topics']))
 			return [];
@@ -148,7 +150,7 @@ public function getTopics(array $parameters): array
 		return $topics;
 	}
 
-	public function getPages(array $parameters): array
+	public function getPages(ParamWrapper $parameters): array
 	{
 		if (empty($parameters['include_pages']))
 			return [];
@@ -201,14 +203,17 @@ public function prepareContent(Event $e): void
 	{
 		$parameters = $e->args->parameters;
 
+		$type = Typed::int($parameters['display_type']);
+
 		$articles = $this->cache($this->name . '_addon_b' . $e->args->id . '_u' . User::$info['id'])
 			->setLifeTime($e->args->cacheTime)
-			->setFallback(fn() => empty($parameters['display_type']) ? $this->getTopics($parameters) : $this->getPages($parameters));
+			->setFallback(fn() => $type === 0 ? $this->getTopics($parameters) : $this->getPages($parameters));
 
 		if ($articles) {
 			$articleList = Str::html('div')->class($this->name);
+			$bodyClass = Typed::string($parameters['body_class']);
 
-			if (empty($parameters['display_type'])) {
+			if ($type === 0) {
 				foreach ($articles as $topic) {
 					$content = Str::html();
 
@@ -230,7 +235,7 @@ public function prepareContent(Event $e): void
 							->setText($topic['title'])
 					);
 
-					$articleList->addHtml(sprintf(Utils::$context['lp_all_content_classes'][$parameters['body_class']], $content));
+					$articleList->addHtml(sprintf(Utils::$context['lp_all_content_classes'][$bodyClass], $content));
 				}
 			} else {
 				foreach ($articles as $page) {
@@ -258,7 +263,7 @@ public function prepareContent(Event $e): void
 					);
 
 					$articleList->addHtml(
-						sprintf(Utils::$context['lp_all_content_classes'][$parameters['body_class']], $content)
+						sprintf(Utils::$context['lp_all_content_classes'][$bodyClass], $content)
 					);
 				}
 			}

diff --git a/src/Sources/LightPortal/Plugins/BoardList/BoardList.php b/src/Sources/LightPortal/Plugins/BoardList/BoardList.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\BoardList;
@@ -26,6 +26,7 @@
 use Bugo\LightPortal\Utils\Icon;
 use Bugo\LightPortal\Utils\MessageIndex;
 use Bugo\LightPortal\Utils\Str;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -71,27 +72,25 @@ public function prepareBlockFields(Event $e): void
 			]);
 	}
 
-	public function getData(): array
-	{
-		return MessageIndex::getBoardList();
-	}
-
 	public function prepareContent(Event $e): void
 	{
-		$parameters = $e->args->parameters;
-
 		$boardList = $this->cache($this->name . '_addon_b' . $e->args->id . '_u' . Utils::$context['user']['id'])
 			->setLifeTime($e->args->cacheTime)
-			->setFallback(fn() => $this->getData());
+			->setFallback(fn() => MessageIndex::getBoardList());
 
 		if (empty($boardList))
 			return;
 
 		Utils::$context['current_board'] ??= 0;
 
+		$parameters = $e->args->parameters;
+
+		$categoryClass = Typed::string($parameters['category_class']);
+		$boardClass = Typed::string($parameters['board_class']);
+
 		foreach ($boardList as $category) {
-			if ($parameters['category_class']) {
-				echo sprintf($this->getCategoryClasses()[$parameters['category_class']], $category['name']);
+			if ($categoryClass) {
+				echo sprintf($this->getCategoryClasses()[$categoryClass], $category['name']);
 			}
 
 			$content = Str::html('ul')->class('smalltext');
@@ -123,7 +122,7 @@ public function prepareContent(Event $e): void
 				$content->addHtml($li);
 			}
 
-			echo sprintf(Utils::$context['lp_all_content_classes'][$parameters['board_class']], $content);
+			echo sprintf(Utils::$context['lp_all_content_classes'][$boardClass], $content);
 		}
 	}
 

diff --git a/src/Sources/LightPortal/Plugins/BoardNews/BoardNews.php b/src/Sources/LightPortal/Plugins/BoardNews/BoardNews.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\BoardNews;
@@ -25,6 +25,7 @@
 use Bugo\LightPortal\UI\Fields\RangeField;
 use Bugo\LightPortal\Utils\MessageIndex;
 use Bugo\LightPortal\Utils\Str;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -78,17 +79,15 @@ public function prepareContent(Event $e): void
 	{
 		$parameters = $e->args->parameters;
 
-		$teaserLength = empty($parameters['teaser_length']) ? null : $parameters['teaser_length'];
-
 		$boardNews = $this->cache($this->name . '_addon_b' . $e->args->id . '_u' . User::$info['id'])
 			->setLifeTime($e->args->cacheTime)
 			->setFallback(
 				fn() => $this->getFromSSI(
 					'boardNews',
-					(int) $parameters['board_id'],
-					(int) $parameters['num_posts'],
+					Typed::int($parameters['board_id']),
+					Typed::int($parameters['num_posts']),
 					null,
-					$teaserLength,
+					Typed::int($parameters['teaser_length']),
 					'array'
 				)
 			);

diff --git a/src/Sources/LightPortal/Plugins/BoardStats/BoardStats.php b/src/Sources/LightPortal/Plugins/BoardStats/BoardStats.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\BoardStats;
@@ -21,7 +21,9 @@
 use Bugo\LightPortal\Plugins\Event;
 use Bugo\LightPortal\UI\Fields\CheckboxField;
 use Bugo\LightPortal\UI\Fields\NumberField;
+use Bugo\LightPortal\Utils\ParamWrapper;
 use Bugo\LightPortal\Utils\Str;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -80,7 +82,7 @@ public function prepareBlockFields(Event $e): void
 			->setValue($options['update_interval']);
 	}
 
-	public function getData(array $parameters): array
+	public function getData(ParamWrapper $parameters): array
 	{
 		if (
 			empty($parameters['show_latest_member'])
@@ -107,17 +109,14 @@ public function prepareContent(Event $e): void
 	{
 		$parameters = $e->args->parameters;
 
+		$cacheTime = Typed::int($parameters['update_interval']);
+
 		if ($this->request()->has('preview')) {
-			$parameters['update_interval'] = 0;
+			$cacheTime = 0;
 		}
 
-		$parameters['show_latest_member'] ??= false;
-		$parameters['show_whos_online'] ??= false;
-		$parameters['show_basic_info'] ??= false;
-		$parameters['use_fa_icons'] ??= false;
-
 		$boardStats = $this->cache($this->name . '_addon_b' . $e->args->id . '_u' . User::$info['id'])
-			->setLifeTime($parameters['update_interval'] ?? $e->args->cacheTime)
+			->setLifeTime($cacheTime)
 			->setFallback(fn() => $this->getData($parameters));
 
 		if (empty($boardStats))

diff --git a/src/Sources/LightPortal/Plugins/Chart/Chart.php b/src/Sources/LightPortal/Plugins/Chart/Chart.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\Chart;
@@ -137,7 +137,7 @@ public function prepareContent(Event $e): void
 
 		$type = $parameters['chart_type'] ?? $this->params['chart_type'];
 
-		$datasets = Utils::jsonDecode($parameters['datasets'] ?? $this->params['datasets'], true);
+		$datasets = Utils::jsonDecode($parameters['datasets'] ?? $this->params['datasets'], true) ?? [];
 		array_walk($datasets, static fn(&$val) => $val['data'] = explode(', ', (string) $val['data']));
 		$datasets = json_encode($datasets);
 

diff --git a/src/Sources/LightPortal/Plugins/Events/Events.php b/src/Sources/LightPortal/Plugins/Events/Events.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\Events;
@@ -22,6 +22,8 @@
 use Bugo\LightPortal\UI\Fields\CheckboxField;
 use Bugo\LightPortal\UI\Fields\NumberField;
 use Bugo\LightPortal\UI\Fields\RangeField;
+use Bugo\LightPortal\Utils\ParamWrapper;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -88,14 +90,14 @@ public function changeIconSet(Event $e): void
 		$e->args->set['event'] = 'fas fa-calendar-days';
 	}
 
-	public function getData(array $parameters): array
+	public function getData(ParamWrapper $parameters): array
 	{
 		$now = time();
 		$todayDate = date('Y-m-d', $now);
 
 		$futureDate = empty($parameters['days_in_future'])
 			? $todayDate
-			: date('Y-m-d', ($now + $parameters['days_in_future'] * 24 * 60 * 60));
+			: date('Y-m-d', ($now + (int) $parameters['days_in_future'] * 24 * 60 * 60));
 
 		$options = [
 			'show_birthdays' => (bool) $parameters['show_birthdays'],
@@ -110,12 +112,14 @@ public function prepareContent(Event $e): void
 	{
 		$parameters = $e->args->parameters;
 
+		$cacheTime = Typed::int($parameters['update_interval']);
+
 		if ($this->request()->has('preview')) {
-			$parameters['update_interval'] = 0;
+			$cacheTime = 0;
 		}
 
 		$data = $this->cache($this->name . '_addon_b' . $e->args->id . '_u' . User::$info['id'])
-			->setLifeTime($parameters['update_interval'] ?? $e->args->cacheTime)
+			->setLifeTime($cacheTime)
 			->setFallback(fn() => $this->getData($parameters));
 
 		$this->setTemplate();

diff --git a/src/Sources/LightPortal/Plugins/GalleryBlock/GalleryBlock.php b/src/Sources/LightPortal/Plugins/GalleryBlock/GalleryBlock.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\GalleryBlock;
@@ -23,7 +23,9 @@
 use Bugo\LightPortal\Plugins\Event;
 use Bugo\LightPortal\UI\Fields\CustomField;
 use Bugo\LightPortal\UI\Fields\NumberField;
+use Bugo\LightPortal\Utils\ParamWrapper;
 use Bugo\LightPortal\Utils\Str;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -64,7 +66,7 @@ public function prepareBlockFields(Event $e): void
 			->setValue($e->args->options['num_images']);
 	}
 
-	public function getData(array $parameters): array
+	public function getData(ParamWrapper $parameters): array
 	{
 		if (empty(Db::$db->list_tables(false, Config::$db_prefix . 'gallery_pic')))
 			return [];
@@ -85,7 +87,7 @@ public function getData(array $parameters): array
 			[
 				'approved'   => 1,
 				'categories' => $categories,
-				'limit'      => $parameters['num_images'],
+				'limit'      => Typed::int($parameters['num_images'], default: 10),
 			]
 		);
 

diff --git a/src/Sources/LightPortal/Plugins/News/News.php b/src/Sources/LightPortal/Plugins/News/News.php
@@ -8,7 +8,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category plugin
- * @version 22.12.24
+ * @version 05.01.25
  */
 
 namespace Bugo\LightPortal\Plugins\News;
@@ -19,6 +19,7 @@
 use Bugo\LightPortal\Plugins\Block;
 use Bugo\LightPortal\Plugins\Event;
 use Bugo\LightPortal\UI\Fields\SelectField;
+use WPLake\Typed\Typed;
 
 if (! defined('LP_NAME'))
 	die('No direct access...');
@@ -64,6 +65,6 @@ public function getData(int $item = 0): string
 
 	public function prepareContent(Event $e): void
 	{
-		echo $this->getData($e->args->parameters['selected_item']) ?: $this->txt['no_items'];
+		echo $this->getData(Typed::int($e->args->parameters['selected_item'])) ?: $this->txt['no_items'];
 	}
 }