Merge pull request #18 from KenoKokoro/6.x-support

6.x support

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     docker:
     # specify the version you desire here
-    - image: circleci/php:7.1-browsers
+    - image: circleci/php:7.2-browsers
 
     working_directory: ~/repo
 

.gitignore

@@ -3,5 +3,7 @@ storage/
 composer.lock
 
 .idea
+publish/docker-compose/.env
 
 tests/storage/
+.phpunit.result.cache

Makefile

@@ -1,10 +1,5 @@
 phpunit:
-	@echo "Setting different namespace for Laravel tests"
-	@php tests/Fake/Integration/Laravel/artisan app:name Laravel
-	@mkdir vendor/laravel/lumen/config/
-	@cp tests/Fake/database.php vendor/laravel/lumen/config/database.php
 	@echo "Running phpunit..."
 	@vendor/bin/phpunit
 	@echo "Cleanup..."
 	@rm -rf ./tests/storage
-	@rm -rf vendor/laravel/lumen/config

composer.json

@@ -24,28 +24,26 @@
                 "vendor/laravel/lumen/tests/"
             ],
             "BaseTree\\Tests\\": "tests/",
-            "Laravel\\": "vendor/laravel/laravel/app/",
-            "App\\": "vendor/laravel/lumen/app/"
+            "App\\": "vendor/laravel/laravel/app/"
         }
     },
     "require": {
         "barryvdh/laravel-ide-helper": "^2.4",
-        "illuminate/contracts": "^5.0",
-        "illuminate/console": "^5.0",
-        "illuminate/container": "^5.0",
-        "illuminate/http": "^5.0",
-        "illuminate/support": "^5.0",
-        "yajra/laravel-datatables-oracle": ">8"
+        "illuminate/contracts": "^6.0",
+        "illuminate/console": "^6.0",
+        "illuminate/container": "^6.0",
+        "illuminate/http": "^6.0",
+        "illuminate/support": "^6.0",
+        "yajra/laravel-datatables-oracle": ">9"
     },
     "require-dev": {
         "fzaninotto/faker": "^1.4",
         "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0",
-        "laravel/laravel": "5.7.*",
-        "laravel/lumen": "5.7.*"
+        "phpunit/phpunit": "^8.0",
+        "laravel/laravel": "^6.0"
     },
     "extra": {
         "laravel": {

phpunit.xml

@@ -15,9 +15,6 @@
         <testsuite name="Laravel">
             <directory suffix="Test.php">./tests/Integration/Laravel</directory>
         </testsuite>
-        <testsuite name="Lumen">
-            <directory suffix="Test.php">./tests/Integration/Lumen</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">

publish/docker-compose/docker-compose.yml

@@ -7,8 +7,6 @@ services:
     build:
       context: docker
       dockerfile: local.Dockerfile
-    links:
-    - mariadb
     volumes:
     - .:${CONTAINER_ROOT}
     - ./docker/${APP_ENV}/conf/supervisord.conf:/etc/supervisord.conf
@@ -27,15 +25,15 @@ services:
     - PGID=${DOCKER_HOST_GID}
 
   # Services
-  mariadb:
-    image: mariadb:10.3
-    hostname: mariadb
-    container_name: mariadb
-    volumes:
-    - ${DATABASE_LOCAL_STORAGE}:/var/lib/mysql:rw
-    environment:
-    - MYSQL_DATABASE=${DB_DATABASE}
-    - MYSQL_USER=${DB_USERNAME}
-    - MYSQL_PASSWORD=${DB_PASSWORD}
-    - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
+#  mariadb:
+#    image: mariadb:10.3
+#    hostname: mariadb
+#    container_name: mariadb
+#    volumes:
+#    - ${DATABASE_LOCAL_STORAGE}:/var/lib/mysql:rw
+#    environment:
+#    - MYSQL_DATABASE=${DB_DATABASE}
+#    - MYSQL_USER=${DB_USERNAME}
+#    - MYSQL_PASSWORD=${DB_PASSWORD}
+#    - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
 

publish/docker-compose/docker/local.Dockerfile

@@ -1,16 +1,16 @@
 FROM php:7.2.3-fpm-stretch
 
-MAINTAINER Jimmy <stefan.brankovik@cosmicdevelopment.com>
+MAINTAINER Jimmy <stefan.brankovik@gmail.com>
 
 ### NGINX
-ARG NGINX_VERSION=1.10.3-1+deb9u1
-ARG YARN_VERSION=1.10.1-1
+ARG NGINX_VERSION=1.10.3-1+deb9u3
+ARG YARN_VERSION=1.19.1-1
 
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils gnupg2 apt-transport-https
 ### Required repositories
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 ### NGINX
 RUN addgroup --system nginx \

readme.md

@@ -1,5 +1,12 @@
 [![CircleCI](https://circleci.com/gh/KenoKokoro/laravel-basetree.svg?style=svg)](https://circleci.com/gh/KenoKokoro/laravel-basetree)
 
+## Support
+|Laravel      | Version       |
+|:------------|--------------:|
+|< 5.6        | 1.*           |
+|5.6,5.7,5.8  | 2.*           |
+|6.x          | 3.*           |
+
 ## Installation
 `composer require kenokokoro/laravel-basetree`