Merge branch 'release/v1.2.2'

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ## [UNRELEASED]
 
-## [1.2.1] - 2018-11-07
+## [1.2.2] - 2018-11-16
 ### Fix
-- [MATURITE] L'ordre des catégories est auto-généré (il restait à 0 pour toutes les catégories)
+- [GLOBAL] Le code postal commencant par 0 ne fonctionnait pas pour les adresses du registre, #119
 
 ## [1.2.0] - 2018-11-07
 ### Changement

config/domain/registry/validation/address.yaml

@@ -10,11 +10,6 @@ App\Domain\Registry\Model\Embeddable\Address:
                 message: 'registry_address.phone_number.regex'
                 groups: ['default']
         zipCode:
-            - Length:
-                min: 5
-                max: 5
-                exactMessage: 'registry_address.zip_code.length'
-                groups: ['default']
             - Regex:
                 pattern: '/^[0-9]{5}$/'
                 message: 'registry_address.zip_code.regex'

config/packages/framework.yaml

 parameters:
-    app.version: 1.2.1
+    app.version: 1.2.2
 
 framework:
     secret: '%env(APP_SECRET)%'

src/Application/Migrations/Version20181115193356.php

+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181115193356 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE registry_contractor CHANGE address_zip_code address_zip_code VARCHAR(5) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE registry_contractor CHANGE address_zip_code address_zip_code INT DEFAULT NULL');
+    }
+}

src/Domain/Registry/Form/Type/Embeddable/AddressType.php

@@ -16,7 +16,6 @@ namespace App\Domain\Registry\Form\Type\Embeddable;
 use App\Domain\Registry\Model\Embeddable\Address;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -40,7 +39,7 @@ class AddressType extends AbstractType
                 'label'    => 'registry.address.form.city',
                 'required' => $required,
             ])
-            ->add('zipCode', NumberType::class, [
+            ->add('zipCode', TextType::class, [
                 'label'    => 'registry.address.form.zip_code',
                 'required' => $required,
             ])

src/Domain/Registry/Model/Embeddable/Address.php

@@ -31,7 +31,7 @@ class Address
     private $city;
 
     /**
-     * @var int
+     * @var string
      */
     private $zipCode;
 
@@ -94,17 +94,17 @@ class Address
     }
 
     /**
-     * @return int|null
+     * @return string|null
      */
-    public function getZipCode(): ?int
+    public function getZipCode(): ?string
     {
         return $this->zipCode;
     }
 
     /**
-     * @param int|null $zipCode
+     * @param string|null $zipCode
      */
-    public function setZipCode(?int $zipCode): void
+    public function setZipCode(?string $zipCode): void
     {
         $this->zipCode = $zipCode;
     }

src/Infrastructure/ORM/Registry/Mapping/Embeddable/Address.orm.xml

@@ -10,7 +10,7 @@
         <field name="lineOne" column="line_one" nullable="true"/>
         <field name="lineTwo" column="line_two" nullable="true"/>
         <field name="city" column="city" nullable="true"/>
-        <field name="zipCode" column="zip_code" type="integer" nullable="true"/>
+        <field name="zipCode" column="zip_code" length="5" nullable="true"/>
         <field name="mail" column="mail" nullable="true"/>
         <field name="phoneNumber" column="phone_number" length="10" nullable="true"/>