Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111467

Change subject: Fix PHP implementation of mw.ustring %W
......................................................................

Fix PHP implementation of mw.ustring %W

Incorrect regex is making it match basically everything.

Bug: 60908
Change-Id: Ic1c5a740c6b825bb7dfacf684d0c7fa905b135ee
---
M engines/LuaCommon/UstringLibrary.php
M tests/engines/LuaCommon/UstringLibraryTests.lua
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/67/111467/1

diff --git a/engines/LuaCommon/UstringLibrary.php 
b/engines/LuaCommon/UstringLibrary.php
index 57f8e6c..ce3364d 100644
--- a/engines/LuaCommon/UstringLibrary.php
+++ b/engines/LuaCommon/UstringLibrary.php
@@ -265,7 +265,7 @@
                                'P' => '\P{P}',
                                'S' => '\P{Xps}',
                                'U' => '\P{Lu}',
-                               'W' => '[\P{L}\P{Nd}]',
+                               'W' => '[^\p{L}\p{Nd}]',
                                'X' => '[^0-9A-Fa-f0-9A-Fa-f]',
                                'Z' => '[^\0]',
                        );
diff --git a/tests/engines/LuaCommon/UstringLibraryTests.lua 
b/tests/engines/LuaCommon/UstringLibraryTests.lua
index 86d5f33..c15466c 100644
--- a/tests/engines/LuaCommon/UstringLibraryTests.lua
+++ b/tests/engines/LuaCommon/UstringLibraryTests.lua
@@ -328,6 +328,10 @@
          args = { "fóó? bar", '%A+' },
          expect = { 4, 5 }
        },
+       { name = 'find: (%W)', func = mw.ustring.find,
+         args = { "fóó? bar", '%W+' },
+         expect = { 4, 5 }
+       },
        { name = 'find: ([^])', func = mw.ustring.find,
          args = { "fóó? bar", '[^a-zó]+' },
          expect = { 4, 5 }

-- 
To view, visit https://gerrit.wikimedia.org/r/111467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1c5a740c6b825bb7dfacf684d0c7fa905b135ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to