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

Update PropelParamConverter.php #316

Merged
merged 5 commits into from
Apr 13, 2016
Merged

Update PropelParamConverter.php #316

merged 5 commits into from
Apr 13, 2016

Conversation

arffak
Copy link
Contributor

@arffak arffak commented Dec 25, 2014

add "query_method" option equivalence of "repository_method" in doctrine

add "query_method" option equivalence of "repository_method" in doctrine
@marcj
Copy link
Member

marcj commented Dec 27, 2014

Thanks @arffak, can you please fix CS?

@arffak
Copy link
Contributor Author

arffak commented Dec 27, 2014

@marcj FIX CS done

throw new \LogicException('Unable to guess how to get a Propel object from the request information.');
$this->queryMethod = $queryMethod = isset($options['query_method']) ? $options['query_method'] : null;

if ($this->queryMethod != null and \method_exists($classQuery, $this->queryMethod)) {
Copy link
Member

Choose a reason for hiding this comment

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

and \method_exists => && method_exists

@arffak
Copy link
Contributor Author

arffak commented Dec 28, 2014

done

throw new \LogicException('Unable to guess how to get a Propel object from the request information.');
$this->queryMethod = $queryMethod = isset($options['query_method']) ? $options['query_method'] : null;

if ($this->queryMethod != null and method_exists($classQuery, $this->queryMethod)) {
Copy link
Member

Choose a reason for hiding this comment

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

still and

@COil
Copy link

COil commented Jan 13, 2015

👍

@@ -50,6 +50,12 @@ class PropelParamConverter implements ParamConverterInterface
protected $withs;

/**
* name of method use to call a query method
* @var string
Copy link
Member

Choose a reason for hiding this comment

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

There is blank line missing before the @var.

@havvg
Copy link
Member

havvg commented Jun 10, 2015

After applying the outstanding changes, could you please rebase and squash the commits?

@havvg havvg added the Propel2 label Jan 22, 2016
@havvg havvg added this to the 2.0.0-alpha5 milestone Jan 22, 2016
@marcj marcj merged commit bc5a3bb into propelorm:2.0 Apr 13, 2016
@marcj
Copy link
Member

marcj commented Apr 13, 2016

Thanks, I merged and fix this CS myself :)

marcj pushed a commit that referenced this pull request Apr 13, 2016
* Update PropelParamConverter.php

add "query_method" option equivalence of "repository_method" in doctrine

* FIX CS

* FIX CS

* \method_exists => && method_exists

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

Successfully merging this pull request may close these issues.

4 participants