--- /dev/null
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Query\Expr;
+
+/**
+ * Expression class for building DQL and parts
+ *
+ *
+ * @link www.doctrine-project.org
+ * @since 2.0
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ */
+class Composite extends Base
+{
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ if ($this->count() === 1) {
+ return (string) $this->parts[0];
+ }
+
+ $components = array();
+
+ foreach ($this->parts as $part) {
+ $components[] = $this->processQueryPart($part);
+ }
+
+ return implode($this->separator, $components);
+ }
+
+
+ /**
+ * @param string $part
+ * @return string
+ */
+ private function processQueryPart($part)
+ {
+ $queryPart = (string) $part;
+
+ if (is_object($part) && $part instanceof self && $part->count() > 1) {
+ return $this->preSeparator . $queryPart . $this->postSeparator;
+ }
+
+ // Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND")
+ if (stripos($queryPart, ' OR ') !== false || stripos($queryPart, ' AND ') !== false) {
+ return $this->preSeparator . $queryPart . $this->postSeparator;
+ }
+
+ return $queryPart;
+ }
+}