CS fixes

Author: GrahamCampbell

.php_cs

@@ -1,31 +1,43 @@
 <?php
 
-$finder = Symfony\Component\Finder\Finder::create()
-    ->files()
-    ->in(__DIR__)
-    ->name('*.stub')
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true);
+use Symfony\CS\Config\Config;
+use Symfony\CS\FixerInterface;
+use Symfony\CS\Finder\DefaultFinder;
 
 $fixers = [
-    '-psr0',
-    '-php_closing_tag',
     'blankline_after_open_tag',
+    'braces',
     'concat_without_spaces',
     'double_arrow_multiline_whitespaces',
     'duplicate_semicolon',
+    'elseif',
     'empty_return',
+    'encoding',
+    'eof_ending',
     'extra_empty_lines',
+    'function_call_space',
+    'function_declaration',
     'include',
+    'indentation',
+    'linefeed',
     'join_function',
+    'line_after_namespace',
     'list_commas',
+    'logical_not_operators_with_successor_space',
+    'lowercase_constants',
+    'lowercase_keywords',
+    'method_argument_space',
     'multiline_array_trailing_comma',
+    'multiline_spaces_before_semicolon',
+    'multiple_use',
     'namespace_no_leading_whitespace',
     'no_blank_lines_after_class_opening',
     'no_empty_lines_after_phpdocs',
     'object_operator',
     'operators_spaces',
+    'parenthesis',
     'phpdoc_indent',
+    'phpdoc_inline_tag',
     'phpdoc_no_access',
     'phpdoc_no_package',
     'phpdoc_scalar',
@@ -38,24 +50,24 @@ $fixers = [
     'remove_lines_between_uses',
     'return',
     'self_accessor',
+    'short_array_syntax',
+    'short_echo_tag',
+    'short_tag',
     'single_array_no_trailing_comma',
     'single_blank_line_before_namespace',
+    'single_line_after_imports',
     'single_quote',
     'spaces_before_semicolon',
     'spaces_cast',
     'standardize_not_equal',
     'ternary_spaces',
+    'trailing_spaces',
     'trim_array_spaces',
     'unalign_equals',
     'unary_operators_spaces',
+    'unused_use',
+    'visibility',
     'whitespacy_lines',
-    'multiline_spaces_before_semicolon',
-    'short_array_syntax',
-    'short_echo_tag',
 ];
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers($fixers)
-    ->finder($finder)
-    ->setUsingCache(true);
+return Config::create()->level(FixerInterface::NONE_LEVEL)->fixers($fixers)->finder(DefaultFinder::create()->in(__DIR__));

.styleci.yml

@@ -0,0 +1 @@
+preset: laravel

src/Illuminate/Auth/AuthManager.php

@@ -29,9 +29,9 @@ protected function createDriver($driver)
         }
 
         if (method_exists($guard, 'setRequest')) {
-            $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));   
+            $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));
         }
-        
+
         return $guard;
     }
 

src/Illuminate/Auth/DatabaseUserProvider.php

