diff --git a/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php b/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php index ce463f5..3a1d127 100644 --- a/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php +++ b/src/Content/Blog/Aggregate/BlogCategoryMappingDefinition.php @@ -3,8 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\Aggregate; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\FkField; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\PrimaryKey; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\Required; @@ -12,6 +10,8 @@ use Shopware\Core\Framework\DataAbstractionLayer\Field\ReferenceVersionField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; use Shopware\Core\Framework\DataAbstractionLayer\MappingEntityDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; class BlogCategoryMappingDefinition extends MappingEntityDefinition { diff --git a/src/Content/Blog/BlogEntitiesIndexer.php b/src/Content/Blog/BlogEntitiesIndexer.php index be63b30..38f98d4 100644 --- a/src/Content/Blog/BlogEntitiesIndexer.php +++ b/src/Content/Blog/BlogEntitiesIndexer.php @@ -3,7 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog; -use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; use Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\IteratorFactory; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent; @@ -11,6 +10,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexingMessage; use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; class BlogEntitiesIndexer extends EntityIndexer { diff --git a/src/Content/Blog/BlogEntriesDefinition.php b/src/Content/Blog/BlogEntriesDefinition.php index 3758c52..ef23789 100644 --- a/src/Content/Blog/BlogEntriesDefinition.php +++ b/src/Content/Blog/BlogEntriesDefinition.php @@ -3,10 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog; -use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationDefinition; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; use Shopware\Core\Content\Cms\CmsPageDefinition; use Shopware\Core\Content\Media\MediaDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition; @@ -27,6 +23,10 @@ use Shopware\Core\Framework\DataAbstractionLayer\Field\TranslatedField; use Shopware\Core\Framework\DataAbstractionLayer\Field\TranslationsAssociationField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; +use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationDefinition; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; class BlogEntriesDefinition extends EntityDefinition { diff --git a/src/Content/Blog/BlogEntriesEntity.php b/src/Content/Blog/BlogEntriesEntity.php index 278c3df..9adf01c 100644 --- a/src/Content/Blog/BlogEntriesEntity.php +++ b/src/Content/Blog/BlogEntriesEntity.php @@ -3,14 +3,14 @@ namespace Werkl\OpenBlogware\Content\Blog; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationCollection; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryCollection; use Shopware\Core\Content\Cms\CmsPageEntity; use Shopware\Core\Content\Media\MediaEntity; use Shopware\Core\Framework\DataAbstractionLayer\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait; use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationCollection; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryCollection; class BlogEntriesEntity extends Entity { diff --git a/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationDefinition.php b/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationDefinition.php index dc972a7..d12a518 100644 --- a/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationDefinition.php +++ b/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationDefinition.php @@ -3,7 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityTranslationDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\CustomFields; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\AllowHtml; @@ -12,6 +11,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\Field\LongTextField; use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; class BlogEntriesTranslationDefinition extends EntityTranslationDefinition { diff --git a/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationEntity.php b/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationEntity.php index fff1106..a24caec 100644 --- a/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationEntity.php +++ b/src/Content/Blog/BlogEntriesTranslation/BlogEntriesTranslationEntity.php @@ -3,9 +3,9 @@ namespace Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait; use Shopware\Core\Framework\DataAbstractionLayer\TranslationEntity; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; class BlogEntriesTranslationEntity extends TranslationEntity { diff --git a/src/Content/Blog/BlogListingFilterBuildEvent.php b/src/Content/Blog/BlogListingFilterBuildEvent.php index 8954d01..ffe7655 100644 --- a/src/Content/Blog/BlogListingFilterBuildEvent.php +++ b/src/Content/Blog/BlogListingFilterBuildEvent.php @@ -3,8 +3,8 @@ namespace Werkl\OpenBlogware\Content\Blog; -use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; use Shopware\Core\Framework\Event\Annotation\Event; +use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; class BlogListingFilterBuildEvent { diff --git a/src/Content/Blog/DataResolver/BlogCategoriesCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogCategoriesCmsElementResolver.php index dab10a0..23c16ac 100644 --- a/src/Content/Blog/DataResolver/BlogCategoriesCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogCategoriesCmsElementResolver.php @@ -3,8 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\DataResolver; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; -use Werkl\OpenBlogware\Content\Blog\Events\CategoriesCriteriaEvent; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Cms\DataResolver\Element\AbstractCmsElementResolver; @@ -13,14 +11,10 @@ use Shopware\Core\Content\Cms\DataResolver\ResolverContext\ResolverContext; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\ContainsFilter; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsAnyFilter; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\OrFilter; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter; -use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\Events\CategoriesCriteriaEvent; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; class BlogCategoriesCmsElementResolver extends AbstractCmsElementResolver { @@ -89,6 +83,7 @@ public function enrich(CmsSlotEntity $slot, ResolverContext $resolverContext, El private function createCriteria(FieldConfigCollection $config, SalesChannelContext $salesChannelContext): Criteria { $criteria = new Criteria(); + return $criteria; } } diff --git a/src/Content/Blog/DataResolver/BlogCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogCmsElementResolver.php index baa5bde..bde8038 100644 --- a/src/Content/Blog/DataResolver/BlogCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogCmsElementResolver.php @@ -3,9 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\DataResolver; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogListingFilterBuildEvent; -use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Cms\DataResolver\Element\AbstractCmsElementResolver; @@ -21,6 +18,9 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting; use Symfony\Component\HttpFoundation\Request; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogListingFilterBuildEvent; +use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; class BlogCmsElementResolver extends AbstractCmsElementResolver { diff --git a/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php index 306bf7e..788beff 100644 --- a/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogDetailCmsElementResolver.php @@ -3,7 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\DataResolver; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Cms\DataResolver\Element\AbstractCmsElementResolver; @@ -15,6 +14,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\OrFilter; use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; class BlogDetailCmsElementResolver extends AbstractCmsElementResolver { diff --git a/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php b/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php index 159dc32..e9d0728 100644 --- a/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php +++ b/src/Content/Blog/DataResolver/BlogNewestListingCmsElementResolver.php @@ -3,8 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\DataResolver; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\Events\NewestListingCriteriaEvent; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Cms\DataResolver\Element\AbstractCmsElementResolver; @@ -21,6 +19,8 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\Events\NewestListingCriteriaEvent; class BlogNewestListingCmsElementResolver extends AbstractCmsElementResolver { diff --git a/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php b/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php index 15c1b4d..7b0164b 100644 --- a/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php +++ b/src/Content/Blog/DataResolver/BlogSingleSelectDataResolver.php @@ -3,7 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\DataResolver; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotEntity; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Cms\DataResolver\Element\AbstractCmsElementResolver; @@ -13,6 +12,7 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\ContainsFilter; use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\OrFilter; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; class BlogSingleSelectDataResolver extends AbstractCmsElementResolver { diff --git a/src/Content/Blog/Subscriber/BlogSubscriber.php b/src/Content/Blog/Subscriber/BlogSubscriber.php index 910b8bd..2218969 100644 --- a/src/Content/Blog/Subscriber/BlogSubscriber.php +++ b/src/Content/Blog/Subscriber/BlogSubscriber.php @@ -3,9 +3,6 @@ namespace Werkl\OpenBlogware\Content\Blog\Subscriber; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogListingFilterBuildEvent; -use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; use Shopware\Core\Content\Cms\DataResolver\CriteriaCollection; use Shopware\Core\Content\Product\SalesChannel\Listing\Filter; use Shopware\Core\Content\Product\SalesChannel\Listing\FilterCollection; @@ -16,6 +13,9 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogListingFilterBuildEvent; +use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; class BlogSubscriber implements EventSubscriberInterface { diff --git a/src/Content/BlogAuthor/BlogAuthorDefinition.php b/src/Content/BlogAuthor/BlogAuthorDefinition.php index 1489a06..f1465bc 100644 --- a/src/Content/BlogAuthor/BlogAuthorDefinition.php +++ b/src/Content/BlogAuthor/BlogAuthorDefinition.php @@ -3,8 +3,6 @@ namespace Werkl\OpenBlogware\Content\BlogAuthor; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationDefinition; use Shopware\Core\Content\Media\MediaDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\FkField; @@ -22,6 +20,8 @@ use Shopware\Core\Framework\DataAbstractionLayer\Field\TranslationsAssociationField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; use Shopware\Core\System\Salutation\SalutationDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationDefinition; class BlogAuthorDefinition extends EntityDefinition { diff --git a/src/Content/BlogAuthor/BlogAuthorEntity.php b/src/Content/BlogAuthor/BlogAuthorEntity.php index 6af13e2..d9c4f96 100644 --- a/src/Content/BlogAuthor/BlogAuthorEntity.php +++ b/src/Content/BlogAuthor/BlogAuthorEntity.php @@ -3,13 +3,13 @@ namespace Werkl\OpenBlogware\Content\BlogAuthor; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationCollection; use Shopware\Core\Content\Media\MediaEntity; use Shopware\Core\Framework\DataAbstractionLayer\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityCustomFieldsTrait; use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait; use Shopware\Core\System\Salutation\SalutationEntity; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationCollection; class BlogAuthorEntity extends Entity { diff --git a/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationDefinition.php b/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationDefinition.php index 83287fa..5d0269b 100644 --- a/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationDefinition.php +++ b/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationDefinition.php @@ -3,11 +3,11 @@ namespace Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityTranslationDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\CustomFields; use Shopware\Core\Framework\DataAbstractionLayer\Field\LongTextField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; class BlogAuthorTranslationDefinition extends EntityTranslationDefinition { diff --git a/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationEntity.php b/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationEntity.php index d714e5a..8b5c584 100644 --- a/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationEntity.php +++ b/src/Content/BlogAuthor/BlogAuthorTranslation/BlogAuthorTranslationEntity.php @@ -3,8 +3,8 @@ namespace Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; use Shopware\Core\Framework\DataAbstractionLayer\TranslationEntity; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; class BlogAuthorTranslationEntity extends TranslationEntity { diff --git a/src/Content/BlogCategory/BlogCategoryDefinition.php b/src/Content/BlogCategory/BlogCategoryDefinition.php index c47feb8..ac93fef 100644 --- a/src/Content/BlogCategory/BlogCategoryDefinition.php +++ b/src/Content/BlogCategory/BlogCategoryDefinition.php @@ -3,9 +3,6 @@ namespace Werkl\OpenBlogware\Content\BlogCategory; -use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\ChildCountField; use Shopware\Core\Framework\DataAbstractionLayer\Field\ChildrenAssociationField; @@ -28,6 +25,9 @@ use Shopware\Core\Framework\DataAbstractionLayer\Field\VersionField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; use Shopware\Core\System\SalesChannel\SalesChannelDefinition; +use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; class BlogCategoryDefinition extends EntityDefinition { diff --git a/src/Content/BlogCategory/BlogCategoryEntity.php b/src/Content/BlogCategory/BlogCategoryEntity.php index 9c935f8..7ff1db7 100644 --- a/src/Content/BlogCategory/BlogCategoryEntity.php +++ b/src/Content/BlogCategory/BlogCategoryEntity.php @@ -3,11 +3,11 @@ namespace Werkl\OpenBlogware\Content\BlogCategory; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationCollection; use Shopware\Core\Framework\DataAbstractionLayer\Entity; use Shopware\Core\Framework\DataAbstractionLayer\EntityIdTrait; use Shopware\Core\System\SalesChannel\SalesChannelCollection; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationCollection; class BlogCategoryEntity extends Entity { diff --git a/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationDefinition.php b/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationDefinition.php index 62946d7..5328bc4 100644 --- a/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationDefinition.php +++ b/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationDefinition.php @@ -3,12 +3,12 @@ namespace Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityTranslationDefinition; use Shopware\Core\Framework\DataAbstractionLayer\Field\CustomFields; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\Required; use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; class BlogCategoryTranslationDefinition extends EntityTranslationDefinition { diff --git a/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationEntity.php b/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationEntity.php index 00ffcfb..1cc897f 100644 --- a/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationEntity.php +++ b/src/Content/BlogCategory/BlogCategoryTranslation/BlogCategoryTranslationEntity.php @@ -3,8 +3,8 @@ namespace Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryEntity; use Shopware\Core\Framework\DataAbstractionLayer\TranslationEntity; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryEntity; class BlogCategoryTranslationEntity extends TranslationEntity { diff --git a/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php b/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php index f6b15f1..bfd4664 100644 --- a/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php +++ b/src/Content/Cms/DataResolver/WerklCmsSlotsDataResolver.php @@ -3,14 +3,14 @@ namespace Werkl\OpenBlogware\Content\Cms\DataResolver; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Content\Blog\DataResolver\BlogDetailCmsElementResolver; use Shopware\Core\Content\Cms\Aggregate\CmsSection\CmsSectionCollection; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotCollection; use Shopware\Core\Content\Cms\CmsPageEntity; use Shopware\Core\Content\Cms\DataResolver\CmsSlotsDataResolver; use Shopware\Core\Content\Cms\DataResolver\Element\CmsElementResolverInterface; use Shopware\Core\Content\Cms\DataResolver\ResolverContext\ResolverContext; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Content\Blog\DataResolver\BlogDetailCmsElementResolver; class WerklCmsSlotsDataResolver extends CmsSlotsDataResolver { diff --git a/src/Content/Extension/LanguageExtension.php b/src/Content/Extension/LanguageExtension.php index 3efe794..26d47e4 100644 --- a/src/Content/Extension/LanguageExtension.php +++ b/src/Content/Extension/LanguageExtension.php @@ -3,14 +3,14 @@ namespace Werkl\OpenBlogware\Content\Extension; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationDefinition; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityExtension; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\CascadeDelete; use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; use Shopware\Core\System\Language\LanguageDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesTranslation\BlogEntriesTranslationDefinition; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorTranslation\BlogAuthorTranslationDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; class LanguageExtension extends EntityExtension { diff --git a/src/Content/Extension/MediaExtension.php b/src/Content/Extension/MediaExtension.php index b263144..53acab5 100644 --- a/src/Content/Extension/MediaExtension.php +++ b/src/Content/Extension/MediaExtension.php @@ -3,12 +3,12 @@ namespace Werkl\OpenBlogware\Content\Extension; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; use Shopware\Core\Content\Media\MediaDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityExtension; use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToOneAssociationField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; class MediaExtension extends EntityExtension { diff --git a/src/Content/Extension/SalutationExtension.php b/src/Content/Extension/SalutationExtension.php index 13ba78f..89eaf38 100644 --- a/src/Content/Extension/SalutationExtension.php +++ b/src/Content/Extension/SalutationExtension.php @@ -3,12 +3,12 @@ namespace Werkl\OpenBlogware\Content\Extension; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; use Shopware\Core\Framework\DataAbstractionLayer\EntityExtension; use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\SetNullOnDelete; use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField; use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection; use Shopware\Core\System\Salutation\SalutationDefinition; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorDefinition; class SalutationExtension extends EntityExtension { diff --git a/src/Controller/BlogController.php b/src/Controller/BlogController.php index dc1d2bf..ea5de10 100644 --- a/src/Controller/BlogController.php +++ b/src/Controller/BlogController.php @@ -3,12 +3,12 @@ namespace Werkl\OpenBlogware\Controller; -use Werkl\OpenBlogware\Page\Blog\BlogPageLoader; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Shopware\Storefront\Controller\StorefrontController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Werkl\OpenBlogware\Page\Blog\BlogPageLoader; /** * Blog detail page controller diff --git a/src/Controller/BlogSearchController.php b/src/Controller/BlogSearchController.php index e0b53e4..7ebc0ac 100644 --- a/src/Controller/BlogSearchController.php +++ b/src/Controller/BlogSearchController.php @@ -3,13 +3,13 @@ namespace Werkl\OpenBlogware\Controller; -use Werkl\OpenBlogware\Page\Search\BlogSearchPageLoader; use Shopware\Core\Framework\Routing\RoutingException; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Shopware\Storefront\Controller\StorefrontController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Werkl\OpenBlogware\Page\Search\BlogSearchPageLoader; /** * Blog search controllers diff --git a/src/Controller/StoreApi/BlogControllerResponse.php b/src/Controller/StoreApi/BlogControllerResponse.php index ae33d22..f07e349 100644 --- a/src/Controller/StoreApi/BlogControllerResponse.php +++ b/src/Controller/StoreApi/BlogControllerResponse.php @@ -3,9 +3,9 @@ namespace Werkl\OpenBlogware\Controller\StoreApi; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult; use Shopware\Core\System\SalesChannel\StoreApiResponse; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; class BlogControllerResponse extends StoreApiResponse { diff --git a/src/Core/Content/Sitemap/Provider/BlogUrlProvider.php b/src/Core/Content/Sitemap/Provider/BlogUrlProvider.php index 9cf7934..e43fbde 100644 --- a/src/Core/Content/Sitemap/Provider/BlogUrlProvider.php +++ b/src/Core/Content/Sitemap/Provider/BlogUrlProvider.php @@ -4,9 +4,6 @@ namespace Werkl\OpenBlogware\Core\Content\Sitemap\Provider; use Doctrine\DBAL\Connection; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; use Shopware\Core\Content\Sitemap\Provider\AbstractUrlProvider; use Shopware\Core\Content\Sitemap\Struct\Url; use Shopware\Core\Content\Sitemap\Struct\UrlResult; @@ -18,6 +15,9 @@ use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; class BlogUrlProvider extends AbstractUrlProvider { diff --git a/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php b/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php index 47e8b1b..815b5df 100644 --- a/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php +++ b/src/Migration/Migration1604520733DefaultBlogCategorySeeder.php @@ -4,16 +4,16 @@ namespace Werkl\OpenBlogware\Migration; use Doctrine\DBAL\Connection; -use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; -use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; use Shopware\Core\Defaults; use Shopware\Core\Framework\DataAbstractionLayer\Doctrine\MultiInsertQueryQueue; use Shopware\Core\Framework\Migration\MigrationStep; use Shopware\Core\Framework\Uuid\Uuid; use Shopware\Core\Migration\Traits\ImportTranslationsTrait; use Shopware\Core\Migration\Traits\Translations; +use Werkl\OpenBlogware\Content\Blog\Aggregate\BlogCategoryMappingDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryDefinition; +use Werkl\OpenBlogware\Content\BlogCategory\BlogCategoryTranslation\BlogCategoryTranslationDefinition; class Migration1604520733DefaultBlogCategorySeeder extends MigrationStep { diff --git a/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php b/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php index 8225c56..01ff4b4 100644 --- a/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php +++ b/src/Migration/Migration1605031477CreateWerklBlogAuthorTable.php @@ -4,10 +4,10 @@ namespace Werkl\OpenBlogware\Migration; use Doctrine\DBAL\Connection; -use Werkl\OpenBlogware\WerklOpenBlogware; use Shopware\Core\Defaults; use Shopware\Core\Framework\Migration\MigrationStep; use Shopware\Core\Framework\Uuid\Uuid; +use Werkl\OpenBlogware\WerklOpenBlogware; class Migration1605031477CreateWerklBlogAuthorTable extends MigrationStep { diff --git a/src/Page/Blog/BlogPage.php b/src/Page/Blog/BlogPage.php index ca0a78b..480b3c7 100644 --- a/src/Page/Blog/BlogPage.php +++ b/src/Page/Blog/BlogPage.php @@ -3,9 +3,9 @@ namespace Werkl\OpenBlogware\Page\Blog; +use Shopware\Storefront\Page\Navigation\NavigationPage; use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Shopware\Storefront\Page\Navigation\NavigationPage; class BlogPage extends NavigationPage { diff --git a/src/Page/Blog/BlogPageLoader.php b/src/Page/Blog/BlogPageLoader.php index cf87f04..43e8a77 100644 --- a/src/Page/Blog/BlogPageLoader.php +++ b/src/Page/Blog/BlogPageLoader.php @@ -3,7 +3,6 @@ namespace Werkl\OpenBlogware\Page\Blog; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; use Shopware\Core\Content\Cms\CmsPageEntity; use Shopware\Core\Content\Cms\Exception\PageNotFoundException; use Shopware\Core\Content\Cms\SalesChannel\SalesChannelCmsPageLoaderInterface; @@ -18,6 +17,7 @@ use Shopware\Storefront\Page\MetaInformation; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; class BlogPageLoader { diff --git a/src/Storefront/Framework/Seo/SeoUrlRoute/SeoUrlUpdateListener.php b/src/Storefront/Framework/Seo/SeoUrlRoute/SeoUrlUpdateListener.php index ad7fbfc..73ed61e 100644 --- a/src/Storefront/Framework/Seo/SeoUrlRoute/SeoUrlUpdateListener.php +++ b/src/Storefront/Framework/Seo/SeoUrlRoute/SeoUrlUpdateListener.php @@ -3,8 +3,6 @@ namespace Werkl\OpenBlogware\Storefront\Framework\Seo\SeoUrlRoute; -use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; -use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; use Shopware\Core\Content\Seo\SeoUrlUpdater; use Shopware\Core\Framework\Context; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; @@ -13,6 +11,8 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; +use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; class SeoUrlUpdateListener implements EventSubscriberInterface { diff --git a/src/Subscriber/BlogCacheInvalidSubscriber.php b/src/Subscriber/BlogCacheInvalidSubscriber.php index f3eff3a..5c0e0f7 100644 --- a/src/Subscriber/BlogCacheInvalidSubscriber.php +++ b/src/Subscriber/BlogCacheInvalidSubscriber.php @@ -3,10 +3,6 @@ namespace Werkl\OpenBlogware\Subscriber; -use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; -use Werkl\OpenBlogware\Controller\CachedBlogController; -use Werkl\OpenBlogware\Controller\CachedBlogRssController; -use Werkl\OpenBlogware\Controller\CachedBlogSearchController; use Shopware\Core\Content\Category\SalesChannel\CachedCategoryRoute; use Shopware\Core\Content\Cms\CmsPageEvents; use Shopware\Core\Content\Seo\Event\SeoEvents; @@ -22,6 +18,10 @@ use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; use Shopware\Core\System\SystemConfig\SystemConfigService; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; +use Werkl\OpenBlogware\Controller\CachedBlogController; +use Werkl\OpenBlogware\Controller\CachedBlogRssController; +use Werkl\OpenBlogware\Controller\CachedBlogSearchController; /** * After you change the SEO Template within the SEO settings, we need to re-generate all existing URLs. diff --git a/src/Util/Update.php b/src/Util/Update.php index 3392bfd..df5f6eb 100644 --- a/src/Util/Update.php +++ b/src/Util/Update.php @@ -5,10 +5,10 @@ use Doctrine\DBAL\Connection; use Psr\Container\ContainerInterface; +use Shopware\Core\Framework\Plugin\Context\UpdateContext; use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; use Werkl\OpenBlogware\Migration\Migration1602739765AddTeaserImageColumnToBlogEntries; use Werkl\OpenBlogware\Migration\Migration1612160298CreatePubslihedDateColumn; -use Shopware\Core\Framework\Plugin\Context\UpdateContext; class Update { diff --git a/src/WerklOpenBlogware.php b/src/WerklOpenBlogware.php index f1bae27..658ecc1 100644 --- a/src/WerklOpenBlogware.php +++ b/src/WerklOpenBlogware.php @@ -5,11 +5,6 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\Result; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; -use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; -use Werkl\OpenBlogware\Util\Lifecycle; -use Werkl\OpenBlogware\Util\Update; use Shopware\Core\Content\Media\Aggregate\MediaThumbnailSize\MediaThumbnailSizeEntity; use Shopware\Core\Content\Seo\SeoUrlTemplate\SeoUrlTemplateCollection; use Shopware\Core\Content\Seo\SeoUrlTemplate\SeoUrlTemplateEntity; @@ -28,6 +23,11 @@ use Shopware\Core\Kernel; use Shopware\Core\System\SystemConfig\SystemConfigService; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogSeoUrlRoute; +use Werkl\OpenBlogware\Content\Blog\Events\BlogIndexerEvent; +use Werkl\OpenBlogware\Util\Lifecycle; +use Werkl\OpenBlogware\Util\Update; class WerklOpenBlogware extends Plugin { @@ -81,7 +81,7 @@ public function uninstall(UninstallContext $context): void $context = Context::createDefaultContext(); $criteria = new Criteria(); - $criteria.addFilter(new EqualsAnyFilter('type', ['blog-detail', 'blog-listing'])); + $criteria . addFilter(new EqualsAnyFilter('type', ['blog-detail', 'blog-listing'])); $cmsBlocks = $cmsBlockRepo->searchIds($criteria, $context); diff --git a/tests/PHPUnit/Content/Blog/Events/BlogMainFilterEventTest.php b/tests/PHPUnit/Content/Blog/Events/BlogMainFilterEventTest.php index c0dc45e..5fed6e2 100644 --- a/tests/PHPUnit/Content/Blog/Events/BlogMainFilterEventTest.php +++ b/tests/PHPUnit/Content/Blog/Events/BlogMainFilterEventTest.php @@ -4,10 +4,10 @@ namespace OpenBlogware\Tests\Content\Blog\Events; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Content\Blog\Events\BlogMainFilterEvent; class BlogMainFilterEventTest extends TestCase { diff --git a/tests/PHPUnit/Content/Cms/DataResolver/SasCmsSlotsDataResolverTest.php b/tests/PHPUnit/Content/Cms/DataResolver/SasCmsSlotsDataResolverTest.php index 6159021..c66a970 100644 --- a/tests/PHPUnit/Content/Cms/DataResolver/SasCmsSlotsDataResolverTest.php +++ b/tests/PHPUnit/Content/Cms/DataResolver/SasCmsSlotsDataResolverTest.php @@ -6,9 +6,6 @@ use OpenBlogware\Tests\Traits\ContextTrait; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Content\Blog\DataResolver\BlogDetailCmsElementResolver; -use Werkl\OpenBlogware\Content\Cms\DataResolver\WerklCmsSlotsDataResolver; use Shopware\Core\Content\Cms\Aggregate\CmsBlock\CmsBlockCollection; use Shopware\Core\Content\Cms\Aggregate\CmsSection\CmsSectionCollection; use Shopware\Core\Content\Cms\Aggregate\CmsSlot\CmsSlotCollection; @@ -17,8 +14,11 @@ use Shopware\Core\Content\Cms\DataResolver\CmsSlotsDataResolver; use Shopware\Core\Content\Cms\DataResolver\Element\CmsElementResolverInterface; use Shopware\Core\Content\Cms\DataResolver\ResolverContext\ResolverContext; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Content\Blog\DataResolver\BlogDetailCmsElementResolver; +use Werkl\OpenBlogware\Content\Cms\DataResolver\WerklCmsSlotsDataResolver; -class WerklCmsSlotsDataResolverTest extends TestCase +class SasCmsSlotsDataResolverTest extends TestCase { use ContextTrait; diff --git a/tests/PHPUnit/Core/Content/Sitemap/Provider/BlogUrlProviderTest.php b/tests/PHPUnit/Core/Content/Sitemap/Provider/BlogUrlProviderTest.php index 562c440..e01ad01 100644 --- a/tests/PHPUnit/Core/Content/Sitemap/Provider/BlogUrlProviderTest.php +++ b/tests/PHPUnit/Core/Content/Sitemap/Provider/BlogUrlProviderTest.php @@ -3,20 +3,20 @@ namespace OpenBlogware\Tests\Core\Content\Sitemap\Provider; +use Doctrine\DBAL\Connection; use OpenBlogware\Tests\Fakes\FakeEntityRepository; use OpenBlogware\Tests\Traits\ContextTrait; -use Doctrine\DBAL\Connection; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Core\Content\Sitemap\Provider\BlogUrlProvider; use Shopware\Core\Content\Sitemap\Struct\UrlResult; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesCollection; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Core\Content\Sitemap\Provider\BlogUrlProvider; class BlogUrlProviderTest extends TestCase { diff --git a/tests/PHPUnit/Page/Blog/BlogPageCriteriaEventTest.php b/tests/PHPUnit/Page/Blog/BlogPageCriteriaEventTest.php index 24e455e..d6aa53f 100644 --- a/tests/PHPUnit/Page/Blog/BlogPageCriteriaEventTest.php +++ b/tests/PHPUnit/Page/Blog/BlogPageCriteriaEventTest.php @@ -4,9 +4,9 @@ namespace OpenBlogware\Tests\Page\Blog; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Page\Blog\BlogPageCriteriaEvent; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\System\SalesChannel\SalesChannelContext; +use Werkl\OpenBlogware\Page\Blog\BlogPageCriteriaEvent; class BlogPageCriteriaEventTest extends TestCase { diff --git a/tests/PHPUnit/Page/Blog/BlogPageLoadedEventTest.php b/tests/PHPUnit/Page/Blog/BlogPageLoadedEventTest.php index e927b68..81e554e 100644 --- a/tests/PHPUnit/Page/Blog/BlogPageLoadedEventTest.php +++ b/tests/PHPUnit/Page/Blog/BlogPageLoadedEventTest.php @@ -4,10 +4,10 @@ namespace OpenBlogware\Tests\Page\Blog; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Page\Blog\BlogPage; -use Werkl\OpenBlogware\Page\Blog\BlogPageLoadedEvent; use Shopware\Core\System\SalesChannel\SalesChannelContext; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Page\Blog\BlogPage; +use Werkl\OpenBlogware\Page\Blog\BlogPageLoadedEvent; class BlogPageLoadedEventTest extends TestCase { diff --git a/tests/PHPUnit/Page/Blog/BlogPageLoaderTest.php b/tests/PHPUnit/Page/Blog/BlogPageLoaderTest.php index 30d9bd6..da37ddd 100644 --- a/tests/PHPUnit/Page/Blog/BlogPageLoaderTest.php +++ b/tests/PHPUnit/Page/Blog/BlogPageLoaderTest.php @@ -6,11 +6,6 @@ use OpenBlogware\Tests\Fakes\FakeEntityRepository; use OpenBlogware\Tests\Traits\ContextTrait; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; -use Werkl\OpenBlogware\Page\Blog\BlogPage; -use Werkl\OpenBlogware\Page\Blog\BlogPageLoader; use Shopware\Core\Content\Category\CategoryEntity; use Shopware\Core\Content\Category\Tree\Tree; use Shopware\Core\Content\Cms\CmsPageEntity; @@ -28,6 +23,11 @@ use Shopware\Storefront\Pagelet\Header\HeaderPagelet; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Content\BlogAuthor\BlogAuthorEntity; +use Werkl\OpenBlogware\Page\Blog\BlogPage; +use Werkl\OpenBlogware\Page\Blog\BlogPageLoader; class BlogPageLoaderTest extends TestCase { diff --git a/tests/PHPUnit/Page/Search/BlogSearchPageLoaderTest.php b/tests/PHPUnit/Page/Search/BlogSearchPageLoaderTest.php index 1460407..2501b00 100644 --- a/tests/PHPUnit/Page/Search/BlogSearchPageLoaderTest.php +++ b/tests/PHPUnit/Page/Search/BlogSearchPageLoaderTest.php @@ -6,10 +6,6 @@ use OpenBlogware\Tests\Fakes\FakeEntityRepository; use OpenBlogware\Tests\Traits\ContextTrait; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; -use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; -use Werkl\OpenBlogware\Page\Search\BlogSearchPage; -use Werkl\OpenBlogware\Page\Search\BlogSearchPageLoader; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult; use Shopware\Core\Framework\Routing\RoutingException; @@ -17,6 +13,10 @@ use Shopware\Storefront\Page\GenericPageLoaderInterface; use Shopware\Storefront\Page\Page; use Symfony\Component\HttpFoundation\Request; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesDefinition; +use Werkl\OpenBlogware\Content\Blog\BlogEntriesEntity; +use Werkl\OpenBlogware\Page\Search\BlogSearchPage; +use Werkl\OpenBlogware\Page\Search\BlogSearchPageLoader; class BlogSearchPageLoaderTest extends TestCase { diff --git a/tests/PHPUnit/Util/LifecycleTest.php b/tests/PHPUnit/Util/LifecycleTest.php index 6020c5f..be07d4f 100644 --- a/tests/PHPUnit/Util/LifecycleTest.php +++ b/tests/PHPUnit/Util/LifecycleTest.php @@ -5,11 +5,11 @@ use OpenBlogware\Tests\Traits\ContextTrait; use PHPUnit\Framework\TestCase; -use Werkl\OpenBlogware\Util\Lifecycle; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository; use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent; use Shopware\Core\Framework\Event\NestedEventCollection; use Shopware\Core\System\SystemConfig\SystemConfigService; +use Werkl\OpenBlogware\Util\Lifecycle; class LifecycleTest extends TestCase { diff --git a/tests/PHPUnit/Util/UpdateTest.php b/tests/PHPUnit/Util/UpdateTest.php index c0a2f0d..475dc88 100644 --- a/tests/PHPUnit/Util/UpdateTest.php +++ b/tests/PHPUnit/Util/UpdateTest.php @@ -3,13 +3,13 @@ namespace OpenBlogware\Tests\Util; -use OpenBlogware\Tests\Traits\ContextTrait; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\AbstractSchemaManager; +use OpenBlogware\Tests\Traits\ContextTrait; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; -use Werkl\OpenBlogware\Util\Update; use Shopware\Core\Framework\Plugin\Context\UpdateContext; +use Werkl\OpenBlogware\Util\Update; class UpdateTest extends TestCase {