reformat code

Author: C0mp4ct

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
           bootstrap: vendor/autoload.php
           configuration: phpunit.xml.dist
           php_extensions: xdebug
-          args: tests --coverage-clover ./coverage.xml
+          args: --coverage-clover ./coverage.xml
 
       - name: Upload to Codecov
         uses: codecov/codecov-action@v3

src/Aggregation/AbstractAggregation.php

@@ -31,18 +31,6 @@ abstract class AbstractAggregation implements NamedBuilderInterface
 
     private ?BuilderBag $aggregations = null;
 
-    /**
-     * Abstract supportsNesting method.
-     *
-     * @return bool
-     */
-    abstract protected function supportsNesting(): bool;
-
-    /**
-     * @return array|\stdClass
-     */
-    abstract public function getArray(): array|\stdClass;
-
     /**
      * Inner aggregations container init.
      *
@@ -53,6 +41,14 @@ public function __construct(string $name)
         $this->setName($name);
     }
 
+    /**
+     * @return string
+     */
+    public function getField()
+    {
+        return $this->field;
+    }
+
     /**
      * @param string $field
      *
@@ -65,14 +61,6 @@ public function setField($field)
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getField()
-    {
-        return $this->field;
-    }
-
     /**
      * Adds a sub-aggregation.
      *
@@ -86,29 +74,25 @@ public function addAggregation(AbstractAggregation $abstractAggregation)
         }
 
         $this->aggregations->add($abstractAggregation);
-        
+
         return $this;
     }
 
     /**
-     * Returns all sub aggregations.
+     * Creates BuilderBag new instance.
      *
-     * @return BuilderBag[]|NamedBuilderInterface[]
+     * @return BuilderBag
      */
-    public function getAggregations()
+    private function createBuilderBag()
     {
-        if ($this->aggregations instanceof BuilderBag) {
-            return $this->aggregations->all();
-        } else {
-            return [];
-        }
+        return new BuilderBag();
     }
 
     /**
      * Returns sub aggregation.
      * @param string $name Aggregation name to return.
      *
-     * @return AbstractAggregation|NamedBuilderInterface|null
+     * @return \ONGR\ElasticsearchDSL\BuilderInterface
      */
     public function getAggregation($name)
     {
@@ -140,6 +124,18 @@ public function toArray(): array|\stdClass
         return $result;
     }
 
+    /**
+     * @return array|\stdClass
+     */
+    abstract public function getArray(): array|\stdClass;
+
+    /**
+     * Abstract supportsNesting method.
+     *
+     * @return bool
+     */
+    abstract protected function supportsNesting(): bool;
+
     /**
      * Process all nested aggregations.
      *
@@ -157,12 +153,16 @@ protected function collectNestedAggregations()
     }
 
     /**
-     * Creates BuilderBag new instance.
+     * Returns all sub aggregations.
      *
-     * @return BuilderBag
+     * @return BuilderBag[]|NamedBuilderInterface[]
      */
-    private function createBuilderBag()
+    public function getAggregations(): array
     {
-        return new BuilderBag();
+        if ($this->aggregations instanceof BuilderBag) {
+            return $this->aggregations->all();
+        } else {
+            return [];
+        }
     }
 }

src/Aggregation/Bucketing/AdjacencyMatrixAggregation.php

@@ -30,13 +30,13 @@ class AdjacencyMatrixAggregation extends AbstractAggregation
      * @var BuilderInterface[]
      */
     private array $filters = [
-        self::FILTERS => []
+        self::FILTERS => [],
     ];
 
     /**
      * Inner aggregations container init.
      *
-     * @param string             $name
+     * @param string $name
      * @param BuilderInterface[] $filters
      */
     public function __construct(string $name, array $filters = [])

src/Aggregation/Bucketing/AutoDateHistogramAggregation.php

@@ -13,7 +13,6 @@
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
-use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Class representing AutoDateHistogramAggregation.
@@ -29,7 +28,7 @@ class AutoDateHistogramAggregation extends AbstractAggregation
      *
      * @param string $name
      * @param string $field
-     * @param int    $buckets
+     * @param int $buckets
      * @param string $format
      */
     public function __construct(string $name, $field, $buckets = null, $format = null)

src/Aggregation/Bucketing/ChildrenAggregation.php

@@ -32,18 +32,6 @@ public function __construct(string $name, ?string $children = null)
         $this->setChildren($children);
     }
 
