Skip to content

Commit

Permalink
Remove Database\Events::setGlobals method
Browse files Browse the repository at this point in the history 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
@MauricioFauth
MauricioFauth committed Apr 13, 2020
1 parent 1102bdf commit f2c8257
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 58 deletions.
91 changes: 37 additions & 54 deletions libraries/classes/Database/Events.php
View file
Expand Up @@ -27,6 +27,34 @@
*/
class Events
{
/** @var array<string, array<int, string>> */
private $status = [
'query' => ['ENABLE', 'DISABLE', 'DISABLE ON SLAVE'],
'display' => ['ENABLED', 'DISABLED', 'SLAVESIDE_DISABLED'],
];

/** @var array<int, string> */
private $type = ['RECURRING', 'ONE TIME'];

/** @var array<int, string> */
private $interval = [
'YEAR',
'QUARTER',
'MONTH',
'DAY',
'HOUR',
'MINUTE',
'WEEK',
'SECOND',
'YEAR_MONTH',
'DAY_HOUR',
'DAY_MINUTE',
'DAY_SECOND',
'HOUR_MINUTE',
'HOUR_SECOND',
'MINUTE_SECOND',
];

/** @var DatabaseInterface */
private $dbi;

Expand All @@ -48,50 +76,6 @@ public function __construct(DatabaseInterface $dbi, Template $template, $respons
$this->response = $response;
}

/**
* Sets required globals
*
* @return void
*/
public function setGlobals()
{
global $event_status, $event_type, $event_interval;

$event_status = [
'query' => [
'ENABLE',
'DISABLE',
'DISABLE ON SLAVE',
],
'display' => [
'ENABLED',
'DISABLED',
'SLAVESIDE_DISABLED',
],
];
$event_type = [
'RECURRING',
'ONE TIME',
];
$event_interval = [
'YEAR',
'QUARTER',
'MONTH',
'DAY',
'HOUR',
'MINUTE',
'WEEK',
'SECOND',
'YEAR_MONTH',
'DAY_HOUR',
'DAY_MINUTE',
'DAY_SECOND',
'HOUR_MINUTE',
'HOUR_SECOND',
'MINUTE_SECOND',
];
}

/**
* Main function for the events functionality
*
Expand All @@ -101,7 +85,6 @@ public function main()
{
global $db, $table, $pmaThemeImage, $text_dir;

$this->setGlobals();
/**
* Process all requests
*/
Expand Down Expand Up @@ -417,7 +400,7 @@ public function getDataFromName($name)
*/
public function getEditorForm($mode, $operation, array $item)
{
global $db, $table, $event_status, $event_type, $event_interval;
global $db, $table;

$modeToUpper = mb_strtoupper($mode);

Expand Down Expand Up @@ -479,7 +462,7 @@ public function getEditorForm($mode, $operation, array $item)
$retval .= ' <td>' . __('Status') . "</td>\n";
$retval .= " <td>\n";
$retval .= " <select name='item_status'>\n";
foreach ($event_status['display'] as $key => $value) {
foreach ($this->status['display'] as $key => $value) {
$selected = '';
if (! empty($item['item_status']) && $item['item_status'] == $value) {
$selected = " selected='selected'";
Expand All @@ -495,7 +478,7 @@ public function getEditorForm($mode, $operation, array $item)
$retval .= " <td>\n";
if ($this->response->isAjax()) {
$retval .= " <select name='item_type'>";
foreach ($event_type as $key => $value) {
foreach ($this->type as $key => $value) {
$selected = '';
if (! empty($item['item_type']) && $item['item_type'] == $value) {
$selected = " selected='selected'";
Expand Down Expand Up @@ -532,7 +515,7 @@ public function getEditorForm($mode, $operation, array $item)
$retval .= " name='item_interval_value'\n";
$retval .= " value='" . $item['item_interval_value'] . "'>\n";
$retval .= " <select class='w-50' name='item_interval_field'>";
foreach ($event_interval as $key => $value) {
foreach ($this->interval as $key => $value) {
$selected = '';
if (! empty($item['item_interval_field'])
&& $item['item_interval_field'] == $value
Expand Down Expand Up @@ -607,7 +590,7 @@ public function getEditorForm($mode, $operation, array $item)
*/
public function getQueryFromRequest()
{
global $errors, $event_status, $event_type, $event_interval;
global $errors;

$query = 'CREATE ';
if (! empty($_POST['item_definer'])) {
Expand All @@ -628,12 +611,12 @@ public function getQueryFromRequest()
}
$query .= 'ON SCHEDULE ';
if (! empty($_POST['item_type'])
&& in_array($_POST['item_type'], $event_type)
&& in_array($_POST['item_type'], $this->type)
) {
if ($_POST['item_type'] == 'RECURRING') {
if (! empty($_POST['item_interval_value'])
&& ! empty($_POST['item_interval_field'])
&& in_array($_POST['item_interval_field'], $event_interval)
&& in_array($_POST['item_interval_field'], $this->interval)
) {
$query .= 'EVERY ' . intval($_POST['item_interval_value']) . ' ';
$query .= $_POST['item_interval_field'] . ' ';
Expand Down Expand Up @@ -670,9 +653,9 @@ public function getQueryFromRequest()
}
$query .= 'PRESERVE ';
if (! empty($_POST['item_status'])) {
foreach ($event_status['display'] as $key => $value) {
foreach ($this->status['display'] as $key => $value) {
if ($value == $_POST['item_status']) {
$query .= $event_status['query'][$key] . ' ';
$query .= $this->status['query'][$key] . ' ';
break;
}
}
Expand Down
4 changes: 0 additions & 4 deletions test/classes/Database/EventsTest.php
View file
Expand Up @@ -153,7 +153,6 @@ public function providerGetDataFromRequest()
*/
public function testGetEditorFormAdd($data, $matcher): void
{
$this->events->setGlobals();
$this->assertStringContainsString(
$matcher,
$this->events->getEditorForm('add', 'change', $data)
Expand Down Expand Up @@ -238,7 +237,6 @@ public function providerGetEditorFormAdd()
*/
public function testGetEditorFormEdit($data, $matcher): void
{
$this->events->setGlobals();
$this->assertStringContainsString(
$matcher,
$this->events->getEditorForm('edit', 'change', $data)
Expand Down Expand Up @@ -324,7 +322,6 @@ public function providerGetEditorFormEdit(): array
public function testGetEditorFormAjax($data, $matcher): void
{
Response::getInstance()->setAjax(true);
$this->events->setGlobals();
$this->assertStringContainsString(
$matcher,
$this->events->getEditorForm('edit', 'change', $data)
Expand Down Expand Up @@ -386,7 +383,6 @@ public function testGetQueryFromRequest($request, $query, $num_err): void
global $errors;

$errors = [];
$this->events->setGlobals();

unset($_POST);
$_POST = $request;
Expand Down

0 comments on commit f2c8257

Please sign in to comment.