Merge branch '4'

# Conflicts:
 #	.editorconfig
 #	.travis.yml
 #	composer.json
 #	phpunit.xml.dist

.gitignore

@@ -2,5 +2,5 @@
 /.env
 /vendor/
 /themes/simple/
-/resources/
-/public/resources/
+/_resources/
+/public/_resources/

.travis.yml

@@ -33,7 +33,11 @@ matrix:
         - PHPUNIT_TEST=core
         - DB=MYSQL
         - PDO=1
-    - php: 7.1.2
+    - php: 7.1
+      env:
+        - PHPUNIT_TEST=framework
+        - DB=MYSQL
+    - php: 7.3
       env:
         - PHPUNIT_TEST=core
         - DB=PGSQL
@@ -42,7 +46,7 @@ matrix:
       env:
         - PHPUNIT_TEST=admin
         - DB=PGSQL
-    - php: 7.1.2
+    - php: 7.2
       env:
         - PHPUNIT_TEST=admin
         - DB=MYSQL

composer.json

@@ -28,7 +28,8 @@
         ],
         "branch-alias": {
             "dev-master": "5.x-dev"
-        }
+        },
+        "resources-dir": "_resources"
     },
     "config": {
         "process-timeout": 600

phpunit.xml.dist

@@ -6,10 +6,10 @@
 	Usage:
 	 - "vendor/bin/phpunit": Runs all tests in all folders
 	 - "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module
-	 - "vendor/bin/phpunit <dash><dash>testsuite admin": Run all tests within the core test group
-	                       (replace <dash> with "-")
-	 - "vendor/bin/phpunit <dash><dash>filter FolderTest vendor/silverstripe/framework/tests": Run a single test
-	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (requires xdebug or phpdbg)
+	 - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem": Run all filesystem tests within framework
+	 - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem/FolderTest.php": Run a single test
+	 - "vendor/bin/phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace
+	                                                           <dash> with "-", requires xdebug or phpdbg)
 
 	More information:
 	- https://www.phpunit.de
@@ -30,9 +30,13 @@
       <directory>vendor/silverstripe/framework/tests/php</directory>
     </testsuite>
 
-    <!-- core components -->
-    <testsuite name="core">
+    <!-- framework only -->
+    <testsuite name="framework">
       <directory>vendor/silverstripe/framework/tests/php/</directory>
+    </testsuite>
+
+    <!-- other core components -->
+    <testsuite name="core">
       <directory>vendor/silverstripe/assets/tests/php/</directory>
       <directory>vendor/silverstripe/versioned/tests/php/</directory>
     </testsuite>