locomotivemtl / charcoal-user

src/Charcoal/User/AuthToken.php

Indentation +4 added lines, -4 removed lines

@@ -246,10 +246,10 @@
         return $this;
     }
 
-     /**
-      * StorableTrait > preSave(): Called automatically before saving the object to source.
-      * @return boolean
-      */
+        /**
+         * StorableTrait > preSave(): Called automatically before saving the object to source.
+         * @return boolean
+         */
     public function preSave()
     {
         parent::preSave();

Doc Comments +5 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
     }
 
     /**
-     * @param DateTimeInterface|string|null $expiry The date/time at object's creation.
+     * @param string $expiry The date/time at object's creation.
      * @throws InvalidArgumentException If the date/time is invalid.
      * @return AuthToken Chainable
      */
@@ -154,7 +154,7 @@ 
     }
 
     /**
-     * @param DateTimeInterface|string|null $created The date/time at object's creation.
+     * @param string $created The date/time at object's creation.
      * @throws InvalidArgumentException If the date/time is invalid.
      * @return AuthToken Chainable
      */
@@ -185,7 +185,7 @@ 
     }
 
     /**
-     * @param DateTimeInterface|string|null $lastModified The last modified date/time.
+     * @param string $lastModified The last modified date/time.
      * @throws InvalidArgumentException If the date/time is invalid.
      * @return AuthToken Chainable
      */
@@ -303,7 +303,7 @@ 
     /**
      * @param mixed  $ident The auth-token identifier.
      * @param string $token The token key to validate against.
-     * @return mixed The user id.
+     * @return string The user id.
      */
     public function getUserId($ident, $token)
     {
@@ -313,7 +313,7 @@ 
     /**
      * @param mixed  $ident The auth-token identifier (username).
      * @param string $token The token to validate against.
-     * @return mixed The user id. An empty string if no token match.
+     * @return string The user id. An empty string if no token match.
      */
     public function getUsernameFromToken($ident, $token)
     {

src/Charcoal/User/Acl/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
      * @param string $resource    The Acl resource (string identifier) to load roles and permissions into.
      * @return void
      */
-    public function loadPermissions(Acl &$acl, array $permissions, $resource = '')
+    public function loadPermissions(Acl&$acl, array $permissions, $resource = '')
     {
         foreach ($permissions as $role => $rolePermissions) {
             $this->addRoleAndPermissions($acl, $role, $rolePermissions, $resource);
@@ -52,7 +52,7 @@ 
      * @param string $resource The Acl resource (string identifier) to load roles and permissions into.
      * @return void
      */
-    public function loadDatabasePermissions(Acl &$acl, PDO $db, $table, $resource = '')
+    public function loadDatabasePermissions(Acl&$acl, PDO $db, $table, $resource = '')
     {
         // Quick-and-dirty sanitization
         $table = preg_replace('/[^A-Za-z0-9_]/', '', $table);
@@ -89,7 +89,7 @@ 
      * @param string $resource    The Acl resource (string identifier) to add roles and permissions into.
      * @return void
      */
-    private function addRoleAndPermissions(Acl &$acl, $role, array $permissions, $resource)
+    private function addRoleAndPermissions(Acl&$acl, $role, array $permissions, $resource)
     {
         if (!$acl->hasRole($role)) {
             // Add role

src/Charcoal/User/AbstractUser.php

Doc Comments +2 added lines, -2 removed lines

@@ -230,7 +230,7 @@ 
     }
 
     /**
-     * @param  string|DateTimeInterface|null $lastLoginDate The last login date.
+     * @param  string $lastLoginDate The last login date.
      * @throws InvalidArgumentException If the ts is not a valid date/time.
      * @return UserInterface Chainable
      */
@@ -309,7 +309,7 @@ 
     }
 
     /**
-     * @param  string|DateTimeInterface|null $lastPasswordDate The last password date.
+     * @param  string $lastPasswordDate The last password date.
      * @throws InvalidArgumentException If the passsword date is not a valid DateTime.
      * @return UserInterface Chainable
      */

Spacing +2 added lines, -2 removed lines

@@ -454,7 +454,7 @@ 
             $this->setLastLoginIp($ip);
         }
 
-        $this->update([ 'last_login_ip', 'last_login_date' ]);
+        $this->update(['last_login_ip', 'last_login_date']);
 
         $this->saveToSession();
 
@@ -541,7 +541,7 @@ 
         }
 
         if ($this->id()) {
-            $this->update([ 'password', 'last_password_date', 'last_password_ip' ]);
+            $this->update(['password', 'last_password_date', 'last_password_ip']);
         }
 
         return $this;

src/Charcoal/User/Acl/Role.php

Unused Use Statements -2 removed lines

@@ -3,9 +3,7 @@
 namespace Charcoal\User\Acl;
 
 use InvalidArgumentException;
-
 use Pimple\Container;
-
 use Charcoal\Translator\TranslatorAwareTrait;
 
 // From 'charcoal-core'