Browse Source

Fix coding standard and missed tests

Adam Halfar 1 year ago
parent
commit
cb1bc28429

+ 4 - 1
src/Form/FormProtector.php

@@ -83,7 +83,10 @@ class FormProtector
         }
 
         if (Configure::read('debug')) {
-            $debugMessage = $this->debugTokenNotMatching($formData, $hashParts + ['url' => $url, 'sessionId' => $sessionId]);
+            $debugMessage = $this->debugTokenNotMatching(
+                $formData,
+                $hashParts + ['url' => $url, 'sessionId' => $sessionId]
+            );
             if ($debugMessage) {
                 $this->debugMessage = $debugMessage;
             }

+ 12 - 4
src/ORM/Behavior/Translate/EavStrategy.php

@@ -316,10 +316,18 @@ class EavStrategy implements TranslateStrategyInterface
 
         $new = array_diff_key($values, $modified);
         foreach ($new as $field => $content) {
-            $new[$field] = new Entity(['locale' => $locale, 'field' => $field, 'content' => $content, 'model' => $model], [
-                'useSetters' => false,
-                'markNew' => true,
-            ]);
+            $new[$field] = new Entity(
+                [
+                    'locale' => $locale,
+                    'field' => $field,
+                    'content' => $content,
+                    'model' => $model,
+                ],
+                [
+                    'useSetters' => false,
+                    'markNew' => true,
+                ]
+            );
         }
 
         $entity->set('_i18n', array_merge($bundled, array_values($modified + $new)));

+ 8 - 1
src/ORM/Marshaller.php

@@ -902,6 +902,13 @@ class Marshaller
     {
         $data = new ArrayObject($data);
         $options = new ArrayObject($options);
-        $this->_table->dispatchEvent('Model.afterMarshal', ['entity' => $entity, 'data' => $data, 'options' => $options]);
+        $this->_table->dispatchEvent(
+            'Model.afterMarshal',
+            [
+                'entity' => $entity,
+                'data' => $data,
+                'options' => $options,
+            ]
+        );
     }
 }

+ 16 - 2
src/ORM/RulesChecker.php

@@ -69,7 +69,14 @@ class RulesChecker extends BaseRulesChecker
 
         $errorField = current($fields);
 
