Commit a435b34a authored by Matt Glaman's avatar Matt Glaman Committed by Adam Bergstein
Browse files

Issue #3266263: Can't launch 10.0.x-dev instance

parent e75fd5fd

modules/simplytest_projects/simplytest_projects.install

+18 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Install, update and uninstall functions for the simplyest_projects module.

 */



use Drupal\Core\Cache\Cache;

use Drupal\Core\Field\BaseFieldDefinition;

use Drupal\simplytest_projects\CoreVersionManager;

use Drupal\simplytest_projects\ProjectVersionManager;
@@ -146,3 +147,20 @@ function simplytest_projects_update_9003() { 
    ->setInitialValue(0);

  $edum->installFieldStorageDefinition('usage', 'simplytest_project', 'simplytest_projects', $definition);

}



/**

 * Refresh Drupal core release data.

 */

function simplytest_projects_update_9004() {

  $state = \Drupal::state();

  $state->delete('release_history_last_modified:drupal:10.x');



  $core_version_manager = \Drupal::service('simplytest_projects.core_version_manager');

  assert($core_version_manager instanceof CoreVersionManager);

  $core_version_manager->updateData(10);



  $project_version_manager = \Drupal::service('simplytest_projects.project_version_manager');

  $project_version_manager->updateData('drupal');



  Cache::invalidateTags(['project_versions:drupal', 'core_versions']);

}

modules/simplytest_projects/simplytest_projects.module

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ function simplytest_projects_cron() { 
  $core_version_manager->updateData(7);

  $core_version_manager->updateData(8);

  $core_version_manager->updateData(9);

  $core_version_manager->updateData(10);



  $project_storage = \Drupal::entityTypeManager()->getStorage('simplytest_project');

  $query = $project_storage->getQuery()

modules/simplytest_projects/src/ReleaseHistory/Processor.php

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ final class Processor { 
          $release_data['core_compatibility'] = $data['api_version'];

        }

        elseif ($data['short_name'] === 'drupal') {

          $release_data['core_compatibility'] = $version[0] . '.x';

          [$major, ,] = explode('.', $version);

          $release_data['core_compatibility'] = $major . '.x';

        }

        // Some projects are missing this, somehow. Assume just 8.x if it is

        // not present, safest assumption.

modules/simplytest_projects/tests/src/Kernel/CoreVersionManagerTest.php

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ final class CoreVersionManagerTest extends KernelTestBase { 
      'vcs_label' => '7.9',

      'insecure' => '1',

    ]];

    yield [10, 1, [

    yield [10, 3, [

      'version' => '10.0.x-dev',

      'major' => '10',

      'minor' => '0',

modules/simplytest_tugboat/src/InstanceManager.php

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class InstanceManager implements InstanceManagerInterface { 
    $repository_id = $this->tugboatSettings->get('repository_id');

    $response = $this->tugboatClient->requestWithApiKey('GET', "repos/{$repository_id}/previews");

    $previews = Json::decode((string) $response->getBody());

    $max_id = NULL;

    $max_id = 'none';



    // Find the most recent preview ID for the base.

    foreach ($previews as $preview) {
@@ -126,7 +126,7 @@ class InstanceManager implements InstanceManagerInterface { 




      $project_version = $submission['project']['version'];

      $major_version = $submission['drupalVersion'][0];

      [$major_version, ,] = explode('.', $submission['drupalVersion']);



      // Send parameters.

      $parameters  = [