From 15bc3e62d34086ec38f94cd3025f4dd73336f11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 2 Mar 2022 16:29:21 +0100 Subject: [PATCH] fix cs --- .../ChillMainBundle/Entity/Location.php | 1 - .../ChillMainBundle/Form/LocationFormType.php | 2 +- .../Form/Type/ChillPhoneNumberType.php | 14 ++++- .../PhoneNumberHelperInterface.php | 1 - .../Phonenumber/PhonenumberHelper.php | 1 - .../Phonenumber/PhonenumberHelperTest.php | 1 - .../migrations/Version20220302132728.php | 30 +++++---- .../Form/CreationPersonType.php | 3 +- .../ChillPersonBundle/Form/PersonType.php | 5 -- .../migrations/Version20220302143821.php | 62 +++++++++++-------- 10 files changed, 67 insertions(+), 53 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php index dd1bfa045..c1421586f 100644 --- a/src/Bundle/ChillMainBundle/Entity/Location.php +++ b/src/Bundle/ChillMainBundle/Entity/Location.php @@ -21,7 +21,6 @@ use Doctrine\ORM\Mapping as ORM; use libphonenumber\PhoneNumber; use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Validator\Constraints as Assert; /** * @ORM\Table(name="chill_main_location") diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php index de10e88a5..c027e8086 100644 --- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php +++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php @@ -48,7 +48,7 @@ final class LocationFormType extends AbstractType ]) ->add('name', TextType::class) ->add('phonenumber1', ChillPhoneNumberType::class, ['required' => false]) - ->add('phonenumber2',ChillPhoneNumberType::class, ['required' => false]) + ->add('phonenumber2', ChillPhoneNumberType::class, ['required' => false]) ->add('email', TextType::class, ['required' => false]) ->add('address', PickAddressType::class, [ 'required' => false, diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php index 9edd7aca4..547782943 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php +++ b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php @@ -1,15 +1,24 @@ setDefault('default_region', $this->defaultCarrierCode) ->setDefault('format', PhoneNumberFormat::NATIONAL) ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE) - ->setNormalizer('attr', function(Options $options, $value) { + ->setNormalizer('attr', function (Options $options, $value) { if (array_key_exists('placeholder', $value)) { return $value; } @@ -49,5 +58,4 @@ class ChillPhoneNumberType extends AbstractType { return PhoneNumberType::class; } - } diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php index 9cd5605f8..bc71ddf3d 100644 --- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php +++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php @@ -51,5 +51,4 @@ interface PhoneNumberHelperInterface * if the validation is not configured. */ public function isValidPhonenumberMobile(string $phonenumber): bool; - } diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php index b82159185..c73b3dc95 100644 --- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php +++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php @@ -17,7 +17,6 @@ use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\ServerException; use libphonenumber\NumberParseException; use libphonenumber\PhoneNumber; -use libphonenumber\PhoneNumberFormat; use libphonenumber\PhoneNumberUtil; use Psr\Cache\CacheItemPoolInterface; use Psr\Log\LoggerInterface; diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php index 59f0cde45..26287e9bc 100644 --- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\MainBundle\Tests\Routing\Loader; use Chill\MainBundle\Phonenumber\PhonenumberHelper; -use libphonenumber\PhoneNumber; use libphonenumber\PhoneNumberUtil; use Psr\Log\NullLogger; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php index 1c0ef50ca..23a7f2ab6 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php @@ -1,5 +1,12 @@ addSql('ALTER TABLE chill_main_location ALTER phonenumber1 TYPE VARCHAR(64)'); + $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber2 TYPE VARCHAR(64)'); + $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber2 DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber1 IS NULL'); + $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber2 IS NULL'); + } + public function getDescription(): string { return 'Upgrade phonenumber on location'; @@ -25,7 +43,7 @@ final class Version20220302132728 extends AbstractMigration implements Container ->getParameter('chill_main')['phone_helper']['default_carrier_code']; if (null === $carrier_code) { - throw new \RuntimeException('no carrier code'); + throw new RuntimeException('no carrier code'); } $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 TYPE VARCHAR(35)'); @@ -45,16 +63,6 @@ final class Version20220302132728 extends AbstractMigration implements Container ); } - public function down(Schema $schema): void - { - $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 TYPE VARCHAR(64)'); - $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 DROP DEFAULT'); - $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber2 TYPE VARCHAR(64)'); - $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber2 DROP DEFAULT'); - $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber1 IS NULL'); - $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber2 IS NULL'); - } - private function buildMigrationPhoneNumberClause(string $defaultCarriercode, string $field): string { $util = PhoneNumberUtil::getInstance(); diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php index 3aa8e3b15..2aed9df97 100644 --- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php @@ -25,7 +25,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\EmailType; -use Symfony\Component\Form\Extension\Core\Type\TelType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -64,7 +63,7 @@ final class CreationPersonType extends AbstractType ]) ->add('phonenumber', ChillPhoneNumberType::class, [ 'required' => false, - 'type' => PhoneNumberType::FIXED_LINE + 'type' => PhoneNumberType::FIXED_LINE, ]) ->add('mobilenumber', ChillPhoneNumberType::class, [ 'required' => false, diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php index 9ba621633..acc65c6ac 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php @@ -27,12 +27,7 @@ use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\PersonPhone; use Chill\PersonBundle\Form\Type\GenderType; use Chill\PersonBundle\Form\Type\PersonAltNameType; -use Chill\PersonBundle\Form\Type\PersonPhoneType; use Chill\PersonBundle\Form\Type\Select2MaritalStatusType; -use libphonenumber\PhoneNumberFormat; -use libphonenumber\PhoneNumberType as LibphonenumberPhoneNumberType; -use libphonenumber\PhoneNumberUtil; -use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\CallbackTransformer; diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php index c70f456d6..6ffb33472 100644 --- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php +++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php @@ -1,5 +1,12 @@ addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(64)'); + $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS NULL'); + } + public function getDescription(): string { return 'Upgrade phonenumber on third parties'; } + public function up(Schema $schema): void + { + $carrier_code = $this->container + ->getParameter('chill_main')['phone_helper']['default_carrier_code']; + + if (null === $carrier_code) { + throw new RuntimeException('no carrier code'); + } + + $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)'); + $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)'); + $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS \'(DC2Type:phone_number)\''); + + $this->addSql( + 'UPDATE chill_3party.third_party SET ' . + $this->buildMigrationPhonenumberClause($carrier_code, 'telephone') + ); + } + private function buildMigrationPhoneNumberClause(string $defaultCarriercode, string $field): string { $util = PhoneNumberUtil::getInstance(); @@ -32,31 +67,4 @@ final class Version20220302143821 extends AbstractMigration implements Container ELSE replace(replace(%s, \'(0)\', \'\'),\' \', \'\') END', $field, $field, $field, $countryCode, $field, $field); } - - public function up(Schema $schema): void - { - $carrier_code = $this->container - ->getParameter('chill_main')['phone_helper']['default_carrier_code']; - - if (null === $carrier_code) { - throw new \RuntimeException('no carrier code'); - } - - $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)'); - $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone DROP DEFAULT'); - $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)'); - $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS \'(DC2Type:phone_number)\''); - - $this->addSql( - 'UPDATE chill_3party.third_party SET ' . - $this->buildMigrationPhonenumberClause($carrier_code, 'telephone') - ); - } - - public function down(Schema $schema): void - { - $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(64)'); - $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone DROP DEFAULT'); - $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS NULL'); - } }