Merge remote-tracking branch 'upstream/master' into password_expiration

src/User/Bootstrap.php

@@ -20,6 +20,7 @@ use yii\authclient\Collection;
 use yii\base\Application;
 use yii\base\BootstrapInterface;
 use yii\base\Exception;
+use yii\base\InvalidConfigException;
 use yii\console\Application as ConsoleApplication;
 use yii\i18n\PhpMessageSource;
 use yii\web\Application as WebApplication;
@@ -36,6 +37,8 @@ class Bootstrap implements BootstrapInterface
 {
     /**
      * {@inheritdoc}
+     *
+     * @throws InvalidConfigException
      */
     public function bootstrap($app)
     {
@@ -178,6 +181,8 @@ class Bootstrap implements BootstrapInterface
      * Registers module translation messages.
      *
      * @param Application $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initTranslations(Application $app)
     {
@@ -194,6 +199,8 @@ class Bootstrap implements BootstrapInterface
      * Ensures the auth manager is the one provided by the library.
      *
      * @param Application $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initAuthManager(Application $app)
     {
@@ -211,6 +218,8 @@ class Bootstrap implements BootstrapInterface
      * Initializes web url routes (rules in Yii2).
      *
      * @param WebApplication $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initUrlRoutes(WebApplication $app)
     {
@@ -253,6 +262,8 @@ class Bootstrap implements BootstrapInterface
      * Ensures the authCollection component is configured.
      *
      * @param WebApplication $app
+     *
+     * @throws InvalidConfigException
      */
     protected function initAuthCollection(WebApplication $app)
     {
@@ -287,6 +298,7 @@ class Bootstrap implements BootstrapInterface
      *
      * @param array $userClassMap user configuration on the module
      *
+     * @throws Exception
      * @return array
      */
     protected function buildClassMap(array $userClassMap)
@@ -360,7 +372,7 @@ class Bootstrap implements BootstrapInterface
     protected function getRoute(array $routes, $name)
     {
         foreach ($routes as $route => $names) {
-            if (in_array($name, $names)) {
+            if (in_array($name, $names, false)) {
                 return $route;
             }
         }