diff options
author | Aurélien Tamisier <virtualtam+github@flibidi.net> | 2018-12-02 22:47:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-02 22:47:41 +0100 |
commit | 1004742f09b55ff781c13745781b9a7e90986faa (patch) | |
tree | aa0e5743390296441edf09f44f95b3d21f2b5a16 /tests/utils | |
parent | 5e0a898bb13fad528514b0d33763bcaae38b45b0 (diff) | |
parent | 9d9f6d75b94aab51067bdfbe50b58b66d1194f6d (diff) | |
download | Shaarli-1004742f09b55ff781c13745781b9a7e90986faa.tar.gz Shaarli-1004742f09b55ff781c13745781b9a7e90986faa.tar.zst Shaarli-1004742f09b55ff781c13745781b9a7e90986faa.zip |
Merge pull request #1234 from virtualtam/lint
Setup PHPCS and cleanup linter configuration
Diffstat (limited to 'tests/utils')
-rw-r--r-- | tests/utils/ReferenceLinkDB.php | 6 | ||||
-rw-r--r-- | tests/utils/config/configPhp.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php index 7426ad07..59679e38 100644 --- a/tests/utils/ReferenceLinkDB.php +++ b/tests/utils/ReferenceLinkDB.php | |||
@@ -150,8 +150,8 @@ class ReferenceLinkDB | |||
150 | $tags, | 150 | $tags, |
151 | $updated = '', | 151 | $updated = '', |
152 | $shorturl = '', | 152 | $shorturl = '', |
153 | $pinned = false) | 153 | $pinned = false |
154 | { | 154 | ) { |
155 | $link = array( | 155 | $link = array( |
156 | 'id' => $id, | 156 | 'id' => $id, |
157 | 'title' => $title, | 157 | 'title' => $title, |
@@ -201,7 +201,7 @@ class ReferenceLinkDB | |||
201 | 201 | ||
202 | $order = $order === 'ASC' ? -1 : 1; | 202 | $order = $order === 'ASC' ? -1 : 1; |
203 | // Reorder array by dates. | 203 | // Reorder array by dates. |
204 | usort($this->_links, function($a, $b) use ($order) { | 204 | usort($this->_links, function ($a, $b) use ($order) { |
205 | if (isset($a['sticky']) && isset($b['sticky']) && $a['sticky'] !== $b['sticky']) { | 205 | if (isset($a['sticky']) && isset($b['sticky']) && $a['sticky'] !== $b['sticky']) { |
206 | return $a['sticky'] ? -1 : 1; | 206 | return $a['sticky'] ? -1 : 1; |
207 | } | 207 | } |
diff --git a/tests/utils/config/configPhp.php b/tests/utils/config/configPhp.php index 0e034175..34b11fcd 100644 --- a/tests/utils/config/configPhp.php +++ b/tests/utils/config/configPhp.php | |||
@@ -1,4 +1,4 @@ | |||
1 | <?php | 1 | <?php |
2 | $GLOBALS['login'] = 'root'; | 2 | $GLOBALS['login'] = 'root'; |
3 | $GLOBALS['hash'] = 'hash'; | 3 | $GLOBALS['hash'] = 'hash'; |
4 | $GLOBALS['salt'] = 'salt'; | 4 | $GLOBALS['salt'] = 'salt'; |