Permalink
Browse files

Merge pull request #2698 from bcrowe/3.0-ext-assoc-trait

3.0 - Fix a couple things for external association trait
  • Loading branch information...
2 parents 36dd94f + 4c8db31 commit cec830784eef2d63b0991eab3a31b5fbbb0e1829 @markstory markstory committed Jan 22, 2014
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/ORM/Association/ExternalAssociationTrait.php
@@ -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;
}
@@ -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) {
@@ -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) {

0 comments on commit cec8307

Please sign in to comment.