From 0dc7921d4e1111f5958b460eef2ed07d1de4fa75 Mon Sep 17 00:00:00 2001 From: Matthew Ross Date: Thu, 5 Jan 2017 20:25:52 -0500 Subject: [PATCH] Additional code cleanup for Codacy --- src/api/controllers/Invalid.php | 7 +++-- src/scss/_chartist-settings.scss | 2 +- src/scss/_core.scss | 2 +- src/scss/_icons.scss | 42 ++++++++++++++-------------- src/scss/_login.scss | 6 ++-- src/scss/_settings.scss | 2 +- test/api/Mocks.php | 2 +- test/api/controllers/InvalidTest.php | 2 +- 8 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/api/controllers/Invalid.php b/src/api/controllers/Invalid.php index cb9c362..bd23ca6 100644 --- a/src/api/controllers/Invalid.php +++ b/src/api/controllers/Invalid.php @@ -2,13 +2,16 @@ class Invalid extends BaseController { public function noApi($request, $response) { + $request; // Not used, but required for Slim Framework $this->apiJson->addAlert('error', 'No API functionality at this endpoint.'); $apiReturn = new stdClass(); $apiReturn->status = 'One of "success" or "failure".'; - $apiReturn->data = 'An array of data (JSON objects and/or arrays). The first object is a new JWT for the next request.'; - $apiReturn->alerts = 'An array of alerts, with "type" of "success", "error", "warn", or "info" and a "text" message.'; + $apiReturn->data = 'An array of data (JSON objects and/or arrays). ' . + 'The first object is a new JWT for the next request.'; + $apiReturn->alerts = 'An array of alerts, with "type" of "success", ' . + '"error", "warn", or "info" and a "text" message.'; $this->apiJson->addData($apiReturn); diff --git a/src/scss/_chartist-settings.scss b/src/scss/_chartist-settings.scss index 408a0f5..20e0cc2 100644 --- a/src/scss/_chartist-settings.scss +++ b/src/scss/_chartist-settings.scss @@ -17,7 +17,7 @@ $ct-text-color: $color-text; position: absolute; transition: opacity .2s; - &:before { + &::before { border: 10px solid transparent; border-top-color: $color-text; content: ''; diff --git a/src/scss/_core.scss b/src/scss/_core.scss index 804d53e..3dba9a7 100644 --- a/src/scss/_core.scss +++ b/src/scss/_core.scss @@ -104,7 +104,7 @@ button { .icon-help-circled { position: relative; - &:hover:after { + &:hover::after { @include shadow-high; background-color: $white; diff --git a/src/scss/_icons.scss b/src/scss/_icons.scss index 9ce23fe..ec5bd57 100644 --- a/src/scss/_icons.scss +++ b/src/scss/_icons.scss @@ -22,27 +22,27 @@ width: 1em; } -.icon-trash-empty:before { content: '\e800'; } -.icon-edit:before { content: '\e801'; } -.icon-plus:before { content: '\e802'; } -.icon-help-circled:before { content: '\e803'; } -.icon-cancel:before { content: '\e804'; } -.icon-download:before { content: '\e805'; } -.icon-upload:before { content: '\e806'; } -.icon-eye:before { content: '\e807'; } -.icon-comment-empty:before { content: '\e808'; } -.icon-chat-empty:before { content: '\e809'; } -.icon-attach:before { content: '\e80a'; } -.icon-angle-double-left:before { content: '\e80b'; } -.icon-angle-double-right:before { content: '\e80c'; } -.icon-angle-double-down:before { content: '\e80d'; } -.icon-angle-double-up:before { content: '\e80e'; } -.icon-calendar:before { content: '\e80f'; } -.icon-floppy:before { content: '\e810'; } -.icon-resize-vertical:before { content: '\e811'; } -.icon-minus-squared-alt:before { content: '\f147'; } -.icon-plus-squared-alt:before { content: '\f196'; } -.icon-eyedropper:before { content: '\f1fb'; } +.icon-trash-empty::before { content: '\e800'; } +.icon-edit::before { content: '\e801'; } +.icon-plus::before { content: '\e802'; } +.icon-help-circled::before { content: '\e803'; } +.icon-cancel::before { content: '\e804'; } +.icon-download::before { content: '\e805'; } +.icon-upload::before { content: '\e806'; } +.icon-eye::before { content: '\e807'; } +.icon-comment-empty::before { content: '\e808'; } +.icon-chat-empty::before { content: '\e809'; } +.icon-attach::before { content: '\e80a'; } +.icon-angle-double-left::before { content: '\e80b'; } +.icon-angle-double-right::before { content: '\e80c'; } +.icon-angle-double-down::before { content: '\e80d'; } +.icon-angle-double-up::before { content: '\e80e'; } +.icon-calendar::before { content: '\e80f'; } +.icon-floppy::before { content: '\e810'; } +.icon-resize-vertical::before { content: '\e811'; } +.icon-minus-squared-alt::before { content: '\f147'; } +.icon-plus-squared-alt::before { content: '\f196'; } +.icon-eyedropper::before { content: '\f1fb'; } .icon-help-circled { cursor: help; diff --git a/src/scss/_login.scss b/src/scss/_login.scss index 7710a7f..7a5d98e 100644 --- a/src/scss/_login.scss +++ b/src/scss/_login.scss @@ -42,8 +42,8 @@ margin-bottom: -1em; } - &:before, - &:after { + &::before, + &::after { @include shadow-low(); background: $color-table-row; @@ -57,7 +57,7 @@ z-index: -1; } - &:after { + &::after { background-color: darken($color-table-row, 5%); transform: rotate(-3deg); z-index: -2; diff --git a/src/scss/_settings.scss b/src/scss/_settings.scss index 8059302..1d05f2c 100644 --- a/src/scss/_settings.scss +++ b/src/scss/_settings.scss @@ -130,7 +130,7 @@ background: $white; display: block; // To override default opacity settings - filter: alpha(opacity=100); + filter: alpha(opacity = 100); opacity: 1; .actions { diff --git a/test/api/Mocks.php b/test/api/Mocks.php index 0bcc2b5..b2c9ef4 100644 --- a/test/api/Mocks.php +++ b/test/api/Mocks.php @@ -31,7 +31,7 @@ class DataMock { return $jwt; } - public static function CreateStandardUser($username = 'standard') { + public static function CreateStandardUser() { $user = R::dispense('user'); self::setUserDefaults($user); R::store($user); diff --git a/test/api/controllers/InvalidTest.php b/test/api/controllers/InvalidTest.php index 40dc2f0..920e1d5 100644 --- a/test/api/controllers/InvalidTest.php +++ b/test/api/controllers/InvalidTest.php @@ -8,7 +8,7 @@ class InvalidTest extends PHPUnit_Framework_TestCase { $data = new stdClass(); $data->status = 'One of "success" or "failure".'; - $data->data = 'An array of data (JSON objects and/or arrays).' . + $data->data = 'An array of data (JSON objects and/or arrays). ' . 'The first object is a new JWT for the next request.'; $data->alerts = 'An array of alerts, with "type" of "success", ' . '"error", "warn", or "info" and a "text" message.';