Adopt to new yiisoft/validator (#364)

yiisoft · May 31, 2021 · 40617f6 · 40617f6
1 parent c03f55a
commit 40617f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Middleware/TrustedHostsNetworkResolver.php b/src/Middleware/TrustedHostsNetworkResolver.php
@@ -208,7 +208,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         $trustedHostData = null;
         $trustedHeaders = [];
-        $ipValidator = ($this->ipValidator ?? new Ip())->disallowSubnet()->disallowNegation();
+        $ipValidator = ($this->ipValidator ?? Ip::rule())->disallowSubnet()->disallowNegation();
         foreach ($this->trustedHosts as $data) {
             // collect all trusted headers
             $trustedHeaders = array_merge($trustedHeaders, $data[self::DATA_KEY_TRUSTED_HEADERS]);

diff --git a/tests/Middleware/IpFilterTest.php b/tests/Middleware/IpFilterTest.php
@@ -38,7 +38,7 @@ public function setUp(): void
         parent::setUp();
         $this->responseFactoryMock = $this->createMock(ResponseFactoryInterface::class);
         $this->requestHandlerMock = $this->createMock(RequestHandlerInterface::class);
-        $this->ipFilter = new IpFilter((new Ip())->ranges([self::ALLOWED_IP]), $this->responseFactoryMock);
+        $this->ipFilter = new IpFilter(Ip::rule()->ranges([self::ALLOWED_IP]), $this->responseFactoryMock);
     }
 
     public function testProcessReturnsAccessDeniedResponseWhenIpIsNotAllowed(): void