Skip to content

Commit

Permalink
Fix a couple things for external association trait
Browse files Browse the repository at this point in the history
  • Loading branch information
bcrowe committed Jan 22, 2014
1 parent 36dd94f commit 4c8db31
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/ORM/Association/ExternalAssociationTrait.php
Expand Up @@ -66,10 +66,10 @@ public function foreignKey($key = null) {
/**
* Sets the sort order in which target records should be returned.
* If no arguments are passed the currently configured value is returned
*
* @return string
* @param mixed $sort A find() compatible order clause
* @return mixed
*/
function sort($sort = null) {
public function sort($sort = null) {
if ($sort !== null) {
$this->_sort = $sort;
}
Expand Down Expand Up @@ -283,7 +283,7 @@ protected function _addFilteringCondition($query, $key, $filter) {
* Generates a string used as a table field that contains the values upon
* which the filter should be applied
*
* params array $options
* @param array $options
* @return string
*/
protected function _linkField($options) {
Expand Down Expand Up @@ -325,8 +325,8 @@ protected function _buildSubquery($query, $foreignKey) {

/**
* Parse extra options passed in the constructor.
* @param array $opts original list of options passed in constructor
*
* @param array $opts original list of options passed in constructor
* @return void
*/
protected function _options(array $opts) {
Expand Down

0 comments on commit 4c8db31

Please sign in to comment.