-        return $this->_addError(new IsUnique($fields, $options), '_isUnique', ['errorField' => $errorField, 'message' => $message]);
+        return $this->_addError(
+            new IsUnique($fields, $options),
+            '_isUnique',
+            [
+                'errorField' => $errorField,
+                'message' => $message,
+            ]
+        );
     }
 
     /**
@@ -119,7 +126,14 @@ class RulesChecker extends BaseRulesChecker
 
         $errorField = is_string($field) ? $field : current($field);
 
-        return $this->_addError(new ExistsIn($field, $table, $options), '_existsIn', ['errorField' => $errorField, 'message' => $message]);
+        return $this->_addError(
+            new ExistsIn($field, $table, $options),
+            '_existsIn',
+            [
+                'errorField' => $errorField,
+                'message' => $message,
+            ]
+        );
     }
 
     /**

+ 10 - 2
src/ORM/Table.php

@@ -1405,7 +1405,12 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
         }
 
         $options = $this->_setFieldMatchers(
-            ['keyField' => $keyField, 'valueField' => $valueField, 'groupField' => $groupField, 'valueSeparator' => $valueSeparator],
+            [
+                'keyField' => $keyField,
+                'valueField' => $valueField,
+                'groupField' => $groupField,
+                'valueSeparator' => $valueSeparator,
+            ],
             ['keyField', 'valueField', 'groupField']
         );
 
@@ -1446,7 +1451,10 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
     ): SelectQuery {
         $keyField ??= $this->getPrimaryKey();
 
-        $options = $this->_setFieldMatchers(['keyField' => $keyField, 'parentField' => $parentField], ['keyField', 'parentField']);
+        $options = $this->_setFieldMatchers([
+            'keyField' => $keyField,
+            'parentField' => $parentField,
+        ], ['keyField', 'parentField']);
 
         return $query->formatResults(fn (CollectionInterface $results) => $results->nest(
             $options['keyField'],

+ 7 - 1
src/Utility/Xml.php

@@ -367,7 +367,13 @@ class Xml
                         }
                     } else {
 // Struct
-                        static::_createChild(['dom' => $dom, 'node' => $node, 'key' => $key, 'value' => $value, 'format' => $format]);
+                        static::_createChild([
+                            'dom' => $dom,
+                            'node' => $node,
+                            'key' => $key,
+                            'value' => $value,
+                            'format' => $format,
+                        ]);
                     }
                 }
             } else {

+ 5 - 1
src/Validation/Validator.php

@@ -3156,7 +3156,11 @@ class Validator implements ArrayAccess, IteratorAggregate, Countable
         }
 
         foreach ($rules as $name => $rule) {
-            $result = $rule->process($data[$field], $this->_providers, ['newRecord' => $newRecord, 'data' => $data, 'field' => $field]);
+            $result = $rule->process($data[$field], $this->_providers, [
+                'newRecord' => $newRecord,
+                'data' => $data,
+                'field' => $field,
+            ]);
             if ($result === true) {
                 continue;
             }

+ 1 - 1
tests/TestCase/Collection/CollectionTest.php

@@ -2728,7 +2728,7 @@ class CollectionTest extends TestCase
         $items = ['a' => 1, 'b' => 2, 'c' => 3];
         $collection = (new Collection($items))->lazy();
         $callable = new class {
-            public function __invoke()
+            public function __invoke(): never
             {
                 throw new Exception('This should not be called');
             }

+ 1 - 1
tests/TestCase/Controller/ComponentRegistryTest.php

@@ -135,7 +135,7 @@ class ComponentRegistryTest extends TestCase
     public function testLoadWithEnableFalse(): void
     {
         $eventManager = new class extends EventManager {
-            public function on($eventKey, $options = null, $callable = []): void
+            public function on($eventKey, $options = null, $callable = []): never
             {
                 throw new Exception('Should not be called');
             }

+ 1 - 1
tests/TestCase/Controller/ComponentTest.php

@@ -260,7 +260,7 @@ class ComponentTest extends TestCase
     {
         $eventManager = new class extends EventManager
         {
-            public function on($eventKey, $options = null, $callable = []): void
+            public function on($eventKey, $options = null, $callable = []): never
             {
                 throw new Exception('Should not be called');
             }

+ 1 - 1
tests/TestCase/Error/Renderer/WebExceptionRendererTest.php

@@ -726,7 +726,7 @@ class WebExceptionRendererTest extends TestCase
 
         $request = new ServerRequest();
         $controller = new class ($request) extends Controller {
-            public function beforeRender(EventInterface $event)
+            public function beforeRender(EventInterface $event): never
             {
                 throw new NotFoundException('Not there, sorry');
             }

+ 6 - 6
tests/TestCase/Event/EventManagerTest.php

@@ -248,8 +248,8 @@ class EventManagerTest extends TestCase
                 return [];
             }
         };
-        $manager->on('fake.event', [$listener, 'listenerFunction']);
-        $manager->on('fake.event', [$anotherListener, 'listenerFunction']);
+        $manager->on('fake.event', $listener->listenerFunction(...));
+        $manager->on('fake.event', $anotherListener->listenerFunction(...));
         $event = new Event('fake.event');
 
         $manager->dispatch($event);
@@ -308,8 +308,8 @@ class EventManagerTest extends TestCase
                 return [];
             }
         };
-        $manager->on('fake.event', [$listener, 'listenerFunction']);
-        $manager->on('fake.event', [$anotherListener, 'listenerFunction']);
+        $manager->on('fake.event', $listener->listenerFunction(...));
+        $manager->on('fake.event', $anotherListener->listenerFunction(...));
         $event = new Event('fake.event');
 
         $manager->dispatch($event);
@@ -354,8 +354,8 @@ class EventManagerTest extends TestCase
                 return [];
             }
         };
-        $manager->on('fake.event', [$listener, 'listenerFunction']);
-        $manager->on('fake.event', [$anotherListener, 'listenerFunction']);
+        $manager->on('fake.event', $listener->listenerFunction(...));
+        $manager->on('fake.event', $anotherListener->listenerFunction(...));
         $event = new Event('fake.event');
 
         $manager->dispatch($event);