Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed invalid return value of PHPDoc #998

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed invalid return value of PHPDoc #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8228d7
Fixed invalid return value of PHPDoc
romantymoshyk Aug 11, 2015
d52ab65
Fixed PHPDoc value and default comparison criteria changed to null
romantymoshyk Aug 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generator/lib/builder/om/QueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions generator/lib/model/ScopedElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected function setupObject()
/**
* Get the value of the namespace.
*
* @return value of namespace.
* @return string
*/
public function getNamespace()
{
Expand All @@ -95,7 +95,7 @@ public function setNamespace($v)
/**
* Get the value of package.
*
* @return value of package.
* @return string
*/
public function getPackage()
{
Expand All @@ -119,7 +119,7 @@ public function setPackage($v)
/**
* Get the value of schema.
*
* @return value of schema.
* @return string
*/
public function getSchema()
{
Expand Down