Laravel version update

Laravel version update

vendor/laravel/socialite/src/AbstractUser.php

@@ -41,13 +41,6 @@ abstract class AbstractUser implements ArrayAccess, Contracts\User
      */
     public $avatar;
 
-    /**
-     * The user's raw attributes.
-     *
-     * @var array
-     */
-    public $user;
-
     /**
      * Get the unique identifier for the user.
      *
@@ -98,16 +91,6 @@ abstract class AbstractUser implements ArrayAccess, Contracts\User
         return $this->avatar;
     }
 
-    /**
-     * Get the raw user array.
-     *
-     * @return array
-     */
-    public function getRaw()
-    {
-        return $this->user;
-    }
-
     /**
      * Set the raw user array from the provider.
      *
@@ -140,7 +123,7 @@ abstract class AbstractUser implements ArrayAccess, Contracts\User
      * Determine if the given raw user attribute exists.
      *
      * @param  string  $offset
-     * @return bool
+     * @return  bool
      */
     public function offsetExists($offset)
     {

vendor/laravel/socialite/src/One/AbstractProvider.php

@@ -13,22 +13,22 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * The HTTP request instance.
      *
-     * @var \Illuminate\Http\Request
+     * @var Request
      */
     protected $request;
 
     /**
      * The OAuth server implementation.
      *
-     * @var \League\OAuth1\Client\Server\Server
+     * @var Server
      */
     protected $server;
 
     /**
      * Create a new provider instance.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \League\OAuth1\Client\Server\Server  $server
+     * @param  Request  $request
+     * @param  Server  $server
      * @return void
      */
     public function __construct(Request $request, Server $server)
@@ -40,11 +40,11 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * Redirect the user to the authentication page for the provider.
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     * @return RedirectResponse
      */
     public function redirect()
     {
-        $this->request->session()->set(
+        $this->request->getSession()->put(
             'oauth.temp', $temp = $this->server->getTemporaryCredentials()
         );
 
@@ -54,7 +54,6 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * Get the User instance for the authenticated user.
      *
-     * @throws \InvalidArgumentException
      * @return \Laravel\Socialite\One\User
      */
     public function user()
@@ -81,7 +80,7 @@ abstract class AbstractProvider implements ProviderContract
      */
     protected function getToken()
     {
-        $temp = $this->request->session()->get('oauth.temp');
+        $temp = $this->request->getSession()->get('oauth.temp');
 
         return $this->server->getTokenCredentials(
             $temp, $this->request->get('oauth_token'), $this->request->get('oauth_verifier')
@@ -101,7 +100,7 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * Set the request instance.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return $this
      */
     public function setRequest(Request $request)

vendor/laravel/socialite/src/One/BitbucketProvider.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Laravel\Socialite\One;
-
-class BitbucketProvider extends AbstractProvider
-{
-    //
-}

vendor/laravel/socialite/src/SocialiteManager.php

@@ -5,9 +5,7 @@ namespace Laravel\Socialite;
 use InvalidArgumentException;
 use Illuminate\Support\Manager;
 use Laravel\Socialite\One\TwitterProvider;
-use Laravel\Socialite\One\BitbucketProvider;
 use League\OAuth1\Client\Server\Twitter as TwitterServer;
-use League\OAuth1\Client\Server\Bitbucket as BitbucketServer;
 
 class SocialiteManager extends Manager implements Contracts\Factory
 {
@@ -78,6 +76,20 @@ class SocialiteManager extends Manager implements Contracts\Factory
         );
     }
 
+    /**
+     * Create an instance of the specified driver.
+     *
+     * @return \Laravel\Socialite\Two\AbstractProvider
+     */
+    protected function createBitbucketDriver()
+    {
+        $config = $this->app['config']['services.bitbucket'];
+
+        return $this->buildProvider(
+          'Laravel\Socialite\Two\BitbucketProvider', $config
+        );
+    }
+
     /**
      * Build an OAuth 2 provider instance.
      *
@@ -107,20 +119,6 @@ class SocialiteManager extends Manager implements Contracts\Factory
         );
     }
 
-    /**
-     * Create an instance of the specified driver.
-     *
-     * @return \Laravel\Socialite\One\AbstractProvider
-     */
-    protected function createBitbucketDriver()
-    {
-        $config = $this->app['config']['services.bitbucket'];
-
-        return new BitbucketProvider(
-            $this->app['request'], new BitbucketServer($this->formatConfig($config))
-        );
-    }
-
     /**
      * Format the server configuration.
      *

vendor/laravel/socialite/src/Two/AbstractProvider.php

@@ -2,8 +2,6 @@
 
 namespace Laravel\Socialite\Two;
 
-use GuzzleHttp\Client;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use GuzzleHttp\ClientInterface;
@@ -15,17 +13,10 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * The HTTP request instance.
      *
-     * @var \Illuminate\Http\Request
+     * @var Request
      */
     protected $request;
 
-    /**
-     * The HTTP Client instance.
-     *
-     * @var \GuzzleHttp\Client
-     */
-    protected $httpClient;
-
     /**
      * The client ID.
      *
@@ -85,7 +76,7 @@ abstract class AbstractProvider implements ProviderContract
     /**
      * Create a new provider instance.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @param  string  $clientId
      * @param  string  $clientSecret
      * @param  string  $redirectUrl
@@ -126,21 +117,21 @@ abstract class AbstractProvider implements ProviderContract
      * Map the raw user array to a Socialite User instance.
      *
      * @param  array  $user
-     * @return \Laravel\Socialite\Two\User
+     * @return \Laravel\Socialite\User
      */
     abstract protected function mapUserToObject(array $user);
 
     /**
      * Redirect the user of the application to the provider's authentication screen.
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function redirect()
     {
         $state = null;
 
         if ($this->usesState()) {
-            $this->request->session()->set('state', $state = Str::random(40));
+            $this->request->getSession()->put('state', $state = Str::random(40));
         }
 
         return new RedirectResponse($this->getAuthUrl($state));
@@ -200,27 +191,10 @@ abstract class AbstractProvider implements ProviderContract
             throw new InvalidStateException;
         }
 
-        $response = $this->getAccessTokenResponse($this->getCode());
-
         $user = $this->mapUserToObject($this->getUserByToken(
-            $token = Arr::get($response, 'access_token')
+            $token = $this->getAccessToken($this->getCode())
         ));
 
-        return $user->setToken($token)
-                    ->setRefreshToken(Arr::get($response, 'refresh_token'))
-                    ->setExpiresIn(Arr::get($response, 'expires_in'));
-    }
-
-    /**
-     * Get a Social User instance from a known access token.
-     *
-     * @param  string  $token
-     * @return \Laravel\Socialite\Two\User
-     */
-    public function userFromToken($token)
-    {
-        $user = $this->mapUserToObject($this->getUserByToken($token));
-
         return $user->setToken($token);
     }
 
@@ -234,21 +208,19 @@ abstract class AbstractProvider implements ProviderContract
         if ($this->isStateless()) {
             return false;
         }
-        //dd($this->request->all());
-        $state = $this->request->input('state');
-        \Session::put('state', $state);
-        //$state = $this->request->session()->pull('state');
+
+        $state = $this->request->getSession()->pull('state');
 
         return ! (strlen($state) > 0 && $this->request->input('state') === $state);
     }
 
     /**
-     * Get the access token response for the given code.
+     * Get the access token for the given code.
      *
      * @param  string  $code
-     * @return array
+     * @return string
      */
-    public function getAccessTokenResponse($code)
+    public function getAccessToken($code)
     {
         $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
 
@@ -257,7 +229,7 @@ abstract class AbstractProvider implements ProviderContract
             $postKey => $this->getTokenFields($code),
         ]);
 
-        return json_decode($response->getBody(), true);
+        return $this->parseAccessToken($response->getBody());
     }
 
     /**
@@ -274,6 +246,17 @@ abstract class AbstractProvider implements ProviderContract
         ];
     }
 
+    /**
+     * Get the access token from the token response body.
+     *
+     * @param  string  $body
+     * @return string
+     */
+    protected function parseAccessToken($body)
+    {
+        return json_decode($body, true)['access_token'];
+    }
+
     /**
      * Get the code from the request.
      *
@@ -292,65 +275,25 @@ abstract class AbstractProvider implements ProviderContract
      */
     public function scopes(array $scopes)
     {
-        $this->scopes = array_unique(array_merge($this->scopes, $scopes));
+        $this->scopes = $scopes;
 
         return $this;
     }
 
     /**
-     * Get the current scopes.
-     *
-     * @return array
-     */
-    public function getScopes()
-    {
-        return $this->scopes;
-    }
-
-    /**
-     * Set the redirect URL.
-     *
-     * @param  string  $url
-     * @return $this
-     */
-    public function redirectUrl($url)
-    {
-        $this->redirectUrl = $url;
-
-        return $this;
-    }
-
-    /**
-     * Get a instance of the Guzzle HTTP client.
+     * Get a fresh instance of the Guzzle HTTP client.
      *
      * @return \GuzzleHttp\Client
      */
     protected function getHttpClient()
     {
-        if (is_null($this->httpClient)) {
-            $this->httpClient = new Client();
-        }
-
-        return $this->httpClient;
-    }
-
-    /**
-     * Set the Guzzle HTTP client instance.
-     *
-     * @param  \GuzzleHttp\Client  $client
-     * @return $this
-     */
-    public function setHttpClient(Client $client)
-    {
-        $this->httpClient = $client;
-
-        return $this;
+        return new \GuzzleHttp\Client;
     }
 
     /**
      * Set the request instance.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return $this
      */
     public function setRequest(Request $request)

vendor/laravel/socialite/src/Two/BitbucketProvider.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Laravel\Socialite\Two;
+
+use Exception;
+use GuzzleHttp\ClientInterface;
+
+class BitbucketProvider extends AbstractProvider implements ProviderInterface
+{
+    /**
+     * The scopes being requested.
+     *
+     * @var array
+     */
+    protected $scopes = ['email'];
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthUrl($state)
+    {
+        return $this->buildAuthUrlFromBase('https://bitbucket.org/site/oauth2/authorize', $state);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getTokenUrl()
+    {
+        return 'https://bitbucket.org/site/oauth2/access_token';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getUserByToken($token)
+    {
+        $userUrl = 'https://api.bitbucket.org/2.0/user?access_token='.$token;
+
+        $response = $this->getHttpClient()->get($userUrl);
+
+        $user = json_decode($response->getBody(), true);
+
+        if (in_array('email', $this->scopes)) {
+            $user['email'] = $this->getEmailByToken($token);
+        }
+
+        return $user;
+    }
+
+    /**
+     * Get the email for the given access token.
+     *
+     * @param  string  $token
+     * @return string|null
+     */
+    protected function getEmailByToken($token)
+    {
+        $emailsUrl = 'https://api.bitbucket.org/2.0/user/emails?access_token='.$token;
+
+        try {
+            $response = $this->getHttpClient()->get($emailsUrl);
+        } catch (Exception $e) {
+            return;
+        }
+
+        $emails = json_decode($response->getBody(), true);
+
+        foreach ($emails['values'] as $email) {
+            if ($email['type'] == 'email' && $email['is_primary'] && $email['is_confirmed']) {
+                return $email['email'];
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function mapUserToObject(array $user)
+    {
+        return (new User)->setRaw($user)->map([
+            'id' => $user['uuid'], 'nickname' => $user['username'],
+            'name' => array_get($user, 'display_name'), 'email' => array_get($user, 'email'),
+            'avatar' => array_get($user, 'links.avatar.href'),
+        ]);
+    }
+
+    /**
+     * Get the access token for the given code.
+     *
+     * @param  string  $code
+     * @return string
+     */
+    public function getAccessToken($code)
+    {
+        $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
+
+        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
+            'auth' => [$this->clientId, $this->clientSecret],
+            'headers' => ['Accept' => 'application/json'],
+            $postKey => $this->getTokenFields($code),
+        ]);
+
+        return $this->parseAccessToken($response->getBody());
+    }
+
+    /**
+     * Get the POST fields for the token request.
+     *
+     * @param  string  $code
+     * @return array
+     */
+    protected function getTokenFields($code)
+    {
+        return [
+            'code' => $code, 'redirect_uri' => $this->redirectUrl, 'grant_type' => 'authorization_code',
+        ];
+    }
+}

vendor/laravel/socialite/src/Two/FacebookProvider.php

@@ -2,9 +2,6 @@
 
 namespace Laravel\Socialite\Two;
 
-use Illuminate\Support\Arr;
-use GuzzleHttp\ClientInterface;
-
 class FacebookProvider extends AbstractProvider implements ProviderInterface
 {
     /**
@@ -19,14 +16,14 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      *
      * @var string
      */
-    protected $version = 'v2.6';
+    protected $version = 'v2.5';
 
     /**
      * The user fields being requested.
      *
      * @var array
      */
-    protected $fields = ['name', 'email', 'gender', 'verified'];
+    protected $fields = ['first_name', 'last_name', 'email', 'gender', 'verified'];
 
     /**
      * The scopes being requested.
@@ -42,13 +39,6 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected $popup = false;
 
-    /**
-     * Re-request a declined permission.
-     *
-     * @var bool
-     */
-    protected $reRequest = false;
-
     /**
      * {@inheritdoc}
      */
@@ -62,23 +52,32 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getTokenUrl()
     {
-        return $this->graphUrl.'/'.$this->version.'/oauth/access_token';
+        return $this->graphUrl.'/oauth/access_token';
+    }
+
+    /**
+     * Get the access token for the given code.
+     *
+     * @param  string  $code
+     * @return string
+     */
+    public function getAccessToken($code)
+    {
+        $response = $this->getHttpClient()->get($this->getTokenUrl(), [
+            'query' => $this->getTokenFields($code),
+        ]);
+
+        return $this->parseAccessToken($response->getBody());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getAccessTokenResponse($code)
+    protected function parseAccessToken($body)
     {
-        $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
+        parse_str($body);
 
-        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
-            $postKey => $this->getTokenFields($code),
-        ]);
-
-        $data = json_decode($response->getBody(), true);
-
-        return Arr::add($data, 'expires_in', Arr::pull($data, 'expires'));
+        return $access_token;
     }
 
     /**
@@ -86,15 +85,9 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getUserByToken($token)
     {
-        $meUrl = $this->graphUrl.'/'.$this->version.'/me?access_token='.$token.'&fields='.implode(',', $this->fields);
+        $appSecretProof = hash_hmac('sha256', $token, $this->clientSecret);
 
-        if (! empty($this->clientSecret)) {
-            $appSecretProof = hash_hmac('sha256', $token, $this->clientSecret);
-
-            $meUrl .= '&appsecret_proof='.$appSecretProof;
-        }
-
-        $response = $this->getHttpClient()->get($meUrl, [
+        $response = $this->getHttpClient()->get($this->graphUrl.'/'.$this->version.'/me?access_token='.$token.'&appsecret_proof='.$appSecretProof.'&fields='.implode(',', $this->fields), [
             'headers' => [
                 'Accept' => 'application/json',
             ],
@@ -110,8 +103,12 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
     {
         $avatarUrl = $this->graphUrl.'/'.$this->version.'/'.$user['id'].'/picture';
 
+        $firstName = isset($user['first_name']) ? $user['first_name'] : null;
+
+        $lastName = isset($user['last_name']) ? $user['last_name'] : null;
+
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => null, 'name' => isset($user['name']) ? $user['name'] : null,
+            'id' => $user['id'], 'nickname' => null, 'name' => $firstName.' '.$lastName,
             'email' => isset($user['email']) ? $user['email'] : null, 'avatar' => $avatarUrl.'?type=normal',
             'avatar_original' => $avatarUrl.'?width=1920',
         ]);
@@ -128,10 +125,6 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
             $fields['display'] = 'popup';
         }
 
-        if ($this->reRequest) {
-            $fields['auth_type'] = 'rerequest';
-        }
-
         return $fields;
     }
 
@@ -159,14 +152,4 @@ class FacebookProvider extends AbstractProvider implements ProviderInterface
 
         return $this;
     }
-
-    /**
-     * Re-request permissions which were previously declined.
-     *
-     * @return $this
-     */
-    public function reRequest()
-    {
-        $this->reRequest = true;
-    }
 }

vendor/laravel/socialite/src/Two/GithubProvider.php

@@ -3,7 +3,6 @@
 namespace Laravel\Socialite\Two;
 
 use Exception;
-use Illuminate\Support\Arr;
 
 class GithubProvider extends AbstractProvider implements ProviderInterface
 {
@@ -81,8 +80,8 @@ class GithubProvider extends AbstractProvider implements ProviderInterface
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => $user['login'], 'name' => Arr::get($user, 'name'),
-            'email' => Arr::get($user, 'email'), 'avatar' => $user['avatar_url'],
+            'id' => $user['id'], 'nickname' => $user['login'], 'name' => array_get($user, 'name'),
+            'email' => array_get($user, 'email'), 'avatar' => $user['avatar_url'],
         ]);
     }
 

vendor/laravel/socialite/src/Two/GoogleProvider.php

@@ -2,7 +2,7 @@
 
 namespace Laravel\Socialite\Two;
 
-use Illuminate\Support\Arr;
+use GuzzleHttp\ClientInterface;
 
 class GoogleProvider extends AbstractProvider implements ProviderInterface
 {
@@ -19,7 +19,6 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
      * @var array
      */
     protected $scopes = [
-        'openid',
         'profile',
         'email',
     ];
@@ -40,6 +39,23 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
         return 'https://accounts.google.com/o/oauth2/token';
     }
 
+    /**
+     * Get the access token for the given code.
+     *
+     * @param  string  $code
+     * @return string
+     */
+    public function getAccessToken($code)
+    {
+        $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body';
+
+        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
+            $postKey => $this->getTokenFields($code),
+        ]);
+
+        return $this->parseAccessToken($response->getBody());
+    }
+
     /**
      * Get the POST fields for the token request.
      *
@@ -77,8 +93,8 @@ class GoogleProvider extends AbstractProvider implements ProviderInterface
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => Arr::get($user, 'nickname'), 'name' => $user['displayName'],
-            'email' => $user['emails'][0]['value'], 'avatar' => Arr::get($user, 'image')['url'],
+            'id' => $user['id'], 'nickname' => array_get($user, 'nickname'), 'name' => $user['displayName'],
+            'email' => $user['emails'][0]['value'], 'avatar' => array_get($user, 'image')['url'],
         ]);
     }
 }

vendor/laravel/socialite/src/Two/InvalidStateException.php

@@ -4,5 +4,4 @@ namespace Laravel\Socialite\Two;
 
 class InvalidStateException extends \InvalidArgumentException
 {
-    //
 }

vendor/laravel/socialite/src/Two/LinkedInProvider.php

@@ -2,8 +2,6 @@
 
 namespace Laravel\Socialite\Two;
 
-use Illuminate\Support\Arr;
-
 class LinkedInProvider extends AbstractProvider implements ProviderInterface
 {
     /**
@@ -12,13 +10,6 @@ class LinkedInProvider extends AbstractProvider implements ProviderInterface
      * @var array
      */
     protected $scopes = ['r_basicprofile', 'r_emailaddress'];
