Skip to content

Commit

Permalink
Scrutinizer Auto-Fixes
Browse files Browse the repository at this point in the history 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
  • Loading branch information
@scrutinizer-auto-fixer
scrutinizer-auto-fixer committed Aug 11, 2017
1 parent a59b766 commit 18159fa
Show file tree
Hide file tree
Showing 33 changed files with 135 additions and 135 deletions.
10 changes: 5 additions & 5 deletions Alpha/Controller/ActiveRecordController.php
View file
Expand Up @@ -684,7 +684,7 @@ protected function renderPageLinks()
$body = '';

// the index of the last record displayed on this page
$last = $this->start + $config->get('app.list.page.amount');
$last = $this->start+$config->get('app.list.page.amount');

// ensure that the last index never overruns the total record count
if ($last > $this->recordCount) {
Expand All @@ -704,9 +704,9 @@ protected function renderPageLinks()
if ($this->start > 0) {
// handle secure URLs
if ($this->request->getParam('token', null) != null) {
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start - $this->limit).'&limit='.$this->limit).'">&lt;&lt;-Previous</a></li>';
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start-$this->limit).'&limit='.$this->limit).'">&lt;&lt;-Previous</a></li>';
} else {
$body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start - $this->limit).'/'.$this->limit.'">&lt;&lt;-Previous</a></li>';
$body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start-$this->limit).'/'.$this->limit.'">&lt;&lt;-Previous</a></li>';
}
} elseif ($this->recordCount > $this->limit) {
$body .= '<li class="disabled"><a href="#">&lt;&lt;-Previous</a></li>';
Expand Down Expand Up @@ -736,9 +736,9 @@ protected function renderPageLinks()
if ($this->recordCount > $last) {
// handle secure URLs
if ($this->request->getParam('token', null) != null) {
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start + $this->limit).'&limit='.$this->limit).'">Next-&gt;&gt;</a></li>';
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start+$this->limit).'&limit='.$this->limit).'">Next-&gt;&gt;</a></li>';
} else {
$body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start + $this->limit.'/'.$this->limit).
$body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start+$this->limit.'/'.$this->limit).
'">Next-&gt;&gt;</a></li>';
}
} elseif ($this->recordCount > $this->limit) {
Expand Down
2 changes: 1 addition & 1 deletion Alpha/Controller/CacheController.php
View file
Expand Up @@ -207,7 +207,7 @@ public function doPOST($request)

if (isset($params['clearCache']) && $params['clearCache'] == 'true') {
try {
FileUtils::deleteDirectoryContents($this->dataDir, array('.htaccess','html','images','pdf','xls'));
FileUtils::deleteDirectoryContents($this->dataDir, array('.htaccess', 'html', 'images', 'pdf', 'xls'));

$this->setStatusMessage(View::displayUpdateMessage('Cache contents deleted successfully.'));

Expand Down
16 changes: 8 additions & 8 deletions Alpha/Controller/Controller.php
View file
Expand Up @@ -509,19 +509,19 @@ public function setUnitOfWork($jobs)
}
// found the current job
if ($this->name == $jobs[$i]) {
if (isset($jobs[$i - 1])) {
if (isset($jobs[$i-1])) {
// set the previous job if it exists
$this->previousJob = $jobs[$i - 1];
$this->previousJob = $jobs[$i-1];
self::$logger->debug('Previous job ['.$this->previousJob.']');
}
if (isset($jobs[$i + 1])) {
if (isset($jobs[$i+1])) {
// set the next job if it exists
$this->nextJob = $jobs[$i + 1];
$this->nextJob = $jobs[$i+1];
self::$logger->debug('Next job ['.$this->nextJob.']');
}
}
// the last job in the sequence
if ($i == ($numOfJobs - 1)) {
if ($i == ($numOfJobs-1)) {
$this->lastJob = $jobs[$i];
}
}
Expand Down Expand Up @@ -685,9 +685,9 @@ public function getUnitDuration()
intval($this->unitEndTime->getYear())
);

self::$logger->debug('<<getUnitDuration ['.($intEndTime - $intStartTime).']');
self::$logger->debug('<<getUnitDuration ['.($intEndTime-$intStartTime).']');

return $intEndTime - $intStartTime;
return $intEndTime-$intStartTime;
}

/**
Expand Down Expand Up @@ -1153,7 +1153,7 @@ public function checkSecurityFields()
*/

// the server hostname + today's date less 1 hour (i.e. yesterday where time is < 1:00AM)
$var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time() - 3600)))), '+/', '-_'), '=');
$var1 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($host.date('Ymd', (time()-3600)))), '+/', '-_'), '=');
// the server's IP plus $var1
$var2 = rtrim(strtr(base64_encode(SecurityUtils::encrypt($ip.$var1)), '+/', '-_'), '=');

Expand Down
52 changes: 26 additions & 26 deletions Alpha/Controller/Front/FrontController.php
View file
Expand Up @@ -175,145 +175,145 @@ public function __construct()
throw new BadRequestException('Request character encoding does not match expected UTF-8');
}

