Skip to content

Commit 1b724a2

Browse files
committed
OXDEV-9078 Move EmailFactory one level up from the Provider namespace
1 parent 4586040 commit 1b724a2

8 files changed

Lines changed: 14 additions & 18 deletions

File tree

src/Authentication/TwoFactorAuth/Infrastructure/Provider/Factory/EmailFactory.php renamed to src/Authentication/TwoFactorAuth/Infrastructure/Factory/EmailFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
declare(strict_types=1);
99

10-
namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory;
10+
namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
1111

1212
use OxidEsales\Eshop\Core\Email;
1313

src/Authentication/TwoFactorAuth/Infrastructure/Provider/Factory/EmailFactoryInterface.php renamed to src/Authentication/TwoFactorAuth/Infrastructure/Factory/EmailFactoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See LICENSE file for license details.
66
*/
77

8-
namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory;
8+
namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
99

1010
use OxidEsales\Eshop\Core\Email;
1111

src/Authentication/TwoFactorAuth/Infrastructure/Factory/services.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@ services:
33
autowire: true
44
public: false
55

6-
OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactoryInterface:
7-
class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactory
6+
OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserModelFactoryInterface:
7+
class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserModelFactory
8+
9+
OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\NewUserFactoryInterface:
10+
class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\NewUserFactory
11+
12+
OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactoryInterface:
13+
class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactory

src/Authentication/TwoFactorAuth/Infrastructure/Provider/Email/EmailAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Email;
1111

12-
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory\EmailFactoryInterface;
12+
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactoryInterface;
1313
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\NotifierAdapterInterface;
1414

1515
class EmailAdapter implements NotifierAdapterInterface

src/Authentication/TwoFactorAuth/Infrastructure/Provider/Factory/services.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/Authentication/TwoFactorAuth/Infrastructure/Provider/services.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
imports:
2-
- { resource: Factory/services.yaml }
3-
41
services:
52
_defaults:
63
autowire: true

tests/Integration/Authentication/TwoFactorAuth/Infrastructure/Provider/Factory/EmailFactoryTest.php renamed to tests/Integration/Authentication/TwoFactorAuth/Infrastructure/Factory/EmailFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
declare(strict_types=1);
99

10-
namespace OxidEsales\SecurityModule\Tests\Integration\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory;
10+
namespace OxidEsales\SecurityModule\Tests\Integration\Authentication\TwoFactorAuth\Infrastructure\Factory;
1111

1212
use OxidEsales\Eshop\Core\Email;
13-
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory\EmailFactory;
13+
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactory;
1414
use PHPUnit\Framework\TestCase;
1515

1616
class EmailFactoryTest extends TestCase

tests/Unit/Authentication/TwoFactorAuth/Infrastructure/Provider/Email/EmailAdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use OxidEsales\Eshop\Core\Email;
1313
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Email\EmailAdapter;
14-
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Provider\Factory\EmailFactoryInterface;
14+
use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactoryInterface;
1515
use PHPUnit\Framework\TestCase;
1616

1717
class EmailAdapterTest extends TestCase

0 commit comments

Comments
 (0)