Run php-cs-fixer on classes and tests for code standards.

PHPSP · May 21, 2015 · 4693362 · 4693362
1 parent 520ed89
commit 4693362
Show file tree

Hide file tree

Showing 72 changed files with 130 additions and 145 deletions.
diff --git a/classes/OpenCFP/Application.php b/classes/OpenCFP/Application.php
@@ -15,13 +15,11 @@
 use OpenCFP\Provider\ControllerResolverServiceProvider;
 use OpenCFP\Provider\Endpoints\RouteServiceProvider;
 use Silex\Provider\FormServiceProvider;
-use Silex\Provider\ServiceControllerServiceProvider;
 use Silex\Provider\SessionServiceProvider;
 use Silex\Provider\SwiftmailerServiceProvider;
 use Silex\Provider\TranslationServiceProvider;
 use Silex\Provider\UrlGeneratorServiceProvider;
 use Silex\Provider\ValidatorServiceProvider;
-use Symfony\Component\HttpFoundation\Request;
 
 class Application extends SilexApplication
 {

diff --git a/classes/OpenCFP/Application/NotAuthorizedException.php b/classes/OpenCFP/Application/NotAuthorizedException.php
@@ -2,4 +2,4 @@
 
 namespace OpenCFP\Application;
 
-class NotAuthorizedException extends \Exception {}
+class NotAuthorizedException extends \Exception {}
diff --git a/classes/OpenCFP/Application/Speakers.php b/classes/OpenCFP/Application/Speakers.php
@@ -11,7 +11,6 @@
 use OpenCFP\Domain\Talk\TalkRepository;
 use OpenCFP\Domain\Talk\TalkSubmission;
 use OpenCFP\Domain\Talk\TalkWasSubmitted;
-use OpenCFP\Domain\ValidationException;
 
 class Speakers
 {
@@ -31,7 +30,7 @@ class Speakers
     /** @var EventDispatcher */
     private $dispatcher;
 
-    function __construct(
+    public function __construct(
         CallForProposal $callForProposal,
         IdentityProvider $identityProvider,
         SpeakerRepository $speakers,
@@ -53,6 +52,7 @@ function __construct(
     public function findProfile()
     {
         $speaker = $this->identityProvider->getCurrentUser();
+
         return new SpeakerProfile($speaker);
     }
 
@@ -88,6 +88,7 @@ public function getTalk($talkId)
     public function getTalks()
     {
         $speaker = $this->identityProvider->getCurrentUser();
+
         return $speaker->talks->execute();
     }
 

diff --git a/classes/OpenCFP/Console/Application.php b/classes/OpenCFP/Console/Application.php
@@ -1,4 +1,4 @@
-<?php namespace OpenCFP\Console; 
+<?php namespace OpenCFP\Console;
 
 use OpenCFP\Console\Command\ClearCacheCommand;
 use Symfony\Component\Console\Application as ConsoleApplication;
@@ -36,4 +36,4 @@ public function getContainer()
     {
         return $this->app;
     }
-}
+}
diff --git a/classes/OpenCFP/Console/BaseCommand.php b/classes/OpenCFP/Console/BaseCommand.php
@@ -24,4 +24,4 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         // Probably okay.
         $this->app = $this->getApplication()->getContainer();
     }
-} 
+}
diff --git a/classes/OpenCFP/Console/Command/AdminDemoteCommand.php b/classes/OpenCFP/Console/Command/AdminDemoteCommand.php
@@ -38,8 +38,8 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
+     * @param  \Symfony\Component\Console\Input\InputInterface   $input
+     * @param  \Symfony\Component\Console\Output\OutputInterface $output
      * @return void
      */
     public function execute(InputInterface $input, OutputInterface $output)
@@ -62,13 +62,12 @@ public function execute(InputInterface $input, OutputInterface $output)
             $adminGroup = $sentry->getGroupProvider()->findByName('Admin');
             $user->removeGroup($adminGroup);
             $output->writeln(sprintf('  Removed <info>%s</info> from the Admin group', $email));
-        }
-        catch (UserNotFoundException $e) {
+        } catch (UserNotFoundException $e) {
             $output->writeln(sprintf('<error>Error:</error> Could not find user by %s', $email));
             exit(1);
         }
 
         $output->writeln('Done!');
         exit(0);
     }
-} 
+}
diff --git a/classes/OpenCFP/Console/Command/AdminPromoteCommand.php b/classes/OpenCFP/Console/Command/AdminPromoteCommand.php
@@ -39,8 +39,8 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
+     * @param  \Symfony\Component\Console\Input\InputInterface   $input
+     * @param  \Symfony\Component\Console\Output\OutputInterface $output
      * @return void
      */
     public function execute(InputInterface $input, OutputInterface $output)
