From 171b43c5173a644a32bd7b2c388364f9c5c8baa6 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Mon, 4 Feb 2019 19:43:21 +0100
Subject: [PATCH] Fixed some configs

---
 .gitattributes   | 10 ++++++----
 composer.json    |  2 +-
 phpunit.xml.dist |  9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 13bb2a91..e3b2282a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,12 +1,14 @@
+/config/test export-ignore
 /data/infra export-ignore
 /docs export-ignore
 /module/CLI/test export-ignore
 /module/CLI/test-resources export-ignore
 /module/Common/test export-ignore
-/module/Common/test-func export-ignore
+/module/Common/test-db export-ignore
 /module/Core/test export-ignore
-/module/Core/test-func export-ignore
+/module/Core/test-db export-ignore
 /module/Rest/test export-ignore
+/module/Rest/test-api export-ignore
 .env.dist export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
@@ -17,9 +19,9 @@ build.sh export-ignore
 CHANGELOG.md export-ignore
 docker-compose.override.yml.dist export-ignore
 docker-compose.yml export-ignore
-func_tests_bootstrap.php export-ignore
 indocker export-ignore
 phpcs.xml export-ignore
 phpunit.xml.dist export-ignore
-phpunit-func.xml export-ignore
+phpunit-api.xml export-ignore
+phpunit-db.xml export-ignore
 phpstan.neon
diff --git a/composer.json b/composer.json
index c946eda2..3865d0da 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
         "lstrojny/functional-php": "^1.8",
         "mikehaertl/phpwkhtmltopdf": "^2.2",
         "monolog/monolog": "^1.21",
-        "roave/security-advisories": "dev-master",
         "symfony/console": "^4.2",
         "symfony/filesystem": "^4.2",
         "symfony/lock": "^4.2",
@@ -57,6 +56,7 @@
         "phpstan/phpstan": "^0.10.0",
         "phpunit/phpcov": "^5.0",
         "phpunit/phpunit": "^7.3",
+        "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~1.0.0",
         "symfony/dotenv": "^4.2",
         "symfony/var-dumper": "^4.2",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 199b49bb..8220a06e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
-        bootstrap="./vendor/autoload.php"
-        colors="true">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
+    bootstrap="./vendor/autoload.php"
+    colors="true"
+>
     <testsuites>
         <testsuite name="Common">
             <directory>./module/Common/test</directory>