[cs] apply php71 set

KnpLabs · Dec 9, 2019 · 9103106 · 9103106
1 parent 33d5c2c
commit 9103106
Show file tree

Hide file tree

Showing 44 changed files with 145 additions and 145 deletions.
diff --git a/ecs.yaml b/ecs.yaml
@@ -2,7 +2,7 @@ parameters:
     sets:
         - 'psr12'
         - 'php70'
-#        - 'php71'
+        - 'php71'
 #        - 'symplify'
 #        - 'common'
 #        - 'clean-code'

diff --git a/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php b/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php
@@ -15,7 +15,7 @@ class DoctrineBehaviorsExtension extends Extension
     /**
      * {@inheritDoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../../config'));
         $loader->load('orm-services.yml');

diff --git a/src/Model/Geocodable/GeocodableMethods.php b/src/Model/Geocodable/GeocodableMethods.php
@@ -39,7 +39,7 @@ public function getLocation()
      *
      * @return $this
      */
-    public function setLocation(Point $location = null)
+    public function setLocation(?Point $location = null)
     {
         $this->location = $location;
 

diff --git a/src/Model/Sluggable/SluggableMethods.php b/src/Model/Sluggable/SluggableMethods.php
@@ -101,7 +101,7 @@ private function generateSlugValue($values)
     /**
      * Generates and sets the entity's slug. Called prePersist and preUpdate
      */
-    public function generateSlug()
+    public function generateSlug(): void
     {
         if ($this->getRegenerateSlugOnUpdate() || empty($this->slug)) {
             $fields = $this->getSluggableFields();

diff --git a/src/Model/SoftDeletable/SoftDeletableMethods.php b/src/Model/SoftDeletable/SoftDeletableMethods.php
@@ -23,15 +23,15 @@ trait SoftDeletableMethods
     /**
      * Marks entity as deleted.
      */
-    public function delete()
+    public function delete(): void
     {
         $this->deletedAt = $this->currentDateTime();
     }
 
     /**
      * Restore entity by undeleting it
      */
-    public function restore()
+    public function restore(): void
     {
         $this->deletedAt = null;
     }
@@ -55,7 +55,7 @@ public function isDeleted()
      *
      * @return Boolean
      */
-    public function willBeDeleted(\DateTime $at = null)
+    public function willBeDeleted(?\DateTime $at = null)
     {
         if ($this->deletedAt === null) {
             return false;

diff --git a/src/Model/Timestampable/TimestampableMethods.php b/src/Model/Timestampable/TimestampableMethods.php
@@ -65,7 +65,7 @@ public function setUpdatedAt(\DateTime $updatedAt)
     /**
      * Updates createdAt and updatedAt timestamps.
      */
-    public function updateTimestamps()
+    public function updateTimestamps(): void
     {
         // Create a datetime with microseconds
         $dateTime = \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)));

diff --git a/src/Model/Translatable/TranslatableMethods.php b/src/Model/Translatable/TranslatableMethods.php
@@ -62,7 +62,7 @@ public function addTranslation($translation)
      *
      * @param Translation $translation The translation
      */
-    public function removeTranslation($translation)
+    public function removeTranslation($translation): void
     {
         $this->getTranslations()->removeElement($translation);
     }
@@ -129,7 +129,7 @@ protected function doTranslate($locale = null, $fallbackToDefault = true)
     /**
      * Merges newly created translations into persisted translations.
      */
-    public function mergeNewTranslations()
+    public function mergeNewTranslations(): void
     {
         foreach ($this->getNewTranslations() as $newTranslation) {
             if (!$this->getTranslations()->contains($newTranslation) && !$newTranslation->isEmpty()) {
@@ -142,7 +142,7 @@ public function mergeNewTranslations()
     /**
      * @param mixed $locale the current locale
      */
-    public function setCurrentLocale($locale)
+    public function setCurrentLocale($locale): void
     {
         $this->currentLocale = $locale;
     }
@@ -158,7 +158,7 @@ public function getCurrentLocale()
     /**
      * @param mixed $locale the default locale
      */
-    public function setDefaultLocale($locale)
+    public function setDefaultLocale($locale): void
     {
         $this->defaultLocale = $locale;
     }

diff --git a/src/Model/Tree/Node.php b/src/Model/Tree/Node.php
@@ -90,7 +90,7 @@ public function getParentMaterializedPath()
     /**
      * {@inheritdoc}
      **/
-    public function setParentMaterializedPath($path)
+    public function setParentMaterializedPath($path): void
     {
         $this->parentNodePath = $path;
     }
@@ -134,7 +134,7 @@ public function getChildNodes()
     /**
      * {@inheritdoc}
      **/
-    public function addChildNode(NodeInterface $node)
+    public function addChildNode(NodeInterface $node): void
     {
         $this->getChildNodes()->add($node);
     }
@@ -159,7 +159,7 @@ public function isChildNodeOf(NodeInterface $node)
     /**
      * {@inheritdoc}
      **/
-    public function setChildNodeOf(NodeInterface $node = null)
+    public function setChildNodeOf(?NodeInterface $node = null)
     {
         $id = $this->getNodeId();
         if (empty($id)) {
@@ -224,7 +224,7 @@ public function getRootNode()
     /**
      * {@inheritdoc}
      **/
-    public function buildTree(array $results)
+    public function buildTree(array $results): void
     {
         $this->getChildNodes()->clear();
         foreach ($results as $i => $node) {
@@ -240,7 +240,7 @@ public function buildTree(array $results)
      *
      * @return string the json representation of the hierarchical result
      **/
-    public function toJson(\Closure $prepare = null)
+    public function toJson(?\Closure $prepare = null)
     {
         $tree = $this->toArray($prepare);
 
@@ -253,7 +253,7 @@ public function toJson(\Closure $prepare = null)
      *
      * @return array the hierarchical result
      **/
-    public function toArray(\Closure $prepare = null, array &$tree = null)
+    public function toArray(?\Closure $prepare = null, ?array &$tree = null)
     {
         if (null === $prepare) {
             $prepare = function (NodeInterface $node) {
@@ -278,7 +278,7 @@ public function toArray(\Closure $prepare = null, array &$tree = null)
      *
      * @return array the flatten result
      **/
-    public function toFlatArray(\Closure $prepare = null, array &$tree = null)
+    public function toFlatArray(?\Closure $prepare = null, ?array &$tree = null)
     {
         if (null === $prepare) {
             $prepare = function (NodeInterface $node) {
@@ -311,7 +311,7 @@ public function offsetExists($offset)
         return isset($this->getChildNodes()[$offset]);
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->getChildNodes()[$offset]);
     }

diff --git a/src/Model/Tree/NodeInterface.php b/src/Model/Tree/NodeInterface.php
@@ -67,7 +67,7 @@ public function setMaterializedPath($path);
      *
      * @return NodeInterface $this Fluent interface
      **/
-    public function setChildNodeOf(NodeInterface $node = null);
+    public function setChildNodeOf(?NodeInterface $node = null);
 
     /**
      * @param NodeInterface $node the node to append to the children collection
@@ -115,5 +115,5 @@ public function getNodeLevel();
      *
      * @return void
      **/
-    public function buildTree(array $nodes);
+    public function buildTree(array $nodes): void;
 }
diff --git a/src/ORM/Blameable/BlameableSubscriber.php b/src/ORM/Blameable/BlameableSubscriber.php
@@ -53,7 +53,7 @@ class BlameableSubscriber extends AbstractSubscriber
      * @param callable
      * @param string $userEntity
      */
-    public function __construct(ClassAnalyzer $classAnalyzer, $isRecursive, $blameableTrait, callable $userCallable = null, $userEntity = null)
+    public function __construct(ClassAnalyzer $classAnalyzer, $isRecursive, $blameableTrait, ?callable $userCallable = null, $userEntity = null)
     {
         parent::__construct($classAnalyzer, $isRecursive);
 
@@ -67,7 +67,7 @@ public function __construct(ClassAnalyzer $classAnalyzer, $isRecursive, $blameab
      *
      * @param LoadClassMetadataEventArgs $eventArgs
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $classMetadata = $eventArgs->getClassMetadata();
 
@@ -80,7 +80,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
         }
     }
 
-    private function mapEntity(ClassMetadata $classMetadata)
+    private function mapEntity(ClassMetadata $classMetadata): void
     {
         if ($this->userEntity) {
             $this->mapManyToOneUser($classMetadata);
@@ -89,7 +89,7 @@ private function mapEntity(ClassMetadata $classMetadata)
         }
     }
 
-    private function mapStringUser(ClassMetadata $classMetadata)
+    private function mapStringUser(ClassMetadata $classMetadata): void
     {
         if (!$classMetadata->hasField('createdBy')) {
             $classMetadata->mapField([
@@ -116,7 +116,7 @@ private function mapStringUser(ClassMetadata $classMetadata)
         }
     }
 
-    private function mapManyToOneUser(classMetadata $classMetadata)
+    private function mapManyToOneUser(classMetadata $classMetadata): void
     {
         if (!$classMetadata->hasAssociation('createdBy')) {
             $classMetadata->mapManyToOne([
@@ -152,7 +152,7 @@ private function mapManyToOneUser(classMetadata $classMetadata)
      *
      * @param LifecycleEventArgs $eventArgs
      */
-    public function prePersist(LifecycleEventArgs $eventArgs)
+    public function prePersist(LifecycleEventArgs $eventArgs): void
     {
         $em = $eventArgs->getEntityManager();
         $uow = $em->getUnitOfWork();
@@ -206,7 +206,7 @@ private function isValidUser($user)
      *
      * @param LifecycleEventArgs $eventArgs
      */
-    public function preUpdate(LifecycleEventArgs $eventArgs)
+    public function preUpdate(LifecycleEventArgs $eventArgs): void
     {
         $em = $eventArgs->getEntityManager();
         $uow = $em->getUnitOfWork();
@@ -235,7 +235,7 @@ public function preUpdate(LifecycleEventArgs $eventArgs)
      *
      * @param LifecycleEventArgs $eventArgs
      */
-    public function preRemove(LifecycleEventArgs $eventArgs)
+    public function preRemove(LifecycleEventArgs $eventArgs): void
     {
         $em = $eventArgs->getEntityManager();
         $uow = $em->getUnitOfWork();
@@ -264,7 +264,7 @@ public function preRemove(LifecycleEventArgs $eventArgs)
      *
      * @param mixed $user
      */
-    public function setUser($user)
+    public function setUser($user): void
     {
         $this->user = $user;
     }
@@ -300,7 +300,7 @@ public function getSubscribedEvents()
         return $events;
     }
 
-    public function setUserCallable(callable $callable)
+    public function setUserCallable(callable $callable): void
     {
         $this->userCallable = $callable;
     }

diff --git a/src/ORM/Filterable/FilterableRepository.php b/src/ORM/Filterable/FilterableRepository.php
@@ -65,7 +65,7 @@ abstract public function getInFilterColumns();
      * @param \Doctrine\ORM\QueryBuilder
      * @return \Doctrine\ORM\QueryBuilder
      */
-    public function filterBy(array $filters, QueryBuilder $qb = null)
+    public function filterBy(array $filters, ?QueryBuilder $qb = null)
     {
         $filters = array_filter($filters, function ($filter) {
             return !empty($filter);

diff --git a/src/ORM/Geocodable/GeocodableSubscriber.php b/src/ORM/Geocodable/GeocodableSubscriber.php
@@ -53,7 +53,7 @@ public function __construct(
         ClassAnalyzer $classAnalyzer,
         $isRecursive,
         $geocodableTrait,
-        callable $geolocationCallable = null
+        ?callable $geolocationCallable = null
     ) {
         parent::__construct($classAnalyzer, $isRecursive);
 
@@ -66,7 +66,7 @@ public function __construct(
      *
      * @param LoadClassMetadataEventArgs $eventArgs
      */
-    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
+    public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs): void
     {
         $classMetadata = $eventArgs->getClassMetadata();
 
@@ -114,7 +114,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
     /**
      * @param LifecycleEventArgs $eventArgs
      */
-    private function updateLocation(LifecycleEventArgs $eventArgs, $override = false)
+    private function updateLocation(LifecycleEventArgs $eventArgs, $override = false): void
     {
         $em = $eventArgs->getEntityManager();
         $uow = $em->getUnitOfWork();
@@ -141,12 +141,12 @@ private function updateLocation(LifecycleEventArgs $eventArgs, $override = false
         }
     }
 
-    public function prePersist(LifecycleEventArgs $eventArgs)
+    public function prePersist(LifecycleEventArgs $eventArgs): void
     {
         $this->updateLocation($eventArgs, false);
     }
 
-    public function preUpdate(LifecycleEventArgs $eventArgs)
+    public function preUpdate(LifecycleEventArgs $eventArgs): void
     {
         $this->updateLocation($eventArgs, true);
     }
@@ -190,7 +190,7 @@ public function getSubscribedEvents()
         ];
     }
 
-    public function setGeolocationCallable(callable $callable)
+    public function setGeolocationCallable(callable $callable): void
     {
         $this->geolocationCallable = $callable;
     }

diff --git a/src/ORM/Geocodable/Query/AST/Functions/DistanceFunction.php b/src/ORM/Geocodable/Query/AST/Functions/DistanceFunction.php
@@ -45,7 +45,7 @@ public function getSql(SqlWalker $sqlWalker)
      *
      * @param Parser $parser
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/ORM/Joinable/JoinableRepository.php b/src/ORM/Joinable/JoinableRepository.php
@@ -22,7 +22,7 @@
  */
 trait JoinableRepository
 {
-    public function getJoinAllQueryBuilder($alias = null, QueryBuilder $qb = null)
+    public function getJoinAllQueryBuilder($alias = null, ?QueryBuilder $qb = null)
     {
         if (null === $alias) {
             $alias = $this->getAlias($this->getClassName());
@@ -39,7 +39,7 @@ public function getJoinAllQueryBuilder($alias = null, QueryBuilder $qb = null)
         return $qb;
     }
 
-    private function addJoinsToQueryBuilder($alias, QueryBuilder $qb, $className, $recursive = true)
+    private function addJoinsToQueryBuilder($alias, QueryBuilder $qb, $className, $recursive = true): void
     {
         foreach ($this->getEntityManager()->getClassMetadata($className)->getAssociationMappings() as $assoc) {
             if (in_array($assoc['targetEntity'], $qb->getRootEntities()) || $className === $assoc['targetEntity']) {

diff --git a/src/ORM/Loggable/LoggableSubscriber.php b/src/ORM/Loggable/LoggableSubscriber.php
@@ -68,7 +68,7 @@ public function postUpdate(LifecycleEventArgs $eventArgs)
      *
      * @param LifecycleEventArgs $eventArgs
      */
-    public function logChangeSet(LifecycleEventArgs $eventArgs)
+    public function logChangeSet(LifecycleEventArgs $eventArgs): void
     {
         $em = $eventArgs->getEntityManager();
         $uow = $em->getUnitOfWork();
@@ -85,7 +85,7 @@ public function logChangeSet(LifecycleEventArgs $eventArgs)
         }
     }
 
-    public function preRemove(LifecycleEventArgs $eventArgs)
+    public function preRemove(LifecycleEventArgs $eventArgs): void
     {
         $em = $eventArgs->getEntityManager();
         $entity = $eventArgs->getEntity();
@@ -98,7 +98,7 @@ public function preRemove(LifecycleEventArgs $eventArgs)
         }
     }
 
-    public function setLoggerCallable(callable $callable)
+    public function setLoggerCallable(callable $callable): void
     {
         $this->loggerCallable = $callable;
     }