mattheworres / phpdraft

api/Domain/Validators/ManagerValidator.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Validators;
 
 use \Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Entities\Manager;
 use PhpDraft\Domain\Models\PhpDraftResponse;

Spacing +22 added lines, -22 removed lines

@@ -20,29 +20,29 @@ 
 
     try {
       $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id);
-    } catch(\Exception $e) {
+    } catch (\Exception $e) {
       $errors[] = $e->getMessage();
       $valid = false;
       $current_manager_count = 0;
     }
     
-    if(empty($manager->draft_id)
+    if (empty($manager->draft_id)
       || empty($manager->manager_name)) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
+    if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
       $errors[] = "Manager name is above maximum length.";
       $valid = false;
     }
 
-    if($current_manager_count > 19) {
+    if ($current_manager_count > 19) {
       $errors[] = "Unable to add more managers - 20 is the maximum number of managers allowed.";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name)) {
+    if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name)) {
       $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name.";
       $valid = false;
     }
@@ -56,34 +56,34 @@ 
     $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id);
     $numberOfNewManagers = count($managersArray);
     $maxNumberOfManagers = 20 - $current_manager_count;
-    $numberOfManagersOver = $numberOfNewManagers-$maxNumberOfManagers;
+    $numberOfManagersOver = $numberOfNewManagers - $maxNumberOfManagers;
     $uniqueManagersCount = count(array_unique($managersArray));
 
-    if($numberOfNewManagers > $maxNumberOfManagers) {
+    if ($numberOfNewManagers > $maxNumberOfManagers) {
       $manager_noun = $numberOfManagersOver > 1 ? "managers" : "manager";
       $errors[] = "Unable to add $numberOfNewManagers new managers - the maximum number of managers is 20. Draft currently has $current_manager_count, so please remove $numberOfManagersOver $manager_noun to continue.";
       $valid = false;
     }
 
-    if($numberOfNewManagers != $uniqueManagersCount) {
+    if ($numberOfNewManagers != $uniqueManagersCount) {
       $errors[] = "Two or more managers had the same name - please ensure all managers have unique names.";
       $valid = false;
     }
 
     $manager_number = 1;
-    foreach($managersArray as $manager) {
-      if(empty($manager->draft_id)
+    foreach ($managersArray as $manager) {
+      if (empty($manager->draft_id)
         || empty($manager->manager_name)) {
         $errors[] = "One or more missing fields for manager #$manager_number.";
         $valid = false;
       }
 
-      if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
+      if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
         $errors[] = "Manager #$manager_number's name is above the maximum length.";
         $valid = false;
       }
 
-      if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft_id)) {
+      if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft_id)) {
         $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name.";
         $valid = false;
       }
@@ -100,26 +100,26 @@ 
     $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id);
     $ids_given = count($managersIdArray);
 
