From af4a77cc7442065035e5bfd25da24372bffb4b2b Mon Sep 17 00:00:00 2001
From: mpyw <ryosuke_i_628@yahoo.co.jp>
Date: Wed, 2 Oct 2019 04:19:58 +0900
Subject: [PATCH] Disable auto-discovery

---
 .coveralls.yml                                |  2 --
 README.md                                     | 25 ++++++++++++++++---
 composer.json                                 | 11 ++------
 ...qlSystemVariableManagerServiceProvider.php | 19 ++++++++++++++
 ...qlSystemVariableManagerServiceProvider.php |  6 ++---
 src/ManagesSystemVariables.php                |  2 +-
 src/MySqlConnection.php                       |  2 +-
 src/PdoDecorator.php                          |  2 +-
 src/SystemVariableAwareReconnector.php        |  4 +--
 tests/BasicVariableAssignmentTest.php         |  4 +--
 tests/ReconnectionTest.php                    |  4 +--
 tests/TestCase.php                            |  6 ++---
 12 files changed, 58 insertions(+), 29 deletions(-)
 delete mode 100644 .coveralls.yml
 create mode 100644 src/LaravelMySqlSystemVariableManagerServiceProvider.php

diff --git a/.coveralls.yml b/.coveralls.yml
deleted file mode 100644
index 30b618e..0000000
--- a/.coveralls.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-coverage_clover: build/logs/clover.xml
-json_path: build/logs/coveralls-upload.json
diff --git a/README.md b/README.md
index 5041c9c..dda3e19 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,29 @@ A tiny extension of `MySqlConnection` that manages **session** system variables
 composer require mpyw/laravel-mysql-system-variable-manager
 ```
 
-The default implementation is provided by the automatically-discovered service provider.
-
 ## Basic Usage
 
+The default implementation is provided by `LaravelMySqlSystemVariableManagerServiceProvider`, however, **package discovery is not available**.
+Be careful that you MUST register it in **`config/app.php`** by yourself.
+
+```php
+<?php
+
+return [
+
+    /* ... */
+
+    'providers' => [
+        /* ... */
+
+        Mpyw\LaravelMySqlSystemVariableManager\LaravelMySqlSystemVariableManagerServiceProvider::class,
+
+        /* ... */
+    ],
+
+];
+```
+
 ```php
 <?php
 
@@ -70,7 +89,7 @@ class DatabaseServiceProvider extends ServiceProvider
 namespace App\Database;
 
 use Illuminate\Database\Connection as BaseMySqlConnection;
-use Mpyw\LaravelMysqlSystemVariableManager\ManagesSystemVariables;
+use Mpyw\LaravelMySqlSystemVariableManager\ManagesSystemVariables;
 
 class MySqlConnection extends BaseMySqlConnection
 {
diff --git a/composer.json b/composer.json
index 24040e9..87eac71 100644
--- a/composer.json
+++ b/composer.json
@@ -12,12 +12,12 @@
     "keywords": ["laravel", "illuminate", "mysql", "system", "variable"],
     "autoload": {
         "psr-4": {
-            "Mpyw\\LaravelMysqlSystemVariableManager\\": "src/"
+            "Mpyw\\LaravelMySqlSystemVariableManager\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Lampager\\Laravel\\Tests\\": "tests/"
+            "Mpyw\\LaravelMySqlSystemVariableManager\\Tests\\": "tests/"
         }
     },
     "require": {
@@ -31,12 +31,5 @@
         "laravel/framework": "^6.0",
         "nilportugues/sql-query-formatter": "^1.2",
         "friendsofphp/php-cs-fixer": "^2.15"
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Mpyw\\LaravelMysqlSystemVariableManager\\LaravelMysqlSystemVariableManagerServiceProvider"
-            ]
-        }
     }
 }
diff --git a/src/LaravelMySqlSystemVariableManagerServiceProvider.php b/src/LaravelMySqlSystemVariableManagerServiceProvider.php
new file mode 100644
index 0000000..5be27df
--- /dev/null
+++ b/src/LaravelMySqlSystemVariableManagerServiceProvider.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Mpyw\LaravelMySqlSystemVariableManager;
+
+use Illuminate\Database\Connection;
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class LaravelMySqlSystemVariableManagerServiceProvider
+ */
+class LaravelMySqlSystemVariableManagerServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Connection::resolverFor('mysql', function (...$parameters) {
+            return new MySqlConnection(...$parameters);
+        });
+    }
+}
diff --git a/src/LaravelMysqlSystemVariableManagerServiceProvider.php b/src/LaravelMysqlSystemVariableManagerServiceProvider.php
index 71a267d..5be27df 100644
--- a/src/LaravelMysqlSystemVariableManagerServiceProvider.php
+++ b/src/LaravelMysqlSystemVariableManagerServiceProvider.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Mpyw\LaravelMysqlSystemVariableManager;
+namespace Mpyw\LaravelMySqlSystemVariableManager;
 
 use Illuminate\Database\Connection;
 use Illuminate\Support\ServiceProvider;
 
 /**
- * Class LaravelMysqlSystemVariableManagerServiceProvider
+ * Class LaravelMySqlSystemVariableManagerServiceProvider
  */
