| @@ -60,11 +60,11 @@ discard block | ||
| 60 | 60 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 61 | 61 | * @param string $table Optional: Database table name | 
| 62 | 62 | */ | 
| 63 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 63 | + public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 64 | 64 |      { | 
| 65 | 65 | // Setup | 
| 66 | 66 | $this->pdo = $pdo; | 
| 67 | - $this->logger = $logger ?: new NullLogger; | |
| 67 | + $this->logger = $logger ?: new NullLogger; | |
| 68 | 68 | $this->table = $table ?: $this->table; | 
| 69 | 69 | |
| 70 | 70 | // Prepare business | 
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | // Prepare | 
| 88 | 88 | $this->stmt = $this->pdo->prepare( $sql ); | 
| 89 | 89 | |
| 90 | - } | |
| 90 | + } | |
| 91 | 91 | |
| 92 | 92 | |
| 93 | 93 | |
| @@ -60,12 +60,12 @@ discard block | ||
| 60 | 60 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 61 | 61 | * @param string $table Optional: Database table name | 
| 62 | 62 | */ | 
| 63 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 63 | + public function __construct(\PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 64 | 64 |      { | 
| 65 | 65 | // Setup | 
| 66 | 66 | $this->pdo = $pdo; | 
| 67 | 67 | $this->logger = $logger ?: new NullLogger; | 
| 68 | - $this->table = $table ?: $this->table; | |
| 68 | + $this->table = $table ?: $this->table; | |
| 69 | 69 | |
| 70 | 70 | // Prepare business | 
| 71 | 71 |          $sql = "INSERT INTO {$this->table} ( | 
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | )"; | 
| 86 | 86 | |
| 87 | 87 | // Prepare | 
| 88 | - $this->stmt = $this->pdo->prepare( $sql ); | |
| 88 | + $this->stmt = $this->pdo->prepare($sql); | |
| 89 | 89 | |
| 90 | 90 | } | 
| 91 | 91 | |
| @@ -107,7 +107,7 @@ discard block | ||
| 107 | 107 | * | 
| 108 | 108 | * @throws InsertUserException|UserProfileExceptionInterface if PDOStatement execution fails or missing required field. | 
| 109 | 109 | */ | 
| 110 | - public function __invoke( array $user_data ) | |
| 110 | + public function __invoke(array $user_data) | |
| 111 | 111 |      { | 
| 112 | 112 | |
| 113 | 113 | // Setup | 
| @@ -120,12 +120,12 @@ discard block | ||
| 120 | 120 | ]; | 
| 121 | 121 | |
| 122 | 122 | // Check data | 
| 123 | - foreach($required_fields as $rf): | |
| 123 | + foreach ($required_fields as $rf): | |
| 124 | 124 | if (!array_key_exists($rf, $user_data)) : | 
| 125 | 125 | |
| 126 | 126 | $message = "Missing field '$rf' in user data"; | 
| 127 | - $this->logger->error( $message ); | |
| 128 | - throw new InsertUserException( $message ); | |
| 127 | + $this->logger->error($message); | |
| 128 | + throw new InsertUserException($message); | |
| 129 | 129 | |
| 130 | 130 | endif; | 
| 131 | 131 | endforeach; | 
| @@ -133,11 +133,11 @@ discard block | ||
| 133 | 133 | |
| 134 | 134 | // Perform | 
| 135 | 135 | $result = $this->stmt->execute([ | 
| 136 | - 'user_login_name' => $user_data[ "login" ], | |
| 137 | - 'user_display_name' => $user_data[ "display_name" ], | |
| 138 | - 'user_email' => $user_data[ "email" ], | |
| 139 | - 'user_last_name' => $user_data[ "last_name" ], | |
| 140 | - 'user_first_name' => $user_data[ "first_name" ], | |
| 136 | + 'user_login_name' => $user_data["login"], | |
| 137 | + 'user_display_name' => $user_data["display_name"], | |
| 138 | + 'user_email' => $user_data["email"], | |
| 139 | + 'user_last_name' => $user_data["last_name"], | |
| 140 | + 'user_first_name' => $user_data["first_name"], | |
| 141 | 141 |              'created' => date('Y-m-d H:i:s') | 
| 142 | 142 | ]) ? $this->pdo->lastInsertId() : null; | 
| 143 | 143 | |
| @@ -145,7 +145,7 @@ discard block | ||
| 145 | 145 | // Evaluate | 
| 146 | 146 | $loginfo = [ | 
| 147 | 147 | 'new_user_id' => $result, | 
| 148 | - 'user_display_name' => $user_data[ "display_name" ] | |
| 148 | + 'user_display_name' => $user_data["display_name"] | |
| 149 | 149 | ]; | 
| 150 | 150 | if ($result): | 
| 151 | 151 |              $this->logger->info("Successfully added new user.", $loginfo); | 
| @@ -59,12 +59,12 @@ discard block | ||
| 59 | 59 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 60 | 60 | * @param string $table Optional: Database table name | 
| 61 | 61 | */ | 
| 62 | - public function __construct( \PDO $pdo, Callable $hash_function, LoggerInterface $logger = null, $table = null) | |
| 62 | + public function __construct(\PDO $pdo, Callable $hash_function, LoggerInterface $logger = null, $table = null) | |
| 63 | 63 |      { | 
| 64 | 64 | // Setup | 
| 65 | 65 | $this->hash_function = $hash_function; | 
| 66 | 66 | $this->logger = $logger ?: new NullLogger; | 
| 67 | - $this->table = $table ?: $this->table; | |
| 67 | + $this->table = $table ?: $this->table; | |
| 68 | 68 | |
| 69 | 69 | // Prepare business | 
| 70 | 70 |          $sql = "UPDATE {$this->table} SET | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | LIMIT 1"; | 
| 74 | 74 | |
| 75 | 75 | // Store for later use | 
| 76 | - $this->stmt = $pdo->prepare( $sql ); | |
| 76 | + $this->stmt = $pdo->prepare($sql); | |
| 77 | 77 | |
| 78 | 78 | } | 
| 79 | 79 | |
| @@ -87,12 +87,12 @@ discard block | ||
| 87 | 87 | * | 
| 88 | 88 | * @throws SetPasswordException if PDOStatement execution fails | 
| 89 | 89 | */ | 
| 90 | - public function __invoke( $user_id, $new_password ) | |
| 90 | + public function __invoke($user_id, $new_password) | |
| 91 | 91 |      { | 
| 92 | 92 | |
| 93 | 93 | // Calc values | 
| 94 | 94 | $hash_function = $this->hash_function; | 
| 95 | - $password_hash = $hash_function( $new_password ); | |
| 95 | + $password_hash = $hash_function($new_password); | |
| 96 | 96 | |
| 97 | 97 | |
| 98 | 98 | // Perform | 
| @@ -104,7 +104,7 @@ discard block | ||
| 104 | 104 | // Evaluate | 
| 105 | 105 | $loginfo = [ | 
| 106 | 106 | 'user_id' => $user_id, | 
| 107 | - 'mb_strlen' => mb_strlen($password_hash ), | |
| 107 | + 'mb_strlen' => mb_strlen($password_hash), | |
| 108 | 108 | 'result' => $result | 
| 109 | 109 | ]; | 
| 110 | 110 | |
| @@ -55,10 +55,10 @@ discard block | ||
| 55 | 55 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 56 | 56 | * @param string $table Optional: Database table name | 
| 57 | 57 | */ | 
| 58 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 58 | + public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 59 | 59 |      { | 
| 60 | 60 | // Setup | 
| 61 | - $this->logger = $logger ?: new NullLogger; | |
| 61 | + $this->logger = $logger ?: new NullLogger; | |
| 62 | 62 | $this->table = $table ?: $this->table; | 
| 63 | 63 | |
| 64 | 64 | |
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | $this->stmt = $pdo->prepare( $sql ); | 
| 77 | 77 | |
| 78 | 78 | |
| 79 | - } | |
| 79 | + } | |
| 80 | 80 | |
| 81 | 81 | /** | 
| 82 | 82 | * @param int $user_id User ID | 
| @@ -55,11 +55,11 @@ discard block | ||
| 55 | 55 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 56 | 56 | * @param string $table Optional: Database table name | 
| 57 | 57 | */ | 
| 58 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null ) | |
| 58 | + public function __construct(\PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 59 | 59 |      { | 
| 60 | 60 | // Setup | 
| 61 | 61 | $this->logger = $logger ?: new NullLogger; | 
| 62 | - $this->table = $table ?: $this->table; | |
| 62 | + $this->table = $table ?: $this->table; | |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | // Prepare business | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | LIMIT 1"; | 
| 74 | 74 | |
| 75 | 75 | // Perform update | 
| 76 | - $this->stmt = $pdo->prepare( $sql ); | |
| 76 | + $this->stmt = $pdo->prepare($sql); | |
| 77 | 77 | |
| 78 | 78 | |
| 79 | 79 | } | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | * | 
| 85 | 85 | * @return bool PDOStatement execution result | 
| 86 | 86 | */ | 
| 87 | - public function __invoke( $user_id, array $user_data ) | |
| 87 | + public function __invoke($user_id, array $user_data) | |
| 88 | 88 |      { | 
| 89 | 89 | |
| 90 | 90 | // Setup | 
| @@ -97,12 +97,12 @@ discard block | ||
| 97 | 97 | ]; | 
| 98 | 98 | |
| 99 | 99 | // Check data | 
| 100 | - foreach($required_fields as $rf): | |
| 100 | + foreach ($required_fields as $rf): | |
| 101 | 101 | if (!array_key_exists($rf, $user_data)) : | 
| 102 | 102 | |
| 103 | 103 | $message = "Missing field '$rf' in user data"; | 
| 104 | - $this->logger->error( $message ); | |
| 105 | - throw new UpdateProfileException( $message ); | |
| 104 | + $this->logger->error($message); | |
| 105 | + throw new UpdateProfileException($message); | |
| 106 | 106 | |
| 107 | 107 | endif; | 
| 108 | 108 | endforeach; | 
| @@ -111,18 +111,18 @@ discard block | ||
| 111 | 111 | // Perform | 
| 112 | 112 | $result = $this->stmt->execute([ | 
| 113 | 113 | 'id' => $user_id, | 
| 114 | - 'first_name' => $user_data[ "first_name" ], | |
| 115 | - 'last_name' => $user_data[ "last_name" ], | |
| 116 | - 'display_name' => $user_data[ "display_name" ], | |
| 117 | - 'email' => $user_data[ "email" ], | |
| 118 | - 'login_name' => $user_data[ "login" ] | |
| 114 | + 'first_name' => $user_data["first_name"], | |
| 115 | + 'last_name' => $user_data["last_name"], | |
| 116 | + 'display_name' => $user_data["display_name"], | |
| 117 | + 'email' => $user_data["email"], | |
| 118 | + 'login_name' => $user_data["login"] | |
| 119 | 119 | ]); | 
| 120 | 120 | |
| 121 | 121 | |
| 122 | 122 | // Evaluate | 
| 123 | 123 | $loginfo = [ | 
| 124 | 124 | 'result' => $result, | 
| 125 | - 'display_name' => $user_data[ "display_name" ] | |
| 125 | + 'display_name' => $user_data["display_name"] | |
| 126 | 126 | ]; | 
| 127 | 127 | |
| 128 | 128 | if ($result): | 
| @@ -61,11 +61,11 @@ discard block | ||
| 61 | 61 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 62 | 62 | * @param string $table Optional: Database table name | 
| 63 | 63 | */ | 
| 64 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 64 | + public function __construct(\PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 65 | 65 |      { | 
| 66 | 66 | // Setup | 
| 67 | 67 | $this->logger = $logger ?: new NullLogger; | 
| 68 | - $this->table = $table ?: $this->table; | |
| 68 | + $this->table = $table ?: $this->table; | |
| 69 | 69 | |
| 70 | 70 | // Prepare business | 
| 71 | 71 |          $sql = "UPDATE {$this->table} SET | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | LIMIT 1"; | 
| 75 | 75 | |
| 76 | 76 | // Store for later use | 
| 77 | - $this->stmt = $pdo->prepare( $sql ); | |
| 77 | + $this->stmt = $pdo->prepare($sql); | |
| 78 | 78 | |
| 79 | 79 | } | 
| 80 | 80 | |
| @@ -88,7 +88,7 @@ discard block | ||
| 88 | 88 | * | 
| 89 | 89 | * @throws SetActiveStateException if PDOStatement execution fails | 
| 90 | 90 | */ | 
| 91 | - public function __invoke( $user_id, $is_active ) | |
| 91 | + public function __invoke($user_id, $is_active) | |
| 92 | 92 |      { | 
| 93 | 93 | |
| 94 | 94 |          if (!filter_var($is_active, \FILTER_VALIDATE_INT)) { | 
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 | public function register(Container $dic) | 
| 15 | 15 |      { | 
| 16 | 16 | |
| 17 | -        $dic['Profiles.Config'] = function( $dic ) { | |
| 17 | +        $dic['Profiles.Config'] = function($dic) { | |
| 18 | 18 | $fieldconfig = (object) [ | 
| 19 | 19 | 'required' => [], | 
| 20 | 20 | 'optional' => [] | 
| @@ -35,14 +35,14 @@ discard block | ||
| 35 | 35 | /** | 
| 36 | 36 | * @return StdClass | 
| 37 | 37 | */ | 
| 38 | -        $dic['Profiles.Login'] = function( $dic ) { | |
| 38 | +        $dic['Profiles.Login'] = function($dic) { | |
| 39 | 39 | return $dic['Profiles.Config']->login; | 
| 40 | 40 | }; | 
| 41 | 41 | |
| 42 | 42 | /** | 
| 43 | 43 | * @return array | 
| 44 | 44 | */ | 
| 45 | -        $dic['Profiles.Login.required'] = function( $dic ) { | |
| 45 | +        $dic['Profiles.Login.required'] = function($dic) { | |
| 46 | 46 | return (array) $dic['Profiles.Login']->required; | 
| 47 | 47 | }; | 
| 48 | 48 | |
| @@ -51,20 +51,20 @@ discard block | ||
| 51 | 51 | /** | 
| 52 | 52 | * @return StdClass | 
| 53 | 53 | */ | 
| 54 | -        $dic['Profiles.ResetPassword'] = function( $dic ) { | |
| 54 | +        $dic['Profiles.ResetPassword'] = function($dic) { | |
| 55 | 55 | return $dic['Profiles.Config']->reset_password; | 
| 56 | 56 | }; | 
| 57 | 57 | |
| 58 | 58 | /** | 
| 59 | 59 | * @return array | 
| 60 | 60 | */ | 
| 61 | -        $dic['Profiles.ResetPassword.required'] = function( $dic ) { | |
| 61 | +        $dic['Profiles.ResetPassword.required'] = function($dic) { | |
| 62 | 62 | return (array) $dic['Profiles.ResetPassword']->required; | 
| 63 | 63 | }; | 
| 64 | 64 | /** | 
| 65 | 65 | * @return array | 
| 66 | 66 | */ | 
| 67 | -        $dic['Profiles.ResetPassword.optional'] = function( $dic ) { | |
| 67 | +        $dic['Profiles.ResetPassword.optional'] = function($dic) { | |
| 68 | 68 | return (array) $dic['Profiles.ResetPassword']->optional; | 
| 69 | 69 | }; | 
| 70 | 70 | |
| @@ -74,21 +74,21 @@ discard block | ||
| 74 | 74 | /** | 
| 75 | 75 | * @return StdClass | 
| 76 | 76 | */ | 
| 77 | -        $dic['Profiles.Register'] = function( $dic ) { | |
| 77 | +        $dic['Profiles.Register'] = function($dic) { | |
| 78 | 78 | return $dic['Profiles.Config']->register; | 
| 79 | 79 | }; | 
| 80 | 80 | |
| 81 | 81 | /** | 
| 82 | 82 | * @return array | 
| 83 | 83 | */ | 
| 84 | -        $dic['Profiles.Register.required'] = function( $dic ) { | |
| 84 | +        $dic['Profiles.Register.required'] = function($dic) { | |
| 85 | 85 | return (array) $dic['Profiles.Register']->required; | 
| 86 | 86 | }; | 
| 87 | 87 | |
| 88 | 88 | /** | 
| 89 | 89 | * @return array | 
| 90 | 90 | */ | 
| 91 | -        $dic['Profiles.Register.optional'] = function( $dic ) { | |
| 91 | +        $dic['Profiles.Register.optional'] = function($dic) { | |
| 92 | 92 | return (array) $dic['Profiles.Register']->optional; | 
| 93 | 93 | }; | 
| 94 | 94 | |
| @@ -97,21 +97,21 @@ discard block | ||
| 97 | 97 | /** | 
| 98 | 98 | * @return StdClass | 
| 99 | 99 | */ | 
| 100 | -        $dic['Profiles.Signup'] = function( $dic ) { | |
| 100 | +        $dic['Profiles.Signup'] = function($dic) { | |
| 101 | 101 | return $dic['Profiles.Config']->signup; | 
| 102 | 102 | }; | 
| 103 | 103 | |
| 104 | 104 | /** | 
| 105 | 105 | * @return array | 
| 106 | 106 | */ | 
| 107 | -        $dic['Profiles.Signup.required'] = function( $dic ) { | |
| 107 | +        $dic['Profiles.Signup.required'] = function($dic) { | |
| 108 | 108 | return (array) $dic['Profiles.Signup']->required; | 
| 109 | 109 | }; | 
| 110 | 110 | |
| 111 | 111 | /** | 
| 112 | 112 | * @return array | 
| 113 | 113 | */ | 
| 114 | -        $dic['Profiles.Signup.optional'] = function( $dic ) { | |
| 114 | +        $dic['Profiles.Signup.optional'] = function($dic) { | |
| 115 | 115 | return (array) $dic['Profiles.Signup']->optional; | 
| 116 | 116 | }; | 
| 117 | 117 | |
| @@ -121,20 +121,20 @@ discard block | ||
| 121 | 121 | /** | 
| 122 | 122 | * @return StdClass | 
| 123 | 123 | */ | 
| 124 | -        $dic['Profiles.ChangePassword'] = function( $dic ) { | |
| 124 | +        $dic['Profiles.ChangePassword'] = function($dic) { | |
| 125 | 125 | return $dic['Profiles.Config']->change_password; | 
| 126 | 126 | }; | 
| 127 | 127 | |
| 128 | 128 | /** | 
| 129 | 129 | * @return array | 
| 130 | 130 | */ | 
| 131 | -        $dic['Profiles.ChangePassword.required'] = function( $dic ) { | |
| 131 | +        $dic['Profiles.ChangePassword.required'] = function($dic) { | |
| 132 | 132 | return (array) $dic['Profiles.ChangePassword']->required; | 
| 133 | 133 | }; | 
| 134 | 134 | /** | 
| 135 | 135 | * @return array | 
| 136 | 136 | */ | 
| 137 | -        $dic['Profiles.ChangePassword.optional'] = function( $dic ) { | |
| 137 | +        $dic['Profiles.ChangePassword.optional'] = function($dic) { | |
| 138 | 138 | return (array) $dic['Profiles.ChangePassword']->optional; | 
| 139 | 139 | }; | 
| 140 | 140 | |
| @@ -145,21 +145,21 @@ discard block | ||
| 145 | 145 | /** | 
| 146 | 146 | * @return StdClass | 
| 147 | 147 | */ | 
| 148 | -        $dic['Profiles.EditProfile'] = function( $dic ) { | |
| 148 | +        $dic['Profiles.EditProfile'] = function($dic) { | |
| 149 | 149 | return $dic['Profiles.Config']->edit_profile; | 
| 150 | 150 | }; | 
| 151 | 151 | |
| 152 | 152 | /** | 
| 153 | 153 | * @return array | 
| 154 | 154 | */ | 
| 155 | -        $dic['Profiles.EditProfile.required'] = function( $dic ) { | |
| 155 | +        $dic['Profiles.EditProfile.required'] = function($dic) { | |
| 156 | 156 | return (array) $dic['Profiles.EditProfile']->required; | 
| 157 | 157 | }; | 
| 158 | 158 | |
| 159 | 159 | /** | 
| 160 | 160 | * @return array | 
| 161 | 161 | */ | 
| 162 | -        $dic['Profiles.EditProfile.optional'] = function( $dic ) { | |
| 162 | +        $dic['Profiles.EditProfile.optional'] = function($dic) { | |
| 163 | 163 | return (array) $dic['Profiles.EditProfile']->optional; | 
| 164 | 164 | }; | 
| 165 | 165 | |
| @@ -75,7 +75,7 @@ | ||
| 75 | 75 | public function __invoke( $user_name ) | 
| 76 | 76 |      { | 
| 77 | 77 | $bool = $this->stmt->execute([ | 
| 78 | - 'username' => $user_name | |
| 78 | + 'username' => $user_name | |
| 79 | 79 | ]); | 
| 80 | 80 | |
| 81 | 81 | $available = !$this->stmt->fetchColumn(); | 
| @@ -49,11 +49,11 @@ discard block | ||
| 49 | 49 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 50 | 50 | * @param string $table Optional: Database table name | 
| 51 | 51 | */ | 
| 52 | - public function __construct( \PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 52 | + public function __construct(\PDO $pdo, LoggerInterface $logger = null, $table = null) | |
| 53 | 53 |      { | 
| 54 | 54 | // Setup | 
| 55 | 55 | $this->logger = $logger ?: new NullLogger; | 
| 56 | - $this->table = $table ?: $this->table; | |
| 56 | + $this->table = $table ?: $this->table; | |
| 57 | 57 | |
| 58 | 58 | // Prepare business | 
| 59 | 59 | $sql = "SELECT id | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 | WHERE user_login_name = :username | 
| 62 | 62 | LIMIT 1"; | 
| 63 | 63 | |
| 64 | - $this->stmt = $pdo->prepare( $sql ); | |
| 64 | + $this->stmt = $pdo->prepare($sql); | |
| 65 | 65 | |
| 66 | 66 | } | 
| 67 | 67 | |
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | * | 
| 73 | 73 | * @throws LoginNameNotAvailableException if username is *not* available | 
| 74 | 74 | */ | 
| 75 | - public function __invoke( $user_name ) | |
| 75 | + public function __invoke($user_name) | |
| 76 | 76 |      { | 
| 77 | 77 | $bool = $this->stmt->execute([ | 
| 78 | 78 | 'username' => $user_name | 
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | ]; | 
| 88 | 88 | |
| 89 | 89 | if ($available): | 
| 90 | -            $this->logger->info("Login name chosen is available.", $loginfo ); | |
| 90 | +            $this->logger->info("Login name chosen is available.", $loginfo); | |
| 91 | 91 | return $available; | 
| 92 | 92 | endif; | 
| 93 | 93 | |
| @@ -53,8 +53,8 @@ discard block | ||
| 53 | 53 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 54 | 54 | * @param string $table Optional: Database table name | 
| 55 | 55 | */ | 
| 56 | - public function __construct( \PDO $pdo, Callable $random_gen, LoggerInterface $logger = null, $table = null ) | |
| 57 | -	{ | |
| 56 | + public function __construct( \PDO $pdo, Callable $random_gen, LoggerInterface $logger = null, $table = null ) | |
| 57 | +    { | |
| 58 | 58 | |
| 59 | 59 | // Prerequisites | 
| 60 | 60 | $this->table = $table ?: $this->table; | 
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | |
| 70 | 70 | // Store for later use | 
| 71 | 71 | $this->stmt = $pdo->prepare( $sql ); | 
| 72 | - } | |
| 72 | + } | |
| 73 | 73 | |
| 74 | 74 | |
| 75 | 75 | /** | 
| @@ -53,7 +53,7 @@ discard block | ||
| 53 | 53 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 54 | 54 | * @param string $table Optional: Database table name | 
| 55 | 55 | */ | 
| 56 | - public function __construct( \PDO $pdo, Callable $random_gen, LoggerInterface $logger = null, $table = null ) | |
| 56 | + public function __construct(\PDO $pdo, Callable $random_gen, LoggerInterface $logger = null, $table = null) | |
| 57 | 57 |  	{ | 
| 58 | 58 | |
| 59 | 59 | // Prerequisites | 
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 | LIMIT 1"; | 
| 69 | 69 | |
| 70 | 70 | // Store for later use | 
| 71 | - $this->stmt = $pdo->prepare( $sql ); | |
| 71 | + $this->stmt = $pdo->prepare($sql); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | |
| @@ -79,7 +79,7 @@ discard block | ||
| 79 | 79 | * | 
| 80 | 80 | * @throws SetApiKeyException if PDOStatement execution fails. | 
| 81 | 81 | */ | 
| 82 | - public function __invoke( $user_id ) | |
| 82 | + public function __invoke($user_id) | |
| 83 | 83 |      { | 
| 84 | 84 | // Calc values | 
| 85 | 85 | $randomgen = $this->random_gen; | 
| @@ -94,7 +94,7 @@ discard block | ||
| 94 | 94 | // Evaluate | 
| 95 | 95 | $loginfo = [ | 
| 96 | 96 | 'user_id' => $user_id, | 
| 97 | - 'mb_strlen' => mb_strlen($apikey ), | |
| 97 | + 'mb_strlen' => mb_strlen($apikey), | |
| 98 | 98 | 'result' => $result | 
| 99 | 99 | ]; | 
| 100 | 100 | |
| @@ -42,7 +42,7 @@ discard block | ||
| 42 | 42 | public $assign_role; | 
| 43 | 43 | |
| 44 | 44 | |
| 45 | - public $users_table = 'users'; | |
| 45 | + public $users_table = 'users'; | |
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | /** | 
| @@ -55,12 +55,12 @@ discard block | ||
| 55 | 55 | public function __construct(\PDO $pdo, Callable $hasher, Callable $randomizer, $users_table = null, LoggerInterface $logger = null) | 
| 56 | 56 |      { | 
| 57 | 57 | $this->logger = $logger ?: new NullLogger; | 
| 58 | - $this->users_table = $users_table ?: $this->users_table; | |
| 58 | + $this->users_table = $users_table ?: $this->users_table; | |
| 59 | 59 | |
| 60 | - $this->check_username = new PdoUsernameChecker( $pdo, $logger, $users_table); | |
| 61 | - $this->insert_user = new PdoInsertNewUser( $pdo, $logger, $users_table); | |
| 62 | - $this->set_password = new PdoPasswordSetter( $pdo, $hasher, $logger, $users_table); | |
| 63 | - $this->set_api_key = new PdoApiKeySetter( $pdo, $randomizer, $logger, $users_table); | |
| 60 | + $this->check_username = new PdoUsernameChecker($pdo, $logger, $users_table); | |
| 61 | + $this->insert_user = new PdoInsertNewUser($pdo, $logger, $users_table); | |
| 62 | + $this->set_password = new PdoPasswordSetter($pdo, $hasher, $logger, $users_table); | |
| 63 | + $this->set_api_key = new PdoApiKeySetter($pdo, $randomizer, $logger, $users_table); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | |
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | * @return int New User ID | 
| 86 | 86 | * @throws UserProfileExceptionInterface | 
| 87 | 87 | */ | 
| 88 | - public function __invoke( array $user_data ) | |
| 88 | + public function __invoke(array $user_data) | |
| 89 | 89 |      { | 
| 90 | 90 |          if (!array_key_exists("login", $user_data) | 
| 91 | 91 |          or  !array_key_exists("password", $user_data)): | 
| @@ -97,7 +97,7 @@ discard block | ||
| 97 | 97 | // (may throw LoginNameNotAvailableException) | 
| 98 | 98 | // | 
| 99 | 99 | $check_username = $this->check_username; | 
| 100 | - $check_username( $user_data['login'] ); | |
| 100 | + $check_username($user_data['login']); | |
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | // | 
| @@ -105,7 +105,7 @@ discard block | ||
| 105 | 105 | // (may throw InsertUserException) | 
| 106 | 106 | // | 
| 107 | 107 | $insert_user = $this->insert_user; | 
| 108 | - $new_user_id = $insert_user( $user_data ); | |
| 108 | + $new_user_id = $insert_user($user_data); | |
| 109 | 109 | |
| 110 | 110 | |
| 111 | 111 | // | 
| @@ -113,7 +113,7 @@ discard block | ||
| 113 | 113 | // (may throw SetPasswordException) | 
| 114 | 114 | // | 
| 115 | 115 | $set_password = $this->set_password; | 
| 116 | - $set_password( $new_user_id, $user_data[ 'password' ] ); | |
| 116 | + $set_password($new_user_id, $user_data['password']); | |
| 117 | 117 | |
| 118 | 118 | |
| 119 | 119 | // | 
| @@ -121,7 +121,7 @@ discard block | ||
| 121 | 121 | // (may throw SetApiKeyException) | 
| 122 | 122 | // | 
| 123 | 123 | $set_api_key = $this->set_api_key; | 
| 124 | - $set_api_key( $new_user_id ); | |
| 124 | + $set_api_key($new_user_id); | |
| 125 | 125 | |
| 126 | 126 | |
| 127 | 127 | // | 
| @@ -55,11 +55,11 @@ discard block | ||
| 55 | 55 | * @param LoggerInterface $logger Optional: PSR-3 Logger | 
| 56 | 56 | * @param string $table Optional: Database table name | 
| 57 | 57 | */ | 
| 58 | - public function __construct( \PDO $pdo, Callable $password_verifier, LoggerInterface $logger = null, $table = null) | |
| 58 | + public function __construct(\PDO $pdo, Callable $password_verifier, LoggerInterface $logger = null, $table = null) | |
| 59 | 59 |      { | 
| 60 | 60 | $this->password_verifier = $password_verifier; | 
| 61 | 61 | $this->logger = $logger ?: new NullLogger; | 
| 62 | - $this->table = $table ?: $this->table; | |
| 62 | + $this->table = $table ?: $this->table; | |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | // Prepare business | 
| @@ -71,7 +71,7 @@ discard block | ||
| 71 | 71 | LIMIT 1"; | 
| 72 | 72 | |
| 73 | 73 | // Store for later use | 
| 74 | - $this->stmt = $pdo->prepare( $sql ); | |
| 74 | + $this->stmt = $pdo->prepare($sql); | |
| 75 | 75 | |
| 76 | 76 | } | 
| 77 | 77 | |
| @@ -83,7 +83,7 @@ discard block | ||
| 83 | 83 | * | 
| 84 | 84 | * @return mixed User ID as integer or FALSE on any failure | 
| 85 | 85 | */ | 
| 86 | - public function __invoke( $login_name, $password ) | |
| 86 | + public function __invoke($login_name, $password) | |
| 87 | 87 |      { | 
| 88 | 88 | |
| 89 | 89 | // Perform | 
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | // If user not found... | 
| 96 | - $found_user = $this->stmt->fetch( \PDO::FETCH_OBJ ); | |
| 96 | + $found_user = $this->stmt->fetch(\PDO::FETCH_OBJ); | |
| 97 | 97 | if (!$found_user): | 
| 98 | 98 |              $this->logger->warning("User login name not found", [ | 
| 99 | 99 | 'user_name' => $login_name | 
| @@ -104,7 +104,7 @@ discard block | ||
| 104 | 104 | |
| 105 | 105 | // If password is wrong... | 
| 106 | 106 | $verifier = $this->password_verifier; | 
| 107 | - if(!$verifier( $password, $found_user->password)) : | |
| 107 | + if (!$verifier($password, $found_user->password)) : | |
| 108 | 108 | |
| 109 | 109 |              $this->logger->warning("Wrong password", [ | 
| 110 | 110 | 'user_name' => $login_name |