diff --git a/.travis.yml b/.travis.yml index be1f7621f4cd34b105d3b0e655195b183810f295..b2cb6d4c9342d54a3ec6722671b6d952ca707f13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ cache: - "$HOME/.selenium/cache" php: - - 7.1.14 + - 7.1.15 env: - AFATG=01-website-base-requirements @@ -24,23 +24,23 @@ env: matrix: exclude: # Automated Functional Acceptance Testing group: 01 website base requirements - - php: 7.1.14 + - php: 7.1.15 env: AFATG=01-website-base-requirements # Automated Functional Acceptance Testing group: 02 user management - - php: 7.1.14 + - php: 7.1.15 env: AFATG=02-user-management # Automated Functional Acceptance Testing group: 03 admin management - - php: 7.1.14 + - php: 7.1.15 env: AFATG=03-admin-management # Automated Functional Acceptance Testing group: 04 content structure - - php: 7.1.14 + - php: 7.1.15 env: AFATG=04-content-structure # Automated Functional Acceptance Testing group: 05 content-management - - php: 7.1.14 + - php: 7.1.15 env: AFATG=05-content-management addons: diff --git a/composer.json b/composer.json index 6eef54e43cbe646ac8114d24c4bfe169a03d1912..edebd7c2aa4c9aefda79c13679eeaf9f660d67e7 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "cweagans/composer-patches": "1.6.4", "drupal-composer/drupal-scaffold": "2.4.0", "drupal/drupal-library-installer-plugin": "0.3", - "drupal/core": "8.4.5", + "drupal/core": "8.5.0", "drupal/config_update": "1.5", "drupal/config_filter": "1.1", "drupal/config_ignore": "2.1", @@ -153,18 +153,18 @@ "drupal/social_auth_linkedin": "2.0-beta1", "drupal/ckeditor_media_embed": "1.1", "drupal/total_control": "2.0-alpha4", - "drupal/anchor_link": "1.x-dev", - "drupal/entity_browser_enhanced": "1.x-dev", - "drupal/vmi": "1.x-dev", - "drupal/varbase_bootstrap_paragraphs": "4.x-dev", - "drupal/varbase_editor": "4.x-dev", - "drupal/varbase_heroslider_media": "4.x-dev", - "drupal/varbase_carousels": "4.x-dev", - "drupal/varbase_total_control": "1.x-dev", - "drupal/varbase_auth" : "4.x-dev", - "drupal/varbase_blog" : "4.x-dev", - "drupal/vartheme": "4.x-dev", - "drupal/vartheme_material": "4.x-dev", + "drupal/anchor_link": "1.6", + "drupal/entity_browser_enhanced": "1.0-rc1", + "drupal/vmi": "1.0-rc1", + "drupal/varbase_bootstrap_paragraphs": "4.0-rc2", + "drupal/varbase_editor": "4.19", + "drupal/varbase_heroslider_media": "4.0-rc1", + "drupal/varbase_carousels": "4.0-rc1", + "drupal/varbase_total_control": "1.0-beta10", + "drupal/varbase_auth" : "4.0-alpha1", + "drupal/varbase_blog" : "4.0-alpha1", + "drupal/vartheme": "4.16", + "drupal/vartheme_material": "4.0-alpha1", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "vardot/dropzone": "4.3.0.1", "vardot/blazy": "1.8.2.1", @@ -239,11 +239,11 @@ "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-408--8.4.4.patch", + "https://www.drupal.org/files/issues/drupal-n1356276-417-d8.5.%2A.patch", "Issue #2720101 Label (Title) not set for Views block (exposed filters in Block)": "https://www.drupal.org/files/issues/2720101-43.patch", "Issue #2599228: Programmatically created translatable content type returns SQL error on content creation": - "https://www.drupal.org/files/issues/2599228-31.patch", + "https://www.drupal.org/files/issues/2599228-31-tests-only.patch", "Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal": "https://www.drupal.org/files/issues/patch_empty_fix.patch" }, @@ -251,7 +251,9 @@ "Issue #2624972: No configuration possible in UI for 301, 303, etc. HTTP responses": "https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch", "Issue #2665328: Variants take entity label not the variant title": - "https://www.drupal.org/files/issues/page_manager-fix_contexts_on_get_title-2665328-66.patch" + "https://www.drupal.org/files/issues/page_manager-fix_contexts_on_get_title-2665328-66.patch", + "Issue #2918564: Update 'page_manager.variant_route_filter' service according to core changes": + "https://www.drupal.org/files/issues/2918564-22.patch" }, "drupal/coffee": { "Issue #2815381: Coffee breaks whole page when using right to left (rtl) languages in drupal 8": @@ -368,7 +370,11 @@ "drupal/slick": { "Issue #2948735: Adding the alt attribute to the slick thumbnails": "https://www.drupal.org/files/issues/adding-the-alt-attribute-to-the-slick-thumbnails-2948735-2.patch" + }, + "drupal/login_destination": { + "Issue #2947616: Fixed SetOptions on null causing error.": + "https://www.drupal.org/files/issues/2018-03-09/toolbar_alter_error-2947616-11.patch" } } } -} +} \ No newline at end of file diff --git a/drupal-org-core.make b/drupal-org-core.make index 880c65feb68eadb546a4386147aa0de2e4e148bf..ad1d209a2256c5b8ddf3419a4cd4ebecefaf3040 100644 --- a/drupal-org-core.make +++ b/drupal-org-core.make @@ -3,14 +3,14 @@ core = 8.x ; Drupal Core projects[drupal][type] = "core" -projects[drupal][version] = "8.4.5" +projects[drupal][version] = "8.5.0" ;; 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-408--8.4.4.patch +projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal-n1356276-417-d8.5.%2A.patch ;; Issue #2720101: Label (Title) not set for Views block (exposed filters in Block) projects[drupal][patch][] = https://www.drupal.org/files/issues/2720101-43.patch ;; Issue #2853988: Add option to rewrite robots.txt on staging environments projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_stg_robots-2853988-2.patch ;; Issue #2599228: Programmatically created translatable content type returns SQL error on content creation -projects[drupal][patch][] = https://www.drupal.org/files/issues/2599228-31.patch +projects[drupal][patch][] = https://www.drupal.org/files/issues/2599228-31-tests-only.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 +projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch \ No newline at end of file diff --git a/drupal-org.make b/drupal-org.make index a0d8384640e28769da31105395c039a10eaa2a63..562b8e679990770e6db6d931b1d5aa42e4b8816a 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -31,6 +31,8 @@ projects[page_manager][version] = 4.0-beta2 projects[page_manager][patch][] = https://www.drupal.org/files/issues/page_manager-redirect_location-2624972-30.patch ;; Issue #2665328: Variants take entity label not the variant title projects[page_manager][patch][] = https://www.drupal.org/files/issues/page_manager-fix_contexts_on_get_title-2665328-66.patch +;; Issue #2918564: Update 'page_manager.variant_route_filter' service according to core changes +projects[page_manager][patch][] = https://www.drupal.org/files/issues/2918564-22.patch projects[panels][type] = module projects[panels][version] = 4.2 @@ -302,7 +304,7 @@ projects[masonry][type] = module projects[masonry][version] = 1.0-rc2 projects[charts][type] = module -projects[charts][version] = 3.0-alpha8 +projects[charts][version] = 3.0-alpha7 projects[google_analytics_reports][type] = module projects[google_analytics_reports][download][url] = https://git.drupal.org/project/google_analytics_reports.git @@ -319,6 +321,8 @@ projects[login_destination][type] = module projects[login_destination][download][url] = https://git.drupal.org/project/login_destination.git projects[login_destination][download][revision] = 54be8b89fdc073ca40af6b9b2eeb050e0aeb7908 projects[login_destination][download][branch] = 8.x-1.x +;; Issue #2947616: Fixed SetOptions on null causing error. +projects[login_destination][patch][] = https://www.drupal.org/files/issues/2018-03-09/toolbar_alter_error-2947616-11.patch projects[betterlogin][type] = module projects[betterlogin][download][url] = https://git.drupal.org/project/betterlogin.git @@ -531,13 +535,13 @@ projects[xmlsitemap][version] = 1.0-alpha2 ;;;;;;;;;;;;;;;;;;;;; projects[anchor_link][type] = module -projects[anchor_link][version] = 1.x-dev +projects[anchor_link][version] = 1.6 projects[entity_browser_enhanced][type] = module -projects[entity_browser_enhanced][version] = 1.x-dev +projects[entity_browser_enhanced][version] = 1.0-rc1 projects[vmi][type] = module -projects[vmi][version] = 1.x-dev +projects[vmi][version] = 1.0-rc1 projects[total_control][type] = module projects[total_control][version] = 2.0-alpha4 @@ -549,35 +553,35 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2 ;;;;;;;;;;;;;;;;;;;;; projects[varbase_editor][type] = module -projects[varbase_editor][version] = 4.x-dev +projects[varbase_editor][version] = 4.19 projects[varbase_heroslider_media][type] = module -projects[varbase_heroslider_media][version] = 4.x-dev +projects[varbase_heroslider_media][version] = 4.0-rc1 projects[varbase_carousels][type] = module -projects[varbase_carousels][version] = 4.x-dev +projects[varbase_carousels][version] = 4.0-rc1 projects[varbase_bootstrap_paragraphs][type] = module -projects[varbase_bootstrap_paragraphs][version] = 4.x-dev +projects[varbase_bootstrap_paragraphs][version] = 4.0-rc2 projects[varbase_total_control][type] = module -projects[varbase_total_control][version] = 1.x-dev +projects[varbase_total_control][version] = 1.0-beta10 projects[varbase_auth][type] = module -projects[varbase_auth][version] = 4.x-dev +projects[varbase_auth][version] = 4.0-alpha1 projects[varbase_blog][type] = module -projects[varbase_blog][version] = 4.x-dev +projects[varbase_blog][version] = 4.0-alpha1 ;;;;;;;;;;;;;;;;;;;;; ;; Varbase public contrib themes. ;;;;;;;;;;;;;;;;;;;;; projects[vartheme][type] = module -projects[vartheme][version] = 4.x-dev +projects[vartheme][version] = 4.16 projects[vartheme_material][type] = module -projects[vartheme_material][version] = 4.x-dev +projects[vartheme_material][version] = 4.0-alpha1 ;;;;;;;;;;;;;;;;;;;;; ;; Libraries