Remove instanceof where defined

Author: lrljoe

.gitignore

@@ -21,4 +21,7 @@ phpunit.xml.bak
 phpstan.txt
 coverage.xml
 ./tmp/**
-./*.php.bk
+./*.php.bk
+src/Views/Filters/Traits/IsExternalArrayFilter.php.bk
+.gitignore
+src/Views/Filters/Traits/IsExternalFilter.php.bk

phpstan.neon

@@ -16,21 +16,6 @@ parameters:
         - identifier: argument.type
         - identifier: argument.templateType
         - identifier: new.static
-        - identifier: trait.unused
-        - identifier: booleanNot.alwaysTrue
-          paths:
-            - src/Views/Columns/Traits/HasDataTableComponent.php
-        - identifier: notIdentical.alwaysTrue
-          paths:
-            - src/Traits/Filters/Helpers/FilterPillsHelpers.php
-            - src/Traits/Helpers/CustomisationsHelpers.php
-            - src/Traits/Helpers/QueryHelpers.php
-            - src/Views/Columns/Traits/HasSlot.php
-        - identifier: instanceof.alwaysTrue
-          paths:
-            - src/Traits/Helpers/ColumnHelpers.php
-            - src/Views/Columns/Traits/HasFooter.php
-            - src/Views/Columns/Traits/HasSecondaryHeader.php
         - identifier: function.alreadyNarrowedType
           paths: 
             - src/Views/Filters/MultiSelectDropdownFilter.php

resources/views/components/tools/toolbar/toolbar.blade.php

@@ -1,6 +1,5 @@
-@aware([ 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap', 'toolBarAttributes'])
 @props([])
-@php($toolBarAttributes = $this->getToolBarAttributesBag())
 
 <div
     {{

resources/views/components/tools/tools.blade.php

@@ -1,11 +1,6 @@
 @aware(['isTailwind','isBootstrap'])
-@php($toolsAttributes = $this->getToolsAttributes())
+@props(['toolsAttributes', 'toolBarAttributes'])
 
-    @includeWhen(
-        $this->hasConfigurableAreaFor('before-tools'),
-        $this->getConfigurableAreaFor('before-tools'),
-        $this->getParametersForConfigurableArea('before-tools')
-    )
 
     <div {{
         $attributes->merge(['x-data' => 'tools($wire)'])->merge($toolsAttributes)
@@ -49,8 +44,3 @@
 
     </div>
 
-    @includeWhen(
-        $this->hasConfigurableAreaFor('after-tools'),
-        $this->getConfigurableAreaFor('after-tools'),
-        $this->getParametersForConfigurableArea('after-tools')
-    )

resources/views/datatable.blade.php

@@ -15,7 +15,22 @@
             @endif
 
             @if($this->shouldShowTools())
-                <x-livewire-tables::tools />
+                        
+                @includeWhen(
+                    $this->hasConfigurableAreaFor('before-tools'),
+                    $this->getConfigurableAreaFor('before-tools'),
+                    $this->getParametersForConfigurableArea('before-tools')
+                )
+
+                <x-livewire-tables::tools :toolsAttributes="$this->getToolsAttributes()" :toolBarAttributes="$this->getToolBarAttributesBag()" />
+
+
+                @includeWhen(
+                    $this->hasConfigurableAreaFor('after-tools'),
+                    $this->getConfigurableAreaFor('after-tools'),
+                    $this->getParametersForConfigurableArea('after-tools')
+                )
+                
             @endif
 
             @php($currentRows = isset($rows) ? $rows : $this->getRows)

src/Traits/Filters/Helpers/FilterPillsHelpers.php

@@ -61,7 +61,7 @@ public function getAppliedFiltersWithValuesForPills(): array
                 }
             }
 
-            return is_array($validatedValue) ? count($validatedValue) : $validatedValue !== null;
+            return is_array($validatedValue) ? count($validatedValue) : true;
         }, ARRAY_FILTER_USE_BOTH);
     }
 

src/Traits/Helpers/ColumnHelpers.php

@@ -21,7 +21,6 @@ public function setColumns(): void
     protected function setupColumns(): void
     {
         $this->columns = $this->columns
-            ->filter(fn ($column) => $column instanceof Column)
             ->map(function (Column $column) {
                 $column->setTheme($this->getTheme())
                     ->setHasTableRowUrl($this->hasTableRowUrl())

src/Traits/Helpers/CustomisationsHelpers.php

@@ -9,7 +9,7 @@ trait CustomisationsHelpers
      */
     public function hasExtends(): bool
     {
-        return isset($this->extends) && $this->extends !== null;
+        return isset($this->extends);
     }
 
     public function getExtends(): ?string
@@ -22,7 +22,7 @@ public function getExtends(): ?string
      */
     public function hasSection(): bool
     {
-        return isset($this->section) && $this->section !== null;
+        return isset($this->section);
     }
 
     public function getSection(): ?string
@@ -35,7 +35,7 @@ public function getSection(): ?string
      */
     public function hasSlot(): bool
     {
-        return isset($this->slot) && $this->slot !== null;
+        return isset($this->slot);
     }
 
     public function getSlot(): ?string
@@ -48,7 +48,7 @@ public function getSlot(): ?string
      */
     public function hasLayout(): bool
     {
-        return isset($this->layout) && $this->layout !== null;
+        return isset($this->layout);
     }
 
     public function getLayout(): ?string

src/Traits/Helpers/QueryHelpers.php

@@ -23,7 +23,7 @@ public function getBuilder(): Builder
 
     public function hasPrimaryKey(): bool
     {
-        return isset($this->primaryKey) && $this->primaryKey !== null;
+        return isset($this->primaryKey);
     }
 
     /**

src/Views/Columns/Traits/HasFooter.php

@@ -125,7 +125,7 @@ public function getNewFooterContents(mixed $rows): string|HtmlString
      */
     public function getFooterFilter(?Filter $filter, array $filterGenericData): \Illuminate\Contracts\Foundation\Application|\Illuminate\View\Factory|\Illuminate\View\View|string
     {
-        if ($filter !== null && $filter instanceof Filter) {
+        if ($filter !== null) {
             return $filter->setFilterPosition('footer')->setGenericDisplayData($filterGenericData)->render();
         } else {
             throw new DataTableConfigurationException('The footer callback must be a closure, filter object, or filter key if using footerFilter().');