Permalink
Browse files

Revert "Modifying Collection and Entity so that you can pass in $opti…

…ons if you so desire. This allows you to"

This reverts commit 348231d.
  • Loading branch information...
1 parent f64f69c commit 2a405a0965e48c3818cd646141801a55ae7ecac1 @coogle committed Dec 26, 2012
Showing with 4 additions and 9 deletions.
  1. +2 −7 data/Collection.php
  2. +2 −2 data/Entity.php
View
9 data/Collection.php
@@ -492,13 +492,8 @@ public function sort($field = 'id', array $options = array()) {
*
* @return array Returns the array value of the data in this `Collection`.
*/
- public function data(array $options = array()) {
- $defaults = array(
- 'indexed' => null
- );
-
- $options += $defaults;
- return $this->to('array', $options);
+ public function data() {
+ return $this->to('array', array('indexed' => null));
}
/**
View
4 data/Entity.php
@@ -218,11 +218,11 @@ public function set(array $data) {
* @param string $name Optionally included field name.
* @return mixed Entire data array if $name is empty, otherwise the value from the named field.
*/
- public function data($name = null, array $options = array()) {
+ public function data($name = null) {
if ($name) {
return $this->__get($name);
}
- return $this->to('array', $options);
+ return $this->to('array');
}
/**

0 comments on commit 2a405a0

Please sign in to comment.