Skip to content

Commit 89b498f

Browse files
SiegSieg
committed
Restructure Filters directory to be more informative
Signed-off-by: Anton Fedurtsya <[email protected]>
1 parent e82ec14 commit 89b498f

20 files changed

+87
-77
lines changed

‎services.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
imports:
22
- { resource: src/ChangeFilter/services.yaml }
33
- { resource: src/Integration/services.yaml }
4-
- { resource: src/Repository/services.yaml }
5-
- { resource: src/Sitemap/services.yaml }
64
- { resource: src/Settings/services.yaml }
5+
- { resource: src/Sitemap/services.yaml }
76
- { resource: src/Url/services.yaml }
87

98
services:

‎src/ChangeFilter/CategoryChangeFilter.php renamed to ‎src/ChangeFilter/Category/CategoryChangeFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Category;
1111

12+
use FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate;
1213
use FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface;
1314

1415
class CategoryChangeFilter extends ChangeFilterTemplate implements ChangeFilterInterface

‎src/ChangeFilter/Category/services.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
3+
_defaults:
4+
public: false
5+
autowire: true
6+
7+
FreshAdvance\Sitemap\ChangeFilter\Category\CategoryChangeFilter:
8+
arguments:
9+
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\CategoryUrlType'
10+
$modelItemRepository: '@FreshAdvance\Sitemap\ChangeFilter\Category\CategoryChangeFilterItemRepository'
11+
tags:
12+
- 'sitemap.change_filter'
13+
14+
FreshAdvance\Sitemap\ChangeFilter\Category\CategoryChangeFilterItemRepository:
15+
class: FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepository
16+
arguments:
17+
$model: '\OxidEsales\Eshop\Application\Model\Category'

‎src/ChangeFilter/ContentChangeFilter.php renamed to ‎src/ChangeFilter/Content/ContentChangeFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Content;
1111

12+
use FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate;
1213
use FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface;
1314

1415
class ContentChangeFilter extends ChangeFilterTemplate implements ChangeFilterInterface

‎src/ChangeFilter/Content/services.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
3+
_defaults:
4+
public: false
5+
autowire: true
6+
7+
FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilter:
8+
arguments:
9+
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\ContentUrlType'
10+
$modelItemRepository: '@FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilterItemRepository'
11+
tags:
12+
- 'sitemap.change_filter'
13+
14+
FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilterItemRepository:
15+
class: FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepository
16+
arguments:
17+
$model: '\OxidEsales\Eshop\Application\Model\Content'

‎src/ChangeFilter/ProductChangeFilter.php renamed to ‎src/ChangeFilter/Product/ProductChangeFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Product;
1111

12+
use FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate;
1213
use FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface;
1314

1415
class ProductChangeFilter extends ChangeFilterTemplate implements ChangeFilterInterface

‎src/ChangeFilter/Product/services.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
3+
_defaults:
4+
public: false
5+
autowire: true
6+
7+
FreshAdvance\Sitemap\ChangeFilter\Product\ProductChangeFilter:
8+
arguments:
9+
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\ProductUrlType'
10+
$modelItemRepository: '@FreshAdvance\Sitemap\ChangeFilter\Product\ProductChangeFilterItemRepository'
11+
tags:
12+
- 'sitemap.change_filter'
13+
14+
FreshAdvance\Sitemap\ChangeFilter\Product\ProductChangeFilterItemRepository:
15+
class: FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepository
16+
arguments:
17+
$model: '\OxidEsales\Eshop\Application\Model\Article'

‎src/ChangeFilter/ChangeFilterTemplate.php renamed to ‎src/ChangeFilter/Shared/ChangeFilterTemplate.php

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

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Shared;
1111

1212
use DateTime;
1313
use Doctrine\DBAL\Connection;
1414
use Doctrine\DBAL\ForwardCompatibility\Result;
15+
use FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepositoryInterface;
1516
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrl;
16-
use FreshAdvance\Sitemap\Repository\ModelItemRepositoryInterface;
1717
use FreshAdvance\Sitemap\Url\DataType\UrlTypeInterface;
1818
use Generator;
1919
use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionProviderInterface;

‎src/Repository/ModelItemRepository.php renamed to ‎src/ChangeFilter/Shared/Repository/ModelItemRepository.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 FreshAdvance\Sitemap\Repository;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Shared\Repository;
1111

1212
use FreshAdvance\Sitemap\Integration\Exception\ModelItemNotFoundException;
1313
use OxidEsales\Eshop\Core\Contract\IUrl;

