Merge pull request #56 from techjoomla/master

Merge `master` into `release-1.1.0`

Author: manojLondhe

changelog.md

@@ -0,0 +1,12 @@
+# Changelog
+
+#### Legend
+
+- Bug Fix (-)
+- Feature Addition (+)
+- Improvement (^)
+
+## com_activitystream v1.0.3
+
+##### ^ Improvements:
+- #169696 PHP8 compatibilty fixes

plugins/api/tjactivity/tjactivity.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.0" type="plugin" group="api" method="upgrade">
 	<name>com_api_tjactivity</name>
-	<version>1.0.1</version>
-	<creationDate>8th Feb 2019</creationDate>
+	<version>1.0.3</version>
+	<creationDate>22nd Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_API_TJACTIVITY_DESCRIPTION</description>
 	<languages>

src/activitystream.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.0" method="upgrade">
 	<name>com_activitystream</name>
-	<!-- The following elements are optional and free of formatting constraints -->
-	<creationDate>8th Feb 2019</creationDate>
+	<creationDate>22nd Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<!--  The version string is recorded in the components table -->
-	<version>1.0.1</version>
-
-	<!-- The description is optional and defaults to the name -->
+	<version>1.0.3</version>
 	<description>COM_ACTIVITYSTREAM_DESCRIPTION</description>
 	<scriptfile>script.activitystream.php</scriptfile>
 	<install>

src/admin/sql/install.mysql.utf8.sql

@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS `#__tj_activities` (
-	`id`       INT(11)     NOT NULL AUTO_INCREMENT,
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`actor` text(900),
 	`actor_id` text(900),
 	`object` text(900),
@@ -8,9 +8,9 @@ CREATE TABLE IF NOT EXISTS `#__tj_activities` (
 	`target_id` text(900),
 	`type` text(900),
 	`client` varchar(20),
-	`template` text(900),
+	`template` text,
 	`default_theme` varchar(20),
-	`formatted_text` text(900),
+	`formatted_text` text,
 	`access` tinyint(2) DEFAULT 1,
 	`state` tinyint(2) DEFAULT 1,
 	`location` text(900),
@@ -19,6 +19,4 @@ CREATE TABLE IF NOT EXISTS `#__tj_activities` (
 	`created_date` datetime DEFAULT NULL,
 	`updated_date` datetime DEFAULT NULL,
 	PRIMARY KEY (`id`)
-)
-	DEFAULT CHARSET =utf8 AUTO_INCREMENT =1;
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

src/admin/sql/updates/mysql/1.0.2.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `#__tj_activities` MODIFY `template` text;
+ALTER TABLE `#__tj_activities` MODIFY `formatted_text` text;
+ALTER TABLE `#__tj_activities` ENGINE = InnoDB;

src/admin/tables/activity.php

@@ -65,9 +65,11 @@ public function check()
 			}
 		}
 
+		$errors = isset($errors) && is_array($errors) ? $errors : [];
+
 		if (count($errors))
 		{
-			$this->setError(implode($errors, ', '));
+			$this->setError(implode(', ', $errors));
 
 			return false;
 		}

src/plugins/privacy/activitystream/activitystream.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.9" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_activitystream</name>
-	<version>1.0.1</version>
-	<creationDate>8th Feb 2019</creationDate>
+	<version>1.0.3</version>
+	<creationDate>22nd Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_PRIVACY_ACTIVITYSTREAM_XML_DESCRIPTION</description>
 	<files>

src/script.activitystream.php

@@ -231,7 +231,7 @@ public function installSqlFiles($parent)
 				{
 					$query = trim($query);
 
-					if ($query != '' && $query{0} != '#')
+					if ($query != '' && $query[0] != '#')
 					{
 						$db->setQuery($query);