Merge pull request opencfp#820 from localheinz/feature/binary-operato…

…rs-spaces Enhancement: Configure binary_operator_spaces fixer to align with minimal space
phpconfasia · Dec 5, 2017 · 93844aa · 93844aa
2 parents 2bf073d + ab2ea61
commit 93844aa
Show file tree

Hide file tree

Showing 33 changed files with 140 additions and 157 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -24,7 +24,7 @@ return PhpCsFixer\Config::create()
             'syntax' => 'short'
         ],
         'binary_operator_spaces' => [
-            'default' => 'align',
+            'default' => 'align_single_space_minimal',
         ],
         'blank_line_after_opening_tag' => true,
         'blank_line_before_statement' => true,

diff --git a/classes/Application.php b/classes/Application.php
@@ -72,9 +72,9 @@ public function __construct(string $basePath, Environment $environment)
         $this->register(new LocaleServiceProvider());
         $this->register(new TranslationServiceProvider());
         $this->register(new MonologServiceProvider(), [
-            'monolog.logfile'  => $this->config('log.path') ?: "{$basePath}/log/app.log",
-            'monolog.name'     => 'opencfp',
-            'monolog.level'    => \strtoupper(
+            'monolog.logfile' => $this->config('log.path') ?: "{$basePath}/log/app.log",
+            'monolog.name'    => 'opencfp',
+            'monolog.level'   => \strtoupper(
                 $this->config('log.level') ?: 'debug'
             ),
         ]);

diff --git a/classes/Domain/Services/ResetEmailer.php b/classes/Domain/Services/ResetEmailer.php
@@ -43,10 +43,10 @@ class ResetEmailer
      */
     public function __construct(\Swift_Mailer $swiftMailer, \Twig_Template $template, $configEmail, $configTitle)
     {
-        $this->swiftMailer  = $swiftMailer;
-        $this->template     = $template;
-        $this->configEmail  = $configEmail;
-        $this->configTitle  = $configTitle;
+        $this->swiftMailer = $swiftMailer;
+        $this->template    = $template;
+        $this->configEmail = $configEmail;
+        $this->configTitle = $configTitle;
     }
 
     /**

diff --git a/classes/Domain/Talk/TalkProfile.php b/classes/Domain/Talk/TalkProfile.php
@@ -89,17 +89,17 @@ public function isDesired(): bool
 
     public function isSponsor(): bool
     {
-        return $this->talk->sponsor ==1;
+        return $this->talk->sponsor == 1;
     }
 
     public function isSpeakerFavorite(): bool
     {
-        return $this->talk->favorite ==1;
+        return $this->talk->favorite == 1;
     }
 
     public function isSelected(): bool
     {
-        return $this->talk->selected ==1;
+        return $this->talk->selected == 1;
     }
 
     public function getComments(): Collection

diff --git a/classes/Http/Controller/Admin/ExportsController.php b/classes/Http/Controller/Admin/ExportsController.php
@@ -54,9 +54,9 @@ public function emailExportAction()
 
     private function talksExportAction(bool $attributed, $where = null)
     {
-        $talks         = Talk::orderBy('created_at', 'DESC');
-        $talks         = $where == null ? $talks : $talks->where($where);
-        $talks         = $talks->get()->toArray();
+        $talks = Talk::orderBy('created_at', 'DESC');
+        $talks = $where == null ? $talks : $talks->where($where);
+        $talks = $talks->get()->toArray();
 
         foreach ($talks as $talk => $info) {
             $talks[$talk]['created_at'] = $info['created_at'];

diff --git a/classes/Http/Controller/Admin/SpeakersController.php b/classes/Http/Controller/Admin/SpeakersController.php
@@ -32,7 +32,7 @@ public function indexAction(Request $request)
         $search = $request->get('search');
 
         /** @var AccountManagement $accounts */
-        $accounts        = $this->service(AccountManagement::class);
+        $accounts = $this->service(AccountManagement::class);
 
         $adminUsers      = $accounts->findByRole('Admin');
         $adminUserIds    = \array_column($adminUsers, 'id');
@@ -168,8 +168,8 @@ public function demoteAction(Request $request)
         /** @var AccountManagement $accounts */
         $accounts = $this->service(AccountManagement::class);
 
-        $role     = $request->get('role');
-        $id       = (int) $request->get('id');
+        $role = $request->get('role');
+        $id   = (int) $request->get('id');
 
         /** @var Authentication $authentication */
         $authentication = $this->service(Authentication::class);
@@ -212,8 +212,8 @@ public function promoteAction(Request $request)
         /* @var AccountManagement $accounts */
         $accounts = $this->service(AccountManagement::class);
 
-        $role     = $request->get('role');
-        $id       = (int) $request->get('id');
+        $role = $request->get('role');
+        $id   = (int) $request->get('id');
 
         /** @var Session\Session $session */
         $session = $this->service('session');

diff --git a/classes/Http/Controller/Admin/TalksController.php b/classes/Http/Controller/Admin/TalksController.php
@@ -29,8 +29,8 @@ public function indexAction(Request $request)
         /* @var Authentication $auth */
         $auth = $this->service(Authentication::class);
 
-        $adminUserId   = $auth->userId();
-        $options       = [
+        $adminUserId = $auth->userId();
+        $options     = [
             'order_by' => $request->get('order_by'),
             'sort'     => $request->get('sort'),
         ];

diff --git a/classes/Http/Controller/ForgotController.php b/classes/Http/Controller/ForgotController.php
@@ -214,10 +214,10 @@ public function updatePasswordAction(Request $request)
             return $this->render('user/reset_password.twig', ['form' => $form->createView()]);
         }
 
-        $data       = $form->getData();
-        $userId     = $data['user_id'];
-        $resetCode  = $data['reset_code'];
-        $password   = $data['password'];
+        $data      = $form->getData();
+        $userId    = $data['user_id'];
+        $resetCode = $data['reset_code'];
+        $password  = $data['password'];
 
         if (empty($resetCode)) {
             throw new \Exception();

diff --git a/classes/Http/Controller/TalkController.php b/classes/Http/Controller/TalkController.php
@@ -35,7 +35,7 @@ class TalkController extends BaseController
     private function getTalkForm($requestData): TalkForm
     {
         /** @var TalkHelper $helper */
-        $helper  = $this->service(TalkHelper::class);
+        $helper = $this->service(TalkHelper::class);
 
         $options = [
             'categories' => $helper->getTalkCategories(),
@@ -62,8 +62,8 @@ public function viewAction(Request $request)
         $speakers = $this->service('application.speakers');
 
         try {
-            $talkId   = (int) $request->get('id');
-            $talk     = $speakers->getTalk($talkId);
+            $talkId = (int) $request->get('id');
+            $talk   = $speakers->getTalk($talkId);
         } catch (NotAuthorizedException $e) {
             return $this->redirectTo('dashboard');
         }
@@ -73,7 +73,7 @@ public function viewAction(Request $request)
 
     public function editAction(Request $request)
     {
-        $talkId      = (int) $request->get('id');
+        $talkId = (int) $request->get('id');
 
         /** @var CallForPapers $callForPapers */
         $callForPapers = $this->service(CallForPapers::class);
@@ -216,7 +216,7 @@ public function processCreateAction(Request $request)
 
         if ($form->validateAll()) {
             $sanitizedData            = $form->getCleanData();
-            $sanitizedData['user_id'] =  (int) $user->getId();
+            $sanitizedData['user_id'] = (int) $user->getId();
             $talk                     = Talk::create($sanitizedData);
 
             $session->set('flash', [
@@ -304,7 +304,7 @@ public function updateAction(Request $request)
 
         if ($form->validateAll()) {
             $sanitizedData            = $form->getCleanData();
-            $sanitizedData['user_id'] =(int) $user->getId();
+            $sanitizedData['user_id'] = (int) $user->getId();
 
             if (Talk::find((int) $sanitizedData['id'])->update($sanitizedData)) {
                 $session->set('flash', [
@@ -368,7 +368,7 @@ public function deleteAction(Request $request)
         $userId = $authentication->userId();
         $talk   = Talk::find($request->get('tid'), ['id', 'user_id']);
 
-        if ((int) $talk->user_id !==  $userId) {
+        if ((int) $talk->user_id !== $userId) {
             return $this->app->json(['delete' => 'no']);
         }
 
@@ -403,7 +403,7 @@ protected function sendSubmitEmail(string $email, int $talkId)
 
         try {
             /** @var \Swift_Mailer $mailer */
-            $mailer  = $this->service('mailer');
+            $mailer = $this->service('mailer');
 
             $message = new Swift_Message();
 

diff --git a/classes/Http/Form/Form.php b/classes/Http/Form/Form.php
@@ -191,8 +191,8 @@ public function sanitize()
      */
     protected function internalSanitize(array $taintedData): array
     {
-        $purifier  = $this->purifier;
-        $filtered  = \array_map(
+        $purifier = $this->purifier;
+        $filtered = \array_map(
             function ($field) use ($purifier) {
                 return $purifier->purify($field);
             },

diff --git a/classes/Http/Form/SignupForm.php b/classes/Http/Form/SignupForm.php
@@ -53,15 +53,15 @@ public function validateAll($action = 'create')
             $agreeCoc       = $this->validateAgreeCoc();
         }
 
-        $validEmail         = $this->validateEmail();
-        $validFirstName     = $this->validateFirstName();
-        $validLastName      = $this->validateLastName();
-        $validCompany       = $this->validateCompany();
-        $validTwitter       = $this->validateTwitter();
-        $validUrl           = $this->validateUrl();
-        $validSpeakerPhoto  = $this->validateSpeakerPhoto();
-        $validSpeakerInfo   = true;
-        $validSpeakerBio    = true;
+        $validEmail        = $this->validateEmail();
+        $validFirstName    = $this->validateFirstName();
+        $validLastName     = $this->validateLastName();
+        $validCompany      = $this->validateCompany();
+        $validTwitter      = $this->validateTwitter();
+        $validUrl          = $this->validateUrl();
+        $validSpeakerPhoto = $this->validateSpeakerPhoto();
+        $validSpeakerInfo  = true;
+        $validSpeakerBio   = true;
 
         if (!empty($this->taintedData['speaker_info'])) {
             $validSpeakerInfo = $this->validateSpeakerInfo();
@@ -72,17 +72,7 @@ public function validateAll($action = 'create')
         }
 
         return
-            $validEmail         &&
-            $validPasswords     &&
-            $validFirstName     &&
-            $validLastName      &&
-            $validCompany       &&
-            $validTwitter       &&
-            $validUrl           &&
-            $validSpeakerInfo   &&
-            $validSpeakerBio    &&
-            $validSpeakerPhoto  &&
-            $agreeCoc;
+            $validEmail && $validPasswords && $validFirstName && $validLastName && $validCompany && $validTwitter && $validUrl && $validSpeakerInfo && $validSpeakerBio && $validSpeakerPhoto && $agreeCoc;
     }
 
     public function validateSpeakerPhoto(): bool
@@ -277,9 +267,9 @@ public function validateSpeakerInfo(): bool
             $this->cleanData['speaker_info'],
             FILTER_SANITIZE_STRING
         );
-        $validationResponse  = true;
-        $speakerInfo         = \strip_tags($speakerInfo);
-        $speakerInfo         = $this->purifier->purify($speakerInfo);
+        $validationResponse = true;
+        $speakerInfo        = \strip_tags($speakerInfo);
+        $speakerInfo        = $this->purifier->purify($speakerInfo);
 
         if (empty($speakerInfo)) {
             $this->addErrorMessage('You submitted speaker info but it was empty after sanitizing');

diff --git a/classes/Http/Form/TalkForm.php b/classes/Http/Form/TalkForm.php
@@ -67,14 +67,7 @@ public function sanitize()
     public function validateAll($action = 'create')
     {
         return
-            $this->validateTitle()       &&
-            $this->validateDescription() &&
-            $this->validateLevel()       &&
-            $this->validateCategory()    &&
-            $this->validateDesired()     &&
-            $this->validateSlides()      &&
-            $this->validateOther()       &&
-            $this->validateSponsor();
+            $this->validateTitle() && $this->validateDescription() && $this->validateLevel() && $this->validateCategory() && $this->validateDesired() && $this->validateSlides() && $this->validateOther() && $this->validateSponsor();
     }
 
     /**

diff --git a/classes/Http/View/TalkHelper.php b/classes/Http/View/TalkHelper.php
@@ -48,18 +48,18 @@ public function getTalkCategories()
 
         if ($categories === null) {
             $categories = [
-                'api'               => 'APIs (REST, SOAP, etc.)',
-                'continuousdelivery'=> 'Continuous Delivery',
-                'database'          => 'Database',
-                'development'       => 'Development',
-                'devops'            => 'Devops',
-                'framework'         => 'Framework',
-                'ibmi'              => 'IBMi',
-                'javascript'        => 'JavaScript',
-                'security'          => 'Security',
-                'testing'           => 'Testing',
-                'uiux'              => 'UI/UX',
-                'other'             => 'Other',
+                'api'                => 'APIs (REST, SOAP, etc.)',
+                'continuousdelivery' => 'Continuous Delivery',
+                'database'           => 'Database',
+                'development'        => 'Development',
+                'devops'             => 'Devops',
+                'framework'          => 'Framework',
+                'ibmi'               => 'IBMi',
+                'javascript'         => 'JavaScript',
+                'security'           => 'Security',
+                'testing'            => 'Testing',
+                'uiux'               => 'UI/UX',
+                'other'              => 'Other',
             ];
         }
 

diff --git a/classes/Provider/TalkHelperProvider.php b/classes/Provider/TalkHelperProvider.php
@@ -21,7 +21,7 @@ class TalkHelperProvider implements ServiceProviderInterface
 {
     public function register(Container $app)
     {
-        $app[TalkHelper::class] =  function ($app) {
+        $app[TalkHelper::class] = function ($app) {
             return new TalkHelper(
                 $app->config('talk.categories'),
                 $app->config('talk.levels'),

diff --git a/migrations/20140902174929_remove_speaker_table.php b/migrations/20140902174929_remove_speaker_table.php
@@ -29,10 +29,10 @@ public function change()
         $rows = $this->fetchAll('SELECT * FROM speakers');
 
         foreach ($rows as $row) {
-            $info       = \filter_var($row['info'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $bio        = \filter_var($row['bio'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $photoPath  = \filter_var($row['photo_path'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $sql        = "UPDATE users SET info = '{$info}', bio = '{$bio}', photo_path = '{$photoPath}' WHERE id = {$row['user_id']}";
+            $info      = \filter_var($row['info'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $bio       = \filter_var($row['bio'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $photoPath = \filter_var($row['photo_path'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $sql       = "UPDATE users SET info = '{$info}', bio = '{$bio}', photo_path = '{$photoPath}' WHERE id = {$row['user_id']}";
             $this->execute($sql);
         }
 
@@ -63,10 +63,10 @@ public function down()
         $rows = $this->fetchAll('SELECT id, info, bio, photo_path FROM users');
 
         foreach ($rows as $row) {
-            $info       = \filter_var($row['info'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $bio        = \filter_var($row['bio'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $photoPath  = \filter_var($row['photo_path'], FILTER_SANITIZE_MAGIC_QUOTES);
-            $sql        = "INSERT INTO speakers (user_id, info, bio, photo_path)
+            $info      = \filter_var($row['info'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $bio       = \filter_var($row['bio'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $photoPath = \filter_var($row['photo_path'], FILTER_SANITIZE_MAGIC_QUOTES);
+            $sql       = "INSERT INTO speakers (user_id, info, bio, photo_path)
                 VALUES ({$row['user_id']}, '{$info}', '{$bio}', '{$photoPath}')";
             $this->execute($sql);
         }

diff --git a/migrations/20171120112704_activate_user_migration.php b/migrations/20171120112704_activate_user_migration.php
@@ -32,8 +32,8 @@ public function bootEloquent()
         $options       = $adapter->getOptions();
         $this->capsule = new Capsule();
         $this->capsule->addConnection([
-            'driver'    => 'mysql',
-            'database'  => $options['name'],
+            'driver'   => 'mysql',
+            'database' => $options['name'],
         ]);
         $this->capsule->getConnection()->setPdo($adapter->getConnection());
         $this->capsule->bootEloquent();

diff --git a/migrations/20171120123411_user_roles_migration.php b/migrations/20171120123411_user_roles_migration.php
@@ -26,8 +26,8 @@ public function bootEloquent()
         $options       = $adapter->getOptions();
         $this->capsule = new Capsule();
         $this->capsule->addConnection([
-            'driver'    => 'mysql',
-            'database'  => $options['name'],
+            'driver'   => 'mysql',
+            'database' => $options['name'],
         ]);
         $this->capsule->getConnection()->setPdo($adapter->getConnection());
         $this->capsule->bootEloquent();