Merge pull request #1 from core23/analysis-XVll6B

Apply fixes from StyleCI
nucleos · Nov 20, 2017 · 0ab2621 · 0ab2621
2 parents ed2341d + 85352e0
commit 0ab2621
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 21 deletions.
diff --git a/src/EventListener/ORM/AbstractListener.php b/src/EventListener/ORM/AbstractListener.php
@@ -20,7 +20,7 @@ abstract class AbstractListener implements EventSubscriber
      *
      * @return bool
      */
-    final protected function containsTrait(ReflectionClass $reflection, string $class):bool
+    final protected function containsTrait(ReflectionClass $reflection, string $class): bool
     {
         do {
             $traits = $reflection->getTraitNames();

diff --git a/src/EventListener/ORM/ConfirmableListener.php b/src/EventListener/ORM/ConfirmableListener.php
@@ -32,7 +32,7 @@ public function getSubscribedEvents()
      *
      * @throws MappingException
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) : void
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $meta = $eventArgs->getClassMetadata();
 

diff --git a/src/EventListener/ORM/DeletableListener.php b/src/EventListener/ORM/DeletableListener.php
@@ -32,7 +32,7 @@ public function getSubscribedEvents()
      *
      * @throws MappingException
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) : void
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $meta = $eventArgs->getClassMetadata();
 

diff --git a/src/EventListener/ORM/LifecycleDateListener.php b/src/EventListener/ORM/LifecycleDateListener.php
@@ -65,7 +65,7 @@ public function preUpdate(LifecycleEventArgs $args): void
      *
      * @throws MappingException
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) : void
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $meta = $eventArgs->getClassMetadata();
 

diff --git a/src/EventListener/ORM/SortableListener.php b/src/EventListener/ORM/SortableListener.php
@@ -79,7 +79,7 @@ public function preRemove(LifecycleEventArgs $args): void
      *
      * @throws MappingException
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) : void
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $meta = $eventArgs->getClassMetadata();
 
@@ -103,7 +103,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) : void
      * @param LifecycleEventArgs $args
      * @param int|null           $oldPosition
      */
-    private function uniquePosition(LifecycleEventArgs $args, ? int $oldPosition = null) : void
+    private function uniquePosition(LifecycleEventArgs $args, ? int $oldPosition = null): void
     {
         $entity = $args->getEntity();
 
@@ -177,7 +177,7 @@ private function getNextPosition(EntityManager $em, PositionAwareInterface $enti
             $qb->andWhere('e.'.$field.' = :'.$field)->setParameter($field, $value);
         }
 
-        /** @var PositionAwareInterface $result */
+        /* @var PositionAwareInterface $result */
         try {
             $result = $qb->getQuery()->getOneOrNullResult();
         } catch (NonUniqueResultException $ignored) {

diff --git a/src/Manager/BaseQueryTrait.php b/src/Manager/BaseQueryTrait.php
@@ -62,11 +62,12 @@ public function addOrder(QueryBuilder $builder, array $sort, string $defaultEnti
             $table = $defaultEntity;
 
             // Map entity to table name
-            if (count($fieldSpl) === 2) {
+            if (2 === count($fieldSpl)) {
                 foreach ($aliasMapping as $k => $v) {
                     if ($fieldSpl[0] === $k) {
                         $table = $v;
                         $field = $fieldSpl[1];
+
                         break;
                     }
                 }

diff --git a/src/Manager/SearchQueryTrait.php b/src/Manager/SearchQueryTrait.php
@@ -47,7 +47,7 @@ public function searchWhere(QueryBuilder $qb, string $field, array $values, bool
      * @param string       $word
      * @param int          $index
      */
-    private function buildLikeExpressions(QueryBuilder $qb, Orx $orx, string $field, string $word, int $index) : void
+    private function buildLikeExpressions(QueryBuilder $qb, Orx $orx, string $field, string $word, int $index): void
     {
         $orx->add(sprintf('%s LIKE :name'.$index.'_any', $field));
         $orx->add(sprintf('%s LIKE :name'.$index.'_pre', $field));

diff --git a/src/Model/ConfirmableInterface.php b/src/Model/ConfirmableInterface.php
@@ -41,5 +41,5 @@ public function setConfirmed(bool $confirmed);
      *
      * @return bool
      */
-    public function isConfirmed() : bool;
+    public function isConfirmed(): bool;
 }
diff --git a/src/Model/DeletableInterface.php b/src/Model/DeletableInterface.php
@@ -41,5 +41,5 @@ public function setDeleted(bool $deleted);
      *
      * @return bool
      */
-    public function isDeleted() : bool;
+    public function isDeleted(): bool;
 }
diff --git a/src/Model/LifecycleDateTimeInterface.php b/src/Model/LifecycleDateTimeInterface.php
@@ -23,7 +23,7 @@ public function getCreatedAt(): ? \DateTime;
      *
      * @return \DateTime|null
      */
-    public function getUpdatedAt() : ? \DateTime;
+    public function getUpdatedAt(): ? \DateTime;
 
     /**
      * Set createdAt.

diff --git a/src/Model/PositionAwareInterface.php b/src/Model/PositionAwareInterface.php
@@ -32,5 +32,5 @@ public function setPosition(? int $position);
      *
      * @return string[]
      */
-    public function getPositionGroup() : array;
+    public function getPositionGroup(): array;
 }
diff --git a/src/Model/Traits/ConfirmableTrait.php b/src/Model/Traits/ConfirmableTrait.php
@@ -63,8 +63,8 @@ public function setConfirmed(bool $confirmed)
      *
      * @return bool
      */
-    public function isConfirmed() : bool
+    public function isConfirmed(): bool
     {
-        return $this->confirmedAt !== null;
+        return null !== $this->confirmedAt;
     }
 }
diff --git a/src/Model/Traits/DeleteableTrait.php b/src/Model/Traits/DeleteableTrait.php
@@ -63,8 +63,8 @@ public function setDeleted(bool $deleted)
      *
      * @return bool
      */
-    public function isDeleted() : bool
+    public function isDeleted(): bool
     {
-        return $this->deletedAt !== null;
+        return null !== $this->deletedAt;
     }
 }
diff --git a/src/Model/Traits/LifecycleDateTimeTrait.php b/src/Model/Traits/LifecycleDateTimeTrait.php
@@ -40,7 +40,7 @@ public function setCreatedAt(? \DateTime $createdAt)
      *
      * @return \DateTime|null
      */
-    public function getCreatedAt() : ? \DateTime
+    public function getCreatedAt(): ? \DateTime
     {
         return $this->createdAt;
     }
@@ -64,7 +64,7 @@ public function setUpdatedAt(? \DateTime $updatedAt)
      *
      * @return \DateTime|null
      */
-    public function getUpdatedAt() : ? \DateTime
+    public function getUpdatedAt(): ? \DateTime
     {
         return $this->updatedAt;
     }

diff --git a/src/Model/Traits/SortableTrait.php b/src/Model/Traits/SortableTrait.php
@@ -31,15 +31,15 @@ public function setPosition(? int $position)
     /**
      * @return int|null
      */
-    public function getPosition() : int
+    public function getPosition(): int
     {
         return $this->position;
     }
 
     /**
      * @return array
      */
-    public function getPositionGroup() : array
+    public function getPositionGroup(): array
     {
         return array();
     }