Use zend-validator to validate URIs, rather than duplicating that logic locally

Author: Ben Batschelet

app/code/Magento/Integration/Test/Unit/Model/Oauth/ConsumerTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Integration\Test\Unit\Model\Oauth;
 
 use Magento\Framework\Url\Validator as UrlValidator;
+use Zend\Validator\Uri as ZendUriValidator;
 use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength;
 
 /**
@@ -84,7 +85,7 @@ protected function setUp()
 
         $this->keyLengthValidator = new KeyLength();
 
-        $this->urlValidator = new UrlValidator();
+        $this->urlValidator = new UrlValidator(new ZendUriValidator());
 
         $this->oauthDataMock = $this->createPartialMock(
             \Magento\Integration\Helper\Oauth\Data::class,

lib/internal/Magento/Framework/Url/Validator.php

@@ -11,8 +11,6 @@
  */
 namespace Magento\Framework\Url;
 
-use Zend\Uri\UriFactory;
-
 class Validator extends \Zend_Validate_Abstract
 {
     /**#@+
@@ -21,13 +19,20 @@ class Validator extends \Zend_Validate_Abstract
     const INVALID_URL = 'invalidUrl';
     /**#@-*/
 
+    /**
+     * @var \Zend\Validator\Uri
+     */
+    private $validator;
+
     /**
      * Object constructor
      */
-    public function __construct()
+    public function __construct(\Zend\Validator\Uri $validator)
     {
         // set translated message template
         $this->setMessage((string)new \Magento\Framework\Phrase("Invalid URL '%value%'."), self::INVALID_URL);
+        $this->validator = $validator;
+        $this->validator->setAllowRelative(false);
     }
 
     /**
@@ -47,14 +52,12 @@ public function isValid($value)
     {
         $this->_setValue($value);
 
-        try {
-            $uri = UriFactory::factory($value);
-            if ($uri->isValid()) {
-                return true;
-            }
-        } catch (Exception $e) {/** left empty */}
+        $valid = $this->validator->isValid($value);
+
+        if (!$valid) {
+            $this->_error(self::INVALID_URL);
+        }
 
-        $this->_error(self::INVALID_URL);
-        return false;
+        return $valid;
     }
 }