mattheworres / phpdraft

api/Controllers/ManagerController.php

Spacing +2 added lines, -2 removed lines

@@ -17,13 +17,13 @@
     $draft_id = (int)$request->get('draft_id');
     $manager_id = (int)$request->get('manager_id');
 
-    if(empty($draft_id) || $draft_id == 0) {
+    if (empty($draft_id) || $draft_id == 0) {
       throw new \Exception("Unable to load draft.");
     }
 
     $draft = $app['phpdraft.DraftRepository']->Load($draft_id);
 
-    if(!$draft->using_depth_charts) {
+    if (!$draft->using_depth_charts) {
       $response = $app['phpdraft.ResponseFactory'](false, array("Draft is not configured to use depth charts."));
       return $app->json($response, $response->responseType());
     }

api/Controllers/AuthenticationController.php

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
     try {
       $credentialValidity = $app['phpdraft.LoginUserValidator']->areLoginCredentialsValid($email, $password);
 
-      if($credentialValidity->success == false) {
+      if ($credentialValidity->success == false) {
         throw new UsernameNotFoundException(sprintf('Email %s does not exist', $email));
       }
 
@@ -42,13 +42,13 @@ 
         $response->auth_timeout = $authTimeout->format('Y-m-d H:i:s');
 
         //If user is enabled, provided valid password and has a verification (pwd reset) key, wipe it (no longer needed)
-        if($user->hasVerificationKey()) {
+        if ($user->hasVerificationKey()) {
           $app['phpdraft.LoginUserRepository']->EraseVerificationKey($user->getEmail());
         }
       }
     } catch (UsernameNotFoundException $e) {
       $response->success = false;
-      $response->errors[] =  'Invalid credentials.';
+      $response->errors[] = 'Invalid credentials.';
     }
 
     return $app->json($response, $response->responseType());
@@ -57,7 +57,7 @@ 
   public function Register(Application $app, Request $request) {
     $validity = $app['phpdraft.LoginUserValidator']->IsRegistrationUserValid($request);
 
-    if(!$validity->success) {
+    if (!$validity->success) {
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
     }
 
@@ -70,12 +70,12 @@ 
     $captcha = $request->get('_recaptcha');
     $userIp = $request->getClientIp();
 
-    if(!in_array($userIp, $whitelist)){
+    if (!in_array($userIp, $whitelist)) {
 
       $recaptcha = new \ReCaptcha\ReCaptcha(RECAPTCHA_SECRET);
       $recaptchaResponse = $recaptcha->verify($captcha, $userIp);
 
-      if(!$recaptchaResponse->isSuccess()) {
+      if (!$recaptchaResponse->isSuccess()) {
         $response = new PhpDraftResponse(false, array());
         $response->errors = $recaptchaResponse->getErrorCodes();
         return $app->json($response, $response->responseType());
@@ -96,7 +96,7 @@ 
   public function VerifyAccount(Application $app, Request $request) {
     $validity = $app['phpdraft.LoginUserValidator']->IsVerificationValid($request);
 
-    if(!$validity->success) {
+    if (!$validity->success) {
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
     }
 
@@ -112,7 +112,7 @@ 
   public function LostPassword(Application $app, Request $request) {
     $validity = $app['phpdraft.LoginUserValidator']->IsForgottenPasswordUserValid($request);
 
-    if(!$validity->success) {
+    if (!$validity->success) {
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
     }
 
@@ -127,12 +127,12 @@ 
     $captcha = $request->get('_recaptcha');
     $userIp = $request->getClientIp();
 
-    if(!in_array($userIp, $whitelist)){
+    if (!in_array($userIp, $whitelist)) {
 
       $recaptcha = new \ReCaptcha\ReCaptcha(RECAPTCHA_SECRET);
       $recaptchaResponse = $recaptcha->verify($captcha, $userIp);
 
-      if(!$recaptchaResponse->isSuccess()) {
+      if (!$recaptchaResponse->isSuccess()) {
         $response = new PhpDraftResponse(false, array());
         $response->errors = $recaptchaResponse->getErrorCodes();
         return $app->json($response, $response->responseType());
@@ -158,7 +158,7 @@ 
   public function ResetPassword(Application $app, Request $request) {
     $validity = $app['phpdraft.LoginUserValidator']->IsResetPasswordRequestValid($request);
 
-    if(!$validity->success) {
+    if (!$validity->success) {
       return $app->json($validity, Response::HTTP_BAD_REQUEST);
     }
 

api/Domain/Services/DatabaseCacheService.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Services;
 
 use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use phpFastCache\CacheManager;
 
 //A wrapper service for the PHP-based caching to save on several MySQL reads

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
   public function GetCachedItem($itemKey) {
     $cachedItem = $this->_LoadCacheObject($itemKey);
 
-    if(!$cachedItem->isHit()) {
+    if (!$cachedItem->isHit()) {
       return null;
     }
 

api/config/_registerValidators.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 //Validators
 //Validators are for ensuring that request data is valid, and ensures save data
 //does not result in corrupt data.
-$app['phpdraft.LoginUserValidator'] = function () use ($app) {
+$app['phpdraft.LoginUserValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\LoginUserValidator($app);
 };
 
@@ -15,26 +15,26 @@ 
   return new \PhpDraft\Domain\Validators\DraftValidator($app);
 };
 
-$app['phpdraft.RoundTimeValidator'] = function () use ($app) {
+$app['phpdraft.RoundTimeValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\RoundTimeValidator($app);
 };
 
-$app['phpdraft.ManagerValidator'] = function () use ($app) {
+$app['phpdraft.ManagerValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\ManagerValidator($app);
 };
 
-$app['phpdraft.TradeValidator'] = function () use ($app) {
+$app['phpdraft.TradeValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\TradeValidator($app);
 };
 
-$app['phpdraft.PickValidator'] = function () use ($app) {
+$app['phpdraft.PickValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\PickValidator($app);
 };
 
-$app['phpdraft.ProPlayerValidator'] = function () use ($app) {
+$app['phpdraft.ProPlayerValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\ProPlayerValidator($app);
 };
 
-$app['phpdraft.DepthChartPositionValidator'] = function () use ($app) {
+$app['phpdraft.DepthChartPositionValidator'] = function() use ($app) {
   return new \PhpDraft\Domain\Validators\DepthChartPositionValidator($app);
 };
\ No newline at end of file

api/config/_registerServices.php

Spacing +10 added lines, -10 removed lines

@@ -16,42 +16,42 @@
   return new \PhpDraft\Domain\Services\EmailService($app);
 };
 
-$app['phpdraft.LoginUserService'] = function () use ($app) {
+$app['phpdraft.LoginUserService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\LoginUserService($app);
 };
 
-$app['phpdraft.DraftService'] = function () use ($app) {
+$app['phpdraft.DraftService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DraftService($app);
 };
 
-$app['phpdraft.RoundTimeService'] = function () use ($app) {
+$app['phpdraft.RoundTimeService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\RoundTimeService($app);
 };
 
-$app['phpdraft.ManagerService'] = function () use ($app) {
+$app['phpdraft.ManagerService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\ManagerService($app);
 };
 
-$app['phpdraft.ProPlayerService'] = function () use ($app) {
+$app['phpdraft.ProPlayerService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\ProPlayerService($app);
 };
 
-$app['phpdraft.TradeService'] = function () use ($app) {
+$app['phpdraft.TradeService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\TradeService($app);
 };
 
-$app['phpdraft.PickService'] = function () use ($app) {
+$app['phpdraft.PickService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\PickService($app);
 };
 
-$app['phpdraft.UtilityService'] = function () use ($app) {
+$app['phpdraft.UtilityService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\UtilityService($app);
 };
 
-$app['phpdraft.DepthChartPositionService'] = function () use ($app) {
+$app['phpdraft.DepthChartPositionService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DepthChartPositionService($app);
 };
 
-$app['phpdraft.DatabaseCacheService'] = function () use ($app) {
+$app['phpdraft.DatabaseCacheService'] = function() use ($app) {
   return new \PhpDraft\Domain\Services\DatabaseCacheService($app);
 };
\ No newline at end of file

deploy/_deploy_tasks.php

Indentation +18 added lines, -18 removed lines

@@ -7,13 +7,13 @@ 
     'deploy:prepare',
     'deploy:lock',
     'deploy:release',
-	'phpdraft:upload_files',
-	'phpdraft:remote_yarn',
+  'phpdraft:upload_files',
+  'phpdraft:remote_yarn',
     'phpdraft:remote_composer',
     'phpdraft:breakpoint',
     'phpdraft:migrate',
-	'deploy:symlink',
-	//'phpdraft:restart_fpm',
+  'deploy:symlink',
+  //'phpdraft:restart_fpm',
     'deploy:unlock',
     'cleanup',
     'success'
@@ -32,13 +32,13 @@ 
     $settings_location = ask("What is the absolute (local) path of where your settings files are located?",
         "~/phpdraft_settings");
 
-	runLocally("cp $settings_location/.htaccess .htaccess");
+  runLocally("cp $settings_location/.htaccess .htaccess");
     runLocally("cp $settings_location/appsettings.php appsettings.php");
-	runLocally("cp $settings_location/config.js js/config.js");
+  runLocally("cp $settings_location/config.js js/config.js");
     runLocally("cp $settings_location/deploy.php deploy.php");
-	runLocally("cp $settings_location/index.html index.html");
-	runLocally("cp $settings_location/phinx.yml phinx.yml");
-	runLocally("cp $settings_location/web.config web.config");
+  runLocally("cp $settings_location/index.html index.html");
+  runLocally("cp $settings_location/phinx.yml phinx.yml");
+  runLocally("cp $settings_location/web.config web.config");
 
     writeln("\n\n<info>Success! I imported those settings for you, you should be ready to deploy now.</info>\n");
 });
@@ -75,12 +75,12 @@ 
         'db',
         'fonts',
         'images',
-		'js',
+    'js',
         '.htaccess',
         'appsettings.php',
         'composer.json',
-		'composer.lock',
-		'package.json',
+    'composer.lock',
+    'package.json',
         'phinx.yml',
         'deploy',
         'index.html',
@@ -95,7 +95,7 @@ 
 
 desc('Install NPM dependencies remotely');
 task('phpdraft:remote_yarn', function() {
-	cd('{{release_path}}');
+  cd('{{release_path}}');
 
     run('yarn --production');
 
@@ -143,9 +143,9 @@ 
 
 desc('Run Phinx migrations');
 task('phpdraft:migrate', function() {
-	cd('{{release_path}}');
+  cd('{{release_path}}');
 
-	set('phpdraft_rollback_required', true);
+  set('phpdraft_rollback_required', true);
 
     run('php deploy/phinx.phar migrate -e production');
 
@@ -156,9 +156,9 @@ 
 task('phpdraft:rollback', function() {
     writeln('<comment>Rolling back database migrations...</comment>');
     if(get("phpdraft_rollback_required") == true) {
-       cd('{{release_path}}');
-       run('php deploy/phinx.phar rollback -e production');
-       cd('{{deploy_path}}');
+        cd('{{release_path}}');
+        run('php deploy/phinx.phar rollback -e production');
+        cd('{{deploy_path}}');
     }
 })->setPrivate();
 

Spacing +3 added lines, -3 removed lines

@@ -55,8 +55,8 @@ 
         'vendor'
     ];
 
-    foreach($items_required_for_deploy as $file) {
-        if(file_exists($file) !== true) {
+    foreach ($items_required_for_deploy as $file) {
+        if (file_exists($file) !== true) {
             writeln("<error>File or directory $file does not exist, cannot deploy.</error>\n");
             writeln("<comment>Ensure you have downloaded a compiled release from https://github.com/mattheworres/phpdraft/releases</comment>\n");
             writeln("<comment>Or, if you are building from sourcecode, consult the wiki on how to properly prepare a release.</comment>\n");
@@ -155,7 +155,7 @@ 
 desc('Rollback migrations on failure');
 task('phpdraft:rollback', function() {
     writeln('<comment>Rolling back database migrations...</comment>');
-    if(get("phpdraft_rollback_required") == true) {
+    if (get("phpdraft_rollback_required") == true) {
        cd('{{release_path}}');
        run('php deploy/phinx.phar rollback -e production');
        cd('{{deploy_path}}');

deploy/_setup_tasks.php

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@ 
 
 desc('PHP Draft: Offer to backup current settings for future upgrade imports');
 task('backup', function() {
-	if (file_exists("js/config.js") == false) {
-		writeln("<error>Looks like js/config.js doesn't exist - I can't back up your settings.</error>\n");
-		writeln("<comment>Ensure you have downloaded a compiled release from https://github.com/mattheworres/phpdraft/releases</comment>\n");
-		writeln("<comment>Or, if you are building from sourcecode, consult the wiki on how to properly prepare a release.</comment>\n");
-		throw new \Exception("PHP Draft is not in a exportable state (use downloads from Releases on Github)");
-	}
+  if (file_exists("js/config.js") == false) {
+    writeln("<error>Looks like js/config.js doesn't exist - I can't back up your settings.</error>\n");
+    writeln("<comment>Ensure you have downloaded a compiled release from https://github.com/mattheworres/phpdraft/releases</comment>\n");
+    writeln("<comment>Or, if you are building from sourcecode, consult the wiki on how to properly prepare a release.</comment>\n");
+    throw new \Exception("PHP Draft is not in a exportable state (use downloads from Releases on Github)");
+  }
 
   writeln("\n\n<info>Looking great! Hey, if you want I can back up these snazzy settings files "
     ."I just created for you. This will make it WAY easier to update PHP Draft in the future!</info>\n");
@@ -35,8 +35,8 @@ 
     runLocally("cp js/config.js $backup_location/config.js");
     runLocally("cp phinx.yml $backup_location/phinx.yml");
     runLocally("cp deploy.php $backup_location/deploy.php");
-		runLocally("cp .htaccess $backup_location/.htaccess");
-		runLocally("cp index.html $backup_location/index.html");
+    runLocally("cp .htaccess $backup_location/.htaccess");
+    runLocally("cp index.html $backup_location/index.html");
     runLocally("cp web.config $backup_location/web.config");
   }
 });

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     ."I just created for you. This will make it WAY easier to update PHP Draft in the future!</info>\n");
   $answer = askConfirmation("Should I back up your settings for you?", false);
 
-  if($answer == true) {
+  if ($answer == true) {
     writeln("\n\n<info>Awesome! Wherever you tell me to back your settings up to, you should make sure "
       ."that only your user has permissions to view the file (if the server you're installing on "
       ."is more important, you should probably ensure your disk is encrypted, too).</info>\n");
@@ -48,7 +48,7 @@ 
 
   $answer = askConfirmation($message, false);
 
-  if($answer == false) {
+  if ($answer == false) {
     throw new \Exception("Quitting setup at the user's request. BYE FELICIA.");
   }
 })->setPrivate();
@@ -146,8 +146,8 @@ 
     'deploy.php'
   ];
 
-  foreach(get('phpdraft_setup_variables') as $property => $value) {
-    foreach($files_to_replace_in as $file) {
+  foreach (get('phpdraft_setup_variables') as $property => $value) {
+    foreach ($files_to_replace_in as $file) {
       //TODO: Is there something more platform agnostic we can use?
       runLocally("sed -i '' 's|{phpdraft.$property}|$value|g' $file $file");
     }

api/config/_app.php

Spacing +12 added lines, -12 removed lines

@@ -1,26 +1,26 @@
 <?php 
 
-require_once dirname(__FILE__).'/../../vendor/autoload.php';
+require_once dirname(__FILE__) . '/../../vendor/autoload.php';
 
 $app = new Silex\Application();
 
 //Handles settings users can define
 //Please see README.md for instructions on how to setup
-require_once dirname(__FILE__).'/../../appsettings.php';
+require_once dirname(__FILE__) . '/../../appsettings.php';
 
 $app['debug'] = DEBUG_MODE;
 
-require_once dirname(__FILE__).'/_database.php';      //Sets up database connections
-require_once dirname(__FILE__).'/_log.php';           //Sets up logging
+require_once dirname(__FILE__) . '/_database.php'; //Sets up database connections
+require_once dirname(__FILE__) . '/_log.php'; //Sets up logging
 
 //Registrations with Pimple DI
-require_once dirname(__FILE__).'/_registerServices.php';
-require_once dirname(__FILE__).'/_registerRepositories.php';
-require_once dirname(__FILE__).'/_registerValidators.php';
-require_once dirname(__FILE__).'/_registerFactories.php';
-
-require_once dirname(__FILE__).'/_middlewares.php';   //Defines middleware handlers for shared logic, like ensuring a draft is editable
-require_once dirname(__FILE__).'/_router.php';        //Sets up controller routing
-require_once dirname(__FILE__).'/_security.php';      //Sets up Symfony-based security & user authentication
+require_once dirname(__FILE__) . '/_registerServices.php';
+require_once dirname(__FILE__) . '/_registerRepositories.php';
+require_once dirname(__FILE__) . '/_registerValidators.php';
+require_once dirname(__FILE__) . '/_registerFactories.php';
+
+require_once dirname(__FILE__) . '/_middlewares.php'; //Defines middleware handlers for shared logic, like ensuring a draft is editable
+require_once dirname(__FILE__) . '/_router.php'; //Sets up controller routing
+require_once dirname(__FILE__) . '/_security.php'; //Sets up Symfony-based security & user authentication
 
 return $app;
\ No newline at end of file

api/Domain/Validators/ProPlayerValidator.php

Spacing +3 added lines, -3 removed lines

@@ -21,19 +21,19 @@
     $errors = array();
     $sports = $this->app['phpdraft.DraftDataRepository']->GetSports();
 
-    if(empty($sport)) {
+    if (empty($sport)) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if(!array_key_exists($sport, $sports)) {
+    if (!array_key_exists($sport, $sports)) {
       $errors[] = "Sport $sport is an invalid value.";
       $valid = false;
     }
 
     if (!isset($file)) {
       $valid = false;
-      $errors[] =  "Must upload a CSV file";
+      $errors[] = "Must upload a CSV file";
     } else {
       $fileErrorCode = $file->getError();