@@ -24,6 +24,10 @@ discard block |
||
24 | 24 | /** @var string */ |
25 | 25 | private $email; |
26 | 26 | |
27 | + /** |
|
28 | + * @param string $username |
|
29 | + * @param string $password |
|
30 | + */ |
|
27 | 31 | public function __construct($username, $password, array $roles) |
28 | 32 | { |
29 | 33 | $this->username = $username; |
@@ -146,7 +150,7 @@ discard block |
||
146 | 150 | * and populated in any number of different ways when the user object |
147 | 151 | * is created. |
148 | 152 | * |
149 | - * @return array Role[] The user roles |
|
153 | + * @return string Role[] The user roles |
|
150 | 154 | */ |
151 | 155 | public function getRoles() |
152 | 156 | { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | * @param string $name Key name |
44 | 44 | * @param mixed $default Default value |
45 | 45 | * |
46 | - * @return mixed |
|
46 | + * @return string |
|
47 | 47 | */ |
48 | 48 | protected function getConfig($name, $default) |
49 | 49 | { |
@@ -112,7 +112,7 @@ |
||
112 | 112 | } |
113 | 113 | } |
114 | 114 | $username = strtolower($username); |
115 | - $pattern = $this->getConfig('username_validation_pattern', '/^[a-z0-9-.]+$/i'); |
|
115 | + $pattern = $this->getConfig('username_validation_pattern', '/^[a-z0-9-.]+$/i'); |
|
116 | 116 | if (preg_match($pattern, $username)) { |
117 | 117 | return $username; |
118 | 118 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | |
23 | 23 | |
24 | - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
24 | + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
25 | 25 | $loader->load('services.yml'); |
26 | 26 | } |
27 | 27 | } |