@@ -63,13 +63,12 @@ public function execute(InputInterface $input, OutputInterface $output)
             $adminGroup = $sentry->getGroupProvider()->findByName('Admin');
             $user->addGroup($adminGroup);
             $output->writeln(sprintf('  Added <info>%s</info> to the Admin group', $email));
-        }
-        catch (UserNotFoundException $e) {
+        } catch (UserNotFoundException $e) {
             $output->writeln(sprintf('<error>Error:</error> Could not find user by %s', $email));
             exit(1);
         }
 
         $output->writeln('Done!');
         exit(0);
     }
-} 
+}
diff --git a/classes/OpenCFP/Console/Command/ClearCacheCommand.php b/classes/OpenCFP/Console/Command/ClearCacheCommand.php
@@ -3,11 +3,8 @@
 namespace OpenCFP\Console\Command;
 
 use Cartalyst\Sentry\Sentry;
-use Cartalyst\Sentry\Users\UserNotFoundException;
 use OpenCFP\Console\BaseCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ClearCacheCommand extends BaseCommand
@@ -27,8 +24,8 @@ protected function configure()
     /**
      * Execute the command.
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
+     * @param  \Symfony\Component\Console\Input\InputInterface   $input
+     * @param  \Symfony\Component\Console\Output\OutputInterface $output
      * @return void
      */
     public function execute(InputInterface $input, OutputInterface $output)
@@ -45,4 +42,4 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln('Done!');
     }
-} 
+}
diff --git a/classes/OpenCFP/ContainerAware.php b/classes/OpenCFP/ContainerAware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCFP; 
+namespace OpenCFP;
 
 trait ContainerAware
 {
@@ -18,4 +18,4 @@ protected function service($slug)
     {
         return $this->app[$slug];
     }
-} 
+}
diff --git a/classes/OpenCFP/Domain/CallForProposal.php b/classes/OpenCFP/Domain/CallForProposal.php
@@ -17,7 +17,8 @@ class CallForProposal
      */
     private $endDate;
 
-    public function __construct(DateTime $end){
+    public function __construct(DateTime $end)
+    {
         $this->endDate = $end;
     }
 
@@ -30,4 +31,4 @@ public function isOpen()
 
         return $now < $this->endDate;
     }
-} 
+}
diff --git a/classes/OpenCFP/Domain/EntityNotFoundException.php b/classes/OpenCFP/Domain/EntityNotFoundException.php
@@ -5,4 +5,4 @@
 class EntityNotFoundException extends \Exception
 {
 
-} 
+}
diff --git a/classes/OpenCFP/Domain/Services/AuthenticationService.php b/classes/OpenCFP/Domain/Services/AuthenticationService.php
@@ -23,4 +23,4 @@ public function authenticate($username, $password);
      */
     public function logout();
 
-} 
+}
diff --git a/classes/OpenCFP/Domain/Services/EventDispatcher.php b/classes/OpenCFP/Domain/Services/EventDispatcher.php
@@ -13,4 +13,4 @@
 class EventDispatcher extends SymfonyEventDispatcher
 {
 
-}
+}
diff --git a/classes/OpenCFP/Domain/Services/IdentityProvider.php b/classes/OpenCFP/Domain/Services/IdentityProvider.php
@@ -15,4 +15,4 @@ interface IdentityProvider
      */
     public function getCurrentUser();
 
-} 
+}
diff --git a/classes/OpenCFP/Domain/Services/NotAuthenticatedException.php b/classes/OpenCFP/Domain/Services/NotAuthenticatedException.php
@@ -4,4 +4,4 @@
 
 class NotAuthenticatedException extends \Exception
 {
-}
+}
diff --git a/classes/OpenCFP/Domain/Services/ProfileImageProcessor.php b/classes/OpenCFP/Domain/Services/ProfileImageProcessor.php
@@ -57,7 +57,7 @@ public function process(UploadedFile $file, $publishFilename)
 
         try {
             $file->move($this->publishDir, $tempFilename);
-            
+
             $speakerPhoto = Image::make($this->publishDir . '/' . $tempFilename);
 
             if ($speakerPhoto->height > $speakerPhoto->width) {

diff --git a/classes/OpenCFP/Domain/Speaker/SpeakerProfile.php b/classes/OpenCFP/Domain/Speaker/SpeakerProfile.php
@@ -17,7 +17,7 @@ class SpeakerProfile
      */
     protected $speaker;
 
-    function __construct($speaker)
+    public function __construct($speaker)
     {
         $this->speaker = $speaker;
     }
@@ -97,4 +97,4 @@ public function toArrayForApi()
             'bio' => $this->getBio()
         ];
     }
-}
+}
diff --git a/classes/OpenCFP/Domain/Speaker/SpeakerRepository.php b/classes/OpenCFP/Domain/Speaker/SpeakerRepository.php
@@ -8,17 +8,17 @@ interface SpeakerRepository
     /**
      * Retrieves a speaker with associated talks.
      *
-     * @param string $speakerId
+     * @param  string                  $speakerId
      * @throws EntityNotFoundException
-     * @return User the speaker that matches given identifier.
+     * @return User                    the speaker that matches given identifier.
      */
     public function findById($speakerId);
 
     /**
      * Saves a speaker and their talks.
      *
-     * @param User $speaker
+     * @param  User  $speaker
      * @return mixed
      */
     public function persist(User $speaker);
