chore: allow Laravel 9 and add test

DeBoerTool · May 13, 2022 · fa595f1 · fa595f1
1 parent 1cc8b9e
commit fa595f1
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 /vendor
 composer.lock
 phpunit.xml
+.phpunit.result.cache
+build
 
 ## Directory-based project format:
 .idea/
diff --git a/composer.json b/composer.json
@@ -22,12 +22,13 @@
     "require": {
         "php": "^8.0",
         "ext-pdo": "*",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/database": "^6.0|^7.0|^8.0"
+        "illuminate/support": "^8.0|^9.0",
+        "illuminate/database": "^8.0|^9.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3",
-        "vimeo/psalm": "^3.1"
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.23",
+        "orchestra/testbench": "^7.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,38 +1,29 @@
 <?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">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
 
-<phpunit
-  bootstrap="vendor/autoload.php"
-  backupGlobals="false"
-  backupStaticAttributes="false"
-  colors="true"
-  verbose="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  processIsolation="false"
-  stopOnFailure="false"
->
   <testsuites>
     <testsuite name="Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
 
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src/</directory>
-    </whitelist>
-  </filter>
-
-  <logging>
-    <log
-      type="coverage-html"
-      target="build/coverage"
-    />
+  <php>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
 
-    <log
-      type="coverage-text"
-      target="build/coverage.txt"
-    />
-  </logging>
+    <env name="ODBC_DSN" value=""/>
+    <env name="ODBC_HOST" value=""/>
+    <env name="ODBC_DB" value=""/>
+    <env name="ODBC_USERNAME" value=""/>
+    <env name="ODBC_PASSWORD" value=""/>
+    <env name="ODBC_TEST_SELECT" value=""/>
+  </php>
 </phpunit>
diff --git a/src/Connection.php b/src/Connection.php
@@ -31,7 +31,7 @@ protected function getDefaultQueryGrammar ()
     protected function getDefaultSchemaGrammar ()
     {
         return $this->withTablePrefix(
-            $this->keyOrDefault('sh', Schema::class)
+            $this->keyOrDefault('schema', Schema::class)
         );
     }
 

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Dbt\Odbc\Tests;
+
+use Illuminate\Support\Facades\DB;
+
+class ConnectionTest extends TestCase
+{
+    /** @test */
+    public function getting_the_connection (): void
+    {
+
+
+        $result = DB::connection('odbc')
+            ->select(config('database.test_select'));
+
+        $this->assertNotNull($result);
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Dbt\Odbc\Tests;
+
+use Dbt\Odbc\Provider;
+use Illuminate\Config\Repository;
+use Orchestra\Testbench\TestCase as Orchestra;
+
+class TestCase extends Orchestra
+{
+    protected function setUp (): void
+    {
+        parent::setUp();
+
+        $config = $this->app->make(Repository::class);
+
+        $config->set('database.connections', [
+            'odbc' => [
+                'driver'   => 'odbc',
+                'dsn'      => env('ODBC_DSN'),
+                'host'     => env('ODBC_HOST'),
+                'database' => env('ODBC_DB'),
+                'username' => env('ODBC_USERNAME'),
+                'password' => env('ODBC_PASSWORD'),
+            ],
+        ]);
+
+        $config->set('database.test_select', env('ODBC_TEST_SELECT'));
+    }
+
+    protected function getPackageProviders ($app): array
+    {
+        return [Provider::class];
+    }
+}