deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Code style fixes (and -> &&).

Browse source
This commit is contained in:
Dmitry Khomutov 2018-03-04 23:42:14 +07:00
parent 3b700f8d3c
commit a16c82babc
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/HomeController.php
View file

@ -31,7 +31,9 @@ class HomeController extends Controller
],
]);
foreach($widgets_config as $name => $params) {
$side = (isset($params['side']) and ($params['side'] == 'right')) ? 'right' : 'left';
$side = (isset($params['side']) && 'right' === $params['side'])
? 'right'
: 'left';
$widgets[$side][$name] = $params;
}

8
src/Controller/WebhookController.php
View file

@ -664,17 +664,17 @@ class WebhookController extends Controller
$activeStates = ['open'];
$inactiveStates = ['closed'];
if (!in_array($action, $activeActions) and !in_array($action, $inactiveActions)) {
if (!in_array($action, $activeActions) && !in_array($action, $inactiveActions)) {
return ['status' => 'ignored', 'message' => 'Action ' . $action . ' ignored'];
}
if (!in_array($state, $activeStates) and !in_array($state, $inactiveStates)) {
if (!in_array($state, $activeStates) && !in_array($state, $inactiveStates)) {
return ['status' => 'ignored', 'message' => 'State ' . $state . ' ignored'];
}
$envs = [];
// Get environment form labels
if (in_array($action, $activeActions) and in_array($state, $activeStates)) {
if (in_array($action, $activeActions) && in_array($state, $activeStates)) {
if (isset($pullRequest['labels']) && is_array($pullRequest['labels'])) {
foreach ($pullRequest['labels'] as $label) {
if (strpos($label['name'], 'env:') === 0) {
@ -708,7 +708,7 @@ class WebhookController extends Controller
}
}
if (($state == 'closed') and $pullRequest['merged']) {
if ('closed' === $state && $pullRequest['merged']) {
// update base branch environments
$environmentNames = $project->getEnvironmentsNamesByBranch($pullRequest['base_branch']);
$envsUpdated = array_merge($envsUpdated, $environmentNames);

4
src/Store/BuildStore.php
View file

@ -298,13 +298,13 @@ class BuildStore extends Store
}
$latest[] = $build;
}
if (empty($projects[$project_id][$environment]['success']) and ($item['status'] == Build::STATUS_SUCCESS)) {
if (empty($projects[$project_id][$environment]['success']) && Build::STATUS_SUCCESS === $item['status']) {
if (is_null($build)) {
$build = new Build($item);
}
$projects[$project_id][$environment]['success'] = $build;
}
if (empty($projects[$project_id][$environment]['failed']) and ($item['status'] == Build::STATUS_FAILED)) {
if (empty($projects[$project_id][$environment]['failed']) && Build::STATUS_FAILED === $item['status']) {
if (is_null($build)) {
$build = new Build($item);
}