2c2
< index 62b46b6..799e500 100644
---
> index 62b46b6..e578625 100644
5c5,22
< @@ -244,7 +244,7 @@ function acquia_connector_has_update_service() {
---
> @@ -12,6 +12,7 @@ use Drupal\acquia_connector\Subscription;
>  use Drupal\Core\Routing\RouteMatchInterface;
>  use Drupal\Core\Url;
>  use Drupal\Core\Link;
> +use Drupal\update\UpdateFetcherInterface;
>  
>  // Version of SPI data format.
>  define('ACQUIA_SPI_DATA_VERSION', 3.1);
> @@ -181,7 +182,7 @@ function acquia_connector_update_status_alter(&$projects) {
>          unset($projects[$project]['security updates']);
>        }
>        else {
> -        $projects[$project]['status'] = UPDATE_NOT_CHECKED;
> +        $projects[$project]['status'] = UpdateFetcherInterface::NOT_CHECKED;
>          $projects[$project]['reason'] = t('No information available from the Acquia Subscription');
>          unset($projects[$project]['releases']);
>          unset($projects[$project]['recommended']);
> @@ -244,7 +245,7 @@ function acquia_connector_has_update_service() {
14c31
< @@ -300,7 +300,7 @@ function acquia_connector_connection_error_message($errno) {
---
> @@ -300,7 +301,7 @@ function acquia_connector_connection_error_message($errno) {
23c40
< @@ -360,7 +360,7 @@ function acquia_connector_show_free_tier_promo() {
---
> @@ -360,7 +361,7 @@ function acquia_connector_show_free_tier_promo() {
32c49
< @@ -379,6 +379,6 @@ function acquia_connector_auto_connect() {
---
> @@ -379,6 +380,6 @@ function acquia_connector_auto_connect() {
39a57,70
> diff --git a/acquia_search/acquia_search.install b/acquia_search/acquia_search.install
> index 84941e2..482c57b 100644
> --- a/acquia_search/acquia_search.install
> +++ b/acquia_search/acquia_search.install
> @@ -15,8 +15,7 @@ function acquia_search_install() {
>    // This causes an invocation of hook_acquia_subscription_status() which is
>    // implemented in this module to set up the environment.
>    // Rebuild data about all currently available modules.
> -  system_rebuild_module_data();
> -
> +  \Drupal::service('extension.list.module')->reset()->getList();
>    _acquia_search_set_version();
>    $subscription = new Subscription();
>    $subscription->update();
109a141,183
> diff --git a/acquia_search/src/Tests/AcquiaConnectorSearchOverrideTest.php b/acquia_search/src/Tests/AcquiaConnectorSearchOverrideTest.php
> index af3e2e4..ea95829 100644
> --- a/acquia_search/src/Tests/AcquiaConnectorSearchOverrideTest.php
> +++ b/acquia_search/src/Tests/AcquiaConnectorSearchOverrideTest.php
> @@ -3,14 +3,14 @@
>  namespace Drupal\acquia_search\Tests;
>  
>  use Drupal\acquia_connector\Helper\Storage;
> -use Drupal\simpletest\WebTestBase;
> +use Drupal\Tests\BrowserTestBase;
>  
>  /**
>   * Tests the automatic switching behavior of the Acquia Search module.
>   *
>   * @group Acquia search
>   */
> -class AcquiaConnectorSearchOverrideTest extends WebTestBase {
> +class AcquiaConnectorSearchOverrideTest extends BrowserTestBase {
>    protected $strictConfigSchema = FALSE;
>    protected $id;
>    protected $key;
> diff --git a/acquia_search/src/Tests/AcquiaConnectorSearchTest.php b/acquia_search/src/Tests/AcquiaConnectorSearchTest.php
> index 1bb3051..77311b7 100644
> --- a/acquia_search/src/Tests/AcquiaConnectorSearchTest.php
> +++ b/acquia_search/src/Tests/AcquiaConnectorSearchTest.php
> @@ -6,15 +6,15 @@
>  
>  namespace Drupal\acquia_search\Tests;
>  
> -use Drupal\simpletest\WebTestBase;
>  use Drupal\search_api\Entity\Server;
> +use Drupal\Tests\BrowserTestBase;
>  
>  /**
>   * Tests the functionality of the Acquia Search module.
>   *
>   * @group Acquia search
>   */
> -class AcquiaConnectorSearchTest extends WebTestBase {
> +class AcquiaConnectorSearchTest extends BrowserTestBase {
>    protected $strictConfigSchema = FALSE;
>    protected $id;
>    protected $key;
143c217
< index f1139b9..411c099 100644
---
> index f1139b9..7f468ab 100644
154a229,237
> @@ -362,7 +362,7 @@ class Client {
>     *   Random base 64 encoded string.
>     */
>    protected function getNonce() {
> -    return Crypt::hashBase64(uniqid(mt_rand(), TRUE) . Crypt::randomBytes(55));
> +    return Crypt::hashBase64(uniqid(mt_rand(), TRUE) . random_bytes(55));
>    }
>  
>    /**
156c239
< index 2fd6bcb..9fa6dc8 100644
---
> index 2fd6bcb..0081c3c 100644
159,163c242
< @@ -8,6 +8,7 @@ use Drupal\Core\Site\Settings;
<  use Drupal\Core\DrupalKernel;
<  use Drupal\field\Entity\FieldConfig;
<  use Drupal\Core\Session\AccountInterface;
< +use Drupal\Component\PhpStorage\FileStorage;
---
> @@ -2,6 +2,8 @@
165,167c244,251
<  /**
<   * Class SecurityReviewController.
< @@ -402,7 +403,7 @@ class SecurityReviewController extends ControllerBase {
---
>  namespace Drupal\acquia_connector\Controller;
>  
> +use Drupal\Component\FileSecurity\FileSecurity;
> +use Drupal\user\UserInterface;
>  use Drupal\views\Views;
>  use Drupal\Core\Controller\ControllerBase;
>  use Drupal\Core\Site\Settings;
> @@ -402,7 +404,7 @@ class SecurityReviewController extends ControllerBase {
172c256
< +      $expected = FileStorage::htaccessLines(FALSE);
---
> +      $expected = FileSecurity::htaccessLines(FALSE);
176c260
< @@ -461,7 +462,7 @@ class SecurityReviewController extends ControllerBase {
---
> @@ -461,7 +463,7 @@ class SecurityReviewController extends ControllerBase {
185c269
< @@ -541,7 +542,7 @@ class SecurityReviewController extends ControllerBase {
---
> @@ -541,7 +543,7 @@ class SecurityReviewController extends ControllerBase {
193a278,286
> @@ -655,7 +657,7 @@ class SecurityReviewController extends ControllerBase {
>      // Need set default value.
>      $user_register = \Drupal::config('user.settings')->get('register');
>      // If visitors are allowed to create accounts they are considered untrusted.
> -    if ($user_register != USER_REGISTER_ADMINISTRATORS_ONLY) {
> +    if ($user_register != UserInterface::REGISTER_ADMINISTRATORS_ONLY) {
>        $roles[AccountInterface::AUTHENTICATED_ROLE] = 'authenticated user';
>      }
>      return $roles;
195c288
< index 433c753..fa20be1 100644
---
> index 433c753..bb68af1 100644
198c291,299
< @@ -354,7 +354,7 @@ class SpiController extends ControllerBase {
---
> @@ -9,6 +9,7 @@ use Drupal\Component\Utility\Unicode;
>  use Drupal\Core\Access\AccessResultAllowed;
>  use Drupal\Core\Access\AccessResultForbidden;
>  use Drupal\Core\Controller\ControllerBase;
> +use Drupal\node\NodeInterface;
>  use Symfony\Component\HttpFoundation\Request;
>  use Symfony\Component\HttpFoundation\Response;
>  use Drupal\Core\Routing\RouteMatch;
> @@ -354,7 +355,7 @@ class SpiController extends ControllerBase {
207c308
< @@ -384,7 +384,7 @@ class SpiController extends ControllerBase {
---
> @@ -384,7 +385,7 @@ class SpiController extends ControllerBase {
216c317
< @@ -416,7 +416,7 @@ class SpiController extends ControllerBase {
---
> @@ -416,7 +417,7 @@ class SpiController extends ControllerBase {
225c326
< @@ -438,7 +438,7 @@ class SpiController extends ControllerBase {
---
> @@ -438,7 +439,7 @@ class SpiController extends ControllerBase {
234c335
< @@ -456,7 +456,7 @@ class SpiController extends ControllerBase {
---
> @@ -456,7 +457,7 @@ class SpiController extends ControllerBase {
243c344
< @@ -498,7 +498,7 @@ class SpiController extends ControllerBase {
---
> @@ -498,7 +499,7 @@ class SpiController extends ControllerBase {
252c353
< @@ -536,7 +536,7 @@ class SpiController extends ControllerBase {
---
> @@ -536,7 +537,7 @@ class SpiController extends ControllerBase {
261c362
< @@ -612,7 +612,7 @@ class SpiController extends ControllerBase {
---
> @@ -612,7 +613,7 @@ class SpiController extends ControllerBase {
270c371
< @@ -638,7 +638,7 @@ class SpiController extends ControllerBase {
---
> @@ -638,7 +639,7 @@ class SpiController extends ControllerBase {
279c380
< @@ -656,7 +656,7 @@ class SpiController extends ControllerBase {
---
> @@ -656,7 +657,7 @@ class SpiController extends ControllerBase {
288c389
< @@ -671,7 +671,7 @@ class SpiController extends ControllerBase {
---
> @@ -671,7 +672,7 @@ class SpiController extends ControllerBase {
297c398,407
< @@ -925,15 +925,15 @@ class SpiController extends ControllerBase {
---
> @@ -893,7 +894,7 @@ class SpiController extends ControllerBase {
>     */
>    private function getModules() {
>      // @todo Only do a full rebuild of the module cache every 1 at the most
> -    $modules = system_rebuild_module_data();
> +    $modules = \Drupal::service('extension.list.module')->reset()->getList();
>      uasort($modules, 'system_sort_modules_by_info_name');
>  
>      $result = array();
> @@ -925,15 +926,15 @@ class SpiController extends ControllerBase {
302c412
< +      $quantum['nodes'] = \Drupal::database()->select('node_field_data', 'n')->fields('n', array('nid'))->condition('n.status', NODE_PUBLISHED)->countQuery()->execute()->fetchField();
---
> +      $quantum['nodes'] = \Drupal::database()->select('node_field_data', 'n')->fields('n', array('nid'))->condition('n.status', NodeInterface::PUBLISHED)->countQuery()->execute()->fetchField();
316c426
< @@ -955,7 +955,7 @@ class SpiController extends ControllerBase {
---
> @@ -955,7 +956,7 @@ class SpiController extends ControllerBase {
325c435
< @@ -1022,23 +1022,23 @@ class SpiController extends ControllerBase {
---
> @@ -1022,23 +1023,23 @@ class SpiController extends ControllerBase {
479a590,637
> diff --git a/src/Tests/AcquiaConnectorModuleTest.php b/src/Tests/AcquiaConnectorModuleTest.php
> index fa817b8..e6ccd0f 100644
> --- a/src/Tests/AcquiaConnectorModuleTest.php
> +++ b/src/Tests/AcquiaConnectorModuleTest.php
> @@ -7,17 +7,17 @@
>  
>  namespace Drupal\acquia_connector\Tests;
>  
> -use Drupal\simpletest\WebTestBase;
>  use Drupal\acquia_connector\Helper\Storage;
>  use Drupal\acquia_connector\Subscription;
>  use Drupal\acquia_connector\Controller\StatusController;
> +use Drupal\Tests\BrowserTestBase;
>  
>  /**
>   * Tests the functionality of the Acquia Connector module.
>   *
>   * @group Acquia connector
>   */
> -class AcquiaConnectorModuleTest extends WebTestBase {
> +class AcquiaConnectorModuleTest extends BrowserTestBase {
>    protected $strictConfigSchema = FALSE;
>  
>    protected $acqtestEmail       = 'TEST_networkuser@example.com';
> diff --git a/src/Tests/AcquiaConnectorSpiTest.php b/src/Tests/AcquiaConnectorSpiTest.php
> index bdd6146..43d4421 100644
> --- a/src/Tests/AcquiaConnectorSpiTest.php
> +++ b/src/Tests/AcquiaConnectorSpiTest.php
> @@ -7,17 +7,17 @@
>  
>  namespace Drupal\acquia_connector\Tests;
>  
> -use Drupal\simpletest\WebTestBase;
>  use Drupal\acquia_connector\Controller\SpiController;
>  use Drupal\acquia_connector\Controller\VariablesController;
>  use Drupal\Component\Serialization\Json;
> +use Drupal\Tests\BrowserTestBase;
>  
>  /**
>   * Tests the functionality of the Acquia SPI module.
>   *
>   * @group Acquia connector
>   */
> -class AcquiaConnectorSpiTest extends WebTestBase {
> +class AcquiaConnectorSpiTest extends BrowserTestBase {
>    protected $strictConfigSchema = FALSE;
>    protected $privilegedUser;
>    protected $setupPath;