Skip to content

Commit 184f9de

Browse files
apt142apt142
committed
Cleaning up code per Code Sniffer
1 parent be98ba2 commit 184f9de

File tree

10 files changed

+126
-94
lines changed

10 files changed

+126
-94
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535

3636
"require-dev": {
37-
"phpunit/phpunit": "3.7.*",
37+
"phpunit/phpunit": "~4.5",
3838
"squizlabs/php_codesniffer": "1.*"
3939
}
4040
}

‎pakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function run_lint() {
3333

3434
function run_sniff() {
3535
echo "\n * Sniffing files\n";
36-
passthru('./vendor/bin/phpcs --standard=./phpcs.xml src/');
36+
passthru('./vendor/bin/phpcs --standard=./phpcs.xml src/ public/');
3737
}
3838

3939
function run_server() {

‎public/index.php

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,24 @@
4141
// Path
4242
$app->post(
4343
'/help',
44-
function() use($app) {
45-
// return $app->redirect('/help');
46-
header("Location: http://localhost:8008/help");
47-
die;
48-
// $app->abort(302, "Ack!");
49-
}
44+
function () use ($app) {
45+
header("Location: http://localhost:8008/help");
46+
die;
47+
}
5048
);
5149

5250
// Path
5351
$app->get(
5452
'/help',
55-
function() use($app) {
53+
function () use ($app) {
5654
$controller = new Colorizr\controllers\Help($app);
5755
return $app->json($controller->help());
5856
}
5957
);
6058

6159
$app->get(
6260
'/complementary/{colorString}',
63-
function($colorString) use($app) {
61+
function ($colorString) use ($app) {
6462
$controller = new Colorizr\controllers\Color(
6563
$app,
6664
new \Colorizr\lib\ColorMath()
@@ -71,7 +69,7 @@ function($colorString) use($app) {
7169

7270
$app->get(
7371
'/complementary/{colorString}/{degree}',
74-
function($colorString, $degree) use($app) {
72+
function ($colorString, $degree) use ($app) {
7573
$controller = new Colorizr\controllers\Color(
7674
$app,
7775
new \Colorizr\lib\ColorMath()
@@ -82,7 +80,7 @@ function($colorString, $degree) use($app) {
8280

8381
$app->get(
8482
'/adjacent/{colorString}',
85-
function($colorString) use($app) {
83+
function ($colorString) use ($app) {
8684
$controller = new Colorizr\controllers\Color(
8785
$app,
8886
new \Colorizr\lib\ColorMath()
@@ -93,7 +91,7 @@ function($colorString) use($app) {
9391

9492
$app->get(
9593
'/adjacent/{colorString}/{degree}',
96-
function($colorString, $degree) use($app) {
94+
function ($colorString, $degree) use ($app) {
9795
$controller = new Colorizr\controllers\Color(
9896
$app,
9997
new \Colorizr\lib\ColorMath()
@@ -104,7 +102,7 @@ function($colorString, $degree) use($app) {
104102

105103
$app->get(
106104
'/triad/{colorString}',
107-
function($colorString) use($app) {
105+
function ($colorString) use ($app) {
108106
$controller = new Colorizr\controllers\Color(
109107
$app,
110108
new \Colorizr\lib\ColorMath()
@@ -115,7 +113,7 @@ function($colorString) use($app) {
115113

116114
$app->get(
117115
'/triad/{colorString}/{degree}',
118-
function($colorString, $degree) use($app) {
116+
function ($colorString, $degree) use ($app) {
119117
$controller = new Colorizr\controllers\Color(
120118
$app,
121119
new \Colorizr\lib\ColorMath()
@@ -126,7 +124,7 @@ function($colorString, $degree) use($app) {
126124

127125
$app->get(
128126
'/quadtrad/{colorString}',
129-
function($colorString) use($app) {
127+
function ($colorString) use ($app) {
130128
$controller = new Colorizr\controllers\Color(
131129
$app,
132130
new \Colorizr\lib\ColorMath()
@@ -137,7 +135,7 @@ function($colorString) use($app) {
137135

138136
$app->get(
139137
'/quadtrad/{colorString}/{degree}',
140-
function($colorString, $degree) use($app) {
138+
function ($colorString, $degree) use ($app) {
141139
$controller = new Colorizr\controllers\Color(
142140
$app,
143141
new \Colorizr\lib\ColorMath()
@@ -148,7 +146,7 @@ function($colorString, $degree) use($app) {
148146

149147
$app->get(
150148
'/overlay/{colorString}/{filterColor}',
151-
function($colorString, $filterColor) use($app) {
149+
function ($colorString, $filterColor) use ($app) {
152150
$controller = new Colorizr\controllers\Color(
153151
$app,
154152
new \Colorizr\lib\ColorMath()
@@ -159,7 +157,7 @@ function($colorString, $filterColor) use($app) {
159157

160158
$app->get(
161159
'/multiply/{colorString}/{filterColor}',
162-
function($colorString, $filterColor) use($app) {
160+
function ($colorString, $filterColor) use ($app) {
163161
$controller = new Colorizr\controllers\Color(
164162
$app,
165163
new \Colorizr\lib\ColorMath()
@@ -170,7 +168,7 @@ function($colorString, $filterColor) use($app) {
170168

171169
$app->get(
172170
'/screen/{colorString}/{filterColor}',
173-
function($colorString, $filterColor) use($app) {
171+
function ($colorString, $filterColor) use ($app) {
174172
$controller = new Colorizr\controllers\Color(
175173
$app,
176174
new \Colorizr\lib\ColorMath()
@@ -182,7 +180,7 @@ function($colorString, $filterColor) use($app) {
182180
// Greyscale
183181
$app->get(
184182
'/greyscale/{colorString}',
185-
function($colorString) use($app) {
183+
function ($colorString) use ($app) {
186184
$controller = new Colorizr\controllers\Color(
187185
$app,
188186
new \Colorizr\lib\ColorMath()
@@ -193,7 +191,7 @@ function($colorString) use($app) {
193191
// In case they want to spell it the other way
194192
$app->get(
195193
'/grayscale/{colorString}',
196-
function($colorString) use($app) {
194+
function ($colorString) use ($app) {
197195
$controller = new Colorizr\controllers\Color(
198196
$app,
199197
new \Colorizr\lib\ColorMath()
@@ -205,7 +203,7 @@ function($colorString) use($app) {
205203
// In case they want to spell it the other way
206204
$app->get(
207205
'/normalize/{colorString}/{$intensity}',
208-
function($colorString, $intensity) use($app) {
206+
function ($colorString, $intensity) use ($app) {
209207
$controller = new Colorizr\controllers\Color(
210208
$app,
211209
new \Colorizr\lib\ColorMath()
@@ -216,7 +214,7 @@ function($colorString, $intensity) use($app) {
216214

217215
$app->get(
218216
'/lighten/{colorString}/{percent}',
219-
function($colorString, $percent) use($app) {
217+
function ($colorString, $percent) use ($app) {
220218
$controller = new Colorizr\controllers\Color(
221219
$app,
222220
new \Colorizr\lib\ColorMath()
@@ -227,7 +225,7 @@ function($colorString, $percent) use($app) {
227225

228226
$app->get(
229227
'/darken/{colorString}/{percent}',
230-
function($colorString, $percent) use($app) {
228+
function ($colorString, $percent) use ($app) {
231229
$controller = new Colorizr\controllers\Color(
232230
$app,
233231
new \Colorizr\lib\ColorMath()
@@ -238,7 +236,7 @@ function($colorString, $percent) use($app) {
238236

239237
$app->get(
240238
'/saturate/{colorString}/{percent}',
241-
function($colorString, $percent) use($app) {
239+
function ($colorString, $percent) use ($app) {
242240
$controller = new Colorizr\controllers\Color(
243241
$app,
244242
new \Colorizr\lib\ColorMath()
@@ -249,7 +247,7 @@ function($colorString, $percent) use($app) {
249247

250248
$app->get(
251249
'/desaturate/{colorString}/{percent}',
252-
function($colorString, $percent) use($app) {
250+
function ($colorString, $percent) use ($app) {
253251
$controller = new Colorizr\controllers\Color(
254252
$app,
255253
new \Colorizr\lib\ColorMath()
@@ -260,7 +258,7 @@ function($colorString, $percent) use($app) {
260258

261259
$app->get(
262260
'/random',
263-
function() use($app) {
261+
function () use ($app) {
264262
$controller = new Colorizr\controllers\Color(
265263
$app,
266264
new \Colorizr\lib\ColorMath()
@@ -271,44 +269,44 @@ function() use($app) {
271269

272270
$app->get(
273271
'/theme/{colorString}',
274-
function($colorString) use($app) {
275-
$controller = new Colorizr\controllers\Color(
276-
$app,
277-
new \Colorizr\lib\ColorMath()
278-
);
279-
return $app->json($controller->theme($colorString));
280-
}
272+
function ($colorString) use ($app) {
273+
$controller = new Colorizr\controllers\Color(
274+
$app,
275+
new \Colorizr\lib\ColorMath()
276+
);
277+
return $app->json($controller->theme($colorString));
278+
}
281279
);
282280

283281

284282
$app->get(
285283
'/',
286-
function() use($app) {
284+
function () use ($app) {
287285
$controller = new Colorizr\controllers\Theme();
288286
$vars = $controller->themeCues();
289287
return $app['twig']->render(
290-
'theme-cues.twig',
291-
$vars
288+
'theme-cues.twig',
289+
$vars
292290
);
293291
}
294292
);
295293

296294
$app->get(
297295
'/theme-cue',
298-
function() use($app) {
299-
$controller = new Colorizr\controllers\Theme();
300-
$vars = $controller->themeCues();
301-
302-
return $app['twig']->render(
303-
'theme-cues.twig',
304-
$vars
305-
);
306-
}
296+
function () use ($app) {
297+
$controller = new Colorizr\controllers\Theme();
298+
$vars = $controller->themeCues();
299+
300+
return $app['twig']->render(
301+
'theme-cues.twig',
302+
$vars
303+
);
304+
}
307305
);
308306

309307
$app->get(
310308
'/theme-cue/{colorString}',
311-
function($colorString) use($app) {
309+
function ($colorString) use ($app) {
312310
$controller = new Colorizr\controllers\Theme();
313311
$vars = $controller->themeCues($colorString);
314312

@@ -321,10 +319,10 @@ function($colorString) use($app) {
321319

322320
$app->post(
323321
'/build/bootstrap',
324-
function (Request $request) use ($app) {
325-
$controller = new Colorizr\controllers\Theme();
326-
return $controller->buildBootstrap($request, $app);
327-
}
322+
function (Request $request) use ($app) {
323+
$controller = new Colorizr\controllers\Theme();
324+
return $controller->buildBootstrap($request, $app);
325+
}
328326
);
329327

330328

‎src/controllers/Color.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@ public function desaturate($colorString, $percent)
380380
*
381381
* @return array
382382
*/
383-
public function theme($colorString) {
383+
public function theme($colorString)
384+
{
384385
$result = null;
385386

386387
if ($this->validateColorString($colorString)) {

‎src/controllers/Theme.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public function themeCues($colorString = null)
6363
*
6464
* @return mixed
6565
*/
66-
public function buildBootstrap(Request $request, Application $app) {
66+
public function buildBootstrap(Request $request, Application $app)
67+
{
6768
// Build bootstrap from the request variables
6869
$bootstrap = new BootstrapBuilder($app);
6970

‎src/lib/ConfigLoader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
* @link http://g.lonefry.com
2727
*/
2828
class ConfigLoader {
29-
public static function loadConfig($config) {
29+
public static function loadConfig($config)
30+
{
3031
$vars = null;
3132

3233
$filename = __DIR__ . '/../config/' . $config . '.php';

0 commit comments

Comments
 (0)