From a8228d764e430eee947e627bd155201df6edd993 Mon Sep 17 00:00:00 2001
From: Roman Tymoshyk <tymoshyk.roman@gmail.com>
Date: Tue, 11 Aug 2015 15:52:00 +0300
Subject: [PATCH 1/2] Fixed invalid return value of PHPDoc

---
 generator/lib/model/ScopedElement.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generator/lib/model/ScopedElement.php b/generator/lib/model/ScopedElement.php
index bca8cb542..b5c661f24 100644
--- a/generator/lib/model/ScopedElement.php
+++ b/generator/lib/model/ScopedElement.php
@@ -68,7 +68,7 @@ protected function setupObject()
     /**
      * Get the value of the namespace.
      *
-     * @return value of namespace.
+     * @return string
      */
     public function getNamespace()
     {
@@ -95,7 +95,7 @@ public function setNamespace($v)
     /**
      * Get the value of package.
      *
-     * @return value of package.
+     * @return string
      */
     public function getPackage()
     {
@@ -119,7 +119,7 @@ public function setPackage($v)
     /**
      * Get the value of schema.
      *
-     * @return value of schema.
+     * @return string
      */
     public function getSchema()
     {

From d52ab6524a6d89c3e1bec4face3f7f0dc0ffb0c8 Mon Sep 17 00:00:00 2001
From: Roman Tymoshyk <tymoshyk.roman@gmail.com>
Date: Thu, 13 Aug 2015 13:55:52 +0300
Subject: [PATCH 2/2] Fixed PHPDoc value and default comparison criteria
 changed to null

---
 generator/lib/builder/om/QueryBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generator/lib/builder/om/QueryBuilder.php b/generator/lib/builder/om/QueryBuilder.php
index 7875f5bb7..104b0805f 100644
--- a/generator/lib/builder/om/QueryBuilder.php
+++ b/generator/lib/builder/om/QueryBuilder.php
@@ -1282,12 +1282,12 @@ protected function addFilterByCrossFK(&$script, $refFK, $crossFK)
      * Filter the query by a related $fkPhpName object
      * using the $crossTableName table as cross reference
      *
-     * @param   $fkPhpName $objectName the related object to use as filter
+     * @param   $fkPhpName|PropelObjectCollection $objectName the related object to use as filter
      * @param     string \$comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return   $queryClass The current query, for fluid interface
      */
-    public function filterBy{$relName}($objectName, \$comparison = Criteria::EQUAL)
+    public function filterBy{$relName}($objectName, \$comparison = null)
     {
         return \$this
             ->use{$relationName}Query()