From 36c57511e874f9f49cb7a6491f87ff5c0404aa18 Mon Sep 17 00:00:00 2001 From: nobohan Date: Thu, 25 Nov 2021 16:10:08 +0100 Subject: [PATCH] location: fix code style with phpstan --- .../Controller/LocationApiController.php | 2 - .../ChillMainBundle/Entity/LocationType.php | 44 +++++++++---------- .../ChillMainBundle/Form/LocationTypeType.php | 19 ++++---- .../migrations/Version20211123093355.php | 23 ++++++---- 4 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php index 3e4911788..16fc414d9 100644 --- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php @@ -10,8 +10,6 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; -use DateInterval; -use DateTime; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php index 9385620cd..a9ff33414 100644 --- a/src/Bundle/ChillMainBundle/Entity/LocationType.php +++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php @@ -25,15 +25,16 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap; */ class LocationType { + public const DEFAULT_FOR_3PARTY = 'thirdparty'; + + public const DEFAULT_FOR_PERSON = 'person'; + public const STATUS_NEVER = 'never'; public const STATUS_OPTIONAL = 'optional'; public const STATUS_REQUIRED = 'required'; - public const DEFAULT_FOR_PERSON = 'person'; - public const DEFAULT_FOR_3PARTY = 'thirdparty'; - /** * @ORM\Column(type="boolean", nullable=true) * @Serializer\Groups({"read"}) @@ -58,6 +59,12 @@ class LocationType */ private string $contactData = self::STATUS_OPTIONAL; + /** + * @ORM\Column(type="string", nullable=true, length=32, unique=true) + * @Serializer\Groups({"read"}) + */ + private ?string $defaultFor = null; + /** * @ORM\Id * @ORM\GeneratedValue @@ -72,13 +79,6 @@ class LocationType */ private array $title = []; - /** - * @ORM\Column(type="string", nullable=true, length=32, unique=true) - * @Serializer\Groups({"read"}) - */ - private ?string $defaultFor = null; - - public function getActive(): ?bool { return $this->active; @@ -99,6 +99,11 @@ class LocationType return $this->contactData; } + public function getDefaultFor(): ?string + { + return $this->defaultFor; + } + public function getId(): ?int { return $this->id; @@ -137,22 +142,17 @@ class LocationType return $this; } - public function setTitle(array $title): self - { - $this->title = $title; - - return $this; - } - - public function getDefaultFor(): ?string - { - return $this->defaultFor; - } - public function setDefaultFor(string $defaultFor): self { $this->defaultFor = $defaultFor; return $this; } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } } diff --git a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php index 93bc5ba0f..41372b48e 100644 --- a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php +++ b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php @@ -73,15 +73,16 @@ final class LocationTypeType extends AbstractType ] ) ->add( - 'defaultFor', + 'defaultFor', ChoiceType::class, - [ - 'choices' => [ - 'none' => null, - 'person' => LocationType::DEFAULT_FOR_PERSON, - 'thirdparty' => LocationType::DEFAULT_FOR_3PARTY, - ], - 'expanded' => true - ]); + [ + 'choices' => [ + 'none' => null, + 'person' => LocationType::DEFAULT_FOR_PERSON, + 'thirdparty' => LocationType::DEFAULT_FOR_3PARTY, + ], + 'expanded' => true, + ] + ); } } diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php index 1736cf857..b6618d25e 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php @@ -1,5 +1,12 @@ addSql('DROP INDEX UNIQ_A459B5CADD3E4105'); + $this->addSql('ALTER TABLE chill_main_location_type DROP defaultFor'); + } + public function getDescription(): string { return 'Add defaultFor to LocationType'; @@ -22,10 +35,4 @@ final class Version20211123093355 extends AbstractMigration $this->addSql('ALTER TABLE chill_main_location_type ADD defaultFor VARCHAR(32) DEFAULT NULL'); $this->addSql('CREATE UNIQUE INDEX UNIQ_A459B5CADD3E4105 ON chill_main_location_type (defaultFor)'); } - - public function down(Schema $schema): void - { - $this->addSql('DROP INDEX UNIQ_A459B5CADD3E4105'); - $this->addSql('ALTER TABLE chill_main_location_type DROP defaultFor'); - } -} \ No newline at end of file +}