$this->addRoute('/', function ($request) {
$this->addRoute('/', function($request) {
$controller = new IndexController();

return $controller->process($request);
});

$this->addRoute('/a/{title}/{view}', function ($request) {
$this->addRoute('/a/{title}/{view}', function($request) {
$controller = new ArticleController();

return $controller->process($request);
})->value('title', null)->value('view', 'detailed');

$this->addRoute('/articles/{start}/{limit}', function ($request) {
$this->addRoute('/articles/{start}/{limit}', function($request) {
$controller = new ArticleController();

return $controller->process($request);
})->value('start', 0)->value('limit', $config->get('app.list.page.amount'));

$this->addRoute('/attach/{articleID}/{filename}', function ($request) {
$this->addRoute('/attach/{articleID}/{filename}', function($request) {
$controller = new AttachmentController();

return $controller->process($request);
});

$this->addRoute('/cache', function ($request) {
$this->addRoute('/cache', function($request) {
$controller = new CacheController();

return $controller->process($request);
});

$this->addRoute('/denum/{denumID}', function ($request) {
$this->addRoute('/denum/{denumID}', function($request) {
$controller = new DEnumController();

return $controller->process($request);
})->value('denumID', null);

$this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function ($request) {
$this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function($request) {
$controller = new ExcelController();

return $controller->process($request);
})->value('ActiveRecordID', null);

$this->addRoute('/feed/{ActiveRecordType}/{type}', function ($request) {
$this->addRoute('/feed/{ActiveRecordType}/{type}', function($request) {
$controller = new FeedController();

return $controller->process($request);
})->value('type', 'Atom');

$this->addRoute('/gensecure', function ($request) {
$this->addRoute('/gensecure', function($request) {
$controller = new GenSecureQueryStringController();

return $controller->process($request);
});

$this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function ($request) {
$this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function($request) {
$controller = new ImageController();

return $controller->process($request);
})->value('var1', null)->value('var2', null);

$this->addRoute('/listactiverecords', function ($request) {
$this->addRoute('/listactiverecords', function($request) {
$controller = new ListActiveRecordsController();

return $controller->process($request);
});

$this->addRoute('/log/{logPath}', function ($request) {
$this->addRoute('/log/{logPath}', function($request) {
$controller = new LogController();

return $controller->process($request);
});

$this->addRoute('/login', function ($request) {
$this->addRoute('/login', function($request) {
$controller = new LoginController();

return $controller->process($request);
});

$this->addRoute('/logout', function ($request) {
$this->addRoute('/logout', function($request) {
$controller = new LogoutController();

return $controller->process($request);
});

$this->addRoute('/metric', function ($request) {
$this->addRoute('/metric', function($request) {
$controller = new MetricController();

return $controller->process($request);
});

$this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function ($request) {
$this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function($request) {
$controller = new RecordSelectorController();

return $controller->process($request);
})->value('relationType', 'ONE-TO-MANY');

$this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function ($request) {
$this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function($request) {
$controller = new RecordSelectorController();

return $controller->process($request);
})->value('relationType', 'MANY-TO-MANY');

$this->addRoute('/search/{query}/{start}/{limit}', function ($request) {
$this->addRoute('/search/{query}/{start}/{limit}', function($request) {
$controller = new SearchController();

return $controller->process($request);
})->value('start', 0)->value('limit', $config->get('app.list.page.amount'));

$this->addRoute('/sequence/{start}/{limit}', function ($request) {
$this->addRoute('/sequence/{start}/{limit}', function($request) {
$controller = new SequenceController();

return $controller->process($request);
})->value('start', 0)->value('limit', $config->get('app.list.page.amount'));

$this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function ($request) {
$this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function($request) {
$controller = new TagController();

return $controller->process($request);
});

$this->addRoute('/install', function ($request) {
$this->addRoute('/install', function($request) {
$controller = new InstallController();

return $controller->process($request);
});

$this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function ($request) {
$this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function($request) {
$controller = new ActiveRecordController();

return $controller->process($request);
})->value('ActiveRecordID', null)->value('view', 'detailed');

$this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function ($request) {
$this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function($request) {
$controller = new ActiveRecordController();

return $controller->process($request);
})->value('start', 0)->value('limit', $config->get('app.list.page.amount'));

$this->addRoute('/tk/{token}', function ($request) {
$this->addRoute('/tk/{token}', function($request) {
$params = self::getDecodeQueryParams($request->getParam('token'));

if (isset($params['act'])) {
Expand All @@ -340,14 +340,14 @@ public function __construct()
return new Response(404, 'Resource not found');
});

$this->addRoute('/alpha/service', function ($request) {
$this->addRoute('/alpha/service', function($request) {
$controller = new LoginController();
$controller->setUnitOfWork(array('Alpha\Controller\LoginController', 'Alpha\Controller\ListActiveRecordsController'));

return $controller->process($request);
});

$this->addRoute('/phpinfo', function ($request) {
$this->addRoute('/phpinfo', function($request) {
$controller = new PhpinfoController();

return $controller->process($request);
Expand Down
2 changes: 1 addition & 1 deletion Alpha/Controller/ImageController.php
View file
Expand Up @@ -107,7 +107,7 @@ public function doGet($request)
$imgWidth = $params['width'];
$imgHeight = $params['height'];
$imgType = $params['type'];
$imgQuality = (double) $params['quality'];
$imgQuality = (double)$params['quality'];
$imgScale = new Boolean($params['scale']);
$imgSecure = new Boolean($params['secure']);
} catch (\Exception $e) {
Expand Down
14 changes: 7 additions & 7 deletions Alpha/Controller/SearchController.php
View file
Expand Up @@ -199,7 +199,7 @@ protected function renderResultList($results, $query = '', $showTags = true)
$config = ConfigProvider::getInstance();

// used to track when our pagination range ends
$end = ($this->startPoint + $config->get('app.list.page.amount'));
$end = ($this->startPoint+$config->get('app.list.page.amount'));

$body = '';

Expand Down Expand Up @@ -289,14 +289,14 @@ protected function renderPageLinks()

$body = '';

$end = ($this->startPoint + $config->get('app.list.page.amount'));
$end = ($this->startPoint+$config->get('app.list.page.amount'));

if ($end > $this->resultCount) {
$end = $this->resultCount;
}

if ($this->resultCount > 0) {
$body .= '<p align="center">Displaying '.($this->startPoint + 1).' to '.$end.' of <strong>'.$this->resultCount.'</strong>.&nbsp;&nbsp;';
$body .= '<p align="center">Displaying '.($this->startPoint+1).' to '.$end.' of <strong>'.$this->resultCount.'</strong>.&nbsp;&nbsp;';
} else {
if (!empty($this->query)) {
$body .= View::displayUpdateMessage('There were no search results for your query.');
Expand All @@ -308,9 +308,9 @@ protected function renderPageLinks()
if ($this->startPoint > 0) {
// handle secure URLs
if (isset($params['tk'])) {
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint - $config->get('app.list.page.amount'))).'">&laquo;</a></li>';
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint-$config->get('app.list.page.amount'))).'">&laquo;</a></li>';
} else {
$body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint - $config->get('app.list.page.amount')).'">&laquo;</a></li>';
$body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint-$config->get('app.list.page.amount')).'">&laquo;</a></li>';
}
} elseif ($this->resultCount > $config->get('app.list.page.amount')) {
$body .= '<li class="disabled"><a href="#">&laquo;</a></li>';
Expand All @@ -336,9 +336,9 @@ protected function renderPageLinks()
if ($this->resultCount > $end) {
// handle secure URLs
if (isset($params['tk'])) {
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint + $config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
$body .= '<li><a href="'.FrontController::generateSecureURL('act=Search&q='.$this->query.'&start='.($this->startPoint+$config->get('app.list.page.amount'))).'">Next-&gt;&gt;</a></li>';
} else {
$body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint + $config->get('app.list.page.amount')).'">&raquo;</a></li>';
$body .= '<li><a href="'.$config->get('app.url').'/search/'.$this->query.'/'.($this->startPoint+$config->get('app.list.page.amount')).'">&raquo;</a></li>';
}
} elseif ($this->resultCount > $config->get('app.list.page.amount')) {
$body .= '<li class="disabled"><a href="#">&raquo;</a></li>';
Expand Down
8 changes: 4 additions & 4 deletions Alpha/Controller/TagController.php
View file
Expand Up @@ -306,17 +306,17 @@ public function doPOST($request)
$startTime = microtime(true);
$record = new $params['clearTaggedClass']();
$records = $record->loadAll();
self::$logger->info('Loaded all of the active records (elapsed time ['.round(microtime(true) - $startTime, 5).'] seconds)');
self::$logger->info('Loaded all of the active records (elapsed time ['.round(microtime(true)-$startTime, 5).'] seconds)');
ActiveRecord::begin();
$tag = new Tag();
$tag->deleteAllByAttribute('taggedClass', $params['clearTaggedClass']);
self::$logger->info('Deleted all of the old tags (elapsed time ['.round(microtime(true) - $startTime, 5).'] seconds)');
self::$logger->info('Deleted all of the old tags (elapsed time ['.round(microtime(true)-$startTime, 5).'] seconds)');
$this->regenerateTagsOnRecords($records);
self::$logger->info('Saved all of the new tags (elapsed time ['.round(microtime(true) - $startTime, 5).'] seconds)');
self::$logger->info('Saved all of the new tags (elapsed time ['.round(microtime(true)-$startTime, 5).'] seconds)');
self::$logger->action('Tags recreated on the ['.$params['clearTaggedClass'].'] class');
ActiveRecord::commit();
$this->setStatusMessage(View::displayUpdateMessage('Tags recreated on the '.$record->getFriendlyClassName().' class.'));
self::$logger->info('Tags recreated on the ['.$params['clearTaggedClass'].'] class (time taken ['.round(microtime(true) - $startTime, 5).'] seconds).');
self::$logger->info('Tags recreated on the ['.$params['clearTaggedClass'].'] class (time taken ['.round(microtime(true)-$startTime, 5).'] seconds).');
} catch (AlphaException $e) {
self::$logger->error($e->getMessage());
ActiveRecord::rollback();
Expand Down

0 comments on commit 18159fa

Please sign in to comment.