Merge branch '3.4' into 3.5

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Jul 6, 2017 · c042bd8 · c042bd8
2 parents 3e9d360 + 7775907
commit c042bd8
Show file tree

Hide file tree

Showing 24 changed files with 7 additions and 805 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,9 @@
 * text=auto
 
 # Ignore following folder/file.
-/tests export-ignore
 /.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs export-ignore
 /.scrutinizer.yml export-ignore
 /.travis.yml export-ignore
 /phpunit.xml export-ignore

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "core"]
+	path = core
+	url = https://github.com/orchestral/testbench-core.git
+    branch = 3.5
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     ],
     "autoload-dev": {
         "psr-4": {
-            "Orchestra\\Testbench\\Tests\\": "tests/"
+            "Orchestra\\Testbench\\Tests\\": "core/tests/"
         }
     },
     "require": {

diff --git a/core b/core
diff --git a/phpunit.xml b/phpunit.xml
@@ -12,7 +12,7 @@
 
     <testsuites>
         <testsuite name="Orchestra\Testbench Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
+            <directory suffix="Test.php">./core/tests/</directory>
         </testsuite>
     </testsuites>
     <php>

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
diff --git a/tests/Databases/MigrateDatabaseTest.php b/tests/Databases/MigrateDatabaseTest.php
diff --git a/tests/Databases/MigrateWithLaravelTest.php b/tests/Databases/MigrateWithLaravelTest.php