Widened the set of allowable emojis.

refs #8368
cakephp · Oct 7, 2017 · d09c6bd · d09c6bd
1 parent ccdbbe1
commit d09c6bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -909,7 +909,7 @@ public static function url($check, $strict = false)
     {
         static::_populateIp();
 
-        $emoji = '\x{1F300}-\x{1F6FF}';
+        $emoji = '\x{1F190}-\x{1F9EF}';
         $alpha = '0-9(\p{L}\p{N}' . $emoji;
         $hex = '(%[0-9a-f]{2})';
         $subDelimiters = preg_quote('/!"$&\'()*+,-.@_:;=~[]', '/');

diff --git a/tests/TestCase/Validation/ValidationTest.php b/tests/TestCase/Validation/ValidationTest.php
@@ -2181,7 +2181,7 @@ public function testUrl()
         $this->assertTrue(Validation::url('http://www.electrohome.ro/images/239537750-284232-215_300[1].jpg'));
         $this->assertTrue(Validation::url('http://www.eräume.foo'));
         $this->assertTrue(Validation::url('http://äüö.eräume.foo'));
-        $this->assertTrue(Validation::url('http://www.domain.com/👹'), 'utf8Extended path failed');
+        $this->assertTrue(Validation::url('http://www.domain.com/👹/🧀'), 'utf8Extended path failed');
 
         $this->assertTrue(Validation::url('http://cakephp.org:80'));
         $this->assertTrue(Validation::url('http://cakephp.org:443'));