Skip to content

PHP7 Compatibility release #21

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
alexnantel88 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

PHP7 Compatibility release #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2a8193
Fix compatibility warnings for PHP7
May 17, 2017
67288d1
PHP7 Compatibility release
May 23, 2017
4a64a8f
Remove deprecated param from buildSortingSQL
May 30, 2017
62dd617
SQL and PHP cases
Aug 24, 2017
71dde4e
Relase infos .. Again
Aug 25, 2017
321c3ce
Code refactoring for Database
May 31, 2018
c10ae6e
Refactor class.systemdate.php with new Database methods
May 31, 2018
457471b
Replace rows()[0] with proper next()
Jun 19, 2018
f5f7731
Remote SQL collate and charset definitions.
Dec 18, 2018
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
132 changes: 100 additions & 32 deletions extension.driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,40 @@ public function update($previousVersion = false)
$ret = true;

if ($ret && version_compare($previousVersion,'1.1.0') == -1) {
$ret1 = Symphony::Database()->query("
ALTER TABLE `tbl_fields_systemcreateddate`
ADD COLUMN `show_time` enum('yes','no') NOT NULL DEFAULT 'no',
ADD COLUMN `use_timeago` enum('yes','no') NOT NULL DEFAULT 'no'
");
$ret2 = Symphony::Database()->query("
ALTER TABLE `tbl_fields_systemmodifieddate`
ADD COLUMN `show_time` enum('yes','no') NOT NULL DEFAULT 'no',
ADD COLUMN `use_timeago` enum('yes','no') NOT NULL DEFAULT 'no'
");
$ret1 = Symphonmy::Database()
->alter('tbl_fields_systemcreateddate')
->add([
'show_time' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
'use_timeago' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
])
->execute()
->success();

$ret2 = Symphonmy::Database()
->alter('tbl_fields_systemmodifieddate')
->add([
'show_time' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
'use_timeago' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
])
->execute()
->success();

$ret = $ret1 && $ret2;
}

Expand All @@ -67,33 +91,77 @@ public function update($previousVersion = false)

public function uninstall()
{
$ret1 = Symphony::Database()->query("DROP TABLE `tbl_fields_systemcreateddate`");
$ret2 = Symphony::Database()->query("DROP TABLE `tbl_fields_systemmodifieddate`");
$ret1 = Symphony::Database()
->drop('tbl_fields_systemcreateddate')
->ifExists()
->execute()
->success();

$ret2 = Symphony::Database()
->drop('tbl_fields_systemmodifieddate')
->ifExists()
->execute()
->success();

return $ret1 && $ret2;
}

public function install()
{
$ret1 = Symphony::Database()->query("
CREATE TABLE `tbl_fields_systemcreateddate` (
`id` int(11) unsigned NOT NULL auto_increment,
`field_id` int(11) unsigned NOT NULL,
`show_time` enum('yes','no') NOT NULL DEFAULT 'no',
`use_timeago` enum('yes','no') NOT NULL DEFAULT 'no',
PRIMARY KEY (`id`),
KEY `field_id` (`field_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
");
$ret2 = Symphony::Database()->query("
CREATE TABLE `tbl_fields_systemmodifieddate` (
`id` int(11) unsigned NOT NULL auto_increment,
`field_id` int(11) unsigned NOT NULL,
`show_time` enum('yes','no') NOT NULL DEFAULT 'no',
`use_timeago` enum('yes','no') NOT NULL DEFAULT 'no',
PRIMARY KEY (`id`),
KEY `field_id` (`field_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
");
$ret1 = Symphony::Database()
->create('tbl_fields_systemcreateddate')
->ifNotExists()
->fields([
'id' => [
'type' => 'int(11)',
'auto' => true,
],
'field_id' => 'int(11)',
'show_time' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
'use_timeago' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
])
->keys([
'id' => 'primary',
'field_id' => 'key',
])
->execute()
->success();

$ret2 = Symphony::Database()
->create('tbl_fields_systemmodifieddate')
->ifNotExists()
->fields([
'id' => [
'type' => 'int(11)',
'auto' => true,
],
'field_id' => 'int(11)',
'show_time' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
'use_timeago' => [
'type' => 'enum',
'values' => ['yes','no'],
'default' => 'no',
],
])
->keys([
'id' => 'primary',
'field_id' => 'key',
])
->execute()
->success();

return $ret1 && $ret2;
}
}
8 changes: 5 additions & 3 deletions extension.meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
</author>
</authors>
<releases>
<release version="2.0.0" date="TBA" min="4.0.0" max="4.x.x" php-min="5.6.x" php-max="7.x.x">
- Update for Symphony 4.x
- PHP7 compatibility
- Code refactoring for Database and EQFA
</release>
<release version="1.2.2" date="2017-06-20" min="2.6.0" max="2.x.x">
- Symphony 2.7.0 compatibility
</release>
<release version="1.2.1" date="2017-03-20" min="2.6.0" max="2.6.x">
- PHP7 compatibility
</release>
<release version="1.2.0" date="2016-01-15" min="2.6.0" max="2.6.x">
- Unify Styling of readonly values
</release>
Expand Down
19 changes: 10 additions & 9 deletions lib/class.systemdate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ protected abstract function getFieldName();

private function dateFromEntryID($entry_id)
{
return Symphony::Database()->fetchRow(0, sprintf("
SELECT %s
FROM `tbl_entries`
WHERE `id` = %d
LIMIT 1
", $this->getFieldName(), $entry_id));
return Symphony::Database()
->select([$this->getFieldName()])
->from('tbl_entries')
->where(['id' => $entry_id])
->limit(1)
->execute()
->next();
}

private function getDateFormat()
Expand Down Expand Up @@ -102,7 +103,7 @@ public function displayPublishPanel(XMLElement &$wrapper, $data = null, $flagWit
{
$label = new XMLElement('label');
$wrapper->appendChild($label);

$row = $this->dateFromEntryID($entry_id);
$date = $this->parseDate($row);
$value = $this->formatDate($date);
Expand All @@ -125,10 +126,10 @@ public function checkPostFieldData($data, &$message, $entry_id = null)
return self::__OK__;
}

public function processRawFieldData($data, &$status, &$message = NULL, $simulate = false, $entry_id = null)
public function processRawFieldData($data, &$status, &$message = null, $simulate = false, $entry_id = null)
{
$status = self::__OK__;
return NULL;
return null;
}

public function commit()
Expand Down