Merge remote-tracking branch 'origin/8.x' into merge-master-to-sgt

* origin/8.x:
  update 8x branch (#4)

# Conflicts:
#	README.md
#	composer.json

Author: zanvidmar

.travis.yml

@@ -29,15 +29,12 @@ install:
 
 script:
   - if [[ $RELEASE = dev ]]; then composer --verbose remove --no-update drupal/console; fi;
-  - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.8.x-dev webflo/drupal-core-require-dev:8.8.x-dev; fi;
+  - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.8.x-dev; composer --verbose require --no-update --dev drupal/core-dev:8.8.x-dev; fi;
   - if [[ $RELEASE = dev ]]; then composer --verbose update; fi;
-  - cd $TRAVIS_BUILD_DIR/web
-  - ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
-  - ./../vendor/bin/drush runserver $SIMPLETEST_BASE_URL &
+  - ./vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
+  - ./vendor/bin/drush runserver $SIMPLETEST_BASE_URL &
   - until curl -s $SIMPLETEST_BASE_URL; do true; done > /dev/null
-  # Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json
-  # Ignore PageCache group temporarily, @see https://www.drupal.org/node/2770673
-  # Ignore Setup group temporarily, @see https://www.drupal.org/node/2962157
-  - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer,DependencyInjection,PageCache,Setup
-  - ./../vendor/bin/drush
-  - if [[ $RELEASE = stable ]]; then ./../vendor/bin/drupal; fi;
+  # Run a single unit test to verfiy the testing setup.
+  - ./vendor/bin/phpunit -c ./web/core ./web/core/modules/system/tests/src/Unit/SystemRequirementsTest.php
+  - ./vendor/bin/drush
+  - if [[ $RELEASE = stable ]]; then ./vendor/bin/drupal; fi;

composer.json

@@ -129,24 +129,23 @@
     }
   ],
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.0.8",
     "composer/installers": "^1.2",
     "cweagans/composer-patches": "^1.6.5",
-    "drupal-composer/drupal-scaffold": "^2.5",
     "drupal/console": "^1.0.2",
-    "drupal/core": "^8.7.0",
-    "drush/drush": "^9.0.0",
+    "drupal/core": "^8.8.0",
+    "drupal/core-composer-scaffold": "^8.8.0",
+    "drush/drush": "^9.7.1 | ^10.0.0",
     "oomphinc/composer-installers-extender": "^1.1",
     "sergeant/sgt_core": "^8.0",
     "sergeant/sgt_ignite": "^8.0",
     "sergeant/sgt_installation_profile": "^8.0",
-    "vlucas/phpdotenv": "^2.4",
+    "vlucas/phpdotenv": "^4.0",
     "webflo/drupal-finder": "^1.0.0",
-    "webmozart/path-util": "^2.3",
     "zaporylie/composer-drupal-optimizations": "^1.0"
   },
   "require-dev": {
-    "webflo/drupal-core-require-dev": "^8.7.0"
+    "drupal/core-dev": "^8.8.0"
   },
   "conflict": {
     "drupal/drupal": "*"
@@ -186,6 +185,11 @@
     "installer-types": [
       "library"
     ],
+    "drupal-scaffold": {
+      "locations": {
+        "web-root": "web/"
+      }
+    },
     "installer-paths": {
       "web/core": ["type:drupal-core"],
       "web/libraries/{$name}": [
@@ -195,7 +199,7 @@
       "web/modules/contrib/{$name}": ["type:drupal-module"],
       "web/profiles/contrib/{$name}": ["type:drupal-profile"],
       "web/themes/contrib/{$name}": ["type:drupal-theme"],
-      "drush/Commands/{$name}": ["type:drupal-drush"],
+      "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
       "web/modules/sgt/{$name}": [
         "sergeant/sgt_checklist",
         "sergeant/sgt_core",
@@ -214,12 +218,6 @@
       "web/profiles/sgt/{$name}": [
         "sergeant/sgt_installation_profile"
       ]
-    },
-    "drupal-scaffold": {
-      "initial": {
-        ".editorconfig": "../.editorconfig",
-        ".gitattributes": "../.gitattributes"
-      }
     }
   }
 }

load.environment.php

@@ -11,10 +11,5 @@
 /**
  * Load any .env file. See /.env.example.
  */
-$dotenv = new Dotenv(__DIR__);
-try {
-  $dotenv->load();
-}
-catch (InvalidPathException $e) {
-  // Do nothing. Production environments rarely use .env files.
-}
+$dotenv = Dotenv::createImmutable(__DIR__);
+$dotenv->safeLoad();

scripts/composer/ScriptHandler.php

@@ -9,6 +9,7 @@
 
 use Composer\Script\Event;
 use Composer\Semver\Comparator;
+use Drupal\Core\Site\Settings;
 use DrupalFinder\DrupalFinder;
 use SgtInstallationProfile\SgtInstallationProfileScriptHandler;
 use Symfony\Component\Filesystem\Filesystem;
@@ -38,15 +39,14 @@ public static function createRequiredFiles(Event $event) {
     }
 
     // Prepare the settings file for installation
-    if (!$fs->exists($drupalRoot . '/sites/default/settings.php') and $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
+    if (!$fs->exists($drupalRoot . '/sites/default/settings.php') && $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
       $fs->copy($drupalRoot . '/sites/default/default.settings.php', $drupalRoot . '/sites/default/settings.php');
       require_once $drupalRoot . '/core/includes/bootstrap.inc';
       require_once $drupalRoot . '/core/includes/install.inc';
-      $settings['config_directories'] = [
-        CONFIG_SYNC_DIRECTORY => (object) [
-          'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
-          'required' => TRUE,
-        ],
+      new Settings([]);
+      $settings['settings']['config_sync_directory'] = (object) [
+        'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
+        'required' => TRUE,
       ];
       drupal_rewrite_settings($settings, $drupalRoot . '/sites/default/settings.php');
       $fs->chmod($drupalRoot . '/sites/default/settings.php', 0666);