From bd2416b6c946635d15d1563c8dbb310ffd408e05 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Thu, 2 Nov 2017 18:18:18 +0200
Subject: [PATCH] Issue #2920412: Updated [Drupal Core] from 8.4.0 to 8.4.1
---
.travis.yml | 20 ++++++++++----------
composer.json | 8 +++-----
drupal-org-core.make | 4 +---
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 80bd5bd4..afd99cb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ cache:
- "$HOME/.drush/cache"
- "$HOME/.npm"
- "$HOME/.selenium/cache"
-
+
php:
- 7.0
-
+
env:
- AFATG=01-website-base-requirements
- AFATG=02-user-management
@@ -30,7 +30,7 @@ matrix:
# Automated Functional Acceptance Testing group: 03 admin management
- php: 7.0
- env: AFATG=03-admin-management
+ env: AFATG=03-admin-management
# Automated Functional Acceptance Testing group: 04 content structure
- php: 7.0
@@ -39,10 +39,10 @@ matrix:
# Automated Functional Acceptance Testing group: 05 content-management
- php: 7.0
env: AFATG=05-content-management
-
-dist: precise
-addons:
+dist: trusty
+
+addons:
firefox: 46.0.1
apt:
packages:
@@ -54,7 +54,7 @@ addons:
- xfonts-75dpi
- xfonts-scalable
- xserver-xorg-core
-
+
mysql:
database: test_varbase4c
username: root
@@ -86,7 +86,7 @@ before_install:
- echo 'sendmail_path = /bin/true' >> varbase.php.ini;
- phpenv config-add varbase.php.ini
- phpenv rehash
-
+
# Configure and run the virtual display.
- export DISPLAY=:0
- sh -e /etc/init.d/xvfb start
@@ -102,7 +102,7 @@ install:
- git checkout $TRAVIS_COMMIT
## Build with the composer.
- composer install --no-interaction -vvv
-
+
## Install with drush.
- cd docroot
- drush site-install varbase --yes --site-name='Test Varbase4c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase4c" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_development_tools.varbase_development=true
@@ -120,4 +120,4 @@ script:
# - behat --strict tests/features/varbase/step3-cleanup-tests/ # no need as we build every time.
matrix:
- fast_finish: true
\ No newline at end of file
+ fast_finish: true
diff --git a/composer.json b/composer.json
index 1bf2adaa..b6855655 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
],
"require": {
"composer/installers": "1.4.0",
- "cweagans/composer-patches": "1.x-dev",
+ "cweagans/composer-patches": "1.6.2",
"drupal-composer/drupal-scaffold": "2.3.0",
"drupal/drupal-library-installer-plugin": "0.3",
"drupal/core": "8.4.1",
@@ -220,15 +220,13 @@
"patches": {
"drupal/core": {
"Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order":
- "https://www.drupal.org/files/issues/1356276-360.patch",
+ "https://www.drupal.org/files/issues/1356276-408--8.4.x.patch",
"Issue #2720101 Label (Title) not set for Views block (exposed filters in Block)":
"https://www.drupal.org/files/issues/2720101-30.patch",
"Issue #2599228: Programmatically created translatable content type returns SQL error on content creation":
"https://www.drupal.org/files/issues/2599228-31.patch",
"Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal":
- "https://www.drupal.org/files/issues/patch_empty_fix.patch",
- "Issue #2573807: Fatal error: Call to a member function getTimestamp()":
- "https://www.drupal.org/files/issues/2573807-49.patch"
+ "https://www.drupal.org/files/issues/patch_empty_fix.patch"
},
"drupal/page_manager": {
"Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses":
diff --git a/drupal-org-core.make b/drupal-org-core.make
index 0e034495..b75455ca 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -5,7 +5,7 @@ core = 8.x
projects[drupal][type] = "core"
projects[drupal][version] = "8.4.1"
;; Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order
-projects[drupal][patch][] = https://www.drupal.org/files/issues/1356276-360.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/1356276-408--8.4.x.patch
;; Issue #2720101: Label (Title) not set for Views block (exposed filters in Block)
projects[drupal][patch][] = https://www.drupal.org/files/issues/2720101-30.patch
;; Issue #2853988: Add option to rewrite robots.txt on staging environments
@@ -14,5 +14,3 @@ projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_s
projects[drupal][patch][] = https://www.drupal.org/files/issues/2599228-31.patch
;; Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal
projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch
-;; Issue #2573807: Fatal error: Call to a member function getTimestamp()
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2573807-49.patch
--
GitLab