-    public function setChildren(?string $children): static
-    {
-        $this->children = $children;
-
-        return $this;
-    }
-
-    public function getChildren(): ?string
-    {
-        return $this->children;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -63,4 +51,16 @@ public function getArray(): array|\stdClass
 
         return ['type' => $this->getChildren()];
     }
+
+    public function getChildren(): ?string
+    {
+        return $this->children;
+    }
+
+    public function setChildren(?string $children): static
+    {
+        $this->children = $children;
+
+        return $this;
+    }
 }

src/Aggregation/Bucketing/CompositeAggregation.php

@@ -54,7 +54,7 @@ public function addSource(AbstractAggregation $agg): static
         $array = is_array($array) ? array_merge($array, $agg->getParameters()) : $array;
 
         $this->sources[] = [
-            $agg->getName() => [ $agg->getType() => $array ]
+            $agg->getName() => [$agg->getType() => $array],
         ];
 
         return $this;
@@ -88,16 +88,21 @@ public function getType(): string
         return 'composite';
     }
 
+    public function getSize(): ?int
+    {
+        return $this->size;
+    }
+
     public function setSize(int $size): static
     {
         $this->size = $size;
 
         return $this;
     }
 
-    public function getSize(): ?int
+    public function getAfter(): ?array
     {
-        return $this->size;
+        return $this->after;
     }
 
     public function setAfter(array $after): static
@@ -106,9 +111,4 @@ public function setAfter(array $after): static
 
         return $this;
     }
-
-    public function getAfter(): ?array
-    {
-        return $this->after;
-    }
 }

src/Aggregation/Bucketing/DateHistogramAggregation.php

@@ -38,18 +38,6 @@ public function __construct(string $name, ?string $field = null, ?string $interv
         $this->setFormat($format);
     }
 
-    public function getInterval(): ?string
-    {
-        return $this->interval;
-    }
-
-    public function setInterval(?string $interval): static
-    {
-        $this->interval = $interval;
-
-        return $this;
-    }
-
     public function setFormat(?string $format): static
     {
         $this->format = $format;
@@ -85,4 +73,16 @@ public function getArray(): array|\stdClass
 
         return $out;
     }
+
+    public function getInterval(): ?string
+    {
+        return $this->interval;
+    }
+
+    public function setInterval(?string $interval): static
+    {
+        $this->interval = $interval;
+
+        return $this;
+    }
 }

src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -27,8 +27,13 @@ class DateRangeAggregation extends AbstractAggregation
     private array $ranges = [];
     private bool $keyed = false;
 
-    public function __construct(string $name, ?string $field = null, ?string $format = null, array $ranges = [], bool $keyed = false)
-    {
+    public function __construct(
+        string $name,
+        ?string $field = null,
+        ?string $format = null,
+        array $ranges = [],
+        bool $keyed = false
+    ) {
         parent::__construct($name);
 
         $this->setField($field);
@@ -54,16 +59,6 @@ public function setKeyed(bool $keyed): static
         return $this;
     }
 
-    public function getFormat(): ?string
-    {
-        return $this->format;
-    }
-
-    public function setFormat(?string $format): void
-    {
-        $this->format = $format;
-    }
-
     /**
      * Add range to aggregation.
      *
@@ -112,6 +107,16 @@ public function getArray(): array|\stdClass
         throw new \LogicException('Date range aggregation must have field, format set and range added.');
     }
 
+    public function getFormat(): ?string
+    {
+        return $this->format;
+    }
+
+    public function setFormat(?string $format): void
+    {
+        $this->format = $format;
+    }
+
     /**
      * {@inheritdoc}
      */

src/Aggregation/Bucketing/DiversifiedSamplerAggregation.php

@@ -44,24 +44,6 @@ public function __construct(string $name, $field = null, $shardSize = null)
         $this->setShardSize($shardSize);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getShardSize()
-    {
-        return $this->shardSize;
-    }
-
-    /**
-     * @return $this
-     */
-    public function setShardSize(mixed $shardSize)
-    {
-        $this->shardSize = $shardSize;
-
-        return $this;
-    }
-
     /**
      * @inheritdoc
      */
@@ -82,4 +64,22 @@ public function getArray(): array|\stdClass
             ]
         );
     }
+
+    /**
+     * @return mixed
+     */
+    public function getShardSize()
+    {
+        return $this->shardSize;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setShardSize(mixed $shardSize)
+    {
+        $this->shardSize = $shardSize;
+
+        return $this;
+    }
 }