-class LaravelMysqlSystemVariableManagerServiceProvider extends ServiceProvider
+class LaravelMySqlSystemVariableManagerServiceProvider extends ServiceProvider
 {
     public function boot(): void
     {
diff --git a/src/ManagesSystemVariables.php b/src/ManagesSystemVariables.php
index 80728e3..d741396 100644
--- a/src/ManagesSystemVariables.php
+++ b/src/ManagesSystemVariables.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpyw\LaravelMysqlSystemVariableManager;
+namespace Mpyw\LaravelMySqlSystemVariableManager;
 
 /**
  * Trait ManagesSystemVariables
diff --git a/src/MySqlConnection.php b/src/MySqlConnection.php
index 18ee30d..2d4eef7 100644
--- a/src/MySqlConnection.php
+++ b/src/MySqlConnection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpyw\LaravelMysqlSystemVariableManager;
+namespace Mpyw\LaravelMySqlSystemVariableManager;
 
 use Illuminate\Database\MySqlConnection as BaseMySqlConnection;
 
diff --git a/src/PdoDecorator.php b/src/PdoDecorator.php
index 3df3ecf..288c320 100644
--- a/src/PdoDecorator.php
+++ b/src/PdoDecorator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpyw\LaravelMysqlSystemVariableManager;
+namespace Mpyw\LaravelMySqlSystemVariableManager;
 
 use Closure;
 use PDO;
diff --git a/src/SystemVariableAwareReconnector.php b/src/SystemVariableAwareReconnector.php
index c048bf5..72cf33f 100644
--- a/src/SystemVariableAwareReconnector.php
+++ b/src/SystemVariableAwareReconnector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpyw\LaravelMysqlSystemVariableManager;
+namespace Mpyw\LaravelMySqlSystemVariableManager;
 
 use Illuminate\Database\ConnectionInterface;
 use LogicException;
@@ -41,7 +41,7 @@ public function memoizeSystemVariables(array $values)
     }
 
     /**
-     * @param  \Illuminate\Database\ConnectionInterface|\Mpyw\LaravelMysqlSystemVariableManager\ManagesSystemVariables $connection
+     * @param  \Illuminate\Database\ConnectionInterface|\Mpyw\LaravelMySqlSystemVariableManager\ManagesSystemVariables $connection
      * @return mixed
      */
     public function __invoke(ConnectionInterface $connection)
diff --git a/tests/BasicVariableAssignmentTest.php b/tests/BasicVariableAssignmentTest.php
index cab5f30..58d53ac 100644
--- a/tests/BasicVariableAssignmentTest.php
+++ b/tests/BasicVariableAssignmentTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Lampager\Laravel\Tests;
+namespace Mpyw\LaravelMySqlSystemVariableManager\Tests;
 
-use Mpyw\LaravelMysqlSystemVariableManager\MySqlConnection;
+use Mpyw\LaravelMySqlSystemVariableManager\MySqlConnection;
 use PDOException;
 
 class BasicVariableAssignmentTest extends TestCase
diff --git a/tests/ReconnectionTest.php b/tests/ReconnectionTest.php
index 7367d2e..34ddb1a 100644
--- a/tests/ReconnectionTest.php
+++ b/tests/ReconnectionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Lampager\Laravel\Tests;
+namespace Mpyw\LaravelMySqlSystemVariableManager\Tests;
 
 use Illuminate\Support\Facades\DB;
-use Mpyw\LaravelMysqlSystemVariableManager\MySqlConnection;
+use Mpyw\LaravelMySqlSystemVariableManager\MySqlConnection;
 
 class ReconnectionTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 973aa53..dfbff91 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Lampager\Laravel\Tests;
+namespace Mpyw\LaravelMySqlSystemVariableManager\Tests;
 
 use Illuminate\Support\Facades\DB;
-use Mpyw\LaravelMysqlSystemVariableManager\LaravelMysqlSystemVariableManagerServiceProvider;
+use Mpyw\LaravelMySqlSystemVariableManager\LaravelMySqlSystemVariableManagerServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use PDO;
 
@@ -41,7 +41,7 @@ protected function getEnvironmentSetUp($app)
     protected function getPackageProviders($app)
     {
         return [
-            LaravelMysqlSystemVariableManagerServiceProvider::class,
+            LaravelMySqlSystemVariableManagerServiceProvider::class,
         ];
     }