Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1128-camel-case-rename

2017-03-17 18:50:57 +01:00
parent 731d085ccd 17415493f5
commit 8ebb3c6b5a
203 changed files with 5111 additions and 1980 deletions
@@ -6,6 +6,7 @@ import fr.xephi.authme.ReflectionTestUtils;
 import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.events.PasswordEncryptionEvent;
+import fr.xephi.authme.initialization.factory.FactoryDependencyHandler;
 import fr.xephi.authme.security.crypts.EncryptionMethod;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.security.crypts.JOOMLA;
@@ -84,7 +85,9 @@ public class PasswordSecurityTest {
                return null;
            }
        }).when(pluginManager).callEvent(any(Event.class));
-        injector = new InjectorBuilder().addDefaultHandlers("fr.xephi.authme").create();
+        injector = new InjectorBuilder()
+            .addHandlers(new FactoryDependencyHandler())
+            .addDefaultHandlers("fr.xephi.authme").create();
        injector.register(Settings.class, settings);
        injector.register(DataSource.class, dataSource);
        injector.register(PluginManager.class, pluginManager);