Merge pull request #13 from 4d47/master

Add limit method visibility

Author: mihai-vlc

src/VerbalExpressions/PHPVerbalExpressions/VerbalExpressions.php

@@ -90,7 +90,7 @@ public function endOfLine($enable = true)
      */
     public function then($value)
     {
-        return $this->add("(".$this->sanitize($value).")");
+        return $this->add("(?:".self::sanitize($value).")");
     }
 
     /**
@@ -114,7 +114,7 @@ public function find($value)
      */
     public function maybe($value)
     {
-        return $this->add("(".$this->sanitize($value).")?");
+        return $this->add("(?:".self::sanitize($value).")?");
     }
 
     /**
@@ -127,7 +127,7 @@ public function maybe($value)
      */
     public function anything()
     {
-        return $this->add("(.*)");
+        return $this->add("(?:.*)");
     }
 
     /**
@@ -141,7 +141,7 @@ public function anything()
      */
     public function anythingBut($value)
     {
-        return $this->add("([^". $this->sanitize($value) ."]*)");
+        return $this->add("(?:[^". self::sanitize($value) ."]*)");
     }
 
     /**
@@ -154,7 +154,7 @@ public function anythingBut($value)
      */
     public function something()
     {
-        return $this->add("(.+)");
+        return $this->add("(?:.+)");
     }
 
     /**
@@ -168,7 +168,7 @@ public function something()
      */
     public function somethingBut($value)
     {
-        return $this->add("([^". $this->sanitize($value) ."]+)");
+        return $this->add("(?:[^". self::sanitize($value) ."]+)");
     }
 
     /**
@@ -203,7 +203,7 @@ public function replace($source, $value)
      */
     public function lineBreak()
     {
-        return $this->add("(\\n|(\\r\\n))");
+        return $this->add("(?:\\n|(\\r\\n))");
     }
 
     /**
@@ -295,7 +295,7 @@ public function range()
         $arg_list = func_get_args();
 
         for ($i = 0; $i < $arg_num;) {
-            $value .= $this->sanitize($arg_list[$i++]) . "-" . $this->sanitize($arg_list[$i++]);
+            $value .= self::sanitize($arg_list[$i++]) . "-" . self::sanitize($arg_list[$i++]);
         }
 
         $value .= "]";
@@ -390,7 +390,7 @@ public function searchOneLine($enable = true)
      */
     public function multiple($value)
     {
-        $value = $this->sanitize($value);
+        $value = self::sanitize($value);
 
         switch (substr($value, -1)) {
             case '+':
@@ -417,14 +417,14 @@ public function multiple($value)
     public function _or($value)
     {
         if (strpos($this->prefixes,"(")===false) {
-            $this->prefixes .= "(";
+            $this->prefixes .= "(?:";
         }
 
         if (strpos($this->suffixes, ")")===false) {
             $this->suffixes .= ")";
         }
 
-        $this->add(")|(");
+        $this->add(")|(?:");
 
         if ($value) {
             $this->add($value);
@@ -514,7 +514,7 @@ public function clean($options = array())
      * @param integer $max
      * @return VerbalExpressions
      */
-    function limit($min, $max = 0) {
+    public function limit($min, $max = 0) {
         if($max == 0)
             $value = "{".$min."}";