Additional cs fixes

Signed-off-by: Graham Campbell <graham@cachethq.io>
laravel · Jun 1, 2015 · 99c428b · 99c428b
1 parent b3c65c7
commit 99c428b
Show file tree

Hide file tree

Showing 637 changed files with 5,178 additions and 5,616 deletions.
diff --git a/src/Illuminate/Auth/AuthManager.php b/src/Illuminate/Auth/AuthManager.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Support\Manager;
 

diff --git a/src/Illuminate/Auth/AuthServiceProvider.php b/src/Illuminate/Auth/AuthServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Support\ServiceProvider;
 

diff --git a/src/Illuminate/Auth/Authenticatable.php b/src/Illuminate/Auth/Authenticatable.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 trait Authenticatable
 {

diff --git a/src/Illuminate/Auth/Console/ClearResetsCommand.php b/src/Illuminate/Auth/Console/ClearResetsCommand.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Console;
+<?php
+
+namespace Illuminate\Auth\Console;
 
 use Illuminate\Console\Command;
 

diff --git a/src/Illuminate/Auth/DatabaseUserProvider.php b/src/Illuminate/Auth/DatabaseUserProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Database\ConnectionInterface;
@@ -101,7 +103,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);
             }
         }

diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
@@ -89,7 +91,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);
             }
         }

diff --git a/src/Illuminate/Auth/GeneratorServiceProvider.php b/src/Illuminate/Auth/GeneratorServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Auth\Console\ClearResetsCommand;

diff --git a/src/Illuminate/Auth/GenericUser.php b/src/Illuminate/Auth/GenericUser.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 

diff --git a/src/Illuminate/Auth/Guard.php b/src/Illuminate/Auth/Guard.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth;
+<?php
+
+namespace Illuminate\Auth;
 
 use RuntimeException;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -106,7 +108,7 @@ public function __construct(UserProvider $provider,
      */
     public function check()
     {
-        return ! is_null($this->user());
+        return !is_null($this->user());
     }
 
     /**
@@ -116,7 +118,7 @@ public function check()
      */
     public function guest()
     {
-        return ! $this->check();
+        return !$this->check();
     }
 
     /**
@@ -133,7 +135,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;
         }
 
@@ -144,7 +146,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);
         }
 
@@ -153,7 +155,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) {
@@ -194,12 +196,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;
         }
@@ -235,7 +237,7 @@ protected function getRecallerId()
      */
     protected function validRecaller($recaller)
     {
-        if (! is_string($recaller) || ! str_contains($recaller, '|')) {
+        if (!is_string($recaller) || !str_contains($recaller, '|')) {
             return false;
         }
 
@@ -302,7 +304,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();
         }
     }
@@ -316,7 +318,7 @@ public function onceBasic($field = 'email')
      */
     protected function attemptBasic(Request $request, $field)
     {
-        if (! $request->getUser()) {
+        if (!$request->getUser()) {
             return false;
         }
 
@@ -386,7 +388,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);
     }
 
     /**
@@ -498,7 +500,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;
@@ -545,7 +547,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);
         }
 
@@ -610,8 +612,8 @@ protected function createRememberTokenIfDoesntExist(UserContract $user)
      */
     public function getCookieJar()
     {
-        if (! isset($this->cookie)) {
-            throw new RuntimeException("Cookie jar has not been set.");
+        if (!isset($this->cookie)) {
+            throw new RuntimeException('Cookie jar has not been set.');
         }
 
         return $this->cookie;

diff --git a/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php b/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Middleware;
+<?php
+
+namespace Illuminate\Auth\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;

diff --git a/src/Illuminate/Auth/Passwords/CanResetPassword.php b/src/Illuminate/Auth/Passwords/CanResetPassword.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Passwords;
+<?php
+
+namespace Illuminate\Auth\Passwords;
 
 trait CanResetPassword
 {

diff --git a/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php b/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Passwords;
+<?php
+
+namespace Illuminate\Auth\Passwords;
 
 use Carbon\Carbon;
 use Illuminate\Database\ConnectionInterface;
@@ -109,7 +111,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);
     }
 
     /**

diff --git a/src/Illuminate/Auth/Passwords/PasswordBroker.php b/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Passwords;
+<?php
+
+namespace Illuminate\Auth\Passwords;
 
 use Closure;
 use UnexpectedValueException;
@@ -110,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);
             }
         });
@@ -130,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;
         }
 
@@ -158,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;
         }
 
@@ -231,8 +233,8 @@ public function getUser(array $credentials)
 
         $user = $this->users->retrieveByCredentials($credentials);
 
-        if ($user && ! $user instanceof CanResetPasswordContract) {
-            throw new UnexpectedValueException("User must implement CanResetPassword interface.");
+        if ($user && !$user instanceof CanResetPasswordContract) {
+            throw new UnexpectedValueException('User must implement CanResetPassword interface.');
         }
 
         return $user;

diff --git a/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php b/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Passwords;
+<?php
+
+namespace Illuminate\Auth\Passwords;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Auth\Passwords\DatabaseTokenRepository as DbRepository;

diff --git a/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php b/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Auth\Passwords;
+<?php
+
+namespace Illuminate\Auth\Passwords;
 
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 

diff --git a/src/Illuminate/Broadcasting/BroadcastEvent.php b/src/Illuminate/Broadcasting/BroadcastEvent.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Broadcasting;
+<?php
+
+namespace Illuminate\Broadcasting;
 
 use ReflectionClass;
 use ReflectionProperty;

diff --git a/src/Illuminate/Broadcasting/BroadcastManager.php b/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Broadcasting;
+<?php
+
+namespace Illuminate\Broadcasting;
 
 use Pusher;
 use Closure;
@@ -94,7 +96,7 @@ protected function resolve($name)
         if (isset($this->customCreators[$config['driver']])) {
             return $this->callCustomCreator($config);
         } else {
-            return $this->{"create".ucfirst($config['driver'])."Driver"}($config);
+            return $this->{'create'.ucfirst($config['driver']).'Driver'}($config);
         }
     }
 
@@ -203,6 +205,6 @@ public function extend($driver, Closure $callback)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array(array($this->driver(), $method), $parameters);
+        return call_user_func_array([$this->driver(), $method], $parameters);
     }
 }
diff --git a/src/Illuminate/Broadcasting/BroadcastServiceProvider.php b/src/Illuminate/Broadcasting/BroadcastServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Broadcasting;
+<?php
+
+namespace Illuminate\Broadcasting;
 
 use Illuminate\Support\ServiceProvider;
 

diff --git a/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/LogBroadcaster.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Broadcasting\Broadcasters;
+<?php
+
+namespace Illuminate\Broadcasting\Broadcasters;
 
 use Psr\Log\LoggerInterface;
 use Illuminate\Contracts\Broadcasting\Broadcaster;
@@ -26,7 +28,7 @@ public function __construct(LoggerInterface $logger)
     /**
      * {@inheritdoc}
      */
-    public function broadcast(array $channels, $event, array $payload = array())
+    public function broadcast(array $channels, $event, array $payload = [])
     {
         $channels = implode(', ', $channels);
 

diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Broadcasting\Broadcasters;
+<?php
+
+namespace Illuminate\Broadcasting\Broadcasters;
 
 use Pusher;
 use Illuminate\Contracts\Broadcasting\Broadcaster;
@@ -26,7 +28,7 @@ public function __construct(Pusher $pusher)
     /**
      * {@inheritdoc}
      */
-    public function broadcast(array $channels, $event, array $payload = array())
+    public function broadcast(array $channels, $event, array $payload = [])
     {
         $this->pusher->trigger($channels, $event, $payload);
     }