Skip to content

Commit

Permalink
Merge branch 'next-0000/change-content-package-annotation-to-buyers-e…
Browse files Browse the repository at this point in the history
…xperience' into 'trunk'

NEXT-0000 - Changed content package annotation to buyers-experience

See merge request shopware/6/product/platform!14320
  • Loading branch information
MartinKrzykawski committed Jul 29, 2024
2 parents fa64d77 + b1e3fd1 commit ab6adb2
Show file tree
Hide file tree
Showing 53 changed files with 53 additions and 58 deletions.
5 changes: 0 additions & 5 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -5241,11 +5241,6 @@ parameters:
count: 1
path: src/Storefront/Event/CartMergedSubscriber.php

-
message: "#^Parameter \\#1 \\$mimeType of class Shopware\\\\Storefront\\\\Framework\\\\Media\\\\Exception\\\\FileTypeNotAllowedException constructor expects string, string\\|null given\\.$#"
count: 1
path: src/Storefront/Framework/Media/Validator/StorefrontMediaDocumentValidator.php

-
message: "#^Property Shopware\\\\Storefront\\\\Framework\\\\Twig\\\\Extension\\\\IconCacheTwigFilter\\:\\:\\$iconCache type has no value type specified in iterable type array\\.$#"
count: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
name: 'media:update-path',
description: 'Iterates over the media and updates the path column.',
)]
#[Package('content')]
#[Package('buyers-experience')]
class UpdatePathCommand extends Command
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal Concrete implementations of this class should not be extended or used as a base class/type hint.
*/
#[Package('content')]
#[Package('buyers-experience')]
class MediaUrlGenerator extends AbstractMediaUrlGenerator
{
public function __construct(private readonly FilesystemOperator $filesystem)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @codeCoverageIgnore (see \Shopware\Tests\Integration\Core\Content\Media\Infrastructure\Path\MediaLocationBuilderTest)
*/
#[Package('content')]
#[Package('buyers-experience')]
class SqlMediaLocationBuilder implements MediaLocationBuilder
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use Shopware\Core\Framework\Validation\DataBag\DataBag;
use Symfony\Contracts\EventDispatcher\Event;

#[Package('content')]
#[Package('buyers-experience')]
final class ReviewFormEvent extends Event implements SalesChannelAware, MailAware, ProductAware, CustomerAware, ScalarValuesAware, FlowEventAware
{
public const EVENT_NAME = 'review_form.send';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @extends EntityCollection<AppCmsBlockEntity>
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockCollection extends EntityCollection
{
protected function getExpectedClass(): string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockDefinition extends EntityDefinition
{
final public const ENTITY_NAME = 'app_cms_block';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* @phpstan-import-type BlockArray from Block
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockEntity extends Entity
{
use EntityIdTrait;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @extends EntityCollection<AppCmsBlockTranslationEntity>
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockTranslationCollection extends EntityCollection
{
protected function getExpectedClass(): string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockTranslationDefinition extends EntityTranslationDefinition
{
final public const ENTITY_NAME = 'app_cms_block_translation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class AppCmsBlockTranslationEntity extends Entity
{
use EntityIdTrait;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/AbstractBlockTemplateLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
abstract class AbstractBlockTemplateLoader
{
abstract public function getTemplateForBlock(CmsExtensions $cmsExtensions, string $blockName): string;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/BlockTemplateLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class BlockTemplateLoader extends AbstractBlockTemplateLoader
{
public function getTemplateForBlock(CmsExtensions $cmsExtensions, string $blockName): string
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/CmsExtensions.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class CmsExtensions
{
private const XSD_FILE = __DIR__ . '/Schema/cms-1.0.xsd';
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/Xml/Block.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* }>
* }
*/
#[Package('content')]
#[Package('buyers-experience')]
class Block extends XmlElement
{
private const TRANSLATABLE_FIELDS = [
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/Xml/Blocks.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Blocks extends XmlElement
{
/**
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/Xml/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* @phpstan-type ConfigArray array<string, array{source: string, value: string}>
*/
#[Package('content')]
#[Package('buyers-experience')]
class Config extends XmlElement
{
/**
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/Xml/DefaultConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class DefaultConfig extends XmlElement
{
protected ?string $marginTop = null;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Framework/App/Cms/Xml/Slot.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Slot extends XmlElement
{
protected string $name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Migration1659425718AddFlagsToCustomEntities extends MigrationStep
{
public function getCreationTimestamp(): int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Migration1662533751AddCustomEntityTypeIdToCategory extends MigrationStep
{
public function getCreationTimestamp(): int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Migration1666689977AddPluginIdToCustomEntity extends MigrationStep
{
public function getCreationTimestamp(): int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class Migration1695732009AddConfigForMedia extends MigrationStep
{
public function getCreationTimestamp(): int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class AdminUiXmlSchema
{
public const FILENAME = 'admin-ui.xml';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class AdminUiXmlSchemaValidator
{
public function validateConfigurations(AdminUiEntity $adminUiEntity, Entity $entity): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class AdminUi extends ConfigXmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Card extends ConfigXmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class CardField extends ConfigXmlElement
{
protected string $ref;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Column extends ConfigXmlElement
{
protected string $ref;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Columns extends ConfigXmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Detail extends ConfigXmlElement
{
protected Tabs $tabs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Entity extends ConfigXmlElement
{
protected Listing $listing;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Listing extends ConfigXmlElement
{
protected Columns $columns;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Tab extends ConfigXmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
final class Tabs extends ConfigXmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class CmsAwareFields
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
abstract class ConfigXmlElement extends XmlElement
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Shopware\Core\Framework\Log\Package;
use Symfony\Component\HttpFoundation\Response;

#[Package('content')]
#[Package('buyers-experience')]
class CustomEntityConfigurationException extends HttpException
{
final public const ENTITY_NOT_GIVEN_CODE = 'CUSTOM_ENTITY_NOT_GIVEN';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* @internal
*/
#[Package('content')]
#[Package('buyers-experience')]
class CustomEntityEnrichmentService
{
public function __construct(private readonly AdminUiXmlSchemaValidator $adminUiXmlSchemaValidator)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Framework\ShopwareHttpException;

#[Package('content')]
#[Package('buyers-experience')]
class FileTypeNotAllowedException extends ShopwareHttpException
{
public function __construct(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\Framework\ShopwareHttpException;

#[Package('content')]
#[Package('buyers-experience')]
class MediaValidatorMissingException extends ShopwareHttpException
{
public function __construct(string $type)
Expand Down
2 changes: 1 addition & 1 deletion src/Storefront/Framework/Media/StorefrontMediaUploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Shopware\Storefront\Framework\Media\Exception\FileTypeNotAllowedException;
use Symfony\Component\HttpFoundation\File\UploadedFile;

#[Package('content')]
#[Package('buyers-experience')]
class StorefrontMediaUploader
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Shopware\Core\Framework\Log\Package;
use Symfony\Component\HttpFoundation\File\UploadedFile;

#[Package('content')]
#[Package('buyers-experience')]
interface StorefrontMediaValidatorInterface
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Shopware\Storefront\Framework\Media\Exception\MediaValidatorMissingException;
use Symfony\Component\HttpFoundation\File\UploadedFile;

#[Package('content')]
#[Package('buyers-experience')]
class StorefrontMediaValidatorRegistry
{
/**
Expand Down
Loading

0 comments on commit ab6adb2

Please sign in to comment.