Lisem fix & features

.php_cs

@@ -24,6 +24,7 @@ $finder = PhpCsFixer\Finder::create()
 $config = PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
+        'binary_operator_spaces' => ['align_double_arrow' => true],
         'concat_space' => ['spacing'=>'one']
     ))
     ->setFinder($finder);

src/Admin/OrganismAdmin.php

@@ -373,17 +373,4 @@ private function handlePositions($object)
             }
         }
     }
-
-    public static function filterNameCallback($queryBuilder, $alias, $field, $value)
-    {
-        if (!$value['value']) {
-            return;
-        }
-        $queryBuilder->orWhere($queryBuilder->expr()->like($alias . '.name', ':value'));
-        $queryBuilder->orWhere($queryBuilder->expr()->like($alias . '.firstname', ':value'));
-        $queryBuilder->orWhere($queryBuilder->expr()->like($alias . '.lastname', ':value'));
-        $queryBuilder->setParameter('value', $value['value']);
-
-        return true;
-    }
 }

src/DependencyInjection/Configuration.php

@@ -60,6 +60,7 @@ public function getConfigTreeBuilder()
                                     ->scalarNode('description')->defaultNull()->end()
                                     ->scalarNode('createdAt')->defaultNull()->end()
                                     ->scalarNode('updatedAt')->defaultNull()->end()
+                                    ->scalarNode('type')->defaultNull()->end()
                                     ->booleanNode('translatable')->defaultFalse()->end()
                                 ->end()
                             ->end()

src/Entity/Address.php