-} 
+}
diff --git a/classes/OpenCFP/Domain/Talk/InvalidTalkSubmissionException.php b/classes/OpenCFP/Domain/Talk/InvalidTalkSubmissionException.php
@@ -6,4 +6,4 @@
 
 class InvalidTalkSubmissionException extends ValidationException
 {
-}
+}
diff --git a/classes/OpenCFP/Domain/Talk/TalkRepository.php b/classes/OpenCFP/Domain/Talk/TalkRepository.php
@@ -10,4 +10,4 @@ interface TalkRepository
      * @return mixed
      */
     public function persist(Talk $talk);
-} 
+}
diff --git a/classes/OpenCFP/Domain/Talk/TalkSubmission.php b/classes/OpenCFP/Domain/Talk/TalkSubmission.php
@@ -107,7 +107,7 @@ private function guardCategoryIsValid($data)
         if (!isset($data['category']) or empty($data['category'])) {
             throw new InvalidTalkSubmissionException('You must choose what category of talk you are submitting.');
         }
-        
+
         if (!$this->isValidCategory($data['category'])) {
             throw new InvalidTalkSubmissionException('You did not choose a valid talk category.');
         }
@@ -131,4 +131,4 @@ private function isValidCategory($category)
         ]);
     }
 
-} 
+}
diff --git a/classes/OpenCFP/Domain/Talk/TalkWasSubmitted.php b/classes/OpenCFP/Domain/Talk/TalkWasSubmitted.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCFP\Domain\Talk; 
+namespace OpenCFP\Domain\Talk;
 
 use OpenCFP\Domain\Entity\Talk;
 use Symfony\Component\EventDispatcher\Event;
@@ -19,4 +19,4 @@ public function getTalk()
     {
         return $this->talk;
     }
-} 
+}
diff --git a/classes/OpenCFP/Domain/ValidationException.php b/classes/OpenCFP/Domain/ValidationException.php
@@ -4,4 +4,4 @@
 
 class ValidationException extends \Exception
 {
-}
+}
diff --git a/classes/OpenCFP/Http/API/ApiController.php b/classes/OpenCFP/Http/API/ApiController.php
@@ -2,12 +2,11 @@
 
 namespace OpenCFP\Http\API;
 
-use OpenCFP\Application;
 use OpenCFP\ContainerAware;
 use Symfony\Component\HttpFoundation\JsonResponse as Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-class ApiController 
+class ApiController
 {
 
     use ContainerAware;
@@ -22,6 +21,7 @@ class ApiController
     public function setStatusCode($status)
     {
         $this->statusCode = $status;
+
         return $this;
     }
 
@@ -107,6 +107,7 @@ public function respondWithError($message)
                 E_USER_WARNING
             );
         }
+
         return $this->respond([
             'message' => $message,
         ]);
@@ -135,4 +136,4 @@ public function redirectTo($route, $status = 302)
     {
         return $this->app->redirect($this->url($route), $status);
     }
-} 
+}
diff --git a/classes/OpenCFP/Http/API/ProfileController.php b/classes/OpenCFP/Http/API/ProfileController.php
@@ -5,11 +5,8 @@
 use Exception;
 use OpenCFP\Application\Speakers;
 use OpenCFP\Domain\Services\NotAuthenticatedException;
-use OpenCFP\Domain\Talk\InvalidTalkSubmissionException;
-use OpenCFP\Domain\Talk\TalkSubmission;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class ProfileController extends ApiController
 {
@@ -40,4 +37,4 @@ public function handleShowSpeakerProfile(Request $request)
             return $this->respondInternalError($e->getMessage());
         }
     }
-} 
+}
diff --git a/classes/OpenCFP/Http/API/TalkController.php b/classes/OpenCFP/Http/API/TalkController.php
@@ -57,7 +57,7 @@ public function handleViewAllTalks(Request $request)
             // TODO Replace this crap with an object responsible for
             // the "Talk Resource" to/from json.
             $output = [];
-            foreach($talks as $talk) {
+            foreach ($talks as $talk) {
                 $output[] = $talk->toArrayForApi();
             }
 
@@ -83,4 +83,4 @@ public function handleViewTalk(Request $request, $id)
             return $this->respondUnauthorized();
         }
     }
-} 
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		namespace OpenCFP\Application;

		class NotAuthorizedException extends \Exception {}
		class NotAuthorizedException extends \Exception {}
-Original file line number
+Diff line change
@@ Expand Up @@
             // Probably okay.
             $this->app = $this->getApplication()->getContainer();
         }
-    }
+    }