From 449d8a66ad65a7694d70c56b5a4f9a7f20612b8b Mon Sep 17 00:00:00 2001
From: "Fabio B. Silva" <fabio.bat.silva@gmail.com>
Date: Sun, 25 Mar 2012 13:00:50 -0300
Subject: [PATCH] changed modifiers

---
 lib/Doctrine/ORM/Query/Expr/Comparison.php |  6 +++---
 lib/Doctrine/ORM/Query/Expr/From.php       |  6 +++---
 lib/Doctrine/ORM/Query/Expr/Func.php       |  7 +++++--
 lib/Doctrine/ORM/Query/Expr/Join.php       | 12 ++++++------
 lib/Doctrine/ORM/Query/Expr/Math.php       |  9 ++++++---
 lib/Doctrine/ORM/Query/Expr/OrderBy.php    |  2 +-
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Expr/Comparison.php b/lib/Doctrine/ORM/Query/Expr/Comparison.php
index f15c92435..6c54e7d44 100644
--- a/lib/Doctrine/ORM/Query/Expr/Comparison.php
+++ b/lib/Doctrine/ORM/Query/Expr/Comparison.php
@@ -41,17 +41,17 @@ class Comparison
     /**
      * @var mixed
      */
-    private $leftExpr;
+    protected $leftExpr;
 
     /**
      * @var string
      */
-    private $operator;
+    protected $operator;
 
     /**
      * @var mixed
      */
-    private $rightExpr;
+    protected $rightExpr;
 
     /**
      * Creates a comparison expression with the given arguments.
diff --git a/lib/Doctrine/ORM/Query/Expr/From.php b/lib/Doctrine/ORM/Query/Expr/From.php
index b9c70cb37..20fe3ded8 100644
--- a/lib/Doctrine/ORM/Query/Expr/From.php
+++ b/lib/Doctrine/ORM/Query/Expr/From.php
@@ -34,17 +34,17 @@ class From
     /**
      * @var string
      */
-    private $from;
+    protected $from;
 
     /**
      * @var string
      */
-    private $alias;
+    protected $alias;
 
     /**
      * @var string
      */
-    private $indexBy;
+    protected $indexBy;
 
     /**
      * @param string $from      The class name.
diff --git a/lib/Doctrine/ORM/Query/Expr/Func.php b/lib/Doctrine/ORM/Query/Expr/Func.php
index 35e79b0d5..4d722fd89 100644
--- a/lib/Doctrine/ORM/Query/Expr/Func.php
+++ b/lib/Doctrine/ORM/Query/Expr/Func.php
@@ -34,12 +34,12 @@ class Func
     /**
      * @var string
      */
-    private $name;
+    protected $name;
 
     /**
      * @var array
      */
-    private $arguments;
+    protected $arguments;
 
     /**
      * Creates a function, with the given argument.
@@ -69,6 +69,9 @@ class Func
         return $this->arguments;
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         return $this->name . '(' . implode(', ', $this->arguments) . ')';
diff --git a/lib/Doctrine/ORM/Query/Expr/Join.php b/lib/Doctrine/ORM/Query/Expr/Join.php
index 7c75d0318..e96da8e73 100644
--- a/lib/Doctrine/ORM/Query/Expr/Join.php
+++ b/lib/Doctrine/ORM/Query/Expr/Join.php
@@ -40,32 +40,32 @@ class Join
     /**
      * @var string
      */
-    private $joinType;
+    protected $joinType;
 
     /**
      * @var string
      */
-    private $join;
+    protected $join;
 
     /**
      * @var string
      */
-    private $alias;
+    protected $alias;
 
     /**
      * @var string
      */
-    private $conditionType;
+    protected $conditionType;
 
     /**
      * @var string
      */
-    private $condition;
+    protected $condition;
 
     /**
      * @var string
      */
-    private $indexBy;
+    protected $indexBy;
 
     /**
      * @param string $joinType      The condition type constant. Either INNER_JOIN or LEFT_JOIN.
diff --git a/lib/Doctrine/ORM/Query/Expr/Math.php b/lib/Doctrine/ORM/Query/Expr/Math.php
index 3bd8f4cdb..e01cb4a0b 100644
--- a/lib/Doctrine/ORM/Query/Expr/Math.php
+++ b/lib/Doctrine/ORM/Query/Expr/Math.php
@@ -34,17 +34,17 @@ class Math
     /**
      * @var mixed
      */
-    private $leftExpr;
+    protected $leftExpr;
 
     /**
      * @var string
      */
-    private $operator;
+    protected $operator;
 
     /**
      * @var mixed
      */
-    private $rightExpr;
+    protected $rightExpr;
 
     /**
      * Creates a mathematical expression with the given arguments.
@@ -84,6 +84,9 @@ class Math
         return $this->rightExpr;
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         // Adjusting Left Expression
diff --git a/lib/Doctrine/ORM/Query/Expr/OrderBy.php b/lib/Doctrine/ORM/Query/Expr/OrderBy.php
index c4e32ab03..96dc4f31e 100644
--- a/lib/Doctrine/ORM/Query/Expr/OrderBy.php
+++ b/lib/Doctrine/ORM/Query/Expr/OrderBy.php
@@ -54,7 +54,7 @@ class OrderBy
     /**
      * @var array
      */
-    private $parts = array();
+    protected $parts = array();
 
     /**
      * @param string $sort