location: fix code style with phpstan

This commit is contained in:
nobohan 2021-11-25 16:10:08 +01:00
parent 3f35f0e251
commit 36c57511e8
4 changed files with 47 additions and 41 deletions

View File

@ -10,8 +10,6 @@
namespace Chill\MainBundle\Controller; namespace Chill\MainBundle\Controller;
use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\CRUD\Controller\ApiController;
use DateInterval;
use DateTime;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
/** /**

View File

@ -25,15 +25,16 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
*/ */
class LocationType class LocationType
{ {
public const DEFAULT_FOR_3PARTY = 'thirdparty';
public const DEFAULT_FOR_PERSON = 'person';
public const STATUS_NEVER = 'never'; public const STATUS_NEVER = 'never';
public const STATUS_OPTIONAL = 'optional'; public const STATUS_OPTIONAL = 'optional';
public const STATUS_REQUIRED = 'required'; public const STATUS_REQUIRED = 'required';
public const DEFAULT_FOR_PERSON = 'person';
public const DEFAULT_FOR_3PARTY = 'thirdparty';
/** /**
* @ORM\Column(type="boolean", nullable=true) * @ORM\Column(type="boolean", nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read"})
@ -58,6 +59,12 @@ class LocationType
*/ */
private string $contactData = self::STATUS_OPTIONAL; 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\Id
* @ORM\GeneratedValue * @ORM\GeneratedValue
@ -72,13 +79,6 @@ class LocationType
*/ */
private array $title = []; private array $title = [];
/**
* @ORM\Column(type="string", nullable=true, length=32, unique=true)
* @Serializer\Groups({"read"})
*/
private ?string $defaultFor = null;
public function getActive(): ?bool public function getActive(): ?bool
{ {
return $this->active; return $this->active;
@ -99,6 +99,11 @@ class LocationType
return $this->contactData; return $this->contactData;
} }
public function getDefaultFor(): ?string
{
return $this->defaultFor;
}
public function getId(): ?int public function getId(): ?int
{ {
return $this->id; return $this->id;
@ -137,22 +142,17 @@ class LocationType
return $this; 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 public function setDefaultFor(string $defaultFor): self
{ {
$this->defaultFor = $defaultFor; $this->defaultFor = $defaultFor;
return $this; return $this;
} }
public function setTitle(array $title): self
{
$this->title = $title;
return $this;
}
} }

View File

@ -73,15 +73,16 @@ final class LocationTypeType extends AbstractType
] ]
) )
->add( ->add(
'defaultFor', 'defaultFor',
ChoiceType::class, ChoiceType::class,
[ [
'choices' => [ 'choices' => [
'none' => null, 'none' => null,
'person' => LocationType::DEFAULT_FOR_PERSON, 'person' => LocationType::DEFAULT_FOR_PERSON,
'thirdparty' => LocationType::DEFAULT_FOR_3PARTY, 'thirdparty' => LocationType::DEFAULT_FOR_3PARTY,
], ],
'expanded' => true 'expanded' => true,
]); ]
);
} }
} }

View File

@ -1,5 +1,12 @@
<?php <?php
/**
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1); declare(strict_types=1);
namespace Chill\Migrations\Main; namespace Chill\Migrations\Main;
@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\AbstractMigration;
/** /**
* Add defaultFor to LocationType * Add defaultFor to LocationType.
*/ */
final class Version20211123093355 extends AbstractMigration final class Version20211123093355 extends AbstractMigration
{ {
public function down(Schema $schema): void
{
$this->addSql('DROP INDEX UNIQ_A459B5CADD3E4105');
$this->addSql('ALTER TABLE chill_main_location_type DROP defaultFor');
}
public function getDescription(): string public function getDescription(): string
{ {
return 'Add defaultFor to LocationType'; 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('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)'); $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');
}
}