Merge pull request opencfp#847 from localheinz/feature/blank-line-bef…

…ore-statement

Enhancement: Configure blank_line_before_statement fixer

.php_cs.dist

@@ -27,7 +27,27 @@ return PhpCsFixer\Config::create()
             'default' => 'align_single_space_minimal',
         ],
         'blank_line_after_opening_tag' => true,
-        'blank_line_before_statement' => true,
+        'blank_line_before_statement' => [
+            'statements' => [
+                'break',
+                'continue',
+                'declare',
+                'do',
+                'for',
+                'foreach',
+                'if',
+                'include',
+                'include_once',
+                'require',
+                'require_once',
+                'return',
+                'switch',
+                'throw',
+                'try',
+                'while',
+                'yield',
+            ],
+        ],
         'cast_spaces' => true,
         'combine_consecutive_unsets' => true,
         'concat_space' => [

classes/Domain/Model/User.php

@@ -98,6 +98,7 @@ public function delete(): bool
                     throw new \Exception('Unable to delete talks of user');
                 }
             });
+
         if (!parent::delete()) {
             throw new \Exception('Unable to delete User');
         }

classes/Domain/Services/TalkRating/TalkRatingContext.php

@@ -21,6 +21,7 @@ class TalkRatingContext
     public static function getTalkStrategy(string $strategy, Authentication $auth): TalkRatingStrategy
     {
         $strategy = \strtolower($strategy);
+
         switch ($strategy) {
             case 'yesno':
                 return new YesNoRating(new TalkMeta(), $auth);

classes/Domain/Talk/TalkFilter.php

@@ -66,6 +66,7 @@ public function getFilteredTalks(int $adminUserId, $filter = null)
         if ($filter === null) {
             return $this->talk;
         }
+
         switch (\strtolower($filter)) {
             case 'selected':
                 return $this->talk->selected();

classes/Domain/Talk/TalkHandler.php

@@ -139,6 +139,7 @@ private function clearFavoriteOfCurrentUser(): bool
                 ->where('talk_id', $this->talk->id)
                 ->where('admin_user_id', $this->userId)
                 ->first();
+
             if ($favorite instanceof Favorite) {
                 $favorite->delete();
             }

classes/Http/Controller/Admin/SpeakersController.php

@@ -220,6 +220,7 @@ public function promoteAction(Request $request)
 
         try {
             $user = $accounts->findById($id);
+
             if ($user->hasAccess(\strtolower($role))) {
                 $session->set('flash', [
                     'type'  => 'error',

classes/Http/Controller/ProfileController.php

@@ -100,6 +100,7 @@ public function processAction(Request $request)
 
         if ($isValid) {
             $sanitizedData = $this->transformSanitizedData($form->getCleanData());
+
             if (isset($formData['speaker_photo'])) {
                 /** @var ProfileImageProcessor $profileImageProcessor */
                 $profileImageProcessor = $this->service('profile_image_processor');

classes/Http/Form/Form.php

@@ -91,6 +91,7 @@ public function getCleanData(array $keys = [])
         }
 
         $data = [];
+
         foreach ($keys as $key) {
             if (isset($this->cleanData[$key])) {
                 $data[$key] = $this->cleanData[$key];

classes/Infrastructure/Auth/RoleAccess.php

@@ -34,6 +34,7 @@ public static function userHasAccess(Authentication $auth, string $role = 'admin
         }
 
         $user = $auth->user();
+
         if (!$user->hasAccess($role)) {
             return new RedirectResponse('/dashboard');
         }

classes/Infrastructure/Auth/SentinelAccountManagement.php

@@ -44,6 +44,7 @@ public function findById(int $userId): UserInterface
     public function findByLogin(string $email): UserInterface
     {
         $user = $this->sentinel->getUserRepository()->findByCredentials(['email' => $email]);
+
         if ($user instanceof SentinelUserInterface) {
             return new SentinelUser($user, $this->sentinel);
         }
@@ -74,6 +75,7 @@ public function create(string $email, string $password, array $data = []): UserI
         $user = $this->sentinel
             ->getUserRepository()
             ->create(\array_merge(['email' => $email, 'password' => $password], $data));
+
         if ($user instanceof SentinelUserInterface) {
             return new SentinelUser($user, $this->sentinel);
         }

classes/Infrastructure/Auth/SentinelAuthentication.php

@@ -43,9 +43,11 @@ public function authenticate($username, $password)
         try {
             $success = false;
             $user    = $this->accountManagement->findByLogin($username);
+
             if ($user->checkPassword($password)) {
                 $success = $this->sentinel->login($user->getUser());
             }
+
             if (!$success) {
                 throw AuthenticationException::loginFailure();
             }
@@ -57,6 +59,7 @@ public function authenticate($username, $password)
     public function user(): UserInterface
     {
         $user = $this->sentinel->getUser();
+
         if ($user instanceof SentinelUserInterface) {
             return new SentinelUser($user, $this->sentinel);
         }

classes/Infrastructure/Auth/SentinelIdentityProvider.php

@@ -46,6 +46,7 @@ public function __construct(Sentinel $sentinel, SpeakerRepository $repo)
     public function getCurrentUser(): User
     {
         $user = $this->sentinel->getUser();
+
         if (!$user instanceof SentinelUserInterface) {
             throw new NotAuthenticatedException();
         }

migrations/20150519122926_reset_photo_paths.php

@@ -57,6 +57,7 @@ private function photosNotPartOfProfile()
         // Crawl uploads directory.
         // If filename is not registered, flag it for removal.
         $iterator = new DirectoryIterator(__DIR__ . '/../web/uploads');
+
         foreach ($iterator as $file) {
             if ($file->isDot() || \in_array($file->getFilename(), ['dummyphoto.jpg'])) {
                 continue;

migrations/20171120123411_user_roles_migration.php

@@ -50,6 +50,7 @@ public function down()
     private function doPromotions($roleName)
     {
         $role = Sentinel::findRoleByName($roleName);
+
         foreach ($this->getRoleIds($roleName) as $roleId) {
             $role->users()->attach($roleId);
         }
@@ -76,6 +77,7 @@ private function promoteSpeakers()
         $users   = \Cartalyst\Sentinel\Users\EloquentUser::all();
         $users   = $users->whereNotIn('id', $roleIds);
         $role    = Sentinel::findRoleByName('Speaker');
+
         foreach ($users as $user) {
             $role->users()->attach($user->id);
         }

server.php

@@ -14,6 +14,7 @@
 \define('WEB_PATH', __DIR__ . '/web/');
 
 $path = WEB_PATH . $_SERVER['REQUEST_URI'];
+
 if (\is_file($path)) {
     return false;
 }

tests/helpers.php

@@ -28,9 +28,11 @@ function factory()
         $factory = Factory::construct($faker, __DIR__ . '/../factories');
 
         $arguments = \func_get_args();
+
         if (isset($arguments[1]) && \is_string($arguments[1])) {
             return $factory->of($arguments[0], $arguments[1])->times($arguments[2] ?? null);
         }
+
         if (isset($arguments[1])) {
             return $factory->of($arguments[0])->times($arguments[1]);
         }

web/index_dev.php

@@ -12,6 +12,7 @@
  */
 
 $filename = __DIR__ . \preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
+
 if (PHP_SAPI === 'cli-server' && \is_file($filename)) {
     return false;
 }