php-cs-fixer run

rekalogika · Oct 4, 2023 · 37ec11c · 37ec11c
1 parent b10c29e
commit 37ec11c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -9,6 +9,24 @@
 return $config->setRules([
         '@PSR12' => true,
         'array_syntax' => ['syntax' => 'short'],
+
+        // imports
+        'fully_qualified_strict_types' => true,
+        'global_namespace_import' => [
+            'import_classes' => false,
+            'import_constants' => false,
+            'import_functions' => false,
+        ],
+        'no_leading_import_slash' => true,
+        'no_unneeded_import_alias' => true,
+        'no_unused_imports' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'alpha',
+            'imports_order' => ['const', 'class', 'function']
+        ],
+        'single_line_after_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
         'declare_strict_types' => true,
         'header_comment' => [
             'header' => <<<EOF

diff --git a/src/AbstractReadableCollectionDecorator.php b/src/AbstractReadableCollectionDecorator.php
@@ -14,7 +14,6 @@
 namespace Rekalogika\Collections\Decorator;
 
 use Doctrine\Common\Collections\ReadableCollection;
-use Rekalogika\Collections\Decorator\DxTrait\ArrayAccessDecoratorDxTrait;
 use Rekalogika\Collections\Decorator\Trait\ReadableCollectionDecoratorTrait;
 
 /**

diff --git a/src/AbstractSelectableCollectionDecorator.php b/src/AbstractSelectableCollectionDecorator.php
@@ -15,7 +15,6 @@
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Selectable;
-use Rekalogika\Collections\Decorator\Trait\CollectionDecoratorTrait;
 use Rekalogika\Collections\Decorator\Trait\SelectableDecoratorTrait;
 
 /**
@@ -24,8 +23,7 @@
  * @extends AbstractCollectionDecorator<TKey, T>
  * @implements Selectable<TKey, T>
  */
-abstract class AbstractSelectableCollectionDecorator extends AbstractCollectionDecorator
-implements Selectable
+abstract class AbstractSelectableCollectionDecorator extends AbstractCollectionDecorator implements Selectable
 {
     /**
      * @use SelectableDecoratorTrait<TKey,T>

diff --git a/src/Trait/CollectionDecoratorTrait.php b/src/Trait/CollectionDecoratorTrait.php
@@ -24,9 +24,13 @@ trait CollectionDecoratorTrait
 {
     /**
      * @use ReadableCollectionDecoratorTrait<TKey,T>
+     */
+    use ReadableCollectionDecoratorTrait;
+
+    /**
      * @use ArrayAccessDecoratorTrait<TKey,T>
      */
-    use ReadableCollectionDecoratorTrait, ArrayAccessDecoratorTrait;
+    use ArrayAccessDecoratorTrait;
 
     /**
      * @return Collection<TKey,T>

diff --git a/src/Trait/ReadableCollectionDecoratorTrait.php b/src/Trait/ReadableCollectionDecoratorTrait.php
@@ -21,10 +21,12 @@
  */
 trait ReadableCollectionDecoratorTrait
 {
+    use CountableDecoratorTrait;
+
     /**
      * @use IteratorAggregateDecoratorTrait<TKey,T>
      */
-    use CountableDecoratorTrait, IteratorAggregateDecoratorTrait;
+    use IteratorAggregateDecoratorTrait;
 
     /**
      * @return ReadableCollection<TKey,T>