Merge pull request #2 from denismitr/v2.0

update composer and tests

Author: denismitr

.travis.yml

@@ -9,8 +9,8 @@ env:
     - COMPOSER_FLAGS=""
 
 php:
-  - 7.0
   - 7.2
+  - 7.3
 
 sudo: false
 

composer.json

@@ -10,13 +10,13 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/database": "~5.5.0|~5.6.0",
-        "illuminate/support": "~5.5.0|~5.6.0"
+        "php": ">=7.2",
+        "illuminate/database": "~5.7.0|~5.8.0",
+        "illuminate/support": "~5.7.0|~5.8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
-        "orchestra/testbench": "^3.5",
+        "phpunit/phpunit": "^7.3",
+        "orchestra/testbench": "~3.7.0|~3.8.0",
         "larapack/dd": "^1.1"
     },
     "autoload": {
@@ -30,7 +30,7 @@
         }
     },
     "scripts": {
-        "test": "vendor\\bin\\phpunit",
+        "test": "./test.sh",
         "test-coverage": "vendor\\bin\\phpunit --coverage-html coverage"
     },
     "config": {

phpunit.xml.dist

@@ -24,6 +24,7 @@
         <env name="DB_PASSWORD" value="password"/>
         <env name="DB_DATABASE" value="json_attributes"/>
         <env name="DB_CONNECTION" value="mysql"/>
+        <env name="DB_PORT" value="3366"/>
     </php>
     <logging>
         <log type="tap" target="build/report.tap"/>

test.sh

@@ -0,0 +1,4 @@
+docker-compose -f ./tests/docker-compose.yml up -d
+php tests/wait.php
+./vendor/bin/phpunit
+docker-compose -f ./tests/docker-compose.yml down

tests/JsonAttributesTest.php

@@ -10,7 +10,7 @@ class JsonAttributesTest extends TestCase
 {
     private $record;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -10,7 +10,7 @@
 
 class TestCase extends OrchestraTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/docker-compose.yml

@@ -11,4 +11,4 @@ services:
       MYSQL_ROOT_HOST: "0.0.0.0"
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     ports:
-      - "3306:3306"
+      - "3366:3306"

tests/wait.php

@@ -4,7 +4,7 @@
 
 while (true) {
     try {
-        new PDO("mysql:host=127.0.0.1;dbname=json_attributes", 'username', 'password');
+        new PDO("mysql:host=127.0.0.1:3366;dbname=json_attributes", 'username', 'password');
         fwrite(STDOUT, 'Docker container started' . PHP_EOL);
         exit(0);
     } catch (PDOException $e) {