Merge branch '5.0.x' of git.drupal.org:project/restrict_ip into 5.0.x

restrict_ip.info.yml

@@ -5,3 +5,4 @@ type: 'module'
 configure: restrict_ip.admin_page
 dependencies:
   - drupal:block
+  - drupal:user

src/Service/RestrictIpService.php

@@ -52,7 +52,7 @@ class RestrictIpService implements RestrictIpServiceInterface, ContainerInjectio
    *
    * @var \Drupal\ip2country\Ip2CountryLookup|null
    */
-  protected $ip2CountryLookupService = NULL;
+  protected ?Ip2CountryLookup $ip2CountryLookupService = NULL;
 
   /**
    * Constructs a RestrictIpService object.
@@ -78,7 +78,7 @@ class RestrictIpService implements RestrictIpServiceInterface, ContainerInjectio
    */
   public function __construct(
     protected AccountProxyInterface $currentUser,
-    CurrentPathStack $currentPathStack,
+    protected CurrentPathStack $currentPathStack,
     protected ConfigFactoryInterface $configFactory,
     protected RequestStack $requestStack,
     protected RestrictIpMapperInterface $mapper,
@@ -97,16 +97,20 @@ class RestrictIpService implements RestrictIpServiceInterface, ContainerInjectio
    * {@inheritDoc}
    */
   public static function create(ContainerInterface $container): static {
+    $ip2CountryLookupService = NULL;
+    if ($container->has('ip2country.lookup')) {
+      $ip2CountryLookupService = $container->get('ip2country.lookup');
+    }
     return new static(
       $container->get('current_user'),
+      $container->get('path.current'),
+      $container->get('config.factory'),
+      $container->get('request_stack'),
       $container->get('restrict_ip.mapper'),
       $container->get('path.matcher'),
       $container->get('module_handler'),
       $container->get('user.data'),
-      $container->get('path.current'),
-      $container->get('config.factory'),
-      $container->get('request_stack'),
-      $container->get('ip2country.lookup'),
+      $ip2CountryLookupService
     );
   }
 

tests/src/Functional/RestrictIpAccessTest.php

@@ -27,6 +27,9 @@ class RestrictIpAccessTest extends RestrictIpBrowserTestBase {
 
   /**
    * Test that a user is blocked when the module is enabled.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   * @throws \Behat\Mink\Exception\ResponseTextException
    */
   public function testModuleEnabled() {
     $adminUser = $this->drupalCreateUser([
@@ -45,6 +48,9 @@ class RestrictIpAccessTest extends RestrictIpBrowserTestBase {
 
   /**
    * Test that a user is not blocked if their IP address is whitelisted.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   * @throws \Behat\Mink\Exception\ResponseTextException
    */
   public function testIpWhitelist() {
     $adminUser = $this->drupalCreateUser([
@@ -61,8 +67,6 @@ class RestrictIpAccessTest extends RestrictIpBrowserTestBase {
     $this->fillTextValue('edit-address-list', $_SERVER['REMOTE_ADDR'] . PHP_EOL . '::1');
     $this->click('#edit-submit');
     $this->assertSession()->pageTextNotContains('The page you are trying to access cannot be accessed from your IP address.');
-
-    return $adminUser;
   }
 
   /**
@@ -113,7 +117,7 @@ class RestrictIpAccessTest extends RestrictIpBrowserTestBase {
     $this->click('#edit-submit');
 
     $admin_role = $this->createRole(['bypass ip restriction']);
-    $adminUser->addRole($admin_role);
+    $adminUser->addRole($admin_role)->save();
     $this->checkCheckbox('#edit-enable');
     $this->click('#edit-submit');
 
@@ -158,7 +162,7 @@ class RestrictIpAccessTest extends RestrictIpBrowserTestBase {
     $this->click('#edit-submit');
 
     $admin_role = $this->createRole(['bypass ip restriction']);
-    $adminUser->addRole($admin_role);
+    $adminUser->addRole($admin_role)->save();
     $this->checkCheckbox('#edit-enable');
     $this->click('#edit-submit');