diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php index c42928e8d2..cc56b49d25 100644 --- a/core/modules/update/src/Form/UpdateManagerUpdate.php +++ b/core/modules/update/src/Form/UpdateManagerUpdate.php @@ -8,6 +8,7 @@ use Drupal\Core\Link; use Drupal\Core\State\StateInterface; use Drupal\Core\Url; +use Drupal\update\ProjectInfo; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -133,7 +134,8 @@ public function buildForm(array $form, FormStateInterface $form_state) { $recommended_release = $project['releases'][$project['recommended']]; $recommended_version = '{{ release_version }} ({{ release_notes }})'; - if ($recommended_release['version_major'] != $project['existing_major']) { + $project_info = new ProjectInfo($recommended_release); + if ($project_info->getMajorVersion() != $project['existing_major']) { $recommended_version .= '
{{ major_update_warning_text }}
'; } diff --git a/core/modules/update/src/UpdateFetcher.php b/core/modules/update/src/UpdateFetcher.php index 2b03c9c101..05cce763a6 100644 --- a/core/modules/update/src/UpdateFetcher.php +++ b/core/modules/update/src/UpdateFetcher.php @@ -77,7 +77,7 @@ public function fetchProjectData(array $project, $site_key = '') { public function buildFetchUrl(array $project, $site_key = '') { $name = $project['name']; $url = $this->getFetchBaseUrl($project); - $url .= '/' . $name . '/' . \Drupal::CORE_COMPATIBILITY; + $url .= '/' . $name . '/current'; // Only append usage information if we have a site key and the project is // enabled. We do not want to record usage statistics for disabled projects. diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml index 82362fe846..ec768599a2 100644 --- a/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml +++ b/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml @@ -17,8 +17,6 @@ aaa_update_test 8.x-1.0 8.x-1.0 DRUPAL-8--1-0 - 1 - 0 published http://example.com/aaa_update_test-8-x-1-0-release http://example.com/aaa_update_test-8.x-1.0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml index 560c82bf05..bdd9216e2b 100644 --- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml +++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml @@ -17,8 +17,6 @@ aaa_update_test 8.x-1.2 8.x-1.2 DRUPAL-8--1-2 - 1 - 2 published http://example.com/aaa_update_test-8-x-1-2-release http://example.com/aaa_update_test-8-x-1-2.tar.gz @@ -35,8 +33,6 @@ aaa_update_test 8.x-1.1 8.x-1.1 DRUPAL-8--1-1 - 1 - 1 published http://example.com/aaa_update_test-8-x-1-1-release http://example.com/aaa_update_test-8-x-1-1.tar.gz @@ -54,8 +50,6 @@ aaa_update_test 8.x-1.0 8.x-1.0 DRUPAL-8--1-0 - 1 - 0 published http://example.com/aaa_update_test-8-x-1-0-release http://example.com/aaa_update_test-8-x-1-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml index 0ebb766dd2..454275d64c 100644 --- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml +++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml @@ -17,8 +17,6 @@ aaa_update_test 8.x-1.2 8.x-1.2 DRUPAL-8--1-2 - 1 - 2 published http://example.com/aaa_update_test-8-x-1-2-release http://example.com/aaa_update_test-8-x-1-2.tar.gz @@ -35,8 +33,6 @@ aaa_update_test 8.x-1.1 8.x-1.1 DRUPAL-8--1-1 - 1 - 1 published http://example.com/aaa_update_test-8-x-1-1-release http://example.com/aaa_update_test-8-x-1-1.tar.gz @@ -53,8 +49,6 @@ aaa_update_test 8.x-1.0 8.x-1.0 DRUPAL-8--1-0 - 1 - 0 published http://example.com/aaa_update_test-8-x-1-0-release http://example.com/aaa_update_test-8-x-1-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml index ee5265901a..b7e5211e6b 100644 --- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml +++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml @@ -17,9 +17,6 @@ aaa_update_test 8.x-3.0-beta2 8.x-3.0-beta2 8.x-3.0-beta2 - 3 - 0 - beta2 published http://example.com/aaa_update_test-8-x-3-0-beta2-release http://example.com/aaa_update_test-8-x-3-0-beta2.tar.gz @@ -38,9 +35,6 @@ aaa_update_test 8.x-3.0-beta1 8.x-3.0-beta1 8.x-3.0-beta1 - 3 - 0 - beta1 published http://example.com/aaa_update_test-8-x-3-0-beta1 http://example.com/aaa_update_test--8-x-3-0-beta1.tar.gz @@ -60,8 +54,6 @@ aaa_update_test 8.x-2.2 8.x-2.2 DRUPAL-8--2-2 - 2 - 2 published http://example.com/aaa_update_test-8-x-2-2-release http://example.com/aaa_update_test-8-x-2-2.tar.gz @@ -78,8 +70,6 @@ aaa_update_test 8.x-2.1 8.x-2.1 DRUPAL-8--2-1 - 2 - 1 published http://example.com/aaa_update_test-8-x-2-1-release http://example.com/aaa_update_test-8-x-2-1.tar.gz @@ -97,8 +87,6 @@ aaa_update_test 8.x-2.0 8.x-2.0 DRUPAL-8--2-0 - 2 - 0 published http://example.com/aaa_update_test-8-x-2-0-release http://example.com/aaa_update_test-8-x-2-0.tar.gz @@ -115,8 +103,6 @@ aaa_update_test 8.x-1.2 8.x-1.2 DRUPAL-8--1-2 - 1 - 2 published http://example.com/aaa_update_test-8-x-1-2-release http://example.com/aaa_update_test-8-x-1-2.tar.gz @@ -133,8 +119,6 @@ aaa_update_test 8.x-1.1 8.x-1.1 DRUPAL-8--1-1 - 1 - 1 published http://example.com/aaa_update_test-8-x-1-1-release http://example.com/aaa_update_test-8-x-1-1.tar.gz @@ -151,8 +135,6 @@ aaa_update_test 8.x-1.0 8.x-1.0 DRUPAL-8--1-0 - 1 - 0 published http://example.com/aaa_update_test-8-x-1-0-release http://example.com/aaa_update_test-8-x-1-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml index a42b58d5c5..890bd2a10d 100644 --- a/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml +++ b/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml @@ -17,8 +17,6 @@ aaa_update_test 8.x-2.2 8.x-2.2 DRUPAL-8--2-2 - 2 - 2 published http://example.com/aaa_update_test-8-x-2-2-release http://example.com/aaa_update_test-8-x-2-2.tar.gz @@ -35,8 +33,6 @@ aaa_update_test 8.x-2.1 8.x-2.1 DRUPAL-8--2-1 - 2 - 1 published http://example.com/aaa_update_test-8-x-2-1-release http://example.com/aaa_update_test-8-x-2-1.tar.gz @@ -54,8 +50,6 @@ aaa_update_test 8.x-2.0 8.x-2.0 DRUPAL-8--2-0 - 2 - 0 published http://example.com/aaa_update_test-8-x-2-0-release http://example.com/aaa_update_test-8-x-2-0.tar.gz @@ -72,8 +66,6 @@ aaa_update_test 8.x-1.2 8.x-1.2 DRUPAL-8--1-2 - 1 - 2 published http://example.com/aaa_update_test-8-x-1-2-release http://example.com/aaa_update_test-8-x-1-2.tar.gz @@ -89,8 +81,6 @@ aaa_update_test 8.x-1.1 8.x-1.1 DRUPAL-8--1-1 - 1 - 1 published http://example.com/aaa_update_test-8-x-1-1-release http://example.com/aaa_update_test-8-x-1-1.tar.gz @@ -106,8 +96,6 @@ aaa_update_test 8.x-1.0 8.x-1.0 DRUPAL-8--1-0 - 1 - 0 published http://example.com/aaa_update_test-8-x-1-0-release http://example.com/aaa_update_test-8-x-1-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml index 8d705b5f96..17f7cada72 100644 --- a/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml +++ b/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml @@ -17,8 +17,6 @@ bbb_update_test 8.x-1.0 8.x-1.0 DRUPAL-7--1-0 - 1 - 0 published http://example.com/bbb_update_test-7-x-1-0-release http://example.com/bbb_update_test-8.x-1.0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml index 82764c2c33..ceaaca17e4 100644 --- a/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml +++ b/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml @@ -17,8 +17,6 @@ ccc_update_test 8.x-1.0 8.x-1.0 DRUPAL-7--1-0 - 1 - 0 published http://example.com/ccc_update_test-7-x-1-0-release http://example.com/ccc_update_test-8.x-1.0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml index e463b72e3d..a0d9c7b6da 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml @@ -17,10 +17,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml index b3dc3bf2aa..2bd904956d 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml @@ -17,10 +17,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -36,10 +32,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.0.xml b/core/modules/update/tests/modules/update_test/drupal.0.0.xml index ac450660d5..b22e2f163f 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.0.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.0.xml @@ -17,9 +17,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -35,10 +32,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -54,10 +47,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml index 150136c67d..71ad5b48ee 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml @@ -17,10 +17,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -36,9 +32,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -54,10 +47,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -73,10 +62,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml index 25c9f7023e..ff48e47605 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml @@ -17,10 +17,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -36,10 +32,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -55,9 +47,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -73,10 +62,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -92,10 +77,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.0.1.xml b/core/modules/update/tests/modules/update_test/drupal.0.1.xml index ea00c15c90..63dd31d57e 100644 --- a/core/modules/update/tests/modules/update_test/drupal.0.1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.0.1.xml @@ -17,9 +17,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -35,10 +32,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -54,10 +47,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -73,9 +62,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -91,10 +77,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -110,10 +92,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml index fe734a844b..df0dec3ab4 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml @@ -17,10 +17,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-1-0-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -36,9 +32,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -54,10 +47,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -73,10 +62,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -92,9 +77,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -110,10 +92,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -129,10 +107,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml index fa65c5e92e..f24a8760c1 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml @@ -17,10 +17,6 @@ Drupal 8.1.0-beta1 8.1.0-beta1 DRUPAL-8-1-0-beta1 - 8 - 1 - 0 - beta1 published http://example.com/drupal-8-1-0-beta1-release http://example.com/drupal-8-1-0-beta1.tar.gz @@ -36,10 +32,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-1-0-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -55,9 +47,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -73,10 +62,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -92,10 +77,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -111,9 +92,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -129,10 +107,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -148,10 +122,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.0.xml b/core/modules/update/tests/modules/update_test/drupal.1.0.xml index 0e6a40c72c..09653d6e54 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.0.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.0.xml @@ -17,9 +17,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -35,10 +32,6 @@ Drupal 8.1.0-beta1 8.1.0-beta1 DRUPAL-8-1-0-beta1 - 8 - 1 - 0 - beta1 published http://example.com/drupal-8-1-0-beta1-release http://example.com/drupal-8-1-0-beta1.tar.gz @@ -54,10 +47,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -73,9 +62,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -91,10 +77,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -110,10 +92,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -129,9 +107,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -147,10 +122,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -166,10 +137,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml index 0356c8d978..2021910b9c 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml @@ -17,10 +17,6 @@ Drupal 8.1.1-alpha1 8.1.1-alpha1 DRUPAL-8-1-1-alpha1 - 8 - 1 - 1 - alpha1 published http://example.com/drupal-8-1-1-alpha1-release http://example.com/drupal-8-1-1-alpha1.tar.gz @@ -36,9 +32,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -54,10 +47,6 @@ Drupal 8.1.0-beta1 8.1.0-beta1 DRUPAL-8-0-1-beta1 - 8 - 1 - 0 - beta1 published http://example.com/drupal-8-1-0-beta1-release http://example.com/drupal-8-1-0-beta1.tar.gz @@ -73,10 +62,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-1-0-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -92,9 +77,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -110,10 +92,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -129,10 +107,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -148,9 +122,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -166,10 +137,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -185,10 +152,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml index abeef7ea41..78f3f7cbe1 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml @@ -17,10 +17,6 @@ Drupal 8.1.1-beta1 8.1.1-beta1 DRUPAL-8-1-1-beta1 - 8 - 1 - 1 - beta1 published http://example.com/drupal-8-1-1-beta1-release http://example.com/drupal-8-1-1-beta1.tar.gz @@ -36,10 +32,6 @@ Drupal 8.1.1-alpha1 8.1.1-alpha1 DRUPAL-8-1-1-alpha1 - 8 - 1 - 1 - alpha1 published http://example.com/drupal-8-1-1-alpha1-release http://example.com/drupal-8-1-1-alpha1.tar.gz @@ -55,9 +47,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -73,10 +62,6 @@ Drupal 8.1.0-beta1 8.1.0-beta1 DRUPAL-8-0-1-beta1 - 8 - 1 - 0 - beta1 published http://example.com/drupal-8-1-0-beta1-release http://example.com/drupal-8-1-0-beta1.tar.gz @@ -92,10 +77,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-1-0-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -111,9 +92,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -129,10 +107,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -148,10 +122,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -167,9 +137,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -185,10 +152,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -204,10 +167,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.1.1.xml b/core/modules/update/tests/modules/update_test/drupal.1.1.xml index a588bdc466..5992074000 100644 --- a/core/modules/update/tests/modules/update_test/drupal.1.1.xml +++ b/core/modules/update/tests/modules/update_test/drupal.1.1.xml @@ -17,9 +17,6 @@ Drupal 8.1.1 8.1.1 DRUPAL-8-1-1 - 8 - 1 - 1 published http://example.com/drupal-8-1-1-release http://example.com/drupal-8-1-1.tar.gz @@ -35,10 +32,6 @@ Drupal 8.1.1-beta1 8.1.1-beta1 DRUPAL-8-1-1-beta1 - 8 - 1 - 1 - beta1 published http://example.com/drupal-8-1-1-beta1-release http://example.com/drupal-8-1-1-beta1.tar.gz @@ -54,10 +47,6 @@ Drupal 8.1.1-alpha1 8.1.1-alpha1 DRUPAL-8-1-1-alpha1 - 8 - 1 - 1 - alpha1 published http://example.com/drupal-8-1-1-alpha1-release http://example.com/drupal-8-1-1-alpha1.tar.gz @@ -73,9 +62,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -91,10 +77,6 @@ Drupal 8.1.0-beta1 8.1.0-beta1 DRUPAL-8-0-1-beta1 - 8 - 1 - 0 - beta1 published http://example.com/drupal-8-1-0-beta1-release http://example.com/drupal-8-1-0-beta1.tar.gz @@ -110,10 +92,6 @@ Drupal 8.1.0-alpha1 8.1.0-alpha1 DRUPAL-8-1-0-alpha1 - 8 - 1 - 0 - alpha1 published http://example.com/drupal-8-1-0-alpha1-release http://example.com/drupal-8-1-0-alpha1.tar.gz @@ -129,9 +107,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -147,10 +122,6 @@ Drupal 8.0.1-beta1 8.0.1-beta1 DRUPAL-8-0-1-beta1 - 8 - 0 - 1 - beta1 published http://example.com/drupal-8-0-1-beta1-release http://example.com/drupal-8-0-1-beta1.tar.gz @@ -166,10 +137,6 @@ Drupal 8.0.1-alpha1 8.0.1-alpha1 DRUPAL-8-0-1-alpha1 - 8 - 0 - 1 - alpha1 published http://example.com/drupal-8-0-1-alpha1-release http://example.com/drupal-8-0-1-alpha1.tar.gz @@ -185,9 +152,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -203,10 +167,6 @@ Drupal 8.0.0-beta1 8.0.0-beta1 DRUPAL-8-0-0-beta1 - 8 - 0 - 0 - beta1 published http://example.com/drupal-8-0-0-beta1-release http://example.com/drupal-8-0-0-beta1.tar.gz @@ -222,10 +182,6 @@ Drupal 8.0.0-alpha1 8.0.0-alpha1 DRUPAL-8-0-0-alpha1 - 8 - 0 - 0 - alpha1 published http://example.com/drupal-8-0-0-alpha1-release http://example.com/drupal-8-0-0-alpha1.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.9.xml b/core/modules/update/tests/modules/update_test/drupal.9.xml index c17b426a75..4c9ed04972 100644 --- a/core/modules/update/tests/modules/update_test/drupal.9.xml +++ b/core/modules/update/tests/modules/update_test/drupal.9.xml @@ -17,9 +17,6 @@ Drupal 9.0.0 9.0.0 DRUPAL-9-0-0 - 9 - 0 - 0 published http://example.com/drupal-9-0-0-release http://example.com/drupal-9-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.dev.xml b/core/modules/update/tests/modules/update_test/drupal.dev.xml index 4ab26bd2db..3975b0c73f 100644 --- a/core/modules/update/tests/modules/update_test/drupal.dev.xml +++ b/core/modules/update/tests/modules/update_test/drupal.dev.xml @@ -17,9 +17,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz @@ -35,9 +32,6 @@ Drupal 8.0.x-dev 8.0.x-dev DRUPAL-8-0 - 8 - 0 - dev published http://example.com/drupal-8-0-x-dev-release http://example.com/drupal-8.0.x-dev.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml index ba954ae427..70f7d7f0fd 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml @@ -17,9 +17,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -36,9 +33,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -56,9 +50,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml index a971ca73eb..939e26181b 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml @@ -17,10 +17,6 @@ drupal 8.2.0-rc2 8.2.0-rc2 8.2.0-rc2 - 8 - 2 - 0 - rc2 published http://example.com/drupal-8-2-0-rc2-release http://example.com/drupal-8-2-0-rc2.tar.gz @@ -39,10 +35,6 @@ drupal 8.2.0-rc1 8.2.0-rc1 8.2.0-rc1 - 8 - 2 - 0 - rc1 published http://example.com/drupal-8-2-0-rc1-release http://example.com/drupal-8-2-0-rc1.tar.gz @@ -61,10 +53,6 @@ drupal 8.2.0-beta2 8.2.0-beta2 8.2.0-beta2 - 8 - 2 - 0 - beta2 published http://example.com/drupal-8-2-0-beta2-release http://example.com/drupal-8-2-0-beta2.tar.gz @@ -83,10 +71,6 @@ drupal 8.2.0-beta1 8.2.0-beta1 8.2.0-beta1 - 8 - 2 - 0 - beta1 published http://example.com/drupal-8-2-0-beta1-release http://example.com/drupal-8-2-0-beta1.tar.gz @@ -105,10 +89,6 @@ drupal 8.2.0-alpha2 8.2.0-alpha2 8.2.0-alpha2 - 8 - 2 - 0 - alpha2 published http://example.com/drupal-8-2-0-alpha2-release http://example.com/drupal-8-2-0-alpha2.tar.gz @@ -127,10 +107,6 @@ drupal 8.2.0-alpha1 8.2.0-alpha1 8.2.0-alpha1 - 8 - 2 - 0 - alpha1 published http://example.com/drupal-8.2.0-alpha1 http://example.com/drupal-8-2-0-alpha1.tar.gz @@ -149,9 +125,6 @@ Drupal 8.1.2 8.1.2 DRUPAL-8-1-2 - 8 - 1 - 2 published http://example.com/drupal-8-1-2-release http://example.com/drupal-8-1-2.tar.gz @@ -168,9 +141,6 @@ Drupal 8.1.1 8.1.1 DRUPAL-8-1-1 - 8 - 1 - 1 published http://example.com/drupal-8-1-1-release http://example.com/drupal-8-1-1.tar.gz @@ -187,9 +157,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -206,9 +173,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -225,9 +189,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -244,9 +205,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml index bc422deb6f..1915018670 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml @@ -17,10 +17,6 @@ drupal 8.2.0-rc2 8.2.0-rc2 8.2.0-rc2 - 8 - 2 - 0 - rc2 published http://example.com/drupal-8-2-0-rc2-release http://example.com/drupal-8-2-0-rc2.tar.gz @@ -40,10 +36,6 @@ drupal 8.2.0-rc1 8.2.0-rc1 8.2.0-rc1 - 8 - 2 - 0 - rc1 published http://example.com/drupal-8-2-0-rc1-release http://example.com/drupal-8-2-0-rc1.tar.gz @@ -63,10 +55,6 @@ drupal 8.2.0-beta2 8.2.0-beta2 8.2.0-beta2 - 8 - 2 - 0 - beta2 published http://example.com/drupal-8-2-0-beta2-release http://example.com/drupal-8-2-0-beta2.tar.gz @@ -86,10 +74,6 @@ drupal 8.2.0-beta1 8.2.0-beta1 8.2.0-beta1 - 8 - 2 - 0 - beta1 published http://example.com/drupal-8-2-0-beta1-release http://example.com/drupal-8-2-0-beta1.tar.gz @@ -109,10 +93,6 @@ drupal 8.2.0-alpha2 8.2.0-alpha2 8.2.0-alpha2 - 8 - 2 - 0 - alpha2 published http://example.com/drupal-8-2-0-alpha2-release http://example.com/drupal-8-2-0-alpha2.tar.gz @@ -132,10 +112,6 @@ drupal 8.2.0-alpha1 8.2.0-alpha1 8.2.0-alpha1 - 8 - 2 - 0 - alpha1 published http://example.com/drupal-8.2.0-alpha1 http://example.com/drupal-8-2-0-alpha1.tar.gz @@ -155,9 +131,6 @@ Drupal 8.1.2 8.1.2 DRUPAL-8-1-2 - 8 - 1 - 2 published http://example.com/drupal-8-1-2-release http://example.com/drupal-8-1-2.tar.gz @@ -174,9 +147,6 @@ Drupal 8.1.1 8.1.1 DRUPAL-8-1-1 - 8 - 1 - 1 published http://example.com/drupal-8-1-1-release http://example.com/drupal-8-1-1.tar.gz @@ -193,9 +163,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -212,9 +179,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -231,9 +195,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -250,9 +211,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml index 0b9bbce632..48923bba09 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml @@ -17,9 +17,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -36,9 +33,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -55,9 +49,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml b/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml index 8665e46b36..4dea277871 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml @@ -17,9 +17,6 @@ Drupal 8.1.2 8.1.2 DRUPAL-8-1-2 - 8 - 1 - 2 published http://example.com/drupal-8-1-2-release http://example.com/drupal-8-1-2.tar.gz @@ -36,9 +33,6 @@ Drupal 8.1.1 8.1.1 DRUPAL-8-1-1 - 8 - 1 - 1 published http://example.com/drupal-8-1-1-release http://example.com/drupal-8-1-1.tar.gz @@ -55,9 +49,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -74,9 +65,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -92,9 +80,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -110,9 +95,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml b/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml index dadad421bc..639e21ea99 100644 --- a/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml +++ b/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml @@ -17,9 +17,6 @@ Drupal 8.1.2 8.1.2 DRUPAL-8-1-2 - 8 - 1 - 2 published http://example.com/drupal-8-1-2-release http://example.com/drupal-8-1-2.tar.gz @@ -36,9 +33,6 @@ Drupal 8.1.1 8.1.1 DRUPAL-8-1-1 - 8 - 1 - 1 published http://example.com/drupal-8-1-1-release http://example.com/drupal-8-1-1.tar.gz @@ -55,9 +49,6 @@ Drupal 8.1.0 8.1.0 DRUPAL-8-1-0 - 8 - 1 - 0 published http://example.com/drupal-8-1-0-release http://example.com/drupal-8-1-0.tar.gz @@ -74,9 +65,6 @@ Drupal 8.0.2 8.0.2 DRUPAL-8-0-2 - 8 - 0 - 2 published http://example.com/drupal-8-0-2-release http://example.com/drupal-8-0-2.tar.gz @@ -93,9 +81,6 @@ Drupal 8.0.1 8.0.1 DRUPAL-8-0-1 - 8 - 0 - 1 published http://example.com/drupal-8-0-1-release http://example.com/drupal-8-0-1.tar.gz @@ -112,9 +97,6 @@ Drupal 8.0.0 8.0.0 DRUPAL-8-0-0 - 8 - 0 - 0 published http://example.com/drupal-8-0-0-release http://example.com/drupal-8-0-0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml b/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml index 3529e19763..42d6435eec 100644 --- a/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml +++ b/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml @@ -17,8 +17,6 @@ update_test_basetheme 8.x-1.1 8.x-1.1 DRUPAL-7--1-1 - 1 - 1 published http://example.com/update_test_basetheme-7-x-1-1-release http://example.com/update_test_basetheme-8.x-1.1.tar.gz @@ -35,8 +33,6 @@ update_test_basetheme 8.x-1.0 8.x-1.0 DRUPAL-7--1-0 - 1 - 0 published http://example.com/update_test_basetheme-7-x-1-0-release http://example.com/update_test_basetheme-8.x-1.0.tar.gz diff --git a/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml b/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml index f9039b2e3f..5ee5e7ee16 100644 --- a/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml +++ b/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml @@ -17,8 +17,6 @@ update_test_new_module 8.x-1.1 8.x-1.1 DRUPAL-8--1-1 - 1 - 1 published http://example.com/update_test_new_module-8-x-1-1-release core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz diff --git a/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml b/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml index c791b7f1fb..8158834fad 100644 --- a/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml +++ b/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml @@ -17,8 +17,6 @@ update_test_subtheme 8.x-1.0 8.x-1.0 DRUPAL-7--1-0 - 1 - 0 published http://example.com/update_test_subtheme-7-x-1-0-release http://example.com/update_test_subtheme-8.x-1.0.tar.gz diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php index 61c767deda..fb06f4173e 100644 --- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php +++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php @@ -5,10 +5,6 @@ use Drupal\Tests\UnitTestCase; use Drupal\update\UpdateFetcher; -if (!defined('DRUPAL_CORE_COMPATIBILITY')) { - define('DRUPAL_CORE_COMPATIBILITY', '8.x'); -} - /** * Tests update functionality unrelated to the database. * @@ -71,20 +67,20 @@ public function providerTestUpdateBuildFetchUrl() { $project['info']['project status url'] = 'http://www.example.com'; $project['includes'] = ['module1' => 'Module 1', 'module2' => 'Module 2']; $site_key = ''; - $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY; + $expected = 'http://www.example.com/' . $project['name'] . '/current'; $data[] = [$project, $site_key, $expected]; // For disabled projects it shouldn't add the site key either. $site_key = 'site_key'; $project['project_type'] = 'disabled'; - $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY; + $expected = 'http://www.example.com/' . $project['name'] . '/current'; $data[] = [$project, $site_key, $expected]; // For enabled projects, test adding the site key. $project['project_type'] = ''; - $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY; + $expected = 'http://www.example.com/' . $project['name'] . '/current'; $expected .= '?site_key=site_key'; $expected .= '&list=' . rawurlencode('module1,module2'); @@ -92,7 +88,7 @@ public function providerTestUpdateBuildFetchUrl() { // Test when the URL contains a question mark. $project['info']['project status url'] = 'http://www.example.com/?project='; - $expected = 'http://www.example.com/?project=/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY; + $expected = 'http://www.example.com/?project=/' . $project['name'] . '/current'; $expected .= '&site_key=site_key'; $expected .= '&list=' . rawurlencode('module1,module2'); diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index dd658120ef..839179d3e2 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -5,6 +5,8 @@ * Code required only when comparing available updates to existing data. */ +use Drupal\update\ProjectInfo; + /** * Determines version and type information for currently installed projects. * @@ -294,6 +296,7 @@ function update_calculate_project_update_status(&$project_data, $available) { return; } foreach ($available['releases'] as $version => $release) { + $release_project_data = new ProjectInfo($release); // First, if this is the existing release, check a few conditions. if ($project_data['existing_version'] === $version) { if (isset($release['terms']['Release type']) && @@ -333,18 +336,20 @@ function update_calculate_project_update_status(&$project_data, $available) { continue; } + $release_major_version = $release_project_data->getMajorVersion(); + $release_patch_version = $release_project_data->getPatchVersion(); // See if this is a higher major version than our target and yet still // supported. If so, record it as an "Also available" release. // Note: Some projects have a HEAD release from CVS days, which could // be one of those being compared. They would not have version_major // set, so we must call isset first. - if (isset($release['version_major']) && $release['version_major'] > $target_major) { - if (in_array($release['version_major'], $supported_majors)) { + if ($release_major_version !== NULL && $release_major_version > $target_major) { + if (in_array($release_major_version, $supported_majors)) { if (!isset($project_data['also'])) { $project_data['also'] = []; } - if (!isset($project_data['also'][$release['version_major']])) { - $project_data['also'][$release['version_major']] = $version; + if (!isset($project_data['also'][$release_major_version])) { + $project_data['also'][$release_major_version] = $version; $project_data['releases'][$version] = $release; } } @@ -361,16 +366,15 @@ function update_calculate_project_update_status(&$project_data, $available) { // Look for the 'latest version' if we haven't found it yet. Latest is // defined as the most recent version for the target major version. if (!isset($project_data['latest_version']) - && $release['version_major'] == $target_major) { + && $release_major_version == $target_major) { $project_data['latest_version'] = $version; $project_data['releases'][$version] = $release; } // Look for the development snapshot release for this branch. if (!isset($project_data['dev_version']) - && $release['version_major'] == $target_major - && isset($release['version_extra']) - && $release['version_extra'] == 'dev') { + && $release_major_version == $target_major + && $release_project_data->getVersionExtra() === 'dev') { $project_data['dev_version'] = $version; $project_data['releases'][$version] = $release; } @@ -378,13 +382,13 @@ function update_calculate_project_update_status(&$project_data, $available) { // Look for the 'recommended' version if we haven't found it yet (see // phpdoc at the top of this function for the definition). if (!isset($project_data['recommended']) - && $release['version_major'] == $target_major - && isset($release['version_patch'])) { - if ($patch != $release['version_patch']) { - $patch = $release['version_patch']; + && $release_major_version == $target_major + && $release_patch_version !== NULL) { + if ($patch != $release_patch_version) { + $patch = $release_patch_version; $release_patch_changed = $release; } - if (empty($release['version_extra']) && $patch == $release['version_patch']) { + if ($release_project_data->getVersionExtra() === NULL && $patch == $release_patch_version) { $project_data['recommended'] = $release_patch_changed['version']; $project_data['releases'][$release_patch_changed['version']] = $release_patch_changed; }