@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace PhpDraft\Domain\Validators; |
| 3 | 3 | |
| 4 | 4 | use \Silex\Application; |
| 5 | -use Symfony\Component\HttpFoundation\Request; |
|
| 6 | 5 | use PhpDraft\Domain\Entities\Draft; |
| 7 | 6 | use PhpDraft\Domain\Entities\Manager; |
| 8 | 7 | use PhpDraft\Domain\Models\PhpDraftResponse; |
@@ -20,29 +20,29 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | try { |
| 22 | 22 | $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id); |
| 23 | - } catch(\Exception $e) { |
|
| 23 | + } catch (\Exception $e) { |
|
| 24 | 24 | $errors[] = $e->getMessage(); |
| 25 | 25 | $valid = false; |
| 26 | 26 | $current_manager_count = 0; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - if(empty($manager->draft_id) |
|
| 29 | + if (empty($manager->draft_id) |
|
| 30 | 30 | || empty($manager->manager_name)) { |
| 31 | 31 | $errors[] = "One or more missing fields."; |
| 32 | 32 | $valid = false; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 35 | + if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 36 | 36 | $errors[] = "Manager name is above maximum length."; |
| 37 | 37 | $valid = false; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if($current_manager_count > 19) { |
|
| 40 | + if ($current_manager_count > 19) { |
|
| 41 | 41 | $errors[] = "Unable to add more managers - 20 is the maximum number of managers allowed."; |
| 42 | 42 | $valid = false; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name)) { |
|
| 45 | + if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name)) { |
|
| 46 | 46 | $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name."; |
| 47 | 47 | $valid = false; |
| 48 | 48 | } |
@@ -56,34 +56,34 @@ discard block |
||
| 56 | 56 | $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id); |
| 57 | 57 | $numberOfNewManagers = count($managersArray); |
| 58 | 58 | $maxNumberOfManagers = 20 - $current_manager_count; |
| 59 | - $numberOfManagersOver = $numberOfNewManagers-$maxNumberOfManagers; |
|
| 59 | + $numberOfManagersOver = $numberOfNewManagers - $maxNumberOfManagers; |
|
| 60 | 60 | $uniqueManagersCount = count(array_unique($managersArray)); |
| 61 | 61 | |
| 62 | - if($numberOfNewManagers > $maxNumberOfManagers) { |
|
| 62 | + if ($numberOfNewManagers > $maxNumberOfManagers) { |
|
| 63 | 63 | $manager_noun = $numberOfManagersOver > 1 ? "managers" : "manager"; |
| 64 | 64 | $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."; |
| 65 | 65 | $valid = false; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if($numberOfNewManagers != $uniqueManagersCount) { |
|
| 68 | + if ($numberOfNewManagers != $uniqueManagersCount) { |
|
| 69 | 69 | $errors[] = "Two or more managers had the same name - please ensure all managers have unique names."; |
| 70 | 70 | $valid = false; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $manager_number = 1; |
| 74 | - foreach($managersArray as $manager) { |
|
| 75 | - if(empty($manager->draft_id) |
|
| 74 | + foreach ($managersArray as $manager) { |
|
| 75 | + if (empty($manager->draft_id) |
|
| 76 | 76 | || empty($manager->manager_name)) { |
| 77 | 77 | $errors[] = "One or more missing fields for manager #$manager_number."; |
| 78 | 78 | $valid = false; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 81 | + if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 82 | 82 | $errors[] = "Manager #$manager_number's name is above the maximum length."; |
| 83 | 83 | $valid = false; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft_id)) { |
|
| 86 | + if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft_id)) { |
|
| 87 | 87 | $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name."; |
| 88 | 88 | $valid = false; |
| 89 | 89 | } |
@@ -100,26 +100,26 @@ discard block |
||
| 100 | 100 | $current_manager_count = $this->app['phpdraft.ManagerRepository']->GetNumberOfCurrentManagers($draft_id); |
| 101 | 101 | $ids_given = count($managersIdArray); |
| 102 | 102 | |
| 103 | - if(count($managersIdArray) == 0) { |
|
| 103 | + if (count($managersIdArray) == 0) { |
|
| 104 | 104 | $errors[] = "One or more missing fields."; |
| 105 | 105 | $valid = false; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - if($ids_given > 20) { |
|
| 108 | + if ($ids_given > 20) { |
|
| 109 | 109 | $errors[] = "Too many managers given - maximum number of managers is 20"; |
| 110 | 110 | $valid = false; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if($ids_given != $current_manager_count) { |
|
| 113 | + if ($ids_given != $current_manager_count) { |
|
| 114 | 114 | $manager_noun = $current_manager_count > 1 ? "managers" : "manager"; |
| 115 | 115 | $errors[] = "Incorrect number of managers given. Draft #$draft_id has $current_manager_count $manager_noun, but $ids_given were received."; |
| 116 | 116 | $valid = false; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | //Save ourself a little processing if we've been handled a faulty request: |
| 120 | - if($valid = true) { |
|
| 121 | - foreach($managersIdArray as $manager_id) { |
|
| 122 | - if(!$this->app['phpdraft.ManagerRepository']->ManagerExists($manager_id, $draft_id)) { |
|
| 120 | + if ($valid = true) { |
|
| 121 | + foreach ($managersIdArray as $manager_id) { |
|
| 122 | + if (!$this->app['phpdraft.ManagerRepository']->ManagerExists($manager_id, $draft_id)) { |
|
| 123 | 123 | $errors[] = "Manager #$manager_id does not exist."; |
| 124 | 124 | $valid = false; |
| 125 | 125 | } |
@@ -133,24 +133,24 @@ discard block |
||
| 133 | 133 | $valid = true; |
| 134 | 134 | $errors = array(); |
| 135 | 135 | |
| 136 | - if(empty($manager->manager_id) |
|
| 136 | + if (empty($manager->manager_id) |
|
| 137 | 137 | || empty($manager->draft_id) |
| 138 | 138 | || empty($manager->manager_name)) { |
| 139 | 139 | $errors[] = "One or more missing fields."; |
| 140 | 140 | $valid = false; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - if($draft->draft_id != $manager->draft_id) { |
|
| 143 | + if ($draft->draft_id != $manager->draft_id) { |
|
| 144 | 144 | $errors[] = "Manager does not belong to draft #$draft_id"; |
| 145 | 145 | $valid = false; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - if(!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 148 | + if (!empty($manager->manager_name) && strlen($manager->manager_name) > 255) { |
|
| 149 | 149 | $errors[] = "Manager name is above maximum length."; |
| 150 | 150 | $valid = false; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - if(!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft->draft_id, $manager->manager_id)) { |
|
| 153 | + if (!$this->app['phpdraft.ManagerRepository']->NameIsUnique($manager->manager_name, $draft->draft_id, $manager->manager_id)) { |
|
| 154 | 154 | $errors[] = "Manager name '$manager->manager_name' already exists - please choose another name."; |
| 155 | 155 | $valid = false; |
| 156 | 156 | } |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | namespace PhpDraft\Domain\Validators; |
| 3 | 3 | |
| 4 | 4 | use \Silex\Application; |
| 5 | -use Symfony\Component\HttpFoundation\Request; |
|
| 6 | 5 | use PhpDraft\Domain\Entities\Draft; |
| 7 | 6 | use PhpDraft\Domain\Entities\Manager; |
| 8 | 7 | use PhpDraft\Domain\Entities\Trade; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $valid = true; |
| 20 | 20 | $errors = array(); |
| 21 | 21 | |
| 22 | - if($draft->draft_id != $manager->draft_id) { |
|
| 22 | + if ($draft->draft_id != $manager->draft_id) { |
|
| 23 | 23 | $errors[] = "Manager does not belong to draft #$draft->draft_id"; |
| 24 | 24 | $valid = false; |
| 25 | 25 | } |
@@ -33,37 +33,37 @@ discard block |
||
| 33 | 33 | $assetCount = count($trade->trade_assets); |
| 34 | 34 | $uniqueAssetCount = count(array_unique($trade->trade_assets)); |
| 35 | 35 | |
| 36 | - if(empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) { |
|
| 36 | + if (empty($trade->trade_round) || $trade->trade_round < 0 || $trade->trade_round > $draft->draft_rounds) { |
|
| 37 | 37 | $errors[] = "Invalid value for trade round."; |
| 38 | 38 | $valid = false; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - foreach($trade->trade_assets as $trade_asset) { |
|
| 42 | - if($trade_asset->oldmanager_id != $trade->manager1_id |
|
| 41 | + foreach ($trade->trade_assets as $trade_asset) { |
|
| 42 | + if ($trade_asset->oldmanager_id != $trade->manager1_id |
|
| 43 | 43 | && $trade_asset->oldmanager_id != $trade->manager2_id) { |
| 44 | 44 | $player_id = $trade_asset->player->player_id; |
| 45 | 45 | $errors[] = "Asset #$player_id does not belong to either manager."; |
| 46 | 46 | $valid = false; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if($trade_asset->player->draft_id != $draft->draft_id) { |
|
| 49 | + if ($trade_asset->player->draft_id != $draft->draft_id) { |
|
| 50 | 50 | $player_id = $trade_asset->player->player_id; |
| 51 | 51 | $errors[] = "Asset #$player_id does not belong to draft #$draft->draft_id"; |
| 52 | 52 | $valid = false; |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - if($assetCount != $uniqueAssetCount) { |
|
| 56 | + if ($assetCount != $uniqueAssetCount) { |
|
| 57 | 57 | $errors[] = "One or more of the trade assets are duplicate."; |
| 58 | 58 | $valid = false; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - if($draft->draft_id != $trade->manager1->draft_id) { |
|
| 61 | + if ($draft->draft_id != $trade->manager1->draft_id) { |
|
| 62 | 62 | $errors[] = "Manager 1 does not belong to draft #$draft->draft_id"; |
| 63 | 63 | $valid = false; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - if($draft->draft_id != $trade->manager2->draft_id) { |
|
| 66 | + if ($draft->draft_id != $trade->manager2->draft_id) { |
|
| 67 | 67 | $errors[] = "Manager 2 does not belong to draft #$draft->draft_id"; |
| 68 | 68 | $valid = false; |
| 69 | 69 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | $app->register(new Silex\Provider\DoctrineServiceProvider(), array( |
| 8 | - 'db.options' => array ( |
|
| 8 | + 'db.options' => array( |
|
| 9 | 9 | 'driver' => DB_DRIVER, |
| 10 | 10 | 'host' => DB_HOST, |
| 11 | 11 | 'dbname' => DB_NAME, |
@@ -106,7 +106,7 @@ |
||
| 106 | 106 | |
| 107 | 107 | $app->get('/draft/{draft_id}/picks', 'pick.controller:GetAll')->before($draftViewable)->before($draftInProgressOrCompleted); |
| 108 | 108 | $app->get('/draft/{draft_id}/picks/updated', 'pick.controller:GetUpdated')->before($draftViewable)->before($draftInProgressOrCompleted); |
| 109 | -$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 |
|
| 109 | +$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 |
|
| 110 | 110 | $app->get('/draft/{draft_id}/picks/last', 'pick.controller:GetLast')->before($draftViewable)->before($draftInProgressOrCompleted); |
| 111 | 111 | $app->get('/draft/{draft_id}/picks/next', 'pick.controller:GetNext')->before($draftViewable)->before($draftInProgressOrCompleted); |
| 112 | 112 | $app->get('/draft/{draft_id}/manager/{manager_id}/picks/all', 'pick.controller:GetAllManagerPicks')->before($draftViewable)->before($draftInProgressOrCompleted); |
@@ -6,42 +6,42 @@ |
||
| 6 | 6 | |
| 7 | 7 | //Repositories |
| 8 | 8 | //Repositories are classes that are responsible for loading and saving data. |
| 9 | -$app['phpdraft.LoginUserRepository'] = function () use ($app) { |
|
| 9 | +$app['phpdraft.LoginUserRepository'] = function() use ($app) { |
|
| 10 | 10 | return new \PhpDraft\Domain\Repositories\LoginUserRepository($app); |
| 11 | 11 | }; |
| 12 | 12 | |
| 13 | -$app['phpdraft.DraftRepository'] = function () use ($app) { |
|
| 13 | +$app['phpdraft.DraftRepository'] = function() use ($app) { |
|
| 14 | 14 | return new \PhpDraft\Domain\Repositories\DraftRepository($app); |
| 15 | 15 | }; |
| 16 | 16 | |
| 17 | -$app['phpdraft.ManagerRepository'] = function () use ($app) { |
|
| 17 | +$app['phpdraft.ManagerRepository'] = function() use ($app) { |
|
| 18 | 18 | return new \PhpDraft\Domain\Repositories\ManagerRepository($app); |
| 19 | 19 | }; |
| 20 | 20 | |
| 21 | -$app['phpdraft.PickRepository'] = function () use ($app) { |
|
| 21 | +$app['phpdraft.PickRepository'] = function() use ($app) { |
|
| 22 | 22 | return new \PhpDraft\Domain\Repositories\PickRepository($app); |
| 23 | 23 | }; |
| 24 | 24 | |
| 25 | -$app['phpdraft.TradeRepository'] = function () use ($app) { |
|
| 25 | +$app['phpdraft.TradeRepository'] = function() use ($app) { |
|
| 26 | 26 | return new \PhpDraft\Domain\Repositories\TradeRepository($app); |
| 27 | 27 | }; |
| 28 | 28 | |
| 29 | -$app['phpdraft.DraftDataRepository'] = function () use ($app) { |
|
| 29 | +$app['phpdraft.DraftDataRepository'] = function() use ($app) { |
|
| 30 | 30 | return new \PhpDraft\Domain\Repositories\DraftDataRepository($app); |
| 31 | 31 | }; |
| 32 | 32 | |
| 33 | -$app['phpdraft.RoundTimeRepository'] = function () use ($app) { |
|
| 33 | +$app['phpdraft.RoundTimeRepository'] = function() use ($app) { |
|
| 34 | 34 | return new \PhpDraft\Domain\Repositories\RoundTimeRepository($app); |
| 35 | 35 | }; |
| 36 | 36 | |
| 37 | -$app['phpdraft.ProPlayerRepository'] = function () use ($app) { |
|
| 37 | +$app['phpdraft.ProPlayerRepository'] = function() use ($app) { |
|
| 38 | 38 | return new \PhpDraft\Domain\Repositories\ProPlayerRepository($app); |
| 39 | 39 | }; |
| 40 | 40 | |
| 41 | -$app['phpdraft.DraftStatsRepository'] = function () use ($app) { |
|
| 41 | +$app['phpdraft.DraftStatsRepository'] = function() use ($app) { |
|
| 42 | 42 | return new \PhpDraft\Domain\Repositories\DraftStatsRepository($app); |
| 43 | 43 | }; |
| 44 | 44 | |
| 45 | -$app['phpdraft.DepthChartPositionRepository'] = function () use ($app) { |
|
| 45 | +$app['phpdraft.DepthChartPositionRepository'] = function() use ($app) { |
|
| 46 | 46 | return new \PhpDraft\Domain\Repositories\DepthChartPositionRepository($app); |
| 47 | 47 | }; |
| 48 | 48 | \ No newline at end of file |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | { |
| 19 | 19 | $array = array('success' => false); |
| 20 | 20 | |
| 21 | - if($authException) { |
|
| 21 | + if ($authException) { |
|
| 22 | 22 | $array['error'] = $authException; |
| 23 | 23 | } |
| 24 | 24 | |
@@ -25,11 +25,13 @@ |
||
| 25 | 25 | $user_stmt->setFetchMode(\PDO::FETCH_INTO, $user); |
| 26 | 26 | $user_stmt->bindParam(1, $email); |
| 27 | 27 | |
| 28 | - if (!$user_stmt->execute()) |
|
| 29 | - throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email)); |
|
| 28 | + if (!$user_stmt->execute()) { |
|
| 29 | + throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email)); |
|
| 30 | + } |
|
| 30 | 31 | |
| 31 | - if (!$user_stmt->fetch()) |
|
| 32 | - throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email)); |
|
| 32 | + if (!$user_stmt->fetch()) { |
|
| 33 | + throw new UsernameNotFoundException(sprintf('Email "%s" does not exist.', $email)); |
|
| 34 | + } |
|
| 33 | 35 | |
| 34 | 36 | return new PhpDraftSecurityUser($user->email, |
| 35 | 37 | $user->name, |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | }; |
| 17 | 17 | }); |
| 18 | 18 | |
| 19 | -$app['phpdraft.EmailValidator'] = $app->factory(function () { |
|
| 19 | +$app['phpdraft.EmailValidator'] = $app->factory(function() { |
|
| 20 | 20 | return new EmailValidator(); |
| 21 | 21 | }); |
| 22 | 22 | |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | throw new Exception('Invalid application setup.'); |
| 5 | 5 | } |
| 6 | 6 | |
| 7 | -if($app['debug'] == true) { |
|
| 7 | +if ($app['debug'] == true) { |
|
| 8 | 8 | $app->register(new Silex\Provider\MonologServiceProvider(), array( |
| 9 | - 'monolog.logfile' => __DIR__.'/logs/' . LOGFILE_NAME, |
|
| 9 | + 'monolog.logfile' => __DIR__ . '/logs/' . LOGFILE_NAME, |
|
| 10 | 10 | )); |
| 11 | 11 | } |
| 12 | 12 | \ No newline at end of file |