Skip to content
Permalink
Browse files

minors corrections

- correct return type
- remove extra unused parameter
- add missing class attribute definition
  • Loading branch information...
antograssiot committed Aug 31, 2015
1 parent bbe5357 commit 6906f6851dd94705e56b9622a8bd7ae73cdbaccb
Showing with 10 additions and 3 deletions.
  1. +2 −2 src/Database/Type/DateTimeType.php
  2. +1 −1 src/ORM/Association.php
  3. +7 −0 src/View/Helper/PaginatorHelper.php
@@ -99,7 +99,7 @@ public function toDatabase($value, Driver $driver)
* *
* @param string $value The value to convert. * @param string $value The value to convert.
* @param Driver $driver The driver instance to convert with. * @param Driver $driver The driver instance to convert with.
* @return \Cake\I18n\Time|DateTime * @return \Cake\I18n\Time|\DateTime
*/ */
public function toPHP($value, Driver $driver) public function toPHP($value, Driver $driver)
{ {
@@ -119,7 +119,7 @@ public function toPHP($value, Driver $driver)
* Convert request data into a datetime object. * Convert request data into a datetime object.
* *
* @param mixed $value Request data * @param mixed $value Request data
* @return \Cake\I18n\Time|DateTime * @return \Cake\I18n\Time|\DateTime
*/ */
public function marshal($value) public function marshal($value)
{ {
@@ -609,7 +609,7 @@ public function defaultRowValue($row, $joined)
public function find($type = null, array $options = []) public function find($type = null, array $options = [])
{ {
$type = $type ?: $this->finder(); $type = $type ?: $this->finder();
list($type, $opts) = $this->_extractFinder($type, $options); list($type, $opts) = $this->_extractFinder($type);
return $this->target() return $this->target()
->find($type, $options + $opts) ->find($type, $options + $opts)
->where($this->conditions()); ->where($this->conditions());
@@ -81,6 +81,13 @@ class PaginatorHelper extends Helper
] ]
]; ];
/**
* Default model of the paged sets
*
* @var string
*/
protected $_defaultModel;
/** /**
* Constructor. Overridden to merge passed args with URL options. * Constructor. Overridden to merge passed args with URL options.
* *

0 comments on commit 6906f68

Please sign in to comment.
You can’t perform that action at this time.