More code modernization

Author: curry684

src/Adapter/AdapterInterface.php

@@ -23,8 +23,10 @@ interface AdapterInterface
 {
     /**
      * Provides initial configuration to the adapter.
+     *
+     * @param array<string, mixed> $options Adapter specific options array
      */
-    public function configure(array $options);
+    public function configure(array $options): void;
 
     /**
      * Processes a datatable's state into a result set fit for further processing.

src/Adapter/Doctrine/ORMAdapter.php

@@ -73,7 +73,7 @@ public function __construct(ManagerRegistry $registry = null)
         $this->registry = $registry;
     }
 
-    public function configure(array $options)
+    public function configure(array $options): void
     {
         $resolver = new OptionsResolver();
         $this->configureOptions($resolver);

src/Adapter/Elasticsearch/ElasticaAdapter.php

@@ -32,7 +32,7 @@ class ElasticaAdapter extends AbstractAdapter
     /** @var array<string, mixed> */
     private array $indices = [];
 
-    public function configure(array $options)
+    public function configure(array $options): void
     {
         $resolver = new OptionsResolver();
         $this->configureOptions($resolver);

src/Column/AbstractColumn.php

@@ -138,7 +138,7 @@ public function getName(): string
         return $this->name;
     }
 
-    public function getLabel(): ?string
+    public function getLabel(): string
     {
         return $this->options['label'] ?? "{$this->dataTable->getName()}.columns.{$this->getName()}";
     }
@@ -173,9 +173,9 @@ public function isOrderable(): bool
         return $this->options['orderable'] ?? !empty($this->getOrderField());
     }
 
-    public function getFilter(): AbstractFilter
+    public function getFilter(): ?AbstractFilter
     {
-        return $this->options['filter'];
+        return $this->options['filter'] ?? null;
     }
 
     public function getOrderField(): ?string
@@ -188,7 +188,7 @@ public function isGlobalSearchable(): bool
         return $this->options['globalSearchable'] ?? $this->isSearchable();
     }
 
-    public function getLeftExpr(): string
+    public function getLeftExpr(): mixed
     {
         $leftExpr = $this->options['leftExpr'];
         if (null === $leftExpr) {
@@ -201,7 +201,7 @@ public function getLeftExpr(): string
         return $leftExpr;
     }
 
-    public function getRightExpr(mixed $value): string
+    public function getRightExpr(mixed $value): mixed
     {
         $rightExpr = $this->options['rightExpr'];
         if (null === $rightExpr) {
@@ -219,9 +219,9 @@ public function getOperator(): string
         return $this->options['operator'];
     }
 
-    public function getClassName(): string
+    public function getClassName(): ?string
     {
-        return $this->options['className'];
+        return $this->options['className'] ?? null;
     }
 
     public function getDataTable(): DataTable
@@ -241,7 +241,7 @@ public function setOption(string $name, mixed $value): static
         return $this;
     }
 
-    public function isValidForSearch(string $value): bool
+    public function isValidForSearch(mixed $value): bool
     {
         return true;
     }

src/Column/BoolColumn.php

@@ -69,7 +69,7 @@ public function getNullValue(): string
         return $this->options['nullValue'];
     }
 
-    public function isValidForSearch(string $value): bool
+    public function isValidForSearch(mixed $value): bool
     {
         $value = trim(mb_strtolower($value));
 

src/Column/NumberColumn.php

@@ -48,7 +48,7 @@ public function isRaw(): bool
         return $this->options['raw'];
     }
 
-    public function isValidForSearch(string $value): bool
+    public function isValidForSearch(mixed $value): bool
     {
         return is_numeric($value);
     }

src/Column/TwigColumn.php

@@ -23,13 +23,14 @@
  */
 class TwigColumn extends AbstractColumn
 {
-    protected Environment $twig;
+    protected readonly Environment $twig;
 
     public function __construct(Environment $twig = null)
     {
-        if (null === ($this->twig = $twig)) {
+        if (null === $twig) {
             throw new MissingDependencyException('You must have TwigBundle installed to use ' . static::class);
         }
+        $this->twig = $twig;
     }
 
     protected function render($value, $context): mixed

src/DataTable.php

@@ -219,9 +219,14 @@ public function getPersistState(): string
         return $this->persistState;
     }
 
-    public function getState(): ?DataTableState
+    public function getState(): DataTableState
     {
-        return $this->state;
+        return $this->state ?? throw new InvalidStateException('The DataTable does not know its state yet, did you call handleRequest?');
+    }
+
+    public function hasState(): bool
+    {
+        return null !== $this->state;
     }
 
     public function getTranslationDomain(): string
@@ -258,9 +263,7 @@ public function handleRequest(Request $request): static
 
     public function getResponse(): Response
     {
-        if (null === $this->state) {
-            throw new InvalidStateException('The DataTable does not know its state yet, did you call handleRequest?');
-        }
+        $state = $this->getState();
 
         // Server side export
         if (null !== $this->state->getExporterName()) {

src/Twig/TwigRenderer.php

@@ -24,14 +24,14 @@
  */
 class TwigRenderer implements DataTableRendererInterface
 {
-    /** @var Environment */
-    private $twig;
+    private readonly Environment $twig;
 
     public function __construct(Environment $twig = null)
     {
-        if (null === ($this->twig = $twig)) {
+        if (null === $twig) {
             throw new MissingDependencyException('You must have symfony/twig-bundle installed to use the default Twig based DataTables rendering');
         }
+        $this->twig = $twig;
     }
 
     /**