fixed compiling exclude command

Author: belamov

docker/Dockerfile-php

@@ -1,4 +1,4 @@
-FROM php:7-cli
+FROM php:8-cli
 
 RUN apt-get update -yqq \
     && apt-get install git zlib1g-dev libpq-dev libzip-dev -y \
@@ -9,3 +9,5 @@ RUN curl -fsSL https://getcomposer.org/installer | php \
 
 RUN pecl install xdebug \
     &&  docker-php-ext-enable xdebug
+
+RUN echo "xdebug.mode=coverage,debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini

phpunit.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
     <include>
       <directory suffix=".php">src/</directory>

src/Macros/BluePrintMacros.php

@@ -27,7 +27,7 @@ public function register(): void
 
         Blueprint::macro('excludeRangeOverlapping', function ($columnName, ...$additionalColumns) {
             return $this->addCommand('excludeRangeOverlapping', [
-                'column' => $columnName,
+                'range_column' => $columnName,
                 'additionalColumns' => $additionalColumns,
             ]);
         });

src/PostgresGrammarWithRangeTypes.php

@@ -99,16 +99,20 @@ public function getFluentCommands(): array
      * @param  Fluent  $command
      * @return string
      */
-    public function compileExcludeRangeOverlapping(Blueprint $blueprint, Fluent $command): string
+    public function compileExcludeRangeOverlapping(Blueprint $blueprint, Fluent $command): ?string
     {
+        if (!$command->range_column){
+            return null;
+        }
+
         if (! empty($command->additionalColumns)) {
             $this->addBtreeGistExtension();
         }
 
         return sprintf('alter table %s add exclude using gist (%s %s with &&)',
             $this->wrapTable($blueprint),
             $this->getAdditionalColumnsForExclude($command->additionalColumns),
-            $this->wrap($command->column)
+            $this->wrap($command->range_column)
         );
     }
 
@@ -117,16 +121,16 @@ protected function addBtreeGistExtension(): void
         DB::statement('CREATE EXTENSION IF NOT EXISTS btree_gist;');
     }
 
-    /**
-     * @param  array|null  $additionalColumns
-     * @return string
-     */
-    private function getAdditionalColumnsForExclude(?array $additionalColumns): string
+    private function getAdditionalColumnsForExclude(?array $additionalColumns = []): string
     {
+        if (!is_array($additionalColumns)){
+            return '';
+        }
+
         $columns = '';
 
         foreach ($additionalColumns as $additionalColumn) {
-            $columns .= "{$additionalColumn} WITH =,";
+            $columns .= "$additionalColumn WITH =,";
         }
 
         return $columns;