Merge pull request #5 from ellgreen/laravel-6-support

Add support for Laravel 6 and 7

Author: ellgreen

README.md

@@ -9,7 +9,7 @@ https://dev.mysql.com/doc/refman/8.0/en/insert-optimization.html
 
 ## Installation
 
-**Requires Laravel version > 8**
+**Requires Laravel 6 or above**
 
 ```bash
 composer require ellgreen/laravel-loadfile

composer.json

@@ -22,11 +22,11 @@
     },
     "require": {
         "php": "^7.4",
-        "illuminate/database": "^8.28"
+        "illuminate/database": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",
-        "orchestra/testbench": "^6.17",
+        "orchestra/testbench": "^4.0|^5.0|^6.0",
         "squizlabs/php_codesniffer": "^3.6",
         "vimeo/psalm": "^4.7"
     },
@@ -35,15 +35,16 @@
         "test-unit-coverage": "php ./vendor/bin/phpunit tests/Unit --coverage-html .coverage/unit",
         "check": [
             "@docker-up",
-            "@docker-test",
+            "@docker-laravel-test",
             "@docker-cs",
             "@docker-static-analysis"
         ],
         "docker-up": "docker compose up -d database",
         "docker-test": "docker compose run --rm app php ./vendor/bin/phpunit",
+        "docker-laravel-test": "docker compose run --rm app php tests/laravel/laravel-version-test.php",
         "docker-test-coverage": "docker compose run --rm app php ./vendor/bin/phpunit --coverage-html .coverage/all",
-        "docker-static-analysis": "docker compose run --rm app php ./vendor/bin/psalm",
-        "docker-cs": "docker compose run --rm app php ./vendor/bin/phpcs --standard=PSR12 src/"
+        "docker-cs": "docker compose run --rm app php ./vendor/bin/phpcs --standard=PSR12 src/",
+        "docker-static-analysis": "docker compose run --rm app php ./vendor/bin/psalm"
     },
     "extra": {
         "laravel": {

composer.lock

@@ -5,6 +5,7 @@ services:
     build: ./tests/docker
     volumes:
       - .:/app
+      - $HOME/.composer/cache:/root/.composer/cache
     working_dir: /app
 
   database:

docker-compose.yml

@@ -23,10 +23,10 @@ public function compileLoadFile(Builder $query): CompiledQuery
             throw CompilationException::noFileOrTableSupplied();
         }
 
-        $querySegments->push(
+        $querySegments->push([
             'load data' . ($query->isLocal() ? ' local' : ''),
             'infile ' . $this->quoteString($file),
-        );
+        ]);
 
         if ($query->isReplace()) {
             $querySegments->push('replace');
@@ -65,10 +65,13 @@ public function compileLoadFile(Builder $query): CompiledQuery
             $querySegments->push($this->compileSetColumns($set));
             /** @psalm-suppress MissingClosureParamType|InvalidArgument */
             $values = collect($set)->filter(fn($value) => ! $this->isExpression($value))->values();
-            $bindings->push(...$values->toArray());
+            $bindings->push($values->toArray());
         }
 
-        return new CompiledQuery($querySegments->filter()->implode(' '), $bindings->toArray());
+        return new CompiledQuery(
+            $querySegments->flatten()->filter()->implode(' '),
+            $bindings->flatten()->toArray()
+        );
     }
 
     private function compileFields(

src/Grammar.php

@@ -1,5 +1,10 @@
 FROM php:7.4-cli
 
+RUN apt-get update && apt-get install -y rsync git zip unzip
+
 RUN docker-php-ext-install pdo pdo_mysql && \
     pecl install pcov && \
     docker-php-ext-enable pdo_mysql pcov
+
+RUN curl -s https://getcomposer.org/installer | \
+    php -- --install-dir=/usr/local/bin --filename=composer

tests/docker/Dockerfile

@@ -0,0 +1,35 @@
+<?php
+
+const TEST_PATH = '/tmp/laravel/app/';
+
+/** @var array $composerConfig */
+$composerConfig = json_decode(file_get_contents('/app/composer.json'), $assoc = true);
+
+$laravelVersions = array_map(function ($version) {
+    return trim($version, '^<>.0');
+}, explode('|', $composerConfig['require']['illuminate/database']));
+
+foreach ($laravelVersions as $laravelVersion) {
+    echo "Testing for Laravel {$laravelVersion}\n";
+
+    passthru(
+        'rsync --delete -a --exclude=vendor/ --exclude=.*/ /app ' .
+        dirname(TEST_PATH)
+    );
+
+    chdir(TEST_PATH);
+
+    $composerConfig['require']['illuminate/database'] = "^{$laravelVersion}.0";
+    $testBench = intval($laravelVersion) - 2;
+    $composerConfig['require-dev']['orchestra/testbench'] = "^{$testBench}.0";
+
+    file_put_contents(TEST_PATH . 'composer.json', json_encode($composerConfig, JSON_PRETTY_PRINT));
+
+    exec('composer update -q');
+    passthru('php ./vendor/bin/phpunit --colors=always', $resultCode);
+
+    if ($resultCode !== 0) {
+        echo "\n\nTests failed for Laravel {$laravelVersion}\n";
+        exit(1);
+    }
+}

tests/laravel/laravel-version-test.php

@@ -5,12 +5,14 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
+class CreatePeopleTable extends Migration
 {
     public function up(): void
     {
+        Schema::dropIfExists('people');
+
         Schema::create('people', function (Blueprint $table) {
-            $table->id();
+            $table->increments('id');
             $table->string('name');
             $table->date('dob');
             $table->string('greeting');
@@ -22,4 +24,4 @@ public function down(): void
     {
         Schema::drop('people');
     }
-};
+}