-    
-    /**
-     * The separating character for the requested scopes.
-     *
-     * @var string
-     */
-    protected $scopeSeparator = ' ';
 
     /**
      * The fields that are included in the profile.
@@ -36,7 +27,7 @@ class LinkedInProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getAuthUrl($state)
     {
-        return $this->buildAuthUrlFromBase('https://www.linkedin.com/oauth/v2/authorization', $state);
+        return $this->buildAuthUrlFromBase('https://www.linkedin.com/uas/oauth2/authorization', $state);
     }
 
     /**
@@ -44,7 +35,7 @@ class LinkedInProvider extends AbstractProvider implements ProviderInterface
      */
     protected function getTokenUrl()
     {
-        return 'https://www.linkedin.com/oauth/v2/accessToken';
+        return 'https://www.linkedin.com/uas/oauth2/accessToken';
     }
 
     /**
@@ -83,9 +74,9 @@ class LinkedInProvider extends AbstractProvider implements ProviderInterface
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => null, 'name' => Arr::get($user, 'formattedName'),
-            'email' => Arr::get($user, 'emailAddress'), 'avatar' => Arr::get($user, 'pictureUrl'),
-            'avatar_original' => Arr::get($user, 'pictureUrls.values.0'),
+            'id' => $user['id'], 'nickname' => null, 'name' => array_get($user, 'formattedName'),
+            'email' => array_get($user, 'emailAddress'), 'avatar' => array_get($user, 'pictureUrl'),
+            'avatar_original' => array_get($user, 'pictureUrls.values.0'),
         ]);
     }
 

vendor/laravel/socialite/src/Two/User.php

@@ -13,20 +13,6 @@ class User extends AbstractUser
      */
     public $token;
 
-    /**
-     * The refresh token that can be exchanged for a new access token.
-     *
-     * @var string
-     */
-    public $refreshToken;
-
-    /**
-     * The number of seconds the access token is valid for.
-     *
-     * @var int
-     */
-    public $expiresIn;
-
     /**
      * Set the token on the user.
      *
@@ -39,30 +25,4 @@ class User extends AbstractUser
 
         return $this;
     }
-
-    /**
-     * Set the refresh token required to obtain a new access token.
-     *
-     * @param  string  $refreshToken
-     * @return $this
-     */
-    public function setRefreshToken($refreshToken)
-    {
-        $this->refreshToken = $refreshToken;
-
-        return $this;
-    }
-
-    /**
-     * Set the number of seconds the access token is valid for.
-     *
-     * @param  int  $expiresIn
-     * @return $this
-     */
-    public function setExpiresIn($expiresIn)
-    {
-        $this->expiresIn = $expiresIn;
-
-        return $this;
-    }
 }