@@ -104,7 +104,7 @@ public function retrieveByCredentials(array $credentials)
         $query = $this->conn->table($this->table);
 
         foreach ($credentials as $key => $value) {
-            if (!Str::contains($key, 'password')) {
+            if (! Str::contains($key, 'password')) {
                 $query->where($key, $value);
             }
         }

src/Illuminate/Auth/EloquentUserProvider.php

@@ -92,7 +92,7 @@ public function retrieveByCredentials(array $credentials)
         $query = $this->createModel()->newQuery();
 
         foreach ($credentials as $key => $value) {
-            if (!Str::contains($key, 'password')) {
+            if (! Str::contains($key, 'password')) {
                 $query->where($key, $value);
             }
         }

src/Illuminate/Auth/Guard.php

@@ -109,7 +109,7 @@ public function __construct(UserProvider $provider,
      */
     public function check()
     {
-        return !is_null($this->user());
+        return ! is_null($this->user());
     }
 
     /**
@@ -119,7 +119,7 @@ public function check()
      */
     public function guest()
     {
-        return !$this->check();
+        return ! $this->check();
     }
 
     /**
@@ -136,7 +136,7 @@ public function user()
         // If we have already retrieved the user for the current request we can just
         // return it back immediately. We do not want to pull the user data every
         // request into the method because that would tremendously slow an app.
-        if (!is_null($this->user)) {
+        if (! is_null($this->user)) {
             return $this->user;
         }
 
@@ -147,7 +147,7 @@ public function user()
         // request, and if one exists, attempt to retrieve the user using that.
         $user = null;
 
-        if (!is_null($id)) {
+        if (! is_null($id)) {
             $user = $this->provider->retrieveById($id);
         }
 
@@ -156,7 +156,7 @@ public function user()
         // the application. Once we have a user we can return it to the caller.
         $recaller = $this->getRecaller();
 
-        if (is_null($user) && !is_null($recaller)) {
+        if (is_null($user) && ! is_null($recaller)) {
             $user = $this->getUserByRecaller($recaller);
 
             if ($user) {
@@ -197,12 +197,12 @@ public function id()
      */
     protected function getUserByRecaller($recaller)
     {
-        if ($this->validRecaller($recaller) && !$this->tokenRetrievalAttempted) {
+        if ($this->validRecaller($recaller) && ! $this->tokenRetrievalAttempted) {
             $this->tokenRetrievalAttempted = true;
 
             list($id, $token) = explode('|', $recaller, 2);
 
-            $this->viaRemember = !is_null($user = $this->provider->retrieveByToken($id, $token));
+            $this->viaRemember = ! is_null($user = $this->provider->retrieveByToken($id, $token));
 
             return $user;
         }
@@ -238,7 +238,7 @@ protected function getRecallerId()
      */
     protected function validRecaller($recaller)
     {
-        if (!is_string($recaller) || !Str::contains($recaller, '|')) {
+        if (! is_string($recaller) || ! Str::contains($recaller, '|')) {
             return false;
         }
 
@@ -305,7 +305,7 @@ public function basic($field = 'email')
      */
     public function onceBasic($field = 'email')
     {
-        if (!$this->once($this->getBasicCredentials($this->getRequest(), $field))) {
+        if (! $this->once($this->getBasicCredentials($this->getRequest(), $field))) {
             return $this->getBasicResponse();
         }
     }
@@ -319,7 +319,7 @@ public function onceBasic($field = 'email')
      */
     protected function attemptBasic(Request $request, $field)
     {
-        if (!$request->getUser()) {
+        if (! $request->getUser()) {
             return false;
         }
 
@@ -387,7 +387,7 @@ public function attempt(array $credentials = [], $remember = false, $login = tru
      */
     protected function hasValidCredentials($user, $credentials)
     {
-        return !is_null($user) && $this->provider->validateCredentials($user, $credentials);
+        return ! is_null($user) && $this->provider->validateCredentials($user, $credentials);
     }
 
     /**
@@ -499,7 +499,7 @@ public function loginUsingId($id, $remember = false)
      */
     public function onceUsingId($id)
     {
-        if (!is_null($user = $this->provider->retrieveById($id))) {
+        if (! is_null($user = $this->provider->retrieveById($id))) {
             $this->setUser($user);
 
             return true;
@@ -546,7 +546,7 @@ public function logout()
         // listening for anytime a user signs out of this application manually.
         $this->clearUserDataFromStorage();
 
-        if (!is_null($this->user)) {
+        if (! is_null($this->user)) {
             $this->refreshRememberToken($user);
         }
 
@@ -611,7 +611,7 @@ protected function createRememberTokenIfDoesntExist(UserContract $user)
      */
     public function getCookieJar()
     {
-        if (!isset($this->cookie)) {
+        if (! isset($this->cookie)) {
             throw new RuntimeException('Cookie jar has not been set.');
         }
 

src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php

@@ -112,7 +112,7 @@ public function exists(CanResetPasswordContract $user, $token)
 
         $token = (array) $this->getTable()->where('email', $email)->where('token', $token)->first();
 
-        return $token && !$this->tokenExpired($token);
+        return $token && ! $this->tokenExpired($token);
     }
 
     /**

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -112,7 +112,7 @@ public function emailResetLink(CanResetPasswordContract $user, $token, Closure $
         return $this->mailer->send($view, compact('token', 'user'), function ($m) use ($user, $token, $callback) {
             $m->to($user->getEmailForPasswordReset());
 
-            if (!is_null($callback)) {
+            if (! is_null($callback)) {
                 call_user_func($callback, $m, $user, $token);
             }
         });
@@ -132,7 +132,7 @@ public function reset(array $credentials, Closure $callback)
         // the user is properly redirected having an error message on the post.
         $user = $this->validateReset($credentials);
 
-        if (!$user instanceof CanResetPasswordContract) {
+        if (! $user instanceof CanResetPasswordContract) {
             return $user;
         }
 
@@ -160,11 +160,11 @@ protected function validateReset(array $credentials)
             return PasswordBrokerContract::INVALID_USER;
         }
 
-        if (!$this->validateNewPassword($credentials)) {
+        if (! $this->validateNewPassword($credentials)) {
             return PasswordBrokerContract::INVALID_PASSWORD;
         }
 
-        if (!$this->tokens->exists($user, $credentials['token'])) {
+        if (! $this->tokens->exists($user, $credentials['token'])) {
             return PasswordBrokerContract::INVALID_TOKEN;
         }
 
@@ -233,7 +233,7 @@ public function getUser(array $credentials)
 
         $user = $this->users->retrieveByCredentials($credentials);
 
-        if ($user && !$user instanceof CanResetPasswordContract) {
+        if ($user && ! $user instanceof CanResetPasswordContract) {
             throw new UnexpectedValueException('User must implement CanResetPassword interface.');
         }
 

src/Illuminate/Bus/Dispatcher.php

@@ -235,7 +235,7 @@ public function dispatchToQueue($command)
     {
         $queue = call_user_func($this->queueResolver);
 
-        if (!$queue instanceof Queue) {
+        if (! $queue instanceof Queue) {
             throw new RuntimeException('Queue resolver did not return a Queue implementation.');
         }
 

src/Illuminate/Cache/DatabaseStore.php

@@ -70,7 +70,7 @@ public function get($key)
         // If we have a cache record we will check the expiration time against current
         // time on the system and see if the record has expired. If it has, we will
         // remove the records from the database table so it isn't returned again.
-        if (!is_null($cache)) {
+        if (! is_null($cache)) {
             if (is_array($cache)) {
                 $cache = (object) $cache;
             }
@@ -157,7 +157,7 @@ protected function incrementOrDecrement($key, $value, Closure $callback)
 
         $cache = $this->table()->where('key', $prefixed)->lockForUpdate()->first();
 
-        if (!is_null($cache)) {
+        if (! is_null($cache)) {
             $current = $this->encrypter->decrypt($cache->value);
 
             if (is_numeric($current)) {

src/Illuminate/Cache/MemcachedConnector.php

@@ -30,7 +30,7 @@ public function connect(array $servers)
 
         $memcachedStatus = $memcached->getVersion();
 
-        if (!is_array($memcachedStatus)) {
+        if (! is_array($memcachedStatus)) {
             throw new RuntimeException('No Memcached servers added.');
         }