userEntity key moved

Xapp73 · Xapp73 · commit 757e05205e39 · 2017-11-23T19:55:21.000+02:00
diff --git a/config/module.config.php b/config/module.config.php
@@ -160,7 +160,8 @@
         'auth' => [
             'header' => true,
             'header_name' => "xxx-user-module-auth",
-        ]
+        ],
+        'userEntity' => User::class,
     ],
     'console' => [
         'router' => [
@@ -177,8 +178,5 @@
             ],
         ],
     ],
-    'UserModule' => [
-        'userEntity' => User::class,
-    ]
 ];
 
diff --git a/src/Controller/Factory/ConsoleControllerFactory.php b/src/Controller/Factory/ConsoleControllerFactory.php
@@ -26,7 +26,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $userManager = $container->get(UserManager::class);
         $entityManager = $container->get('doctrine.entitymanager.orm_default');
         $config = $container->get("Config");
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
         return new ConsoleController($userManager, $entityManager, $userEntityClassName);
     }
 }
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -96,7 +96,7 @@ public function __construct(EntityManager $entityManager, UserManager $userManag
         $this->userManager = $userManager;
         $this->container = $container;
         $config = $this->container->get("Config");
-        $this->userEntityClassName = $config['UserModule']['userEntity'];
+        $this->userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
         $this->userRoleId = $userRoleId;
     }
 
diff --git a/src/Mapper/Factory/UserMapperFactory.php b/src/Mapper/Factory/UserMapperFactory.php
@@ -27,7 +27,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         /** @var EntityManager $em */
         $em = $container->get('doctrine.entitymanager.orm_default');
         $config = $container->get('Config');
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
         $repository = $em->getRepository($userEntityClassName);
 
         /** @var AbstractHydrator $hydrator */
diff --git a/src/Service/Factory/AuthAdapterFactory.php b/src/Service/Factory/AuthAdapterFactory.php
@@ -30,7 +30,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
 
         $config = $container->get('Config');
         $headerEnabled = $config['ProspectOne\UserModule']['auth']['header'];
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
 
         /** @var Request $request */
         $request = $container->get("Request");
diff --git a/src/Service/Factory/AuthAdapterServiceFactory.php b/src/Service/Factory/AuthAdapterServiceFactory.php
@@ -33,7 +33,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
 
         $config = $container->get('Config');
         $headerEnabled = $config['ProspectOne\UserModule']['auth']['header'];
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
 
         /** @var Request $request */
         $request = $container->get("Request");
diff --git a/src/Service/Factory/CurrentUserFactory.php b/src/Service/Factory/CurrentUserFactory.php
@@ -34,7 +34,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             throw new BadMethodCallException("Can be created for only logged in users");
         }
         $config = $container->get("Config");
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
         /** @var UserInterface $user */
         $user = $entityManager->getRepository($userEntityClassName)->findBy(['email' => $email])[0];
         return $user;
diff --git a/src/Service/Factory/UserManagerFactory.php b/src/Service/Factory/UserManagerFactory.php
@@ -26,7 +26,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $bcrypt = $container->get('ProspectOne\UserModule\Bcrypt');
 
         $config = $container->get("Config");
-        $userEntityClassName = $config['UserModule']['userEntity'];
+        $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];
                         
         return new UserManager($entityManager, $bcrypt, $userEntityClassName);
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o`
`26`	`26`	`$userManager = $container->get(UserManager::class);`
`27`	`27`	`$entityManager = $container->get('doctrine.entitymanager.orm_default');`
`28`	`28`	`$config = $container->get("Config");`
`29`		`- $userEntityClassName = $config['UserModule']['userEntity'];`
	`29`	`+ $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];`
`30`	`30`	`return new ConsoleController($userManager, $entityManager, $userEntityClassName);`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function __construct(EntityManager $entityManager, UserManager $userManag`
`96`	`96`	`$this->userManager = $userManager;`
`97`	`97`	`$this->container = $container;`
`98`	`98`	`$config = $this->container->get("Config");`
`99`		`- $this->userEntityClassName = $config['UserModule']['userEntity'];`
	`99`	`+ $this->userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];`
`100`	`100`	`$this->userRoleId = $userRoleId;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o`
`34`	`34`	`throw new BadMethodCallException("Can be created for only logged in users");`
`35`	`35`	`}`
`36`	`36`	`$config = $container->get("Config");`
`37`		`- $userEntityClassName = $config['UserModule']['userEntity'];`
	`37`	`+ $userEntityClassName = $config['ProspectOne\UserModule']['userEntity'];`
`38`	`38`	`/** @var UserInterface $user */`
`39`	`39`	`$user = $entityManager->getRepository($userEntityClassName)->findBy(['email' => $email])[0];`
`40`	`40`	`return $user;`