[CssSelector] moved protected to private

symfony · Mar 24, 2011 · da7ddeb · da7ddeb
1 parent 80ff6fb
commit da7ddeb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/Parser.php b/Parser.php
@@ -29,12 +29,12 @@ class Parser
      * Optionally, a prefix can be added to the resulting XPath
      * expression with the $prefix parameter.
      *
-     * @throws SyntaxError When got None for xpath expression
-     *
      * @param  mixed  $cssExpr The CSS expression.
      * @param  string $prefix  An optional prefix for the XPath expression.
      *
      * @return string
+     *
+     * @throws SyntaxError When got None for xpath expression
      */
     static public function cssToXpath($cssExpr, $prefix = 'descendant-or-self::')
     {
@@ -103,7 +103,7 @@ public function parse($string)
      *
      * @return Node\NodeInterface
      */
-    protected function parseSelectorGroup($stream)
+    private function parseSelectorGroup($stream)
     {
         $result = array();
         while (true) {
@@ -132,7 +132,7 @@ protected function parseSelectorGroup($stream)
      *
      * @return Node\NodeInterface
      */
-    protected function parseSelector($stream)
+    private function parseSelector($stream)
     {
         $result = $this->parseSimpleSelector($stream);
 
@@ -168,7 +168,7 @@ protected function parseSelector($stream)
      *
      * @return Node\NodeInterface
      */
-    protected function parseSimpleSelector($stream)
+    private function parseSimpleSelector($stream)
     {
         $peek = $stream->peek();
         if ('*' != $peek && !$peek->isType('Symbol')) {
@@ -277,7 +277,7 @@ protected function parseSimpleSelector($stream)
      *
      * @return Node\AttribNode
      */
-    protected function parseAttrib($selector, $stream)
+    private function parseAttrib($selector, $stream)
     {
         $attrib = $stream->next();
         if ($stream->peek() == '|') {

diff --git a/Token.php b/Token.php
@@ -21,9 +21,9 @@
  */
 class Token
 {
-    protected $type;
-    protected $value;
-    protected $position;
+    private $type;
+    private $value;
+    private $position;
 
     /**
      * Constructor.

diff --git a/TokenStream.php b/TokenStream.php
@@ -21,11 +21,11 @@
  */
 class TokenStream
 {
-    protected $used;
-    protected $tokens;
-    protected $source;
-    protected $peeked;
-    protected $peeking;
+    private $used;
+    private $tokens;
+    private $source;
+    private $peeked;
+    private $peeking;
 
     /**
      * Constructor.

diff --git a/Tokenizer.php b/Tokenizer.php
@@ -114,7 +114,7 @@ public function tokenize($s)
      *
      * @return array
      */
-    protected function tokenizeEscapedString($s, $pos)
+    private function tokenizeEscapedString($s, $pos)
     {
         $quote = $s[$pos];
 
@@ -150,7 +150,7 @@ protected function tokenizeEscapedString($s, $pos)
      *
      * @return string
      */
-    protected function unescapeStringLiteral($literal)
+    private function unescapeStringLiteral($literal)
     {
         return preg_replace_callback('#(\\\\(?:[A-Fa-f0-9]{1,6}(?:\r\n|\s)?|[^A-Fa-f0-9]))#', function ($matches) use ($literal)
         {
@@ -177,7 +177,7 @@ protected function unescapeStringLiteral($literal)
      *
      * @return array
      */
-    protected function tokenizeSymbol($s, $pos)
+    private function tokenizeSymbol($s, $pos)
     {
         $start = $pos;
 

diff --git a/XPathExpr.php b/XPathExpr.php
@@ -21,11 +21,11 @@
  */
 class XPathExpr
 {
-    protected $prefix;
-    protected $path;
-    protected $element;
-    protected $condition;
-    protected $starPrefix;
+    private $prefix;
+    private $path;
+    private $element;
+    private $condition;
+    private $starPrefix;
 
     /**
      * Constructor.