Update webscraper.php

Author: felipe1234-dev

webscraper.php

@@ -31,21 +31,13 @@ private function convert2XPath($query){
 
         $xpath = preg_replace(
              [
-                "/::/",
-            	"/([^,])\s/", 
+                "/([^,])\s/", 
                 "/\/>\//",
 
                 "/\[([^\.\s\/\#\[\,]+)='(([^\s\.]+)\.([^\s\.]+))+'\]/",
 
                 "/:first-child/",
                 "/:last-child/",
-               
-                "/([^\.\s\/\#\[,]+),\s([^\.\s\/\#\[,]+)/",
-               	"/,\s([^\.\s\/\#\[,]+)/",
-                "/((self::[^\.\s\/\#\[,]+ or\s)+(self::[^\.\s\/\#\[,]+)+)/",
-                "/self::self::/",
-                "/\/{1,2}\[/",
-                "/^\[/",
 
                 "/\.([^\.\s\/\#\[,]+)/",
                 "/\/{1,2}\[/",
@@ -62,10 +54,16 @@ private function convert2XPath($query){
                 "/{dot}/",
                 "/::text/",
                 "/::comment/",
-                "/::attributes/"
+                "/::attributes/",
+                
+                "/([^\.\s\/\#\[,]+),\s([^\.\s\/\#\[,]+)/",
+                "/,\s([^\.\s\/\#\[,]+)/",
+                "/((self::[^\.\s\/\#\[,]+ or\s)+(self::[^\.\s\/\#\[,]+)+)/",
+                "/self::self::/",
+                "/\/{1,2}\[/",
+                "/^\[/",
             ],
             [
-                " ::",
                 "$1/",
                 "/",
 
@@ -74,13 +72,6 @@ private function convert2XPath($query){
                 "[1]",
                 "[last()]",
 
-                "self::$1 or self::$2",
-                " or self::$1",
-                "[$1]",
-                "self::",
-                "/*[",
-                "*[",
-                
                 "[contains(@class, '$1')]",
                 "/*[",
                 "*[",
@@ -96,7 +87,14 @@ private function convert2XPath($query){
                 ".",
                 "text()",
                 "comment()",
-                "@*"
+                "@*",
+                
+                "self::$1 or self::$2",
+                " or self::$1",
+                "[$1]",
+                "self::",
+                "/*[",
+                "*[",
             ],
             $xpath
         );