From b262ebfeb3d7384187f377aca92e211ce7248f69 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Tue, 23 Mar 2021 13:27:51 -0400 Subject: [PATCH 1/6] Move validators from utopia --- src/Appwrite/Network/Validator/Email.php | 66 ++++++++++++ src/Appwrite/Network/Validator/Host.php | 82 ++++++++++++++ src/Appwrite/Network/Validator/IP.php | 112 ++++++++++++++++++++ src/Appwrite/Network/Validator/URL.php | 66 ++++++++++++ tests/unit/Network/Validators/EmailTest.php | 71 +++++++++++++ tests/unit/Network/Validators/HostTest.php | 45 ++++++++ tests/unit/Network/Validators/IPTest.php | 81 ++++++++++++++ tests/unit/Network/Validators/URLTest.php | 48 +++++++++ 8 files changed, 571 insertions(+) create mode 100644 src/Appwrite/Network/Validator/Email.php create mode 100644 src/Appwrite/Network/Validator/Host.php create mode 100644 src/Appwrite/Network/Validator/IP.php create mode 100644 src/Appwrite/Network/Validator/URL.php create mode 100755 tests/unit/Network/Validators/EmailTest.php create mode 100755 tests/unit/Network/Validators/HostTest.php create mode 100755 tests/unit/Network/Validators/IPTest.php create mode 100755 tests/unit/Network/Validators/URLTest.php diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php new file mode 100644 index 0000000000..451e8e3b00 --- /dev/null +++ b/src/Appwrite/Network/Validator/Email.php @@ -0,0 +1,66 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * Email + * + * Validate that an variable is a valid email address + * + * @package Utopia\Validator + */ +class Email extends Validator +{ + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid email address'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid email address. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + if (!\filter_var($value, FILTER_VALIDATE_EMAIL)) { + return false; + } + + return true; + } +} diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php new file mode 100644 index 0000000000..54c9ebbd2f --- /dev/null +++ b/src/Appwrite/Network/Validator/Host.php @@ -0,0 +1,82 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * Host + * + * Validate that a host is allowed from given whitelisted hosts list + * + * @package Utopia\Validator + */ +class Host extends Validator +{ + protected $whitelist = []; + + /** + * @param array $whitelist + */ + public function __construct(array $whitelist) + { + $this->whitelist = $whitelist; + } + + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'URL host must be one of: ' . \implode(', ', $this->whitelist); + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value starts with one of the given hosts + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + $urlValidator = new URL(); + + if (!$urlValidator->isValid($value)) { + return false; + } + + if (\in_array(\parse_url($value, PHP_URL_HOST), $this->whitelist)) { + return true; + } + + return false; + } +} diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php new file mode 100644 index 0000000000..b1ea727795 --- /dev/null +++ b/src/Appwrite/Network/Validator/IP.php @@ -0,0 +1,112 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Exception; +use Utopia\Validator; + +/** + * IP + * + * Validate that an variable is a valid IP address + * + * @package Utopia\Validator + */ +class IP extends Validator +{ + const ALL = 'all'; + const V4 = 'ipv4'; + const V6 = 'ipv6'; + + /** + * @var string + */ + protected $type = self::ALL; + + /** + * Constructor + * + * Set a the type of IP check. + * + * @param string $type + */ + public function __construct(string $type = self::ALL) + { + if (!in_array($type, [self::ALL, self::V4, self::V6])) { + throw new Exception('Unsupported IP type'); + } + + $this->type = $type; + } + + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid IP address'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid IP address. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + switch ($this->type) { + case self::ALL: + if (\filter_var($value, FILTER_VALIDATE_IP)) { + return true; + } + break; + + case self::V4: + if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { + return true; + } + break; + + case self::V6: + if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { + return true; + } + break; + + default: + return false; + break; + } + + return false; + } +} diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php new file mode 100644 index 0000000000..a610928d79 --- /dev/null +++ b/src/Appwrite/Network/Validator/URL.php @@ -0,0 +1,66 @@ + + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use Utopia\Validator; + +/** + * URL + * + * Validate that an variable is a valid URL + * + * @package Utopia\Validator + */ +class URL extends Validator +{ + /** + * Get Description + * + * Returns validator description + * + * @return string + */ + public function getDescription() + { + return 'Value must be a valid URL'; + } + + /** + * Get Type + * + * Returns validator type. + * + * @return string + */ + public function getType() + { + return self::TYPE_STRING; + } + + /** + * Is valid + * + * Validation will pass when $value is valid URL. + * + * @param mixed $value + * @return bool + */ + public function isValid($value) + { + if (\filter_var($value, FILTER_VALIDATE_URL) === false) { + return false; + } + + return true; + } +} diff --git a/tests/unit/Network/Validators/EmailTest.php b/tests/unit/Network/Validators/EmailTest.php new file mode 100755 index 0000000000..03e4d043c5 --- /dev/null +++ b/tests/unit/Network/Validators/EmailTest.php @@ -0,0 +1,71 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class EmailTest extends TestCase +{ + /** + * @var Email + */ + protected $email = null; + + public function setUp():void + { + $this->email = new Email(); + } + + public function tearDown():void + { + $this->email = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals(true, $this->email->isValid('email@domain.com')); + $this->assertEquals(true, $this->email->isValid('firstname.lastname@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@subdomain.domain.com')); + $this->assertEquals(true, $this->email->isValid('firstname+lastname@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@[123.123.123.123]')); + $this->assertEquals(true, $this->email->isValid('"email"@domain.com')); + $this->assertEquals(true, $this->email->isValid('1234567890@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@domain-one.com')); + $this->assertEquals(true, $this->email->isValid('_______@domain.com')); + $this->assertEquals(true, $this->email->isValid('email@domain.name')); + $this->assertEquals(true, $this->email->isValid('email@domain.co.jp')); + $this->assertEquals(true, $this->email->isValid('firstname-lastname@domain.com')); + $this->assertEquals(false, $this->email->isValid(false)); + $this->assertEquals(false, $this->email->isValid(['string', 'string'])); + $this->assertEquals(false, $this->email->isValid(1)); + $this->assertEquals(false, $this->email->isValid(1.2)); + $this->assertEquals(false, $this->email->isValid('plainaddress')); // Missing @ sign and domain + $this->assertEquals(false, $this->email->isValid('@domain.com')); // Missing username + $this->assertEquals(false, $this->email->isValid('#@%^%#$@#$@#.com')); // Garbage + $this->assertEquals(false, $this->email->isValid('Joe Smith ')); // Encoded html within email is invalid + $this->assertEquals(false, $this->email->isValid('email.domain.com')); // Missing @ + $this->assertEquals(false, $this->email->isValid('email@domain@domain.com')); // Two @ sign + $this->assertEquals(false, $this->email->isValid('.email@domain.com')); // Leading dot in address is not allowed + $this->assertEquals(false, $this->email->isValid('email.@domain.com')); // Trailing dot in address is not allowed + $this->assertEquals(false, $this->email->isValid('email..email@domain.com')); // Multiple dots + $this->assertEquals(false, $this->email->isValid('あいうえお@domain.com')); // Unicode char as address + $this->assertEquals(false, $this->email->isValid('email@domain.com (Joe Smith)')); // Text followed email is not allowed + $this->assertEquals(false, $this->email->isValid('email@domain')); // Missing top level domain (.com/.net/.org/etc) + $this->assertEquals(false, $this->email->isValid('email@-domain.com')); // Leading dash in front of domain is invalid + $this->assertEquals(false, $this->email->isValid('email@111.222.333.44444')); // Invalid IP format + $this->assertEquals(false, $this->email->isValid('email@domain..com')); // Multiple dot in the domain portion is invalid + $this->assertEquals($this->email->getType(), 'string'); + } +} diff --git a/tests/unit/Network/Validators/HostTest.php b/tests/unit/Network/Validators/HostTest.php new file mode 100755 index 0000000000..dbaf83b7b8 --- /dev/null +++ b/tests/unit/Network/Validators/HostTest.php @@ -0,0 +1,45 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class HostTest extends TestCase +{ + /** + * @var Host + */ + protected $host = null; + + public function setUp():void + { + $this->host = new Host(['appwrite.io', 'subdomain.appwrite.test', 'localhost']); + } + + public function tearDown():void + { + $this->host = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals($this->host->isValid('https://appwrite.io/link'), true); + $this->assertEquals($this->host->isValid('https://localhost'), true); + $this->assertEquals($this->host->isValid('localhost'), false); + $this->assertEquals($this->host->isValid('http://subdomain.appwrite.test/path'), true); + $this->assertEquals($this->host->isValid('http://test.subdomain.appwrite.test/path'), false); + $this->assertEquals($this->host->getType(), 'string'); + } +} diff --git a/tests/unit/Network/Validators/IPTest.php b/tests/unit/Network/Validators/IPTest.php new file mode 100755 index 0000000000..1be8f78ab3 --- /dev/null +++ b/tests/unit/Network/Validators/IPTest.php @@ -0,0 +1,81 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class IPTest extends TestCase +{ + public function tearDown():void + { + $this->validator = null; + } + + public function testIsValidIP() + { + $validator = new IP(); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + $this->assertEquals($validator->getType(), 'string'); + } + + public function testIsValidIPALL() + { + $validator = new IP(IP::ALL); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } + + public function testIsValidIPV4() + { + $validator = new IP(IP::V4); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), false); + $this->assertEquals($validator->isValid('109.67.204.101'), true); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } + + public function testIsValidIPV6() + { + $validator = new IP(IP::V6); + + // Assertions + $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true); + $this->assertEquals($validator->isValid('109.67.204.101'), false); + $this->assertEquals($validator->isValid(23.5), false); + $this->assertEquals($validator->isValid('23.5'), false); + $this->assertEquals($validator->isValid(null), false); + $this->assertEquals($validator->isValid(true), false); + $this->assertEquals($validator->isValid(false), false); + } +} diff --git a/tests/unit/Network/Validators/URLTest.php b/tests/unit/Network/Validators/URLTest.php new file mode 100755 index 0000000000..cd4844f7c9 --- /dev/null +++ b/tests/unit/Network/Validators/URLTest.php @@ -0,0 +1,48 @@ + + * @version 1.0 RC4 + * @license The MIT License (MIT) + */ + +namespace Utopia\Validator; + +use PHPUnit\Framework\TestCase; + +class URLTest extends TestCase +{ + /** + * @var Domain + */ + protected $url = null; + + public function setUp():void + { + $this->url = new URL(); + } + + public function tearDown():void + { + $this->url = null; + } + + public function testIsValid() + { + // Assertions + $this->assertEquals(true, $this->url->isValid('http://example.com')); + $this->assertEquals(true, $this->url->isValid('https://example.com')); + $this->assertEquals(true, $this->url->isValid('htts://example.com')); // does not validate protocol + $this->assertEquals(false, $this->url->isValid('example.com')); // though, requires some kind of protocol + $this->assertEquals(false, $this->url->isValid('http:/example.com')); + $this->assertEquals(true, $this->url->isValid('http://exa-mple.com')); + $this->assertEquals(false, $this->url->isValid('htt@s://example.com')); + $this->assertEquals(true, $this->url->isValid('http://www.example.com/foo%2\u00c2\u00a9zbar')); + $this->assertEquals(true, $this->url->isValid('http://www.example.com/?q=%3Casdf%3E')); + } +} From 7f485ce53622b9227a653a706dade94dc8db774d Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 13:47:17 -0400 Subject: [PATCH 2/6] Update validator namespaces --- src/Appwrite/Network/Validator/Email.php | 2 +- src/Appwrite/Network/Validator/Host.php | 2 +- src/Appwrite/Network/Validator/IP.php | 2 +- src/Appwrite/Network/Validator/URL.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 451e8e3b00..85ec99b07d 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 54c9ebbd2f..0a912a77b0 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index b1ea727795..8fed45dca0 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Exception; use Utopia\Validator; diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index a610928d79..b7907da71b 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -10,7 +10,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use Utopia\Validator; From 07140bda5a92298b858ac0e3f7ca106b74ff7178 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 13:47:43 -0400 Subject: [PATCH 3/6] Replace utopia libs with native validators --- app/controllers/api/account.php | 6 +++--- app/controllers/api/avatars.php | 2 +- app/controllers/api/projects.php | 2 +- app/controllers/api/teams.php | 4 ++-- app/controllers/api/users.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index fd09aaa3d5..0a26151993 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -6,10 +6,10 @@ use Utopia\Exception; use Utopia\Config\Config; use Utopia\Validator\Assoc; use Utopia\Validator\Text; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\WhiteList; -use Utopia\Validator\Host; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\Host; +use Appwrite\Network\Validator\URL; use Utopia\Audit\Audit; use Utopia\Audit\Adapters\MySQL as AuditAdapter; use Appwrite\Auth\Auth; diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php index a094dc672a..b5c47c1987 100644 --- a/app/controllers/api/avatars.php +++ b/app/controllers/api/avatars.php @@ -14,7 +14,7 @@ use Utopia\Validator\Boolean; use Utopia\Validator\HexColor; use Utopia\Validator\Range; use Utopia\Validator\Text; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\URL; use Utopia\Validator\WhiteList; $avatarCallback = function ($type, $code, $width, $height, $quality, $response) { diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 63c99ffaee..5737714610 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -6,7 +6,7 @@ use Utopia\Validator\ArrayList; use Utopia\Validator\Boolean; use Utopia\Validator\Text; use Utopia\Validator\WhiteList; -use Utopia\Validator\URL; +use Appwrite\Network\Validator\URL; use Utopia\Validator\Range; use Utopia\Config\Config; use Utopia\Domains\Domain; diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index c4a9e4875d..847b37484d 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -3,9 +3,9 @@ use Utopia\App; use Utopia\Exception; use Utopia\Config\Config; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\Text; -use Utopia\Validator\Host; +use Appwrite\Network\Validator\Host; use Utopia\Validator\Range; use Utopia\Validator\ArrayList; use Utopia\Validator\WhiteList; diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 958dfc1488..58ec3ee978 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -4,7 +4,7 @@ use Utopia\App; use Utopia\Exception; use Utopia\Validator\Assoc; use Utopia\Validator\WhiteList; -use Utopia\Validator\Email; +use Appwrite\Network\Validator\Email; use Utopia\Validator\Text; use Utopia\Validator\Range; use Utopia\Audit\Audit; From 31bf1bdcef6c58b6d43e671389424f56c0d2776f Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 14:34:47 -0400 Subject: [PATCH 4/6] Update validator namespaces --- tests/unit/Network/Validators/EmailTest.php | 2 +- tests/unit/Network/Validators/HostTest.php | 2 +- tests/unit/Network/Validators/IPTest.php | 2 +- tests/unit/Network/Validators/URLTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/Network/Validators/EmailTest.php b/tests/unit/Network/Validators/EmailTest.php index 03e4d043c5..5a7bf0f963 100755 --- a/tests/unit/Network/Validators/EmailTest.php +++ b/tests/unit/Network/Validators/EmailTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/HostTest.php b/tests/unit/Network/Validators/HostTest.php index dbaf83b7b8..724ad74152 100755 --- a/tests/unit/Network/Validators/HostTest.php +++ b/tests/unit/Network/Validators/HostTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/IPTest.php b/tests/unit/Network/Validators/IPTest.php index 1be8f78ab3..8ebd12dd03 100755 --- a/tests/unit/Network/Validators/IPTest.php +++ b/tests/unit/Network/Validators/IPTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; diff --git a/tests/unit/Network/Validators/URLTest.php b/tests/unit/Network/Validators/URLTest.php index cd4844f7c9..458637da67 100755 --- a/tests/unit/Network/Validators/URLTest.php +++ b/tests/unit/Network/Validators/URLTest.php @@ -11,7 +11,7 @@ * @license The MIT License (MIT) */ -namespace Utopia\Validator; +namespace Appwrite\Network\Validator; use PHPUnit\Framework\TestCase; From 448276fcd485f3e58a65e4bca8a8bf5fb37be7db Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Wed, 24 Mar 2021 14:35:36 -0400 Subject: [PATCH 5/6] Validator constants not defined --- src/Appwrite/Network/Validator/Email.php | 2 +- src/Appwrite/Network/Validator/Host.php | 2 +- src/Appwrite/Network/Validator/IP.php | 2 +- src/Appwrite/Network/Validator/URL.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 85ec99b07d..1736ac8172 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -44,7 +44,7 @@ class Email extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 0a912a77b0..145e4eb7ed 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -54,7 +54,7 @@ class Host extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index 8fed45dca0..c1d1402dbd 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -70,7 +70,7 @@ class IP extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index b7907da71b..0a2a1326ed 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -44,7 +44,7 @@ class URL extends Validator */ public function getType() { - return self::TYPE_STRING; + return 'string'; } /** From c49166248795cf49860f6934f06fe6c65a134750 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Tue, 30 Mar 2021 07:25:21 -0400 Subject: [PATCH 6/6] Remove utopia license comments --- src/Appwrite/Network/Validator/Email.php | 10 ---------- src/Appwrite/Network/Validator/Host.php | 10 ---------- src/Appwrite/Network/Validator/IP.php | 10 ---------- src/Appwrite/Network/Validator/URL.php | 10 ---------- 4 files changed, 40 deletions(-) diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php index 1736ac8172..ca9ba1d53d 100644 --- a/src/Appwrite/Network/Validator/Email.php +++ b/src/Appwrite/Network/Validator/Email.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php index 145e4eb7ed..f746ecd752 100644 --- a/src/Appwrite/Network/Validator/Host.php +++ b/src/Appwrite/Network/Validator/Host.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php index c1d1402dbd..523147eb2d 100644 --- a/src/Appwrite/Network/Validator/IP.php +++ b/src/Appwrite/Network/Validator/IP.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator; diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php index 0a2a1326ed..bd1546e111 100644 --- a/src/Appwrite/Network/Validator/URL.php +++ b/src/Appwrite/Network/Validator/URL.php @@ -1,14 +1,4 @@ - * @license The MIT License (MIT) - */ namespace Appwrite\Network\Validator;