‎src/Repository/ModelItemRepositoryInterface.php renamed to ‎src/ChangeFilter/Shared/Repository/ModelItemRepositoryInterface.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 FreshAdvance\Sitemap\Repository;
10+
namespace FreshAdvance\Sitemap\ChangeFilter\Shared\Repository;
1111

1212
use OxidEsales\Eshop\Core\Contract\IUrl;
1313
use OxidEsales\Eshop\Core\Model\BaseModel;

‎src/ChangeFilter/services.yaml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,4 @@
1-
services:
2-
3-
_defaults:
4-
public: false
5-
autowire: true
6-
7-
FreshAdvance\Sitemap\ChangeFilter\ContentChangeFilter:
8-
arguments:
9-
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\ContentUrlType'
10-
$modelItemRepository: '@FreshAdvance\Sitemap\Repository\ContentModelItemRepository'
11-
tags:
12-
- 'sitemap.change_filter'
13-
14-
FreshAdvance\Sitemap\ChangeFilter\ProductChangeFilter:
15-
arguments:
16-
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\ProductUrlType'
17-
$modelItemRepository: '@FreshAdvance\Sitemap\Repository\ProductModelItemRepository'
18-
tags:
19-
- 'sitemap.change_filter'
20-
21-
FreshAdvance\Sitemap\ChangeFilter\CategoryChangeFilter:
22-
arguments:
23-
$pageTypeConfiguration: '@FreshAdvance\Sitemap\Url\DataTypeFactory\CategoryUrlType'
24-
$modelItemRepository: '@FreshAdvance\Sitemap\Repository\CategoryModelItemRepository'
25-
tags:
26-
- 'sitemap.change_filter'
1+
imports:
2+
- { resource: Category/services.yaml }
3+
- { resource: Content/services.yaml }
4+
- { resource: Product/services.yaml }

‎src/Repository/services.yaml

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

‎tests/Integration/ChangeFilter/CategoryChangeFilterTest.php renamed to ‎tests/Integration/ChangeFilter/Category/CategoryChangeFilterTest.php

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

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter\Category;
1111

1212
use DateTime;
13-
use FreshAdvance\Sitemap\ChangeFilter\CategoryChangeFilter;
13+
use FreshAdvance\Sitemap\ChangeFilter\Category\CategoryChangeFilter;
1414
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrlInterface;
1515
use FreshAdvance\Sitemap\Tests\Integration\IntegrationTestCase;
1616
use OxidEsales\Eshop\Application\Model\Category;
1717

