Cleaned with php-cs for php 7.4.

Author: Daniel Berthereau

.gitignore

@@ -10,5 +10,6 @@
 .bundle
 .DS_Store
 .php_cs.cache
+.php-cs-fixer.cache
 composer.phar
 debug.log

Module.php

@@ -83,7 +83,7 @@ public function install(ServiceLocatorInterface $services): void
 
         $filepath = $useMyIsam
             ? $this->modulePath() . '/data/install/schema-myisam.sql'
-            :  $this->modulePath() . '/data/install/schema.sql';
+            : $this->modulePath() . '/data/install/schema.sql';
         $this->execSqlFromFile($filepath);
     }
 
@@ -831,7 +831,7 @@ public function saveGeometryData(Event $event): void
     /**
      * @todo Remove the fix of srid in geographic table after save (check dependency?).
      */
-    public function fixSridInDatabase(Event $event)
+    public function fixSridInDatabase(Event $event): void
     {
         $services = $this->getServiceLocator();
         /** @var \Doctrine\DBAL\Connection $connection */

config/module.config.php

@@ -224,7 +224,7 @@
                 'label' => 'Geography', // @translate
                 'adapter' => 'literal',
             ],
-            'geography:coordinates'  => [
+            'geography:coordinates' => [
                 'label' => 'Geographic coordinates', // @translate
                 'adapter' => 'literal',
             ],

src/DataType/AbstractDataType.php

@@ -112,7 +112,7 @@ public function parseGeometry($value): ?array
         return $geometry;
     }
 
-    public function valueAnnotationPrepareForm(PhpRenderer $view)
+    public function valueAnnotationPrepareForm(PhpRenderer $view): void
     {
         $this->prepareForm($view);
     }

src/DataType/GeographyCoordinates.php

@@ -56,19 +56,19 @@ public function form(PhpRenderer $view)
                 'max' => '180.0',
             ]);
 
-            return '<div class="field-geometry">'
-                . '<div class="error invalid-value" data-custom-validity="' . $escapeAttr($translate($validity)) . '"></div>'
-                . $view->formHidden($hiddenValue)
-                . '<div class="field-geometry-number">'
-                . $view->formLabel($latitudeElement)
-                . $view->formNumber($latitudeElement)
-                . '</div>'
-                . '<div class="field-geometry-number">'
-                . $view->formLabel($longitudeElement)
-                . $view->formNumber($longitudeElement)
-                . '</div>'
-                . '</div>'
-            ;
+        return '<div class="field-geometry">'
+            . '<div class="error invalid-value" data-custom-validity="' . $escapeAttr($translate($validity)) . '"></div>'
+            . $view->formHidden($hiddenValue)
+            . '<div class="field-geometry-number">'
+            . $view->formLabel($latitudeElement)
+            . $view->formNumber($latitudeElement)
+            . '</div>'
+            . '<div class="field-geometry-number">'
+            . $view->formLabel($longitudeElement)
+            . $view->formNumber($longitudeElement)
+            . '</div>'
+            . '</div>'
+        ;
     }
 
     public function isValid(array $valueObject)

src/DataType/GeometryPosition.php

@@ -146,7 +146,7 @@ public function getGeometryFromValue($value): \CrEOF\Spatial\PHP\Types\Geometry\
         if (is_string($value)) {
             $matches = [];
             $value = preg_match($this->regexPosition, (string) $value, $matches)
-                ? 'POINT (' . $matches['x'] . ' ' . ($matches['y'] ? '-' : ''). $matches['y'] . ')'
+                ? 'POINT (' . $matches['x'] . ' ' . ($matches['y'] ? '-' : '') . $matches['y'] . ')'
                 : strtoupper((string) $value);
         }
         try {

src/DataType/QueryGeometryTrait.php

@@ -318,7 +318,7 @@ protected function getPropertyId(AbstractEntityAdapter $adapter, $property): int
         if (!preg_match('/^[a-z0-9-_]+:[a-z0-9-_]+$/i', $property)) {
             return 0;
         }
-        list($prefix, $localName) = explode(':', $property);
+        [$prefix, $localName] = explode(':', $property);
         $dql = <<<'DQL'
 SELECT p.id
 FROM Omeka\Entity\Property p

src/Generic/AbstractModule.php

@@ -57,7 +57,7 @@ public function getConfig()
         return include $this->modulePath() . '/config/module.config.php';
     }
 
-    public function onBootstrap(MvcEvent $event)
+    public function onBootstrap(MvcEvent $event): void
     {
         parent::onBootstrap($event);
 
@@ -674,9 +674,7 @@ protected function initDataToPopulate(SettingsInterface $settings, string $setti
         // setting currently. So fill them via upgrade in that case or fill the
         // values.
         // TODO Find a way to save empty multi-checkboxes and multi-selects (core fix).
-        $defaultSettings = array_filter($defaultSettings, function ($v) {
-            return !is_array($v);
-        });
+        $defaultSettings = array_filter($defaultSettings, fn ($v) => !is_array($v));
         $missingSettings = array_diff_key($defaultSettings, $currentSettings);
 
         foreach ($missingSettings as $name => $value) {

src/View/Helper/NormalizeGeometryQuery.php

@@ -106,9 +106,7 @@ public function __invoke($query)
                 $result['property'] = $property;
             }
 
-            $geo['around'] = array_filter($geo['around'], function ($v) {
-                return $v !== null && $v !== '';
-            });
+            $geo['around'] = array_filter($geo['around'], fn ($v) => $v !== null && $v !== '');
             if ($geo['around']) {
                 $around = $this->normalizeAround($geo['around'] + $defaults['around']);
                 if ($around) {
@@ -258,7 +256,7 @@ protected function normalizeBox($box)
             if (strpos($box, ' ') === false) {
                 return;
             }
-            list($left, $top, $right, $bottom) = explode(' ', $box, 4);
+            [$left, $top, $right, $bottom] = explode(' ', $box, 4);
         }
         if (is_numeric($left)
             && is_numeric($top)