Просмотр исходного кода

Merge remote branch 'everzet/crawler-privatisation-fixes'

* everzet/crawler-privatisation-fixes:
  [DomCrawler] moved private methods under public ones (readability)
Fabien Potencier 14 лет назад
Родитель
Сommit
843c449c73
1 измененных файлов с 26 добавлено и 26 удалено
  1. 26 26
      src/Symfony/Component/DomCrawler/Crawler.php

+ 26 - 26
src/Symfony/Component/DomCrawler/Crawler.php

@@ -560,6 +560,32 @@ class Crawler extends \SplObjectStorage
         return $form;
     }
 
+    static public function xpathLiteral($s)
+    {
+        if (false === strpos($s, "'")) {
+            return sprintf("'%s'", $s);
+        }
+
+        if (false === strpos($s, '"')) {
+            return sprintf('"%s"', $s);
+        }
+
+        $string = $s;
+        $parts = array();
+        while (true) {
+            if (false !== $pos = strpos($string, "'")) {
+                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
+                $parts[] = "\"'\"";
+                $string = substr($string, $pos + 1);
+            } else {
+                $parts[] = "'$string'";
+                break;
+            }
+        }
+
+        return sprintf("concat(%s)", implode($parts, ', '));
+    }
+
     private function getNode($position)
     {
         foreach ($this as $i => $node) {
@@ -596,30 +622,4 @@ class Crawler extends \SplObjectStorage
 
         return $nodes;
     }
-
-    static public function xpathLiteral($s)
-    {
-        if (false === strpos($s, "'")) {
-            return sprintf("'%s'", $s);
-        }
-
-        if (false === strpos($s, '"')) {
-            return sprintf('"%s"', $s);
-        }
-
-        $string = $s;
-        $parts = array();
-        while (true) {
-            if (false !== $pos = strpos($string, "'")) {
-                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
-                $parts[] = "\"'\"";
-                $string = substr($string, $pos + 1);
-            } else {
-                $parts[] = "'$string'";
-                break;
-            }
-        }
-
-        return sprintf("concat(%s)", implode($parts, ', '));
-    }
 }