chore: 🤖 Migrate Ci & Improve tests (#13)

mpyw · web-flow · commit 76421abcf59e · 2021-06-27T03:59:13.000+09:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,84 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - '3306:3306'
+        env:
+          MYSQL_DATABASE: testing
+          MYSQL_USER: testing
+          MYSQL_PASSWORD: testing
+          MYSQL_ROOT_PASSWORD: testing
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=30s
+          --health-retries=5
+
+    strategy:
+      matrix:
+        php: [7.1, 7.2, 7.3, 7.4, 8.0]
+        lib:
+          - { laravel: ^8.0, testbench: ^6.0, composer_flags: --prefer-stable }
+          - { laravel: ^7.0, testbench: ^5.0, composer_flags: --prefer-stable }
+          - { laravel: ^6.0, testbench: ^4.0, composer_flags: --prefer-stable }
+          - { laravel: ^6.0, testbench: ^4.0, composer_flags: --prefer-stable --prefer-lowest }
+          - { laravel: 5.8.*, testbench: 3.8.*, composer_flags: --prefer-stable }
+        exclude:
+          - lib: { laravel: ^8.0, testbench: ^6.0, composer_flags: --prefer-stable }
+            php: 7.2
+          - lib: { laravel: ^8.0, testbench: ^6.0, composer_flags: --prefer-stable }
+            php: 7.1
+          - lib: { laravel: ^7.0, testbench: ^5.0, composer_flags: --prefer-stable }
+            php: 7.1
+          - lib: { laravel: ^6.0, testbench: ^4.0, composer_flags: --prefer-stable }
+            php: 7.1
+          - lib: { laravel: ^6.0, testbench: ^4.0, composer_flags: --prefer-stable --prefer-lowest }
+            php: 7.1
+          - lib: { laravel: 5.8.*, testbench: 3.8.*, composer_flags: --prefer-stable }
+            php: 8.0
+          - lib: { laravel: 5.7.*, testbench: 3.7.*, composer_flags: --prefer-stable }
+            php: 8.0
+          - lib: { laravel: 5.6.*, testbench: 3.6.*, composer_flags: --prefer-stable }
+            php: 8.0
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: xdebug
+
+      - name: Adjust Package Versions
+        run: |
+          composer require "laravel/framework:${{ matrix.lib.laravel }}" --dev --no-update ${{ matrix.lib.composer_flags }}
+          if php -r 'exit((int)!version_compare(PHP_VERSION, "8", ">="));'; then
+            composer require "orchestra/testbench:>=4.14" --dev --no-update ${{ matrix.lib.composer_flags }}
+            composer require "phpunit/phpunit:>=9.3" --dev --no-update ${{ matrix.lib.composer_flags }}
+          else
+            composer require "orchestra/testbench:${{ matrix.lib.testbench }}" --dev --no-update ${{ matrix.lib.composer_flags }}
+          fi
+          composer update ${{ matrix.lib.composer_flags }}
+
+      - run: mkdir -p build/logs
+      - run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+      - name: Upload Coverage
+        uses: nick-invision/retry@v2
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          timeout_minutes: 1
+          max_attempts: 3
+          command: |
+            composer global require php-coveralls/php-coveralls
+            php-coveralls --coverage_clover=build/logs/clover.xml -v
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -13,24 +13,28 @@ build:
     php: '7.4'
     docker: true
 
+  nodes:
+    custom-nodes:
+      services:
+        custom-mysql:
+          image: docker.io/library/mysql:5.7
+          env:
+            MYSQL_DATABASE: testing
+            MYSQL_USER: testing
+            MYSQL_PASSWORD: testing
+            MYSQL_ROOT_PASSWORD: testing
+          ports:
+            - 3306
+
   dependencies:
     before:
-      - sudo rm /usr/local/bin/docker-compose
-      - curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > docker-compose
-      - chmod +x docker-compose
-      - sudo mv docker-compose /usr/local/bin
-      - cp docker-compose-ci.yml docker-compose.yml
-      - export PHP_VERSION=$(php -r 'preg_match("/^((\d+)[.](\d+))[.](\d+)$/", PHP_VERSION, $m); echo $m[1];')
-      - docker-compose up -d
-      - |
-        sh -c 'docker-compose logs -f mysql | { sed "/mysqld: ready for connections/ q" && kill $$ ;}' || :
       - composer install
       - mkdir -p build/logs
 
   tests:
     override:
       -
-        command: "docker-compose exec php sh -c 'cd /code; vendor/bin/phpunit --coverage-clover build/logs/clover.xml'"
+        command: 'vendor/bin/phpunit --coverage-clover build/logs/clover.xml'
         coverage:
           file: 'build/logs/clover.xml'
           format: 'clover'
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
-# Laravel MySQL System Variable Manager<br>[![Build Status](https://travis-ci.com/mpyw/laravel-mysql-system-variable-manager.svg?branch=master)](https://travis-ci.com/mpyw/laravel-mysql-system-variable-manager) [![Code Coverage](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/?branch=master)
+# Laravel MySQL System Variable Manager<br>[![Build Status](https://github.com/mpyw/laravel-mysql-system-variable-manager/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/mpyw/laravel-mysql-system-variable-manager/actions) [![Coverage Status](https://coveralls.io/repos/github/mpyw/laravel-mysql-system-variable-manager/badge.svg?branch=migrate-ci)](https://coveralls.io/github/mpyw/laravel-mysql-system-variable-manager?branch=migrate-ci) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/mpyw/laravel-mysql-system-variable-manager/?branch=master)
 
 A tiny extension of `MySqlConnection` that manages **session** system variables
 
 ## Requirements
 
-- PHP: ^7.1
-- Laravel: ^5.8 || ^6.0 || ^7.0 || ^8.0
+- PHP: `^7.1 || ^8.0`
+- Laravel: `^5.8 || ^6.0 || ^7.0 || ^8.0`
 
 ## Installing
 
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "ext-pdo": "*",
         "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
 
   php:
-    image: circleci/php:7.3
+    image: circleci/php:7.4
     volumes:
       - .:/code:cached
     command:
@@ -17,6 +17,6 @@ services:
     image: mysql:5.7
     environment:
       MYSQL_DATABASE: testing
-      MYSQL_USER: user
-      MYSQL_PASSWORD: password
-      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+      MYSQL_USER: testing
+      MYSQL_PASSWORD: testing
+      MYSQL_ROOT_PASSWORD: testing
diff --git a/tests/BasicVariableAssignmentTest.php b/tests/BasicVariableAssignmentTest.php
@@ -133,42 +133,82 @@ public function testAssigningNullThrowsOnUnresolvedEmulatedConnection(): void
     public function testAssignmentPriorityOnLazilyResolvedConnection(): void
     {
         $this->onNativeConnection(function (MySqlConnection $db) {
+            $this->assertPdoNotResolved($db->getName());
+
             $db
                 ->setSystemVariable('long_query_time', 11.0)
                 ->setSystemVariable('long_query_time', 12.0)
                 ->setSystemVariable('long_query_time', 13.0);
+
+            $this->assertPdoNotResolved($db->getName());
+
             $db->getPdo();
+
+            $this->assertPdoResolved($db->getName());
+
             $this->assertSame(13.0, $db->selectOne('select @@long_query_time as value')->value);
+
+            $this->assertPdoResolved($db->getName());
         });
 
         $this->onEmulatedConnection(function (MySqlConnection $db) {
+            $this->assertPdoNotResolved($db->getName());
+
             $db
                 ->setSystemVariable('long_query_time', 11.0)
                 ->setSystemVariable('long_query_time', 12.0)
                 ->setSystemVariable('long_query_time', 13.0);
+
+            $this->assertPdoNotResolved($db->getName());
+
             $db->getPdo();
+
+            $this->assertPdoResolved($db->getName());
+
             $this->assertSame('13.000000', $db->selectOne('select @@long_query_time as value')->value);
+
+            $this->assertPdoResolved($db->getName());
         });
     }
 
     public function testAssignmentPriorityOnEagerlyResolvedConnection(): void
     {
         $this->onNativeConnection(function (MySqlConnection $db) {
+            $this->assertPdoNotResolved($db->getName());
+
             $db->getPdo();
+
+            $this->assertPdoResolved($db->getName());
+
             $db
                 ->setSystemVariable('long_query_time', 11.0)
                 ->setSystemVariable('long_query_time', 12.0)
                 ->setSystemVariable('long_query_time', 13.0);
+
+            $this->assertPdoResolved($db->getName());
+
             $this->assertSame(13.0, $db->selectOne('select @@long_query_time as value')->value);
+
+            $this->assertPdoResolved($db->getName());
         });
 
         $this->onEmulatedConnection(function (MySqlConnection $db) {
+            $this->assertPdoNotResolved($db->getName());
+
             $db->getPdo();
+
+            $this->assertPdoResolved($db->getName());
+
             $db
                 ->setSystemVariable('long_query_time', 11.0)
                 ->setSystemVariable('long_query_time', 12.0)
                 ->setSystemVariable('long_query_time', 13.0);
+
+            $this->assertPdoResolved($db->getName());
+
             $this->assertSame('13.000000', $db->selectOne('select @@long_query_time as value')->value);
+
+            $this->assertPdoResolved($db->getName());
         });
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,6 +2,7 @@
 
 namespace Mpyw\LaravelMySqlSystemVariableManager\Tests;
 
+use Closure;
 use Illuminate\Support\Facades\DB;
 use Mpyw\LaravelMySqlSystemVariableManager\MySqlConnectionServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
@@ -14,19 +15,23 @@ class TestCase extends BaseTestCase
      */
     protected function getEnvironmentSetUp($app)
     {
+        $host = \gethostbyname('mysql') !== 'mysql' // Is "mysql" valid hostname?
+            ? 'mysql' // Local
+            : '127.0.0.1'; // CI
+
         $app['config']->set('database.default', 'mysql');
         $app['config']->set('database.connections.mysql', [
             'driver' => 'mysql',
-            'host' => 'mysql',
-            'username' => 'user',
-            'password' => 'password',
+            'host' => $host,
+            'username' => 'testing',
+            'password' => 'testing',
             'database' => 'testing',
         ]);
         $app['config']->set('database.connections.mysql:emulated', [
             'driver' => 'mysql',
-            'host' => 'mysql',
-            'username' => 'user',
-            'password' => 'password',
+            'host' => $host,
+            'username' => 'testing',
+            'password' => 'testing',
             'database' => 'testing',
             'options' => [
                 PDO::ATTR_EMULATE_PREPARES => true,
@@ -54,4 +59,26 @@ protected function onEmulatedConnection(callable $callback): void
     {
         $callback(DB::connection('mysql:emulated'));
     }
+
+    /**
+     * @param  string        $property
+     * @return \Closure|\PDO
+     */
+    protected function getConnectionPropertyValue(string $connection, string $property)
+    {
+        $db = DB::connection($connection);
+        $rp = new \ReflectionProperty($db, $property);
+        $rp->setAccessible(true);
+        return $rp->getValue($db);
+    }
+
+    protected function assertPdoResolved(string $connection): void
+    {
+        $this->assertInstanceOf(PDO::class, $this->getConnectionPropertyValue($connection, 'pdo'));
+    }
+
+    protected function assertPdoNotResolved(string $connection): void
+    {
+        $this->assertInstanceOf(Closure::class, $this->getConnectionPropertyValue($connection, 'pdo'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`}`
`22`	`22`	`},`
`23`	`23`	`"require": {`
`24`		`- "php": "^7.1",`
	`24`	`+ "php": "^7.1 \|\| ^8.0",`
`25`	`25`	`"ext-pdo": "*",`
`26`	`26`	`"illuminate/support": "^5.8 \|\| ^6.0 \|\| ^7.0 \|\| ^8.0 \|\| ^9.0",`
`27`	`27`	`"illuminate/database": "^5.8 \|\| ^6.0 \|\| ^7.0 \|\| ^8.0 \|\| ^9.0",`