Merge pull request #103 from WeareJH/bug/72-zend-config

buskamuza · buskamuza · commit ca2676844432 · 2018-04-06T15:50:44.000-05:00
Eliminate usage of Zend_Config from Magento 2 Open Source #71
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php b/app/code/Magento/Integration/Model/Oauth/Consumer/Validator/KeyLength.php
@@ -39,7 +39,7 @@ class KeyLength extends \Zend_Validate_StringLength
      * Default encoding is set to utf-8 if none provided
      * New option name added to allow adding key name in validation error messages
      *
-     * @param  integer|array|\Zend_Config $options
+     * @inheritdoc
      */
     public function __construct($options = [])
     {
diff --git a/lib/internal/Magento/Framework/Validator/EmailAddress.php b/lib/internal/Magento/Framework/Validator/EmailAddress.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Framework\Validator;
 
-use Zend_Config;
-
 class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Framework\Validator\ValidatorInterface
 {
     /**
@@ -21,7 +19,7 @@ class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Frame
      * 'mx'       => If MX check should be enabled, boolean
      * 'deep'     => If a deep MX check should be done, boolean
      *
-     * @param array|string|Zend_Config $options OPTIONAL
+     * @inheritdoc
      */
     public function __construct($options = [])
     {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class KeyLength extends \Zend_Validate_StringLength`
`39`	`39`	`* Default encoding is set to utf-8 if none provided`
`40`	`40`	`* New option name added to allow adding key name in validation error messages`
`41`	`41`	`*`
`42`		`- * @param integer\|array\|\Zend_Config $options`
	`42`	`+ * @inheritdoc`
`43`	`43`	`*/`
`44`	`44`	`public function __construct($options = [])`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`*/`
`8`	`8`	`namespace Magento\Framework\Validator;`
`9`	`9`
`10`		`-use Zend_Config;`
`11`		`-`
`12`	`10`	`class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Framework\Validator\ValidatorInterface`
`13`	`11`	`{`
`14`	`12`	`/**`
`@@ -21,7 +19,7 @@ class EmailAddress extends \Zend_Validate_EmailAddress implements \Magento\Frame`
`21`	`19`	`* 'mx' => If MX check should be enabled, boolean`
`22`	`20`	`* 'deep' => If a deep MX check should be done, boolean`
`23`	`21`	`*`
`24`		`- * @param array\|string\|Zend_Config $options OPTIONAL`
	`22`	`+ * @inheritdoc`
`25`	`23`	`*/`
`26`	`24`	`public function __construct($options = [])`
`27`	`25`	`{`