Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 7d2761f

Browse files
magefanmagefan
authored
Merge pull request #10 from magefan/8931-compatibility-with-6-5
add compatibility to shapware 6.5
2 parents 29ec072 + e734122 commit 7d2761f

21 files changed

+219
-208
lines changed

‎src/Core/Content/Blog/DataResolver/BlogAbstractResolver.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Magefan\Blog\Core\Content\Blog\DataResolver;
1010

11-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
11+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1212
use Shopware\Core\System\SystemConfig\SystemConfigService;
1313
use Symfony\Component\HttpFoundation\Request;
1414

@@ -20,9 +20,9 @@ class BlogAbstractResolver
2020
protected SystemConfigService $systemConfigService;
2121

2222
/**
23-
* @var EntityRepositoryInterface
23+
* @var EntityRepository
2424
*/
25-
private EntityRepositoryInterface $blogAuthorRepository;
25+
private EntityRepository $blogAuthorRepository;
2626

2727
/**
2828
* @param SystemConfigService $systemConfigService

‎src/Core/Content/Blog/DataResolver/BlogArchiveResolver.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Magefan\Blog\Core\Content\Blog\DataResolver;
1010

1111
use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection;
12-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
12+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1313
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
1414
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
1515
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter;
@@ -18,17 +18,17 @@
1818
class BlogArchiveResolver extends BlogAbstractResolver
1919
{
2020
/**
21-
* @var EntityRepositoryInterface
21+
* @var EntityRepository
2222
*/
23-
private EntityRepositoryInterface $blogPostRepository;
23+
private EntityRepository $blogPostRepository;
2424