-    if(count($managersIdArray) == 0) {
+    if (count($managersIdArray) == 0) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if($ids_given > 20) {
+    if ($ids_given > 20) {
       $errors[] = "Too many managers given - maximum number of managers is 20";
       $valid = false;
     }
 
-    if($ids_given != $current_manager_count) {
+    if ($ids_given != $current_manager_count) {
       $manager_noun = $current_manager_count > 1 ? "managers" : "manager";
       $errors[] = "Incorrect number of managers given. Draft #$draft_id has $current_manager_count $manager_noun, but $ids_given were received.";
       $valid = false;
     }
 
     //Save ourself a little processing if we've been handled a faulty request:
-    if($valid = true) {
-      foreach($managersIdArray as $manager_id) {
-        if(!$this->app['phpdraft.ManagerRepository']->ManagerExists($manager_id, $draft_id)) {
+    if ($valid = true) {
+      foreach ($managersIdArray as $manager_id) {
+        if (!$this->app['phpdraft.ManagerRepository']->ManagerExists($manager_id, $draft_id)) {
           $errors[] = "Manager #$manager_id does not exist.";
           $valid = false;
         }
@@ -133,24 +133,24 @@ 
     $valid = true;
     $errors = array();
     
-    if(empty($manager->manager_id)
+    if (empty($manager->manager_id)
       || empty($manager->draft_id)
       || empty($manager->manager_name)) {
       $errors[] = "One or more missing fields.";
       $valid = false;
     }
 
-    if($draft->draft_id != $manager->draft_id) {
+    if ($draft->draft_id != $manager->draft_id) {
       $errors[] = "Manager does not belong to draft #$draft_id";
       $valid = false;
     }
 
-    if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
+    if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) {
       $errors[] = "Manager name is above maximum length.";
       $valid = false;
     }
 
-    if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft->draft_id, $manager->manager_id)) {
+    if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft->draft_id, $manager->manager_id)) {
       $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name.";
       $valid = false;
     }

api/Domain/Validators/TradeValidator.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace PhpDraft\Domain\Validators;
 
 use \Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
 use PhpDraft\Domain\Entities\Draft;
 use PhpDraft\Domain\Entities\Manager;
 use PhpDraft\Domain\Entities\Trade;

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
     $valid = true;
     $errors = array();
 
-    if($draft->draft_id != $manager->draft_id) {
+    if ($draft->draft_id != $manager->draft_id) {
       $errors[] = "Manager does not belong to draft #$draft->draft_id";
       $valid = false;
     }
@@ -35,38 +35,38 @@ 
     $asset_count = count($trade->trade_assets);
     $unique_asset_count = count(array_unique($trade->trade_assets));
 
-    if(empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) {
+    if (empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) {
       $errors[] = "Invalid value for trade round.";
       $valid = false;
     }
 
-    foreach($trade->trade_assets as $trade_asset) {
-      if($trade_asset->oldmanager_id == $trade->manager1_id) {
+    foreach ($trade->trade_assets as $trade_asset) {
+      if ($trade_asset->oldmanager_id == $trade->manager1_id) {
         $manager1_asset_count++;
-      } else if($trade_asset->oldmanager_id == $trade->manager2_id) {
+      } else if ($trade_asset->oldmanager_id == $trade->manager2_id) {
         $manager2_asset_count++;
       } else {
         $errors[] = "Asset #$trade_asset->player_id does not belong to either manager.";
         $valid = false;
       }
 
-      if($trade_asset->player->draft_id != $draft->draft_id) {
+      if ($trade_asset->player->draft_id != $draft->draft_id) {
         $errors[] = "Asset #$trade_asset->player_id does not belong to draft #$draft->draft_id";
         $valid = false;
       }
     }
 
-    if($asset_count != $unique_asset_count) {
+    if ($asset_count != $unique_asset_count) {
       $errors[] = "One or more of the trade assets are duplicate.";
       $valid = false;
     }
 
-    if($draft->draft_id != $trade->manager1->draft_id) {
+    if ($draft->draft_id != $trade->manager1->draft_id) {
       $errors[] = "Manager 1 does not belong to draft #$draft->draft_id";
       $valid = false;
     }
 
-    if($draft->draft_id != $trade->manager2->draft_id) {
+    if ($draft->draft_id != $trade->manager2->draft_id) {
       $errors[] = "Manager 2 does not belong to draft #$draft->draft_id";
       $valid = false;
     }

api/config/_database.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 }
 
 $app->register(new Silex\Provider\DoctrineServiceProvider(), array(
-    'db.options' => array (
+    'db.options' => array(
         'driver'    => DB_DRIVER,
         'host'      => DB_HOST,
         'dbname'    => DB_NAME,

api/config/_router.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 
 $app->get('/draft/{draft_id}/picks', 'pick.controller:GetAll')->before($draftViewable)->before($draftInProgressOrCompleted);
 $app->get('/draft/{draft_id}/picks/updated', 'pick.controller:GetUpdated')->before($draftViewable)->before($draftInProgressOrCompleted);
-$app->put('/draft/{draft_id}/pick/{pick_id}/depth_chart/{position_id}', 'pick.controller:UpdateDepthChart')->before($draftViewable)->before($draftInProgressOrCompletedTenMinutes);#Give a ten minute grace period to allow edits right at the end
+$app->put('/draft/{draft_id}/pick/{pick_id}/depth_chart/{position_id}', 'pick.controller:UpdateDepthChart')->before($draftViewable)->before($draftInProgressOrCompletedTenMinutes); #Give a ten minute grace period to allow edits right at the end
 $app->get('/draft/{draft_id}/picks/last', 'pick.controller:GetLast')->before($draftViewable)->before($draftInProgressOrCompleted);
 $app->get('/draft/{draft_id}/picks/next', 'pick.controller:GetNext')->before($draftViewable)->before($draftInProgressOrCompleted);
 $app->get('/draft/{draft_id}/manager/{manager_id}/picks/all', 'pick.controller:GetAllManagerPicks')->before($draftViewable)->before($draftInProgressOrCompleted);

api/config/_registerRepositories.php

Spacing +10 added lines, -10 removed lines

@@ -6,42 +6,42 @@
 
 //Repositories
 //Repositories are classes that are responsible for loading and saving data.
-$app['phpdraft.LoginUserRepository'] = function () use ($app) {
+$app['phpdraft.LoginUserRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\LoginUserRepository($app);
 };
 
-$app['phpdraft.DraftRepository'] = function () use ($app) {
+$app['phpdraft.DraftRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\DraftRepository($app);
 };
 
-$app['phpdraft.ManagerRepository'] = function () use ($app) {
+$app['phpdraft.ManagerRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\ManagerRepository($app);
 };
 
-$app['phpdraft.PickRepository'] = function () use ($app) {
+$app['phpdraft.PickRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\PickRepository($app);
 };
 
-$app['phpdraft.TradeRepository'] = function () use ($app) {
+$app['phpdraft.TradeRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\TradeRepository($app);
 };
 
-$app['phpdraft.DraftDataRepository'] = function () use ($app) {
+$app['phpdraft.DraftDataRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\DraftDataRepository($app);
 };
 
-$app['phpdraft.RoundTimeRepository'] = function () use ($app) {
+$app['phpdraft.RoundTimeRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\RoundTimeRepository($app);
 };
 
-$app['phpdraft.ProPlayerRepository'] = function () use ($app) {
+$app['phpdraft.ProPlayerRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\ProPlayerRepository($app);
 };
 
-$app['phpdraft.DraftStatsRepository'] = function () use ($app) {
+$app['phpdraft.DraftStatsRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\DraftStatsRepository($app);
 };
 
-$app['phpdraft.DepthChartPositionRepository'] = function () use ($app) {
+$app['phpdraft.DepthChartPositionRepository'] = function() use ($app) {
   return new \PhpDraft\Domain\Repositories\DepthChartPositionRepository($app);
 };
\ No newline at end of file

api/config/Security/AuthenticationEntryPoint.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
   {
       $array = array('success' => false);
       
-      if($authException) {
+      if ($authException) {
         $array['error'] = $authException;
       }
 

api/config/Security/UserProvider.php

Braces +6 added lines, -4 removed lines

@@ -25,11 +25,13 @@
     $user_stmt->setFetchMode(\PDO::FETCH_INTO, $user);
     $user_stmt->bindParam(1, $email);
 
-    if (!$user_stmt->execute())
-      throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email));
+    if (!$user_stmt->execute()) {
+          throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email));
+    }
 
-    if (!$user_stmt->fetch())
-      throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email));
+    if (!$user_stmt->fetch()) {
+          throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email));
+    }
 
     return new PhpDraftSecurityUser($user->email,
       $user->name,

api/config/_registerFactories.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
   };
 });
 
-$app['phpdraft.EmailValidator'] = $app->factory(function () {
+$app['phpdraft.EmailValidator'] = $app->factory(function() {
   return new EmailValidator();
 });
 

api/config/_app.php

Spacing +12 added lines, -12 removed lines

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