From 8a29f5aefecc73f7f9f9e8aab9657f3903df660c Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 17 Mar 2018 10:58:23 +0700 Subject: [PATCH] Code style fixes (' 'router = new Router($this, $this->request, $this->config); - if (method_exists($this, 'init')) { - $this->init(); - } + $this->init(); } /** diff --git a/src/Helper/Lang.php b/src/Helper/Lang.php index 57964d85..48c56148 100644 --- a/src/Helper/Lang.php +++ b/src/Helper/Lang.php @@ -54,16 +54,6 @@ class Lang return $string; } - /** - * Output a specific string from the language file. - * - * @param array ...$params - */ - public static function out(...$params) - { - print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], $params); - } - /** * Get the currently active language. * diff --git a/src/View/Build/errors.phtml b/src/View/Build/errors.phtml index 09b068a2..c7b87be6 100644 --- a/src/View/Build/errors.phtml +++ b/src/View/Build/errors.phtml @@ -1,9 +1,16 @@ getFileLinkTemplate(); -/** @var \PHPCensor\Model\BuildError[] $errors */ foreach ($errors as $error): $link = str_replace('{BASEFILE}', basename($error->getFile()), $linkTemplate); @@ -11,7 +18,6 @@ foreach ($errors as $error): $link = str_replace('{LINE}', $error->getLineStart(), $link); $link = str_replace('{LINE_END}', $error->getLineEnd(), $link); ?> - getIsNew()): ?> @@ -37,7 +43,5 @@ foreach ($errors as $error): getMessage())); ?> - - diff --git a/src/View/Build/header-row.phtml b/src/View/Build/header-row.phtml index 126f39bf..8b47dfeb 100644 --- a/src/View/Build/header-row.phtml +++ b/src/View/Build/header-row.phtml @@ -19,12 +19,18 @@ use PHPCensor\Model\Build;

getProject()->getTitle(); ?> - getStatus() == \PHPCensor\Model\Build::STATUS_PENDING): ?> - getCreateDate()->format('H:i')); ?> - getStatus() == \PHPCensor\Model\Build::STATUS_RUNNING): ?> - getStartDate()->format('H:i')); ?> + getStatus() == Build::STATUS_PENDING): ?> + + getCreateDate()->format('H:i')); ?> + + getStatus() == Build::STATUS_RUNNING): ?> + + getStartDate()->format('H:i')); ?> +

-

getBranch()); ?>

+

+ getBranch()); ?> +

diff --git a/src/View/Build/view.phtml b/src/View/Build/view.phtml index 888323e7..ed235b42 100644 --- a/src/View/Build/view.phtml +++ b/src/View/Build/view.phtml @@ -15,14 +15,14 @@ use PHPCensor\Model\BuildError;

- +

- + - + - + - +
@@ -32,7 +32,7 @@ use PHPCensor\Model\BuildError;
getSource()): ?> @@ -53,7 +53,7 @@ use PHPCensor\Model\BuildError;
getEnvironment(); @@ -63,7 +63,7 @@ use PHPCensor\Model\BuildError;
getBranch(); ?> @@ -89,20 +89,20 @@ use PHPCensor\Model\BuildError;

- +

- + - + - + - + @@ -132,35 +132,35 @@ use PHPCensor\Model\BuildError;

- +

- getSourceHumanize()); ?> + getSourceHumanize()); ?>
getCommitId(), 0, 7); ?> @@ -111,14 +111,14 @@ use PHPCensor\Model\BuildError;
getCommitterEmail(); ?>
getCommitMessage()); ?>
- + - + - + - + @@ -289,12 +289,12 @@ use PHPCensor\Model\BuildError;
getCreateDate() ? $build->getCreateDate()->format('Y-m-d H:i:s') : ''); ?>
getStartDate() ? $build->getStartDate()->format('Y-m-d H:i:s') : ''); ?>
getFinishDate() ? $build->getFinishDate()->format('Y-m-d H:i:s') : ''); ?>
getDuration(); ?>
- - - - - - + + + + + + diff --git a/src/View/Group/edit.phtml b/src/View/Group/edit.phtml index 389e6f8c..1eae6177 100644 --- a/src/View/Group/edit.phtml +++ b/src/View/Group/edit.phtml @@ -5,7 +5,7 @@ use PHPCensor\Helper\Lang; ?>
-

+

diff --git a/src/View/Group/index.phtml b/src/View/Group/index.phtml index b6008e48..d63b6638 100644 --- a/src/View/Group/index.phtml +++ b/src/View/Group/index.phtml @@ -5,7 +5,7 @@ use PHPCensor\Helper\Lang; ?>
- +
@@ -13,8 +13,8 @@ use PHPCensor\Helper\Lang;
- - + + @@ -25,13 +25,13 @@ use PHPCensor\Helper\Lang; - + @@ -52,7 +52,7 @@ $branches = $build->getExtra('branches'); - +
- + getUser()->getIsAdmin() && (!count($group['projects']))): ?>
    -
    • +
diff --git a/src/View/Project/ajax-builds.phtml b/src/View/Project/ajax-builds.phtml index 1ed869fc..e62b3be6 100644 --- a/src/View/Project/ajax-builds.phtml +++ b/src/View/Project/ajax-builds.phtml @@ -11,7 +11,7 @@ use PHPCensor\Model\Build;
#getId(), 6, '0', STR_PAD_LEFT); ?> getCreateDate()->format('Y-m-d H:i:s'); ?>getSourceHumanize()); ?>getSourceHumanize()); ?>
- + getUser()->getIsAdmin()): ?>
    -
    • +
diff --git a/src/View/Project/edit.phtml b/src/View/Project/edit.phtml index 4148d438..2de6bd46 100644 --- a/src/View/Project/edit.phtml +++ b/src/View/Project/edit.phtml @@ -24,7 +24,7 @@
-

+

@@ -37,7 +37,7 @@
-

+

diff --git a/src/View/Project/view.phtml b/src/View/Project/view.phtml index 7fbf3583..dd7b4f34 100644 --- a/src/View/Project/view.phtml +++ b/src/View/Project/view.phtml @@ -17,11 +17,11 @@ use PHPCensor\Helper\Lang;
- + - + getUser()->getIsAdmin()): ?> - + - + - + - + - + - + @@ -63,16 +63,16 @@ use PHPCensor\Helper\Lang;