@@ -20,6 +20,7 @@
 
 /**
  * Address.
+ * https://github.com/Sylius/Sylius/issues/8345 & https://ocramius.github.io/blog/fluent-interfaces-are-evil/
  */
 class Address implements AddressInterface, VCardableInterface
 {
@@ -106,11 +107,11 @@ public function initAddress()
     public function __toString()
     {
         return sprintf(
-           '%s %s, %s %s',
-           $this->getFirstName(),
-           $this->getLastName(),
-           $this->getStreet(),
-           $this->getCountryCode()
+            '%s %s, %s %s',
+            $this->getFirstName(),
+            $this->getLastName(),
+            $this->getStreet(),
+            $this->getCountryCode()
         );
     }
 
@@ -119,37 +120,34 @@ public function __toString()
      *
      * @param string $firstName
      *
-     * @return Address
      */
-    public function setFirstName($firstName)
+    public function setFirstName(?string $firstName): void
     {
         $this->firstName = $firstName;
-
-        return $this;
     }
 
     /**
      * Get firstName.
      *
      * @return string
      */
-    public function getFirstName()
+    public function getFirstName(): ?string
     {
         return $this->firstName;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getLastName()
+    public function getLastName(): ?string
     {
         return $this->lastName;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setLastName($lastName)
+    public function setLastName(?string $lastName): void
     {
         $this->lastName = $lastName;
     }
@@ -159,21 +157,18 @@ public function setLastName($lastName)
      *
      * @param string $postCode
      *
-     * @return Address
      */
-    public function setPostCode($postCode)
+    public function setPostCode(?string $postCode): void
     {
         $this->postCode = $postCode;
-
-        return $this;
     }
 
     /**
      * Get postCode.
      *
      * @return string
      */
-    public function getPostCode()
+    public function getPostCode(): ?string
     {
         return $this->postCode;
     }
@@ -183,21 +178,18 @@ public function getPostCode()
      *
      * @param string $street
      *
-     * @return Address
      */
-    public function setStreet($street)
+    public function setStreet(?string $street): void
     {
         $this->street = $street;
-
-        return $this;
     }
 
     /**
      * Get street.
      *
      * @return string
      */
-    public function getStreet()
+    public function getStreet(): ?string
     {
         return $this->street;
     }
@@ -207,21 +199,18 @@ public function getStreet()
      *
      * @param string $city
      *
-     * @return Address
      */
-    public function setCity($city)
+    public function setCity(?string $city): void
     {
         $this->city = $city;
-
-        return $this;
     }
 
     /**
      * Get city.
      *
      * @return string
      */
-    public function getCity()
+    public function getCity(): ?string
     {
         return $this->city;
     }
@@ -231,21 +220,18 @@ public function getCity()
      *
      * @param string $countryCode
      *
-     * @return Address
      */
-    public function setCountryCode($countryCode = null)
+    public function setCountryCode(?string $countryCode = null): void
     {
         $this->countryCode = $countryCode;
-
-        return $this;
     }
 
     /**
      * Get countryCode.
      *
      * @return string
      */
-    public function getCountryCode()
+    public function getCountryCode(): ?string
     {
         return $this->countryCode;
     }
@@ -255,21 +241,18 @@ public function getCountryCode()
      *
      * @param string $provinceCode
      *
-     * @return Address
      */
-    public function setProvinceCode($provinceCode = null)
+    public function setProvinceCode(?string $provinceCode = null): void
     {
         $this->provinceCode = $provinceCode;
-
-        return $this;
     }
 
     /**
      * Get provinceCode.
      *
      * @return string
      */
-    public function getProvinceCode()
+    public function getProvinceCode(): ?string
     {
         return $this->provinceCode;
     }
@@ -279,21 +262,18 @@ public function getProvinceCode()
      *
      * @param string $provinceName
      *
-     * @return Address
      */
-    public function setProvinceName($provinceName = null)
+    public function setProvinceName(?string $provinceName = null): void
     {
         $this->provinceName = $provinceName;
-
-        return $this;
     }
 
     /**
      * Get provinceName.
      *
      * @return string
      */
-    public function getProvinceName()
+    public function getProvinceName(): ?string
     {
         return $this->provinceName;
     }
@@ -303,37 +283,42 @@ public function getProvinceName()
      *
      * @param bool $npai
      *
-     * @return Address
      */
     public function setNpai($npai)
     {
         $this->npai = $npai;
-
-        return $this;
     }
 
+    /**
+     * Is npai.
+     *
+     * @return bool
+     */
+    public function isNpai()
+    {
+        return $this->npai;
+    }
+
     /**
      * Get npai.
      *
      * @return bool
      */
     public function getNpai()
     {
-        return $this->npai;
+        /* for retrocomp only */
+        return $this->isNpai();
     }
 
     /**
      * Set vcardUid.
      *
      * @param string $vcardUid
      *
-     * @return Address
      */
     public function setVcardUid($vcardUid)
     {
         $this->vcardUid = $vcardUid;
-
-        return $this;
     }
 
     /**
@@ -351,13 +336,20 @@ public function getVcardUid()
      *
      * @param bool $confirmed
      *
-     * @return Address
      */
     public function setConfirmed($confirmed)
     {
         $this->confirmed = $confirmed;
+    }
 
-        return $this;
+    /**
+     * Is confirmed.
+     *
+     * @return bool
+     */
+    public function isConfirmed()
+    {
+        return $this->confirmed;
     }
 
     /**
@@ -367,29 +359,27 @@ public function setConfirmed($confirmed)
      */
     public function getConfirmed()
     {
-        return $this->confirmed;
+        /* for retrocomp only */
+        return $this->isConfirmed();
     }
 
     /**
      * Set organism.
      *
      * @param \Librinfo\CRMBundle\Entity\Organism $organism
      *
-     * @return Address
      */
-    public function setOrganism(\Librinfo\CRMBundle\Entity\Organism $organism = null)
+    public function setOrganism(\Librinfo\CRMBundle\Entity\Organism $organism = null): void
     {
         $this->organism = $organism;
-
-        return $this;
     }
 
     /**
      * Get organism.
      *
      * @return \Librinfo\CRMBundle\Entity\Organism
      */
-    public function getOrganism()
+    public function getOrganism(): ?\Librinfo\CRMBundle\Entity\Organism
     {
         return $this->organism;
     }

src/Entity/AddressSearchIndex.php

@@ -16,5 +16,4 @@
 
 class AddressSearchIndex extends SearchIndexEntity
 {
-    public static $fields = ['lastName', 'firstName', 'postCode', 'street', 'city', 'countryCode', 'provinceCode', 'provinceName'];
 }

src/Entity/OrganismSearchIndex.php

@@ -16,7 +16,4 @@
 
 class OrganismSearchIndex extends SearchIndexEntity
 {
-    // TODO: this should go in the organism.orm.yml mapping file :
-    //       find a way to override Doctrine ORM YamlDriver and ClassMetadata classes
-    public static $fields = ['name', 'firstname', 'lastname', 'description', 'email', 'url'];
 }

src/Entity/PositionSearchIndex.php

@@ -16,7 +16,4 @@
 
 class PositionSearchIndex extends SearchIndexEntity
 {
-    // TODO: this should go in the organism.orm.yml mapping file :
-    //       find a way to override Doctrine ORM YamlDriver and ClassMetadata classes
-    public static $fields = ['label', 'description', 'email', 'department'];
 }