Fixed phpcs warnings

locomotivemtl · Mar 4, 2019 · c352812 · c352812
1 parent 69fb66e
commit c352812
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/src/Charcoal/User/AbstractUser.php b/src/Charcoal/User/AbstractUser.php
@@ -566,7 +566,7 @@ public static function getAuthenticated(FactoryInterface $factory)
 
 
 
-    // Extends \Charcoal\Validator\ValidatableTrait
+    // Extends Charcoal\Validator\ValidatableTrait
     // =========================================================================
 
     /**

diff --git a/src/Charcoal/User/AuthTokenMetadata.php b/src/Charcoal/User/AuthTokenMetadata.php
@@ -28,7 +28,7 @@ class AuthTokenMetadata extends ModelMetadata
     private $cookieDuration;
 
     /**
-     * @var bool $httpsOnly
+     * @var boolean $httpsOnly
      */
     private $httpsOnly;
 

diff --git a/src/Charcoal/User/Authenticator.php b/src/Charcoal/User/Authenticator.php
@@ -96,7 +96,7 @@ public function authenticate()
     /**
      * Attempt to authenticate a user using the given credentials.
      *
-     * @param string $email Email, part of necessary credentials.
+     * @param string $email    Email, part of necessary credentials.
      * @param string $password Password, part of necessary credentials.
      * @throws InvalidArgumentException If email or password are invalid or empty.
      * @return \Charcoal\User\UserInterface|null Returns the authenticated user object

diff --git a/tests/Charcoal/User/AbstractUserTest.php b/tests/Charcoal/User/AbstractUserTest.php
@@ -50,11 +50,8 @@ public function setUp()
             AbstractUser::class,
             [
                 [
-                    # 'container'        => $container,
-                    'logger'           => $container['logger'],
-                    'translator'       => $container['translator'],
-                    # 'property_factory' => $container['property/factory'],
-                    # 'metadata_loader'  => $container['metadata/loader']
+                    'logger'     => $container['logger'],
+                    'translator' => $container['translator'],
                 ]
             ],
             '',
@@ -112,17 +109,6 @@ public function testSetData()
         $this->assertFalse($obj->active());
     }
 
-    /**
-     * @return void
-     */
-    /*public function testSetDataDoesNotSetPassword()
-    {
-        $obj = $this->obj;
-        $this->assertNull($obj->password());
-        $obj->setData(['password'=>'password123']);
-        $this->assertNull($obj->password())
-    }*/
-
     /**
      * @return void
      */
@@ -299,7 +285,6 @@ public function testResetPassword()
         $this->assertSame($ret, $this->obj);
 
         $this->obj['id'] = 'bar';
-        //$ret = $this->obj->resetPassword('foo');
 
         $this->expectException(InvalidArgumentException::class);
         $this->obj->resetPassword(false);

diff --git a/tests/Charcoal/User/AuthTokenTest.php b/tests/Charcoal/User/AuthTokenTest.php
@@ -42,10 +42,8 @@ public function setUp()
 
         $this->obj = $container['model/factory']->create(AuthToken::class);
         $this->obj = new AuthToken([
-            # 'container'        => $container,
-            'logger'           => $container['logger'],
-            # 'property_factory' => $container['property/factory'],
-            'metadata_loader'  => $container['metadata/loader']
+            'logger'          => $container['logger'],
+            'metadata_loader' => $container['metadata/loader']
         ]);
     }