Skip to content

Commit 6ff9226

Browse files
committed
Revert "feat: shopware 6.7"
This reverts commit cc5b0f8.
1 parent 9f4ef62 commit 6ff9226

File tree

79 files changed

+1399
-1249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1399
-1249
lines changed

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "werkstattl/openblogware",
33
"description": "OpenBlogware: A Blog Module for Shopware 6.",
4-
"version": "5.0.0",
4+
"version": "4.3.0",
55
"type": "shopware-platform-plugin",
66
"keywords": ["blog", "news"],
77
"license":"MIT",
@@ -17,9 +17,10 @@
1717
"issues": "https://github.com/werkstattl/openblogware/issues",
1818
"docs": "https://github.com/Werkstattl/OpenBlogware/blob/main/README.md"
1919
},
20-
"minimum-stability": "dev",
2120
"require": {
22-
"shopware/core": "~6.7.0"
21+
"shopware/core": "^6.6.7",
22+
"shopware/administration": "^6.6.7",
23+
"shopware/storefront": "^6.6.7"
2324
},
2425
"require-dev":{
2526
"phpunit/phpunit": "^9.5",

src/Content/Blog/BlogEntitiesIndexer.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,20 @@
1414

1515
class BlogEntitiesIndexer extends EntityIndexer
1616
{
17-
public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly IteratorFactory $iteratorFactory, private readonly EntityRepository $repository)
18-
{
17+
private EventDispatcherInterface $eventDispatcher;
18+
19+
private IteratorFactory $iteratorFactory;
20+
21+
private EntityRepository $repository;
22+
23+
public function __construct(
24+
EventDispatcherInterface $eventDispatcher,
25+
IteratorFactory $iteratorFactory,
26+
EntityRepository $repository
27+
) {
28+
$this->eventDispatcher = $eventDispatcher;
29+
$this->iteratorFactory = $iteratorFactory;
30+
$this->repository = $repository;
1931
}
2032

2133
public function getName(): string

src/Content/Blog/BlogEntriesEntity.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ class BlogEntriesEntity extends Entity
1818
use EntityCustomFieldsTrait;
1919
use EntityIdTrait;
2020

21-
protected ?string $title = null;
21+
protected ?string $title;
2222

23-
protected ?string $slug = null;
23+
protected ?string $slug;
2424

25-
protected ?string $teaser = null;
25+
protected ?string $teaser;
2626

27-
protected ?string $metaTitle = null;
27+
protected ?string $metaTitle;
2828

29-
protected ?string $metaDescription = null;
29+
protected ?string $metaDescription;
3030

31-
protected ?string $content = null;
31+
protected ?string $content;
3232

3333
protected bool $active;
3434

@@ -46,17 +46,17 @@ class BlogEntriesEntity extends Entity
4646

4747
protected string $authorId;
4848

49-
protected ?BlogAuthorEntity $blogAuthor = null;
49+
protected ?BlogAuthorEntity $blogAuthor;
5050

51-
protected ?string $mediaId = null;
51+
protected ?string $mediaId;
5252

5353
protected ?MediaEntity $media = null;
5454

5555
protected \DateTimeInterface $publishedAt;
5656

57-
protected ?string $cmsPageId = null;
57+
protected ?string $cmsPageId;
5858

59-
protected ?CmsPageEntity $cmsPage = null;
59+
protected ?CmsPageEntity $cmsPage;
6060

6161
protected ?TagCollection $tags = null;
6262

src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationEntity.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class BlogEntriesTranslationEntity extends TranslationEntity
1515

1616
protected BlogEntriesEntity $werklBlogEntries;
1717

18-
protected ?string $mediaId = null;
18+
protected ?string $mediaId;
1919

2020
protected string $title;
2121

@@ -25,9 +25,9 @@ class BlogEntriesTranslationEntity extends TranslationEntity
2525

2626
protected string $teaser;
2727

28-
protected ?string $metaTitle = null;
28+
protected ?string $metaTitle;
2929

30-
protected ?string $metaDescription = null;
30+
protected ?string $metaDescription;
3131

3232
public function getWerklBlogEntriesId(): string
3333
{

src/Content/Blog/BlogSeoUrlListener.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99

1010
class BlogSeoUrlListener implements EventSubscriberInterface
1111
{
12-
public function __construct(private readonly SeoUrlUpdater $seoUrlUpdater)
12+
private SeoUrlUpdater $seoUrlUpdater;
13+
14+
public function __construct(SeoUrlUpdater $seoUrlUpdater)
1315
{
16+
$this->seoUrlUpdater = $seoUrlUpdater;
1417
}
1518

1619
public static function getSubscribedEvents(): array

src/Content/Blog/BlogSeoUrlRoute.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@ class BlogSeoUrlRoute implements SeoUrlRouteInterface
1515
public const ROUTE_NAME = 'werkl.frontend.blog.detail';
1616
public const DEFAULT_TEMPLATE = 'blog/{{ entry.blogCategories.first.translated.name|lower }}/{{ entry.translated.title|lower }}';
1717

18-
public function __construct(private readonly BlogEntriesDefinition $definition)
18+
/**
19+
* @var BlogEntriesDefinition
20+
*/
21+
private $definition;
22+
23+
public function __construct(BlogEntriesDefinition $definition)
1924
{
25+
$this->definition = $definition;
2026
}
2127

2228
public function getConfig(): SeoUrlRouteConfig

src/Content/Blog/DataResolver/BlogCategoriesCmsElementResolver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818

1919
class BlogCategoriesCmsElementResolver extends AbstractCmsElementResolver
2020
{
21-
public function __construct(private readonly EventDispatcherInterface $eventDispatcher)
21+
private EventDispatcherInterface $eventDispatcher;
22+
23+
public function __construct(EventDispatcherInterface $eventDispatcher)
2224
{
25+
$this->eventDispatcher = $eventDispatcher;
2326
}
2427

2528
/**

src/Content/Blog/DataResolver/BlogCmsElementResolver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@
2424

2525
class BlogCmsElementResolver extends AbstractCmsElementResolver
2626
{
27-
public function __construct(private readonly EventDispatcherInterface $eventDispatcher)
27+
private EventDispatcherInterface $eventDispatcher;
28+
29+
public function __construct(EventDispatcherInterface $eventDispatcher)
2830
{
31+
$this->eventDispatcher = $eventDispatcher;
2932
}
3033

3134
public function getType(): string

src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@
2424

2525
class BlogNewestListingCmsElementResolver extends AbstractCmsElementResolver
2626
{
27-
public function __construct(private readonly EventDispatcherInterface $eventDispatcher)
27+
private EventDispatcherInterface $eventDispatcher;
28+
29+
public function __construct(EventDispatcherInterface $eventDispatcher)
2830
{
31+
$this->eventDispatcher = $eventDispatcher;
2932
}
3033

3134
/**

src/Content/Blog/Events/BlogIndexerEvent.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ class BlogIndexerEvent extends NestedEvent
1818
*/
1919
protected $context;
2020

21-
public function __construct(array $ids, Context $context, private readonly array $skip = [])
21+
private array $skip;
22+
23+
public function __construct(array $ids, Context $context, array $skip = [])
2224
{
2325
$this->ids = $ids;
2426
$this->context = $context;
27+
$this->skip = $skip;
2528
}
2629

2730
public function getIds(): array

0 commit comments

Comments
 (0)