Skip to content

Task#163718 feat: Solving phpcs errors from com_activitystream #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aishwaryab2 wants to merge 7 commits into
base: release-1.1.0
Choose a base branch
from
Open

Task#163718 feat: Solving phpcs errors from com_activitystream #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a774a03
Update default DB engine of the tables #41 (#42)
ankush-maherwal Oct 22, 2019
571574e
Release 1.0.2 (#44)
ankush-maherwal Oct 22, 2019
eb25917
Merge pull request #45 from techjoomla/release-1.0.2
manojLondhe Oct 22, 2019
9fac6b1
Update tjactivity.xml
manojLondhe Oct 22, 2019
50435ad
Issue #000 chore: Version update
manojLondhe Oct 22, 2019
ef75e5c
Merge remote-tracking branch 'upstream/release-1.1.0' into Task#163718
Aug 4, 2020
41cd51b
Task #163718 feat:solving phpcs errors from com_activitystream
Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions build/bump.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ function usage($command)
'major' => $versionSubParts[0],
'minor' => $versionSubParts[1],
'patch' => $versionSubParts[2],
'extra' => (!empty($versionParts[1]) ? $versionParts[1] : '') .
(!empty($versionParts[2]) ? (!empty($versionParts[1]) ? '-' : '') . $versionParts[2] : ''),
'extra' => (!empty($versionParts[1]) ? $versionParts[1] : '') . !empty($versionParts[2]) ?
(!empty($versionParts[1]) ? '-' : '') . $versionParts[2] : ''),
'release' => $versionSubParts[0] . '.' . $versionSubParts[1] . '.' . $versionSubParts[2],
'dev_devel' => $versionSubParts[2] . (!empty($versionParts[1]) ? '-' .
$versionParts[1] : '') . (!empty($versionParts[2]) ? '-' . $versionParts[2] : ''),
'dev_devel' => $versionSubParts[2] . (!empty($versionParts[1]) ? '-' . $versionParts[1] : '')
. (!empty($versionParts[2]) ? '-' . $versionParts[2] : ''),
'dev_status' => $dev_status,
'build' => '',
'reldate' => date('j-F-Y'),
Expand Down Expand Up @@ -249,33 +249,33 @@ function usage($command)

$fileContents = file_get_contents($rootPath . $coreXmlFile);

$fileContents = preg_replace('#<version>[^<]*</version>#', '<version>' . $version['main'] .
'.' . $version['dev_devel'] . '</version>', $fileContents
$fileContents = preg_replace('#<version>[^<]*</version>#',
'<version>' . $version['main'] . '.' . $version['dev_devel'] . '</version>', $fileContents
);

$fileContents = preg_replace('#<creationDate>[^<]*</creationDate>#', '<creationDate>' .
$version['credate'] . '</creationDate>', $fileContents
$fileContents = preg_replace('#<creationDate>[^<]*</creationDate>#',
'<creationDate>' . $version['credate'] . '</creationDate>', $fileContents
);

// + TJ - chanages
$fileContents = preg_replace('#<author>[^<]*</author>#', '<author>' .
$author . '</author>', $fileContents
$fileContents = preg_replace('#<author>[^<]*</author>#',
'<author>' . $author . '</author>', $fileContents
);

$fileContents = preg_replace('#<authorEmail>[^<]*</authorEmail>#', '<authorEmail>' .
$authorEmail . '</authorEmail>', $fileContents
$fileContents = preg_replace('#<authorEmail>[^<]*</authorEmail>#',
'<authorEmail>' . $authorEmail . '</authorEmail>', $fileContents
);

$fileContents = preg_replace('#<authorUrl>[^<]*</authorUrl>#', '<authorUrl>' .
$authorUrl . '</authorUrl>', $fileContents
$fileContents = preg_replace('#<authorUrl>[^<]*</authorUrl>#',
'<authorUrl>' . $authorUrl . '</authorUrl>', $fileContents
);

$fileContents = preg_replace('#<license>[^<]*</license>#', '<license>' .
$license . '</license>', $fileContents
$fileContents = preg_replace('#<license>[^<]*</license>#',
'<license>' . $license . '</license>', $fileContents
);

$fileContents = preg_replace('#<copyright>[^<]*</copyright>#', '<copyright>' .
$copyright . '</copyright>', $fileContents
$fileContents = preg_replace('#<copyright>[^<]*</copyright>#',
'<copyright>' . $copyright . '</copyright>', $fileContents
);

// + TJ - chanages - end
Expand All @@ -288,8 +288,8 @@ function usage($command)
if (file_exists($rootPath . $antJobFile))
{
$fileContents = file_get_contents($rootPath . $antJobFile);
$fileContents = preg_replace('#<arg value="Joomla! CMS [^ ]* API" />#', '<arg value="Joomla! CMS ' .
$version['main'] . ' API" />', $fileContents
$fileContents = preg_replace('#<arg value="Joomla! CMS [^ ]* API" />#',
'<arg value="Joomla! CMS ' . $version['main'] . ' API" />', $fileContents
);
file_put_contents($rootPath . $antJobFile, $fileContents);
}
Expand Down Expand Up @@ -357,8 +357,8 @@ function usage($command)
&& !preg_match('#2016\s+-\s+' . $year . '\s+Techjoomla.\s+All\s+rights#', $fileContents))
{
$changeCopyrightDate = true;
$fileContents = preg_replace('#2016\s+-\s+[0-9]{4}\s+Techjoomla.\s+All\s+rights#', '2016 - ' .
$year . ' Techjoomla. All rights', $fileContents
$fileContents = preg_replace('#2016\s+-\s+[0-9]{4}\s+Techjoomla.\s+All\s+rights#',
'2016 - ' . $year . ' Techjoomla. All rights', $fileContents
);
$changedFilesCopyrightDate++;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/api/tjactivity/tjactivity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?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.2</version>
<creationDate>22nd Oct 2019</creationDate>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
Expand Down
8 changes: 2 additions & 6 deletions src/activitystream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 Oct 2019</creationDate>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
<copyright>Copyright (C) 2016 - 2019 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.2</version>
<description>COM_ACTIVITYSTREAM_DESCRIPTION</description>
<scriptfile>script.activitystream.php</scriptfile>
<install>
Expand Down
10 changes: 4 additions & 6 deletions src/admin/sql/install.mysql.utf8.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand All @@ -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),
Expand All @@ -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;
3 changes: 3 additions & 0 deletions src/admin/sql/updates/mysql/1.0.2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions src/plugins/privacy/activitystream/activitystream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?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.2</version>
<creationDate>22nd Oct 2019</creationDate>
<author>Techjoomla</author>
<authorEmail>extensions@techjoomla.com</authorEmail>
<authorUrl>https://techjoomla.com</authorUrl>
Expand Down