From 3743ca6856be4e91e1de47ff6e48f50aaf41b7bb Mon Sep 17 00:00:00 2001 From: OleksandrProtsiuk Date: Thu, 11 Jul 2024 15:54:50 +0300 Subject: [PATCH] Upgrade extensions - Updated requirements to oro/commerce 6.0.* - oro/upgrade-toolkit automatic migrations applied --- composer.json | 10 ++--- .../Entity/CreditLineSettings.php | 42 ++++--------------- .../Form/Type/CreditLineSettingsType.php | 2 +- 3 files changed, 13 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 3f69ec4..6f07fb4 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ "exclude-from-classmap": ["/Tests/"] }, "require": { - "php": "^7.3|^8.0", - "oro/commerce": "4.2.*" + "php": "~8.3.0", + "oro/commerce": "6.0.*" }, "repositories": { "oro": { @@ -34,10 +34,10 @@ "require-dev": { "phpmd/phpmd": "^2.8", "phpro/grumphp": "^1.1.0", - "phpspec/phpspec": "^6.1", - "phpstan/phpstan": "0.12.91", + "phpspec/phpspec": "^7.5", + "phpstan/phpstan": "^1.10", "php-parallel-lint/php-parallel-lint": "^1.0", "enlightn/security-checker": "^1.9", - "friendsofphp/php-cs-fixer": "^2.18" + "friendsofphp/php-cs-fixer": "~3.57.2" } } diff --git a/src/Synolia/Bundle/CreditLineBundle/Entity/CreditLineSettings.php b/src/Synolia/Bundle/CreditLineBundle/Entity/CreditLineSettings.php index 508051c..3e009dc 100644 --- a/src/Synolia/Bundle/CreditLineBundle/Entity/CreditLineSettings.php +++ b/src/Synolia/Bundle/CreditLineBundle/Entity/CreditLineSettings.php @@ -10,51 +10,23 @@ use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\Validator\Constraints as Assert; -/** - * @ORM\Entity(repositoryClass="Synolia\Bundle\CreditLineBundle\Entity\Repository\CreditLineSettingsRepository") - */ +#[ORM\Entity(repositoryClass: \Synolia\Bundle\CreditLineBundle\Entity\Repository\CreditLineSettingsRepository::class)] class CreditLineSettings extends Transport { /** * @var Collection|LocalizedFallbackValue[] - * - * @ORM\ManyToMany( - * targetEntity="Oro\Bundle\LocaleBundle\Entity\LocalizedFallbackValue", - * cascade={"ALL"}, - * orphanRemoval=true - * ) - * @ORM\JoinTable( - * name="credit_line_trans_label", - * joinColumns={ - * @ORM\JoinColumn(name="transport_id", referencedColumnName="id", onDelete="CASCADE") - * }, - * inverseJoinColumns={ - * @ORM\JoinColumn(name="localized_value_id", referencedColumnName="id", onDelete="CASCADE", unique=true) - * } - * ) - * @Assert\NotBlank */ + #[Assert\NotBlank] + #[ORM\ManyToMany(targetEntity: \Oro\Bundle\LocaleBundle\Entity\LocalizedFallbackValue::class, cascade: ['ALL'], orphanRemoval: true)] + #[ORM\JoinTable(name: 'credit_line_trans_label', joinColumns: [new ORM\JoinColumn(name: 'transport_id', referencedColumnName: 'id', onDelete: 'CASCADE')], inverseJoinColumns: [new ORM\JoinColumn(name: 'localized_value_id', referencedColumnName: 'id', onDelete: 'CASCADE', unique: true)])] private $labels; /** * @var Collection|LocalizedFallbackValue[] - * - * @ORM\ManyToMany( - * targetEntity="Oro\Bundle\LocaleBundle\Entity\LocalizedFallbackValue", - * cascade={"ALL"}, - * orphanRemoval=true - * ) - * @ORM\JoinTable( - * name="credit_line_short_label", - * joinColumns={ - * @ORM\JoinColumn(name="transport_id", referencedColumnName="id", onDelete="CASCADE") - * }, - * inverseJoinColumns={ - * @ORM\JoinColumn(name="localized_value_id", referencedColumnName="id", onDelete="CASCADE", unique=true) - * } - * ) - * @Assert\NotBlank */ + #[Assert\NotBlank] + #[ORM\ManyToMany(targetEntity: \Oro\Bundle\LocaleBundle\Entity\LocalizedFallbackValue::class, cascade: ['ALL'], orphanRemoval: true)] + #[ORM\JoinTable(name: 'credit_line_short_label', joinColumns: [new ORM\JoinColumn(name: 'transport_id', referencedColumnName: 'id', onDelete: 'CASCADE')], inverseJoinColumns: [new ORM\JoinColumn(name: 'localized_value_id', referencedColumnName: 'id', onDelete: 'CASCADE', unique: true)])] private $shortLabels; /** diff --git a/src/Synolia/Bundle/CreditLineBundle/Form/Type/CreditLineSettingsType.php b/src/Synolia/Bundle/CreditLineBundle/Form/Type/CreditLineSettingsType.php index 6536848..94d080b 100644 --- a/src/Synolia/Bundle/CreditLineBundle/Form/Type/CreditLineSettingsType.php +++ b/src/Synolia/Bundle/CreditLineBundle/Form/Type/CreditLineSettingsType.php @@ -52,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver) /** * {@inheritdoc} */ - public function getBlockPrefix() + public function getBlockPrefix(): string { return self::BLOCK_PREFIX; }