Updating the package

* Adding PHP 7.4 support
* Updating the `same` check for the impersonator and the impersonated

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4snapshot
   - nightly
 
 matrix:
@@ -19,5 +20,5 @@ script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "7.4snapshot" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "7.4snapshot" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

src/Contracts/Impersonatable.php

@@ -56,4 +56,13 @@ public function canBeImpersonated();
      * @return bool
      */
     public function isImpersonated();
+
+    /**
+     * Check if the two persons are the same.
+     *
+     * @param  \Arcanedev\LaravelImpersonator\Contracts\Impersonatable|mixed  $impersonated
+     *
+     * @return bool
+     */
+    public function isSamePerson($impersonated);
 }

src/Exceptions/ImpersonationException.php

@@ -47,7 +47,10 @@ public static function selfImpersonation(): self
     public static function cannotImpersonate(Impersonatable $impersonater): self
     {
         return static::make(
-            "The impersonater with `{$impersonater->getAuthIdentifierName()}`=[{$impersonater->getAuthIdentifier()}] doesn't have the ability to impersonate."
+            __("The impersonater with `:impersonator_name`=[:impersonator_id] doesn't have the ability to impersonate.", [
+                'impersonator_name' => $impersonater->getAuthIdentifierName(),
+                'impersonator_id'   => $impersonater->getAuthIdentifier(),
+            ])
         );
     }
 
@@ -61,7 +64,22 @@ public static function cannotImpersonate(Impersonatable $impersonater): self
     public static function cannotBeImpersonated(Impersonatable $impersonated)
     {
         return static::make(
-            "The impersonated with `{$impersonated->getAuthIdentifierName()}`=[{$impersonated->getAuthIdentifier()}] cannot be impersonated."
+            __('The impersonated with `:impersonated_name`=[:impersonated_id] cannot be impersonated.', [
+                'impersonated_name' => $impersonated->getAuthIdentifierName(),
+                'impersonated_id' => $impersonated->getAuthIdentifier()
+            ])
+        );
+    }
+
+    /**
+     * Make an exception when the impersonator and the impersonated are the same person.
+     *
+     * @return static
+     */
+    public static function impersonaterAndImpersonatedAreSame()
+    {
+        return static::make(
+            __('The impersonater & impersonated with must be different.')
         );
     }
 }

src/Impersonator.php

@@ -249,8 +249,9 @@ private function mustBeEnabled(): void
      */
     private function mustBeDifferentImpersonatable(Impersonatable $impersonater, Impersonatable $impersonated): void
     {
-        if ($impersonater->getAuthIdentifier() == $impersonated->getAuthIdentifier())
-            throw ImpersonationException::selfImpersonation();
+        if ($impersonater->isSamePerson($impersonated)) {
+            throw Exceptions\ImpersonationException::impersonaterAndImpersonatedAreSame();
+        }
     }
 
     /**

src/ImpersonatorServiceProvider.php

@@ -78,7 +78,7 @@ private function extendAuthDriver(): void
         /** @var  \Illuminate\Auth\AuthManager  $auth */
         $auth = $this->app['auth'];
 
-        $this->app['auth']->extend('session', function (Application $app, $name, array $config) use ($auth) {
+        $auth->extend('session', function (Application $app, $name, array $config) use ($auth) {
             $provider = $auth->createUserProvider($config['provider']);
 
             return tap(

src/Traits/CanImpersonate.php

@@ -1,6 +1,7 @@
 <?php namespace Arcanedev\LaravelImpersonator\Traits;
 
 use Arcanedev\LaravelImpersonator\Contracts\Impersonatable;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * Trait     HasImpersonation
@@ -66,4 +67,20 @@ public function isImpersonated()
     {
         return impersonator()->isImpersonating();
     }
+
+    /**
+     * Check if the two persons are the same.
+     *
+     * @param  \Arcanedev\LaravelImpersonator\Contracts\Impersonatable|mixed  $impersonated
+     *
+     * @return bool
+     */
+    public function isSamePerson($impersonated)
+    {
+        if ($this instanceof Model && $impersonated instanceof Model) {
+            return $this->is($impersonated);
+        }
+
+        return $this->getAuthIdentifier() == $impersonated->getAuthIdentifier();
+    }
 }