2525
/**
2626
* @param SystemConfigService $systemConfigService
27-
* @param EntityRepositoryInterface $blogPostRepository
27+
* @param EntityRepository $blogPostRepository
2828
*/
2929
public function __construct(
3030
SystemConfigService $systemConfigService,
31-
EntityRepositoryInterface $blogPostRepository
31+
EntityRepository $blogPostRepository
3232
) {
3333
$this->blogPostRepository = $blogPostRepository;
3434
parent::__construct($systemConfigService);
@@ -58,7 +58,7 @@ public function getArchive($identifier, $request, $context)
5858
$limit = (int)$this->systemConfigService->get('MagefanBlog.config.postsPerPagePostList');
5959
$pageNumber = $this->getPage($request);
6060
$pageOffset = ($pageNumber - 1) * $limit;
61-
$criteria = (new Criteria([]))
61+
$criteria = (new Criteria())
6262
->addFilter(new EqualsFilter('isActive', 1))
6363
->addFilter(new RangeFilter(
6464
'createdAt',
@@ -85,7 +85,7 @@ public function getArchive($identifier, $request, $context)
8585
*/
8686
public function getAllPosts($context): EntityCollection
8787
{
88-
$criteria = (new Criteria([]))
88+
$criteria = (new Criteria())
8989
->addFilter(new EqualsFilter('isActive', 1));
9090
return$this->blogPostRepository->search($criteria, $context->getContext())->getEntities();
9191
}

‎src/Core/Content/Blog/DataResolver/BlogCategoryResolver.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\Framework\Api\SortOrder;
1313
use Shopware\Core\Framework\Context;
1414
use Shopware\Core\Framework\DataAbstractionLayer\EntityCollection;
15-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
15+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1616
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
1717
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
1818
use Doctrine\DBAL\Connection;
@@ -27,26 +27,26 @@ class BlogCategoryResolver extends BlogAbstractResolver
2727
private Connection $connection;
2828

2929
/**
30-
* @var EntityRepositoryInterface
30+
* @var EntityRepository
3131
*/
32-
private EntityRepositoryInterface $blogCategoryRepository;
32+
private EntityRepository $blogCategoryRepository;
3333

3434
/**
35-
* @var EntityRepositoryInterface
35+
* @var EntityRepository
3636
*/
37-
private EntityRepositoryInterface $blogPostRepository;
37+
private EntityRepository $blogPostRepository;
3838

3939
/**
4040
* @param SystemConfigService $systemConfigService
4141
* @param Connection $connection
42-
* @param EntityRepositoryInterface $blogCategoryRepository
43-
* @param EntityRepositoryInterface $blogPostRepository
42+
* @param EntityRepository $blogCategoryRepository
43+
* @param EntityRepository $blogPostRepository
4444
*/
4545
public function __construct(
4646
SystemConfigService $systemConfigService,
4747
Connection $connection,
48-
EntityRepositoryInterface $blogCategoryRepository,
49-
EntityRepositoryInterface $blogPostRepository
48+
EntityRepository $blogCategoryRepository,
49+
EntityRepository $blogPostRepository
5050
)
5151
{
5252
$this->connection = $connection;
@@ -62,7 +62,7 @@ public function __construct(
6262
*/
6363
public function getCategory($identifier, $context)
6464
{
65-
$criteria = (new Criteria([]))
65+
$criteria = (new Criteria())
6666
->addFilter(new EqualsFilter('identifier', $identifier))
6767
->addFilter(new EqualsFilter('isActive', 1))
6868
->addAssociation('blogCategories')
@@ -89,7 +89,7 @@ public function getPostsByCategory($category, $request, $context): EntityCollect
8989
$sorting = FieldSorting::ASCENDING;
9090
}
9191

92-
$postsCriteria = (new Criteria([]))
92+
$postsCriteria = (new Criteria())
9393
->addAssociation('media')
9494
->addAssociation('postCategories')
9595
->addAssociation('blogPosts')
@@ -116,7 +116,7 @@ public function getPostsByCategory($category, $request, $context): EntityCollect
116116
*/
117117
public function getCategories(): EntityCollection
118118
{
119-
$criteria = (new Criteria([]))
119+
$criteria = (new Criteria())
120120
->addFilter(new EqualsFilter('isActive', 1))
121121
->addFilter(new EqualsFilter('includeInMenu', 1))
122122
->addSorting(new FieldSorting('position', FieldSorting::ASCENDING));

‎src/Core/Content/Blog/DataResolver/BlogListResolver.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Magefan\Blog\Core\Content\Blog\DataResolver;
1010

1111
use Doctrine\DBAL\Exception;
12-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
12+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1313
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
1414
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
1515
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
@@ -19,31 +19,31 @@
1919
class BlogListResolver
2020
{
2121
/**
22-
* @var EntityRepositoryInterface
22+
* @var EntityRepository
2323
*/
24-
private EntityRepositoryInterface $blogAuthorRepository;
24+
private EntityRepository $blogAuthorRepository;
2525

2626
/**
27-
* @var EntityRepositoryInterface
27+
* @var EntityRepository
2828
*/
29-
private EntityRepositoryInterface $blogCategoryRepository;
29+
private EntityRepository $blogCategoryRepository;
3030

3131
/**
3232
* @var SystemConfigService
3333
*/
3434
private SystemConfigService $systemConfigService;
3535

3636
/**
37-
* @var EntityRepositoryInterface
37+
* @var EntityRepository
3838
*/
39-
private EntityRepositoryInterface $blogPostRepository;
39+
private EntityRepository $blogPostRepository;
4040

4141
/**
42-
* @param EntityRepositoryInterface $blogPostRepository
42+
* @param EntityRepository $blogPostRepository
4343
* @param SystemConfigService $systemConfigService
4444
*/
4545
public function __construct(
46-
EntityRepositoryInterface $blogPostRepository,
46+
EntityRepository $blogPostRepository,
4747
SystemConfigService $systemConfigService
4848
) {
4949
$this->blogPostRepository = $blogPostRepository;
@@ -71,7 +71,7 @@ public function getPosts($request, $context)
7171
$pageNumber = $this->getPage($request);
7272
$pageOffset = ($pageNumber - 1) * $limit;
7373

74-
$postsCriteria = (new Criteria([]))
74+
$postsCriteria = (new Criteria())
7575
->addFilter(new EqualsFilter('isActive', 1))
7676
->addSorting(new FieldSorting($sortBy, $sorting))
7777
->setLimit($limit)
@@ -116,7 +116,7 @@ private function getPage(Request $request): int
116116
public function getPagination($context): array
117117
{
118118
$displayMode = $this->systemConfigService->get('MagefanBlog.config.displayMode');
119-
$criteria = (new Criteria([]))->addFilter(new EqualsFilter('isActive', 1));
119+
$criteria = (new Criteria())->addFilter(new EqualsFilter('isActive', 1));
120120

121121
if ((int)$displayMode == 0) {
122122
$criteria->addFilter(new EqualsFilter('includeInRecent', true));

‎src/Core/Content/Blog/DataResolver/BlogPostResolver.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Magefan\Blog\Core\Content\Blog\DataResolver;
1010

1111
use Shopware\Core\Defaults;
12-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
12+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1313
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
1414
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
1515
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter;
@@ -22,15 +22,15 @@ class BlogPostResolver
2222
protected $_nextPost;
2323

2424
/**
25-
* @var EntityRepositoryInterface
25+
* @var EntityRepository
2626
*/
27-
private EntityRepositoryInterface $blogPostRepository;
27+
private EntityRepository $blogPostRepository;
2828

2929
/**
30-
* @param EntityRepositoryInterface $blogPostRepository
30+
* @param EntityRepository $blogPostRepository
3131
*/
3232
public function __construct(
33-
EntityRepositoryInterface $blogPostRepository
33+
EntityRepository $blogPostRepository
3434
) {
3535
$this->blogPostRepository = $blogPostRepository;
3636
}
@@ -42,7 +42,7 @@ public function __construct(
4242
*/
4343
public function getPost($identifier, $context)
4444
{
45-
$postCriteria = (new Criteria([]))
45+
$postCriteria = (new Criteria())
4646
->addFilter(new EqualsFilter('identifier', $identifier))
4747
->addFilter(new EqualsFilter('isActive', 1))
4848
->addAssociation('postCategories')
@@ -79,7 +79,7 @@ public function getPrevPost($currentPost, $context)
7979
if ($this->_prevPost === null) {
8080
$this->_prevPost = false;
8181

82-
$postCriteria = (new Criteria([]))
82+
$postCriteria = (new Criteria())
8383
->addFilter(new EqualsFilter('isActive', 1))
8484
->addSorting(new FieldSorting('createdAt', FieldSorting::DESCENDING))
8585
->addFilter(
@@ -108,7 +108,7 @@ public function getNextPost($currentPost, $context)
108108
if ($this->_nextPost === null) {
109109
$this->_nextPost = false;
110110

111-
$postCriteria = (new Criteria([]))
111+
$postCriteria = (new Criteria())
112112
->addFilter(new EqualsFilter('isActive', 1))
113113
->addSorting(new FieldSorting('createdAt', FieldSorting::ASCENDING))
114114
->addFilter(

‎src/Core/Content/Blog/DataResolver/BlogSidebarResolver.php‎

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

99
namespace Magefan\Blog\Core\Content\Blog\DataResolver;
1010

11-
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
11+
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
1212
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
1313
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
1414
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
@@ -17,14 +17,14 @@
1717
class BlogSidebarResolver
1818
{
1919
/**
20-
* @var EntityRepositoryInterface
20+
* @var EntityRepository
2121
*/
22-
private EntityRepositoryInterface $blogCategoryRepository;
22+
private EntityRepository $blogCategoryRepository;
2323

2424
/**
25-
* @var EntityRepositoryInterface
25+
* @var EntityRepository
2626
*/
27-
private EntityRepositoryInterface $blogPostRepository;
27+
private EntityRepository $blogPostRepository;
2828

2929
/**
3030
* @var
@@ -42,20 +42,20 @@ class BlogSidebarResolver
4242
private SystemConfigService $systemConfigService;
4343

4444
/**
45-
* @var EntityRepositoryInterface
45+
* @var EntityRepository
4646
*/
47-
private EntityRepositoryInterface $blogTagRepository;
47+
private EntityRepository $blogTagRepository;
4848

4949
/**
50-
* @param EntityRepositoryInterface $blogPostRepository
51-
* @param EntityRepositoryInterface $blogCategoryRepository
52-
* @param EntityRepositoryInterface $blogTagRepository
50+
* @param EntityRepository $blogPostRepository
51+
* @param EntityRepository $blogCategoryRepository
52+
* @param EntityRepository $blogTagRepository
5353
* @param SystemConfigService $systemConfigService
5454
*/
5555
public function __construct(
56-
EntityRepositoryInterface $blogPostRepository,
57-
EntityRepositoryInterface $blogCategoryRepository,
58-
EntityRepositoryInterface $blogTagRepository,
56+
EntityRepository $blogPostRepository,
57+
EntityRepository $blogCategoryRepository,
58+
EntityRepository $blogTagRepository,
5959
SystemConfigService $systemConfigService
6060
) {
6161
$this->blogPostRepository = $blogPostRepository;
@@ -100,7 +100,7 @@ private function getArchive($context)
100100
if (null === $this->months && $archiveWidgetEnabled) {
101101
$recentPostNumbers = (int)$this->systemConfigService->get('MagefanBlog.config.recentPostNumbers');
102102

103-
$criteria = (new Criteria([]))->addFilter(new EqualsFilter('isActive', 1))
103+
$criteria = (new Criteria())->addFilter(new EqualsFilter('isActive', 1))
104104
->addSorting(new FieldSorting('createdAt', FieldSorting::DESCENDING))
105105
->setLimit($recentPostNumbers);
106106

@@ -126,7 +126,7 @@ public function getCategories($context): array
126126
return $categories;
127127
}
128128

129-
$criteria = (new Criteria([]))->addFilter(new EqualsFilter('isActive', 1))
129+
$criteria = (new Criteria())->addFilter(new EqualsFilter('isActive', 1))
130130
->addSorting(new FieldSorting('position', FieldSorting::DESCENDING))
131131
->addAssociation('blogPosts');
132132

@@ -150,7 +150,7 @@ public function getRecentPosts($context): array
150150

151151
$recentPostNumbers = (int)$this->systemConfigService->get('MagefanBlog.config.recentPostNumbers');
152152

153-
$criteria = (new Criteria([]))
153+
$criteria = (new Criteria())
154154
->addFilter(new EqualsFilter('isActive', 1))
155155
->addFilter(new EqualsFilter('includeInRecent', true))
156156
->addSorting(new FieldSorting('createdAt', FieldSorting::DESCENDING))
@@ -179,7 +179,7 @@ public function getTags($context): array
179179

180180
$tagsNumber = (int)$this->systemConfigService->get('MagefanBlog.config.tagsNumber');
181181

182-
$criteria = (new Criteria([]))->addFilter(new EqualsFilter('isActive', 1))
182+
$criteria = (new Criteria())->addFilter(new EqualsFilter('isActive', 1))
183183
->addSorting(new FieldSorting('createdAt', FieldSorting::DESCENDING))
184184
->setLimit($tagsNumber)
185185
->addAssociation('postTags');

0 commit comments

Comments
 (0)