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.

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

Fix for #1021 and preparation for #1012 #1022

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

Conversation

Bonscho
Copy link

@Bonscho Bonscho commented Jan 29, 2016

Contains unanswered PR propelorm/Propel#1011changes also.

Martin Brecht-Precht added 6 commits November 11, 2015 13:53
Especially the doc blocks should now be much better than before.
Especially doc blocks should be much cleaner.
Added `$comparison` as second argument to the `filterByPrimaryKey` methods of the generated query classes.
@@ -670,7 +670,7 @@ protected function addFilterByPrimaryKey(&$script)
*
* @return " . $this->getStubQueryBuilder()->getClassname() . " The current query, for fluid interface
*/
public function filterByPrimaryKey(\$key)
public function filterByPrimaryKey(\$key, \$comparison = Criteria::EQUAL)
{";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice patch ;)
Just a minor suggestion:
add the new "@param string $comparison" in the description of this method ;)

@Bonscho
Copy link
Author

Bonscho commented Jan 29, 2016

You are absolutely right. Thanks.

@havvg
Copy link
Member

havvg commented Jan 29, 2016

+1, but please squash the changes :)

@@ -1,3 +1,51 @@
### JetBrains template
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed from the projects .gitignore.

It should be part of your user specific gitignore (usually at ~/.gitignore configured via core.excludesfile).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jepp. You are right. My very own .gitignore should have not benn part of the commit.

@marcj
Copy link
Member

marcj commented Jan 29, 2016

Well, thanks, but v1 is freezed. We're not going to release any new version soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants