From 907e9b8d8f31bbe2323bb6046e57b3753e787390 Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Thu, 7 Mar 2024 19:23:52 +0200
Subject: [PATCH] Update on v5.0.0-beta1 (beta for next version)

Here's an update on the current version, which includes changes towards the next release still in beta.
---
 CHANGELOG.md                                           |  2 +-
 README.md                                              |  2 +-
 admin/README.txt                                       |  2 +-
 admin/src/Model/AjaxModel.php                          |  4 ++--
 admin/tmpl/manual_updater/default.php                  |  2 +-
 .../VDM.Joomla/src/Utilities/Component/Helper.php      | 10 +++++-----
 sermondistributor.xml                                  |  6 +++---
 site/src/Controller/ApiController.php                  |  2 +-
 site/tmpl/sermon/default.php                           |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6258b86b..e5844549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # v5.0.0-beta1
 
-- First release of [[[Component]]] towards Joomla 5
+- First release of Sermon Distributor towards Joomla 5
 
 # v3.0.3
 
diff --git a/README.md b/README.md
index 37fc3d72..515982f9 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 2nd March, 2024
++ *Last Build*: 7th March, 2024
 + *Version*: 5.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/README.txt b/admin/README.txt
index 37fc3d72..515982f9 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -24,7 +24,7 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 2nd March, 2024
++ *Last Build*: 7th March, 2024
 + *Version*: 5.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/src/Model/AjaxModel.php b/admin/src/Model/AjaxModel.php
index f0a1f37e..c79e34e7 100644
--- a/admin/src/Model/AjaxModel.php
+++ b/admin/src/Model/AjaxModel.php
@@ -282,11 +282,11 @@ class AjaxModel extends ListModel
 			$result['error'] = '<span style="color: red;">' . Text::sprintf('COM_SERMONDISTRIBUTOR_NO_CRONJOB_PATH_FOUND_FOR_S', $type) . '</span>';
 			if ($this->hasCurl())
 			{
-				$path = '*/15 * * * * curl -s "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
+				$path = '*/15 * * * * curl -s "' .\JUri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
 			}
 			else
 			{
-				$path = '*/15 * * * * wget "' .JURI::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
+				$path = '*/15 * * * * wget "' .\JUri::root() . 'index.php?option=com_sermondistributor&task=api.externalUpdate" >/dev/null 2>&1';
 			}
 			$result['path'] =  '<code>' . $path . '</code>';
 		}
diff --git a/admin/tmpl/manual_updater/default.php b/admin/tmpl/manual_updater/default.php
index 4c6c5bf5..d1a8f3a9 100644
--- a/admin/tmpl/manual_updater/default.php
+++ b/admin/tmpl/manual_updater/default.php
@@ -130,7 +130,7 @@ jQuery(document).ready(function($) {
 </div>
 <script>
 // token 
-var token = '<?php echo JSession::getFormToken(); ?>';
+var token = '<?php echo \JSession::getFormToken(); ?>';
 // nice little dot trick :)
 jQuery(document).ready( function($) {
   var x=0;
diff --git a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php
index b2ae8246..5660a491 100644
--- a/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php
+++ b/libraries/jcb_powers/VDM.Joomla/src/Utilities/Component/Helper.php
@@ -79,12 +79,12 @@ abstract class Helper
 	/**
 	 * Set the component option
 	 *
-	 * @param   string     $option  The option
+	 * @param   string|null     $option  The option
 	 *
 	 * @return  void
 	 * @since   3.2.0
 	 */
-	public static function setOption(string $option): void
+	public static function setOption(?string $option): void
 	{
 		self::$option = $option;
 	}
@@ -97,7 +97,7 @@ abstract class Helper
 	 * @return  string|null      A component option
 	 * @since   3.0.11
 	 */
-	public static function getOption(string $default = 'empty'): ?string
+	public static function getOption(?string $default = 'empty'): ?string
 	{
 		if (empty(self::$option))
 		{
@@ -160,7 +160,7 @@ abstract class Helper
 	 *
 	 * @since   3.0.11
 	 */
-	public static function get(string $option = null, string $default = null): ?string
+	public static function get(?string $option = null, ?string $default = null): ?string
 	{
 		// check that we have an option
 		// and get the code name from it
@@ -260,7 +260,7 @@ abstract class Helper
 	 *
 	 * @since   3.0.11
 	 */
-	public static function methodExists(string $method, string $option = null): bool
+	public static function methodExists(string $method, ?string $option = null): bool
 	{
 		// get the helper class
 		return ($helper = self::get($option, null)) !== null &&
diff --git a/sermondistributor.xml b/sermondistributor.xml
index 6b94e38a..2fbbd6a8 100644
--- a/sermondistributor.xml
+++ b/sermondistributor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="component" version="4.0" method="upgrade">
+<extension type="component" version="5.0" method="upgrade">
 	<name>COM_SERMONDISTRIBUTOR</name>
-	<creationDate>2nd March, 2024</creationDate>
+	<creationDate>7th March, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>
@@ -97,6 +97,6 @@
 
 	</administration>
 	<updateservers>
-		<server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.0/sermondistributor_update_server.xml</server>
+		<server type="extension" enabled="1" element="com_sermondistributor" name="Sermon Distributor">https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.x/sermondistributor_update_server.xml</server>
 	</updateservers>
 </extension>
\ No newline at end of file
diff --git a/site/src/Controller/ApiController.php b/site/src/Controller/ApiController.php
index a42a45c7..d7ad4b99 100644
--- a/site/src/Controller/ApiController.php
+++ b/site/src/Controller/ApiController.php
@@ -159,7 +159,7 @@ class ApiController extends FormController
 	protected function getApiUser()
 	{
 		// get params
-		$params = JComponentHelper::getParams('com_sermondistributor');
+		$params = \JComponentHelper::getParams('com_sermondistributor');
 		// return user object
 		return Factory::getUser($params->get('api', 0, 'INT'));
 	}
diff --git a/site/tmpl/sermon/default.php b/site/tmpl/sermon/default.php
index a4b308e6..3763e2c0 100644
--- a/site/tmpl/sermon/default.php
+++ b/site/tmpl/sermon/default.php
@@ -75,7 +75,7 @@ defined('_JEXEC') or die;
 	}
 	<?php if (1 == $this->item->playerKey) : ?>
 		soundManager.setup({
-			url: '<?php echo JURI::root(true); ?>/media/com_sermondistributor/soundmanager/swf',
+			url: '<?php echo \JUri::root(true); ?>/media/com_sermondistributor/soundmanager/swf',
 			flashVersion: 9,
 			onready: function() {
 				// Ready to use; soundManager.createSound() etc. can now be called.