1818
/**
19-
* @covers \FreshAdvance\Sitemap\ChangeFilter\ChangeFilterTemplate
20-
* @covers \FreshAdvance\Sitemap\ChangeFilter\CategoryChangeFilter
19+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate
20+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Category\CategoryChangeFilter
2121
*/
2222
class CategoryChangeFilterTest extends IntegrationTestCase
2323
{

‎tests/Integration/ChangeFilter/ContentChangeFilterTest.php renamed to ‎tests/Integration/ChangeFilter/Content/ContentChangeFilterTest.php

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

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter\Content;
1111

1212
use DateTime;
13-
use FreshAdvance\Sitemap\ChangeFilter\ContentChangeFilter;
13+
use FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilter;
1414
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrlInterface;
1515
use FreshAdvance\Sitemap\Tests\Integration\IntegrationTestCase;
1616
use OxidEsales\EshopCommunity\Application\Model\Content;
1717

1818
/**
19-
* @covers \FreshAdvance\Sitemap\ChangeFilter\ChangeFilterTemplate
20-
* @covers \FreshAdvance\Sitemap\ChangeFilter\ContentChangeFilter
19+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate
20+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilter
2121
*/
2222
class ContentChangeFilterTest extends IntegrationTestCase
2323
{
@@ -34,8 +34,8 @@ public function testCheckCurrentUrlItem(): void
3434
$this->createExampleContent('example4', false, 'CMSFOLDER_USERINFO');
3535
$this->createExampleContent('example5', true, 'CMSFOLDER_USERINFO');
3636

37-
/** @var ContentChangeFilter $sut */
38-
$sut = $this->get(ContentChangeFilter::class);
37+
/** @var \FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilter $sut */
38+
$sut = $this->get(\FreshAdvance\Sitemap\ChangeFilter\Content\ContentChangeFilter::class);
3939
$urls = $sut->getUpdatedUrls(3);
4040

4141
$this->checkCurrentUrlItem($urls->current(), 'example1');

‎tests/Integration/ChangeFilter/ProductChangeFilterTest.php renamed to ‎tests/Integration/ChangeFilter/Product/ProductChangeFilterTest.php

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

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter;
10+
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter\Product;
1111

1212
use DateTime;
13-
use FreshAdvance\Sitemap\ChangeFilter\ProductChangeFilter;
13+
use FreshAdvance\Sitemap\ChangeFilter\Product\ProductChangeFilter;
1414
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrlInterface;
1515
use FreshAdvance\Sitemap\Tests\Integration\IntegrationTestCase;
1616
use OxidEsales\Eshop\Application\Model\Article;
1717

1818
/**
19-
* @covers \FreshAdvance\Sitemap\ChangeFilter\ChangeFilterTemplate
20-
* @covers \FreshAdvance\Sitemap\ChangeFilter\ProductChangeFilter
19+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Shared\ChangeFilterTemplate
20+
* @covers \FreshAdvance\Sitemap\ChangeFilter\Product\ProductChangeFilter
2121
*/
2222
class ProductChangeFilterTest extends IntegrationTestCase
2323
{

‎tests/Integration/Repository/ModelItemRepositoryTest.php renamed to ‎tests/Integration/ChangeFilter/Shared/Repository/ModelItemRepositoryTest.php

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

88
declare(strict_types=1);
99

10-
namespace FreshAdvance\Sitemap\Tests\Integration\Repository;
10+
namespace FreshAdvance\Sitemap\Tests\Integration\ChangeFilter\Shared\Repository;
1111

1212
use FreshAdvance\Sitemap\Integration\Exception\ModelItemNotFoundException;
13-
use FreshAdvance\Sitemap\Repository\ModelItemRepository;
1413
use FreshAdvance\Sitemap\Tests\Integration\IntegrationTestCase;
1514
use Generator;
1615
use OxidEsales\Eshop\Application\Model\Article;
@@ -25,7 +24,7 @@ public function testGetItem(string $model, string $filler): void
2524
$identifier = uniqid();
2625
$this->$filler($identifier);
2726

28-
$sut = new ModelItemRepository(model: $model);
27+
$sut = new \FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepository(model: $model);
2928
$item = $sut->getItem($identifier);
3029

3130
$this->assertTrue($item->isLoaded());
@@ -51,7 +50,7 @@ public function getItemDataProvider(): Generator
5150

5251
public function testLoadingFailureThrowsException(): void
5352
{
54-
$sut = new ModelItemRepository(model: Content::class);
53+
$sut = new \FreshAdvance\Sitemap\ChangeFilter\Shared\Repository\ModelItemRepository(model: Content::class);
5554

5655
$this->expectException(ModelItemNotFoundException::class);
5756
$sut->getItem(uniqid());

‎tests/Integration/Command/UpdateTypeCommandTest.php renamed to ‎tests/Integration/Integration/Command/UpdateTypeCommandTest.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 Command;
10+
namespace FreshAdvance\Sitemap\Tests\Integration\Integration\Command;
1111

1212
use FreshAdvance\Sitemap\Integration\Service\Synchronizer;
1313
use PHPUnit\Framework\TestCase;

‎tests/Unit/DataStructure/ObjectUrlTest.php renamed to ‎tests/Unit/Integration/DataType/ObjectUrlTest.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 FreshAdvance\Sitemap\Tests\Unit\DataStructure;
10+
namespace FreshAdvance\Sitemap\Tests\Unit\Integration\DataType;
1111

1212
use DateTime;
1313
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrl;

‎tests/Unit/ChangeFilter/FilterFactoryTest.php renamed to ‎tests/Unit/Integration/Service/FilterFactoryTest.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 ChangeFilter;
10+
namespace FreshAdvance\Sitemap\Tests\Unit\Integration\Service;
1111

1212
use FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface;
1313
use FreshAdvance\Sitemap\Integration\Exception\FilterConfigurationException;

‎tests/Unit/Service/SynchronizerTest.php renamed to ‎tests/Unit/Integration/Service/SynchronizerTest.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 FreshAdvance\Sitemap\Tests\Unit\Service;
10+
namespace FreshAdvance\Sitemap\Tests\Unit\Integration\Service;
1111

1212
use FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface;
1313
use FreshAdvance\Sitemap\Integration\DataType\ObjectUrlInterface;

0 commit comments

Comments
 (0)