adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch usage to Hash where possible.

Browse source
This commit is contained in:
mark_story 2012-03-10 20:57:18 -05:00
parent 29048b3bb7
commit 19e0d8d946
43 changed files with 148 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Configure/IniReader.php
View file

@ -127,7 +127,7 @@ class IniReader implements ConfigReaderInterface {
$value = false; $value = false;
} }
if (strpos($key, '.') !== false) { if (strpos($key, '.') !== false) {
$values = Set::insert($values, $key, $value); $values = Hash::insert($values, $key, $value);
} else { } else {
$values[$key] = $value; $values[$key] = $value;
} }

4
lib/Cake/Console/Command/AclShell.php
View file

@ -21,6 +21,7 @@ App::uses('Controller', 'Controller');
App::uses('ComponentCollection', 'Controller'); App::uses('ComponentCollection', 'Controller');
App::uses('AclComponent', 'Controller/Component'); App::uses('AclComponent', 'Controller/Component');
App::uses('DbAcl', 'Model'); App::uses('DbAcl', 'Model');
App::uses('Hash', 'Utility');
/** /**
* Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode
@ -558,8 +559,9 @@ class AclShell extends AppShell {
$identifier = var_export($identifier, true); $identifier = var_export($identifier, true);
} }
$this->error(__d('cake_console', 'Could not find node using reference "%s"', $identifier)); $this->error(__d('cake_console', 'Could not find node using reference "%s"', $identifier));
return;
} }
return Set::extract($node, "0.{$class}.id"); return Hash::get($node, "0.{$class}.id");
} }
/** /**

2
lib/Cake/Console/Command/ConsoleShell.php
View file

@ -300,7 +300,7 @@ class ConsoleShell extends AppShell {
break; break;
case (preg_match("/^routes\s+show/i", $command, $tmp) == true): case (preg_match("/^routes\s+show/i", $command, $tmp) == true):
$router = Router::getInstance(); $router = Router::getInstance();
$this->out(implode("\n", Set::extract($router->routes, '{n}.0'))); $this->out(implode("\n", Hash::extract($router->routes, '{n}.0')));
break; break;
case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true): case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true):
if ($url = eval('return array' . $tmp[1] . ';')) { if ($url = eval('return array' . $tmp[1] . ';')) {

3
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -19,6 +19,7 @@
App::uses('AppShell', 'Console/Command'); App::uses('AppShell', 'Console/Command');
App::uses('File', 'Utility'); App::uses('File', 'Utility');
App::uses('Folder', 'Utility'); App::uses('Folder', 'Utility');
App::uses('Hash', 'Utility');
/** /**
* Language string extractor * Language string extractor
@ -431,7 +432,7 @@ class ExtractTask extends AppShell {
return; return;
} }
$dims = Set::countDim($rules); $dims = Hash::dimensions($rules);
if ($dims == 1 || ($dims == 2 && isset($rules['message']))) { if ($dims == 1 || ($dims == 2 && isset($rules['message']))) {
$rules = array($rules); $rules = array($rules);
} }

1
lib/Cake/Controller/Component/Acl/DbAcl.php
View file

@ -13,6 +13,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('AclInterface', 'Controller/Component/Acl'); App::uses('AclInterface', 'Controller/Component/Acl');
App::uses('Hash', 'Utility');
/** /**
* DbAcl implements an ACL control system in the database. ARO's and ACO's are * DbAcl implements an ACL control system in the database. ARO's and ACO's are

4
lib/Cake/Controller/Component/Acl/IniAcl.php
View file

@ -30,7 +30,7 @@ class IniAcl extends Object implements AclInterface {
public $config = null; public $config = null;
/** /**
* The Set::classicExtract() path to the user/aro identifier in the * The Hash::extract() path to the user/aro identifier in the
* acl.ini file. This path will be used to extract the string * acl.ini file. This path will be used to extract the string
* representation of a user used in the ini file. * representation of a user used in the ini file.
* *
@ -97,7 +97,7 @@ class IniAcl extends Object implements AclInterface {
$aclConfig = $this->config; $aclConfig = $this->config;
if (is_array($aro)) { if (is_array($aro)) {
$aro = Set::classicExtract($aro, $this->userPath); $aro = Hash::get($aro, $this->userPath);
} }
if (isset($aclConfig[$aro]['deny'])) { if (isset($aclConfig[$aro]['deny'])) {

2
lib/Cake/Controller/Component/Acl/PhpAcl.php
View file

@ -494,7 +494,7 @@ class PhpAro {
// detect cycles // detect cycles
$roles = $this->roles($dependency); $roles = $this->roles($dependency);
if (in_array($role, Set::flatten($roles))) { if (in_array($role, Hash::flatten($roles))) {
$path = ''; $path = '';
foreach ($roles as $roleDependencies) { foreach ($roles as $roleDependencies) {

4
lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
View file

@ -12,8 +12,8 @@
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Security', 'Utility'); App::uses('Security', 'Utility');
App::uses('Hash', 'Utility');
/** /**
* Base Authentication class with common methods and properties. * Base Authentication class with common methods and properties.
@ -58,7 +58,7 @@ abstract class BaseAuthenticate {
*/ */
public function __construct(ComponentCollection $collection, $settings) { public function __construct(ComponentCollection $collection, $settings) {
$this->_Collection = $collection; $this->_Collection = $collection;
$this->settings = Set::merge($this->settings, $settings); $this->settings = Hash::merge($this->settings, $settings);
} }
/** /**

3
lib/Cake/Controller/Component/Auth/BaseAuthorize.php
View file

@ -12,6 +12,7 @@
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Hash', 'Utility');
/** /**
* Abstract base authorization adapter for AuthComponent. * Abstract base authorization adapter for AuthComponent.
@ -69,7 +70,7 @@ abstract class BaseAuthorize {
$this->_Collection = $collection; $this->_Collection = $collection;
$controller = $collection->getController(); $controller = $collection->getController();
$this->controller($controller); $this->controller($controller);
$this->settings = Set::merge($this->settings, $settings); $this->settings = Hash::merge($this->settings, $settings);
} }
/** /**

6
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -19,11 +19,11 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Component', 'Controller'); App::uses('Component', 'Controller');
App::uses('Router', 'Routing'); App::uses('Router', 'Routing');
App::uses('Security', 'Utility'); App::uses('Security', 'Utility');
App::uses('Debugger', 'Utility'); App::uses('Debugger', 'Utility');
App::uses('Hash', 'Utility');
App::uses('CakeSession', 'Model/Datasource'); App::uses('CakeSession', 'Model/Datasource');
App::uses('BaseAuthorize', 'Controller/Component/Auth'); App::uses('BaseAuthorize', 'Controller/Component/Auth');
App::uses('BaseAuthenticate', 'Controller/Component/Auth'); App::uses('BaseAuthenticate', 'Controller/Component/Auth');
@ -394,7 +394,7 @@ class AuthComponent extends Component {
return; return;
} }
$this->_authorizeObjects = array(); $this->_authorizeObjects = array();
$config = Set::normalize($this->authorize); $config = Hash::normalize((array)$this->authorize);
$global = array(); $global = array();
if (isset($config[AuthComponent::ALL])) { if (isset($config[AuthComponent::ALL])) {
$global = $config[AuthComponent::ALL]; $global = $config[AuthComponent::ALL];
@ -652,7 +652,7 @@ class AuthComponent extends Component {
return; return;
} }
$this->_authenticateObjects = array(); $this->_authenticateObjects = array();
$config = Set::normalize($this->authenticate); $config = Hash::normalize((array)$this->authenticate);
$global = array(); $global = array();
if (isset($config[AuthComponent::ALL])) { if (isset($config[AuthComponent::ALL])) {
$global = $config[AuthComponent::ALL]; $global = $config[AuthComponent::ALL];

7
lib/Cake/Controller/Component/CookieComponent.php
View file

@ -19,6 +19,7 @@
App::uses('Component', 'Controller'); App::uses('Component', 'Controller');
App::uses('Security', 'Utility'); App::uses('Security', 'Utility');
App::uses('Hash', 'Utility');
/** /**
* Cookie Component. * Cookie Component.
@ -239,7 +240,7 @@ class CookieComponent extends Component {
if (!isset($this->_values[$this->name][$names[0]])) { if (!isset($this->_values[$this->name][$names[0]])) {
$this->_values[$this->name][$names[0]] = array(); $this->_values[$this->name][$names[0]] = array();
} }
$this->_values[$this->name][$names[0]] = Set::insert($this->_values[$this->name][$names[0]], $names[1], $value); $this->_values[$this->name][$names[0]] = Hash::insert($this->_values[$this->name][$names[0]], $names[1], $value);
$this->_write('[' . implode('][', $names) . ']', $value); $this->_write('[' . implode('][', $names) . ']', $value);
} }
} }
@ -276,7 +277,7 @@ class CookieComponent extends Component {
} }
if (!empty($names[1])) { if (!empty($names[1])) {
return Set::extract($this->_values[$this->name][$key], $names[1]); return Hash::get($this->_values[$this->name][$key], $names[1]);
} }
return $this->_values[$this->name][$key]; return $this->_values[$this->name][$key];
} }
@ -310,7 +311,7 @@ class CookieComponent extends Component {
} }
$names = explode('.', $key, 2); $names = explode('.', $key, 2);
if (isset($this->_values[$this->name][$names[0]])) { if (isset($this->_values[$this->name][$names[0]])) {
$this->_values[$this->name][$names[0]] = Set::remove($this->_values[$this->name][$names[0]], $names[1]); $this->_values[$this->name][$names[0]] = Hash::remove($this->_values[$this->name][$names[0]], $names[1]);
} }
$this->_delete('[' . implode('][', $names) . ']'); $this->_delete('[' . implode('][', $names) . ']');
} }

3
lib/Cake/Controller/Component/PaginatorComponent.php
View file

@ -16,6 +16,7 @@
* @since CakePHP(tm) v 2.0 * @since CakePHP(tm) v 2.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Hash', 'Utility');
/** /**
* This component is used to handle automatic model data pagination. The primary way to use this * This component is used to handle automatic model data pagination. The primary way to use this
@ -194,7 +195,7 @@ class PaginatorComponent extends Component {
'pageCount' => $pageCount, 'pageCount' => $pageCount,
'order' => $order, 'order' => $order,
'limit' => $limit, 'limit' => $limit,
'options' => Set::diff($options, $defaults), 'options' => Hash::diff($options, $defaults),
'paramType' => $options['paramType'] 'paramType' => $options['paramType']
); );
if (!isset($this->Controller->request['paging'])) { if (!isset($this->Controller->request['paging'])) {

3
lib/Cake/Controller/Component/SecurityComponent.php
View file

@ -19,6 +19,7 @@
App::uses('Component', 'Controller'); App::uses('Component', 'Controller');
App::uses('String', 'Utility'); App::uses('String', 'Utility');
App::uses('Hash', 'Utility');
App::uses('Security', 'Utility'); App::uses('Security', 'Utility');
/** /**
@ -443,7 +444,7 @@ class SecurityComponent extends Component {
$unlocked = explode('|', $unlocked); $unlocked = explode('|', $unlocked);
$lockedFields = array(); $lockedFields = array();
$fields = Set::flatten($check); $fields = Hash::flatten($check);
$fieldList = array_keys($fields); $fieldList = array_keys($fields);
$multi = array(); $multi = array();

8
lib/Cake/Core/Object.php
View file

@ -181,7 +181,7 @@ class Object {
* *
* @param array $properties The name of the properties to merge. * @param array $properties The name of the properties to merge.
* @param string $class The class to merge the property with. * @param string $class The class to merge the property with.
* @param boolean $normalize Set to true to run the properties through Set::normalize() before merging. * @param boolean $normalize Set to true to run the properties through Hash::normalize() before merging.
* @return void * @return void
*/ */
protected function _mergeVars($properties, $class, $normalize = true) { protected function _mergeVars($properties, $class, $normalize = true) {
@ -194,10 +194,10 @@ class Object {
$this->{$var} != $classProperties[$var] $this->{$var} != $classProperties[$var]
) { ) {
if ($normalize) { if ($normalize) {
$classProperties[$var] = Set::normalize($classProperties[$var]); $classProperties[$var] = Hash::normalize($classProperties[$var]);
$this->{$var} = Set::normalize($this->{$var}); $this->{$var} = Hash::normalize($this->{$var});
} }
$this->{$var} = Set::merge($classProperties[$var], $this->{$var}); $this->{$var} = Hash::merge($classProperties[$var], $this->{$var});
} }
} }
} }

3
lib/Cake/Model/Behavior/AclBehavior.php
View file

@ -19,6 +19,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('AclNode', 'Model'); App::uses('AclNode', 'Model');
App::uses('Hash', 'Utility');
/** /**
* ACL behavior * ACL behavior
@ -131,7 +132,7 @@ class AclBehavior extends ModelBehavior {
$types = array($types); $types = array($types);
} }
foreach ($types as $type) { foreach ($types as $type) {
$node = Set::extract($this->node($model, null, $type), "0.{$type}.id"); $node = Hash::extract($this->node($model, null, $type), "0.{$type}.id");
if (!empty($node)) { if (!empty($node)) {
$model->{$type}->delete($node); $model->{$type}->delete($node);
} }

2
lib/Cake/Model/Behavior/ContainableBehavior.php
View file

@ -321,7 +321,7 @@ class ContainableBehavior extends ModelBehavior {
$key = $option; $key = $option;
$optionKey = true; $optionKey = true;
if (!empty($newChildren)) { if (!empty($newChildren)) {
$children = Set::merge($children, $newChildren); $children = Hash::merge($children, $newChildren);
} }
} }
if ($optionKey && isset($children[$key])) { if ($optionKey && isset($children[$key])) {

6
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -363,10 +363,10 @@ class TreeBehavior extends ModelBehavior {
} }
if ($valuePath == null) { if ($valuePath == null) {
$valuePath = array('{0}{1}', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField); $valuePath = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
} elseif (is_string($valuePath)) { } elseif (is_string($valuePath)) {
$valuePath = array('{0}{1}', '{n}.tree_prefix', $valuePath); $valuePath = array('%s%s', '{n}.tree_prefix', $valuePath);
} else { } else {
$valuePath[0] = '{' . (count($valuePath) - 1) . '}' . $valuePath[0]; $valuePath[0] = '{' . (count($valuePath) - 1) . '}' . $valuePath[0];
@ -386,7 +386,7 @@ class TreeBehavior extends ModelBehavior {
if (empty($results)) { if (empty($results)) {
return array(); return array();
} }
return Set::combine($results, $keyPath, $valuePath); return Hash::combine($results, $keyPath, $valuePath);
} }
/** /**

4
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -245,7 +245,7 @@ class CakeSession {
*/ */
public static function delete($name) { public static function delete($name) {
if (self::check($name)) { if (self::check($name)) {
self::_overwrite($_SESSION, Set::remove($_SESSION, $name)); self::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
return (self::check($name) == false); return (self::check($name) == false);
} }
self::_setError(2, __d('cake_dev', "%s doesn't exist", $name)); self::_setError(2, __d('cake_dev', "%s doesn't exist", $name));
@ -452,7 +452,7 @@ class CakeSession {
if (isset($sessionConfig['defaults'])) { if (isset($sessionConfig['defaults'])) {
$defaults = self::_defaultConfig($sessionConfig['defaults']); $defaults = self::_defaultConfig($sessionConfig['defaults']);
if ($defaults) { if ($defaults) {
$sessionConfig = Set::merge($defaults, $sessionConfig); $sessionConfig = Hash::merge($defaults, $sessionConfig);
} }
} }
if (!isset($sessionConfig['ini']['session.cookie_secure']) && env('HTTPS')) { if (!isset($sessionConfig['ini']['session.cookie_secure']) && env('HTTPS')) {

2
lib/Cake/Model/Datasource/Database/Postgres.php
View file

@ -421,7 +421,7 @@ class Postgres extends DboSource {
$match[1] = $this->name($match[1]); $match[1] = $this->name($match[1]);
} elseif (!$constant) { } elseif (!$constant) {
$parts = explode('.', $match[1]); $parts = explode('.', $match[1]);
if (!Set::numeric($parts)) { if (!Hash::numeric($parts)) {
$match[1] = $this->name($match[1]); $match[1] = $this->name($match[1]);
} }
} }

8
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1409,7 +1409,7 @@ class DboSource extends DataSource {
if ($mergeKeys[0] === $dataKeys[0] || $mergeKeys === $dataKeys) { if ($mergeKeys[0] === $dataKeys[0] || $mergeKeys === $dataKeys) {
$data[$association][$association] = $merge[0][$association]; $data[$association][$association] = $merge[0][$association];
} else { } else {
$diff = Set::diff($dataAssocTmp, $mergeAssocTmp); $diff = Hash::diff($dataAssocTmp, $mergeAssocTmp);
$data[$association] = array_merge($merge[0][$association], $diff); $data[$association] = array_merge($merge[0][$association], $diff);
} }
} elseif ($selfJoin && array_key_exists($association, $merge[0])) { } elseif ($selfJoin && array_key_exists($association, $merge[0])) {
@ -1934,7 +1934,7 @@ class DboSource extends DataSource {
return false; return false;
} }
$conditions = $this->conditions(array( $conditions = $this->conditions(array(
$model->primaryKey => Set::extract($idList, "{n}.{$model->alias}.{$model->primaryKey}") $model->primaryKey => Hash::extract($idList, "{n}.{$model->alias}.{$model->primaryKey}")
)); ));
} }
return $conditions; return $conditions;
@ -2256,7 +2256,7 @@ class DboSource extends DataSource {
} else { } else {
if (strpos($fields[$i], ',') === false) { if (strpos($fields[$i], ',') === false) {
$build = explode('.', $fields[$i]); $build = explode('.', $fields[$i]);
if (!Set::numeric($build)) { if (!Hash::numeric($build)) {
$fields[$i] = $this->name(implode('.', $build)); $fields[$i] = $this->name(implode('.', $build));
} }
} }
@ -2268,7 +2268,7 @@ class DboSource extends DataSource {
$field[1] = $this->name($alias . '.' . $field[1]); $field[1] = $this->name($alias . '.' . $field[1]);
} else { } else {
$field[0] = explode('.', $field[1]); $field[0] = explode('.', $field[1]);
if (!Set::numeric($field[0])) { if (!Hash::numeric($field[0])) {
$field[0] = implode('.', array_map(array(&$this, 'name'), $field[0])); $field[0] = implode('.', array_map(array(&$this, 'name'), $field[0]));
$fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1); $fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1);
} }

16
lib/Cake/Model/Model.php
View file

@ -1728,7 +1728,7 @@ class Model extends Object implements CakeEventListener {
$this->getEventManager()->dispatch($event); $this->getEventManager()->dispatch($event);
} }
if (!empty($this->data)) { if (!empty($this->data)) {
$success = Set::merge($success, $this->data); $success = Hash::merge($success, $this->data);
} }
$this->data = false; $this->data = false;
$this->_clearCache(); $this->_clearCache();
@ -1819,7 +1819,7 @@ class Model extends Object implements CakeEventListener {
'fields' => $associationForeignKey, 'fields' => $associationForeignKey,
)); ));
$oldLinks = Set::extract($links, "{n}.{$associationForeignKey}"); $oldLinks = Hash::extract($links, "{n}.{$associationForeignKey}");
if (!empty($oldLinks)) { if (!empty($oldLinks)) {
if ($keepExisting && !empty($newJoins)) { if ($keepExisting && !empty($newJoins)) {
$conditions[$associationForeignKey] = array_diff($oldLinks, $newJoins); $conditions[$associationForeignKey] = array_diff($oldLinks, $newJoins);
@ -1993,7 +1993,7 @@ class Model extends Object implements CakeEventListener {
*/ */
public function saveAll($data = null, $options = array()) { public function saveAll($data = null, $options = array()) {
$options = array_merge(array('validate' => 'first'), $options); $options = array_merge(array('validate' => 'first'), $options);
if (Set::numeric(array_keys($data))) { if (Hash::numeric(array_keys($data))) {
if ($options['validate'] === 'only') { if ($options['validate'] === 'only') {
return $this->validateMany($data, $options); return $this->validateMany($data, $options);
} }
@ -2514,7 +2514,7 @@ class Model extends Object implements CakeEventListener {
return false; return false;
} }
$ids = Set::extract($ids, "{n}.{$this->alias}.{$this->primaryKey}"); $ids = Hash::extract($ids, "{n}.{$this->alias}.{$this->primaryKey}");
if (empty($ids)) { if (empty($ids)) {
return true; return true;
} }
@ -2837,7 +2837,7 @@ class Model extends Object implements CakeEventListener {
return array(); return array();
} }
$lst = $query['list']; $lst = $query['list'];
return Set::combine($results, $lst['keyPath'], $lst['valuePath'], $lst['groupPath']); return Hash::combine($results, $lst['keyPath'], $lst['valuePath'], $lst['groupPath']);
} }
} }
@ -2915,9 +2915,9 @@ class Model extends Object implements CakeEventListener {
if (isset($query['parent'])) { if (isset($query['parent'])) {
$parent = $query['parent']; $parent = $query['parent'];
} }
return Set::nest($results, array( return Hash::nest($results, array(
'idPath' => '/' . $this->alias . '/' . $this->primaryKey, 'idPath' => '{n}.' . $this->alias . '.' . $this->primaryKey,
'parentPath' => '/' . $this->alias . '/' . $parent 'parentPath' => '{n}.' . $this->alias . '.' . $parent
)); ));
} }
} }

10
lib/Cake/Network/CakeRequest.php
View file

@ -153,7 +153,7 @@ class CakeRequest implements ArrayAccess {
* into a single array. Variables prefixed with `data` will overwrite those without. * into a single array. Variables prefixed with `data` will overwrite those without.
* *
* If you have mixed POST values be careful not to make any top level keys numeric * If you have mixed POST values be careful not to make any top level keys numeric
* containing arrays. Set::merge() is used to merge data, and it has possibly * containing arrays. Hash::merge() is used to merge data, and it has possibly
* unexpected behavior in this situation. * unexpected behavior in this situation.
* *
* @return void * @return void
@ -181,7 +181,7 @@ class CakeRequest implements ArrayAccess {
$this->data = $data; $this->data = $data;
} else { } else {
unset($this->data['data']); unset($this->data['data']);
$this->data = Set::merge($this->data, $data); $this->data = Hash::merge($this->data, $data);
} }
} }
} }
@ -519,7 +519,7 @@ class CakeRequest implements ArrayAccess {
public function addDetector($name, $options) { public function addDetector($name, $options) {
$name = strtolower($name); $name = strtolower($name);
if (isset($this->_detectors[$name]) && isset($options['options'])) { if (isset($this->_detectors[$name]) && isset($options['options'])) {
$options = Set::merge($this->_detectors[$name], $options); $options = Hash::merge($this->_detectors[$name], $options);
} }
$this->_detectors[$name] = $options; $this->_detectors[$name] = $options;
} }
@ -748,10 +748,10 @@ class CakeRequest implements ArrayAccess {
public function data($name) { public function data($name) {
$args = func_get_args(); $args = func_get_args();
if (count($args) == 2) { if (count($args) == 2) {
$this->data = Set::insert($this->data, $name, $args[1]); $this->data = Hash::insert($this->data, $name, $args[1]);
return $this; return $this;
} }
return Set::classicExtract($this->data, $name); return Hash::get($this->data, $name);
} }
/** /**

2
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1363,7 +1363,7 @@ class CakeEmail {
$msg = array(); $msg = array();
$contentIds = array_filter((array)Set::classicExtract($this->_attachments, '{s}.contentId')); $contentIds = array_filter((array)Hash::extract($this->_attachments, '{s}.contentId'));
$hasInlineAttachments = count($contentIds) > 0; $hasInlineAttachments = count($contentIds) > 0;
$hasAttachments = !empty($this->_attachments); $hasAttachments = !empty($this->_attachments);
$hasMultipleTypes = count($rendered) > 1; $hasMultipleTypes = count($rendered) > 1;

16
lib/Cake/Network/Http/HttpSocket.php
View file

@ -153,7 +153,7 @@ class HttpSocket extends CakeSocket {
$this->_configUri($config['request']['uri']); $this->_configUri($config['request']['uri']);
unset($config['request']['uri']); unset($config['request']['uri']);
} }
$this->config = Set::merge($this->config, $config); $this->config = Hash::merge($this->config, $config);
} }
parent::__construct($this->config); parent::__construct($this->config);
} }
@ -271,7 +271,7 @@ class HttpSocket extends CakeSocket {
} }
$request['uri'] = $this->url($request['uri']); $request['uri'] = $this->url($request['uri']);
$request['uri'] = $this->_parseUri($request['uri'], true); $request['uri'] = $this->_parseUri($request['uri'], true);
$this->request = Set::merge($this->request, array_diff_key($this->config['request'], array('cookies' => true)), $request); $this->request = Hash::merge($this->request, array_diff_key($this->config['request'], array('cookies' => true)), $request);
$this->_configUri($this->request['uri']); $this->_configUri($this->request['uri']);
@ -446,7 +446,7 @@ class HttpSocket extends CakeSocket {
$uri = $this->_buildUri($uri); $uri = $this->_buildUri($uri);
} }
$request = Set::merge(array('method' => 'GET', 'uri' => $uri), $request); $request = Hash::merge(array('method' => 'GET', 'uri' => $uri), $request);
return $this->request($request); return $this->request($request);
} }
@ -468,7 +468,7 @@ class HttpSocket extends CakeSocket {
* @return mixed Result of request, either false on failure or the response to the request. * @return mixed Result of request, either false on failure or the response to the request.
*/ */
public function post($uri = null, $data = array(), $request = array()) { public function post($uri = null, $data = array(), $request = array()) {
$request = Set::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request); $request = Hash::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request);
return $this->request($request); return $this->request($request);
} }
@ -481,7 +481,7 @@ class HttpSocket extends CakeSocket {
* @return mixed Result of request * @return mixed Result of request
*/ */
public function put($uri = null, $data = array(), $request = array()) { public function put($uri = null, $data = array(), $request = array()) {
$request = Set::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request); $request = Hash::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request);
return $this->request($request); return $this->request($request);
} }
@ -494,7 +494,7 @@ class HttpSocket extends CakeSocket {
* @return mixed Result of request * @return mixed Result of request
*/ */
public function delete($uri = null, $data = array(), $request = array()) { public function delete($uri = null, $data = array(), $request = array()) {
$request = Set::merge(array('method' => 'DELETE', 'uri' => $uri, 'body' => $data), $request); $request = Hash::merge(array('method' => 'DELETE', 'uri' => $uri, 'body' => $data), $request);
return $this->request($request); return $this->request($request);
} }
@ -639,8 +639,8 @@ class HttpSocket extends CakeSocket {
'uri' => array_intersect_key($uri, $this->config['request']['uri']) 'uri' => array_intersect_key($uri, $this->config['request']['uri'])
) )
); );
$this->config = Set::merge($this->config, $config); $this->config = Hash::merge($this->config, $config);
$this->config = Set::merge($this->config, array_intersect_key($this->config['request']['uri'], $this->config)); $this->config = Hash::merge($this->config, array_intersect_key($this->config['request']['uri'], $this->config));
return true; return true;
} }

2
lib/Cake/Routing/Route/CakeRoute.php
View file

@ -494,7 +494,7 @@ class CakeRoute {
$named = array(); $named = array();
foreach ($params['named'] as $key => $value) { foreach ($params['named'] as $key => $value) {
if (is_array($value)) { if (is_array($value)) {
$flat = Set::flatten($value, ']['); $flat = Hash::flatten($value, '][');
foreach ($flat as $namedKey => $namedValue) { foreach ($flat as $namedKey => $namedValue) {
$named[] = $key . "[$namedKey]" . $separator . rawurlencode($namedValue); $named[] = $key . "[$namedKey]" . $separator . rawurlencode($namedValue);
} }

4
lib/Cake/Routing/Router.php
View file

@ -890,7 +890,7 @@ class Router {
} }
} }
list($args, $named) = array(Set::filter($args, true), Set::filter($named, true)); list($args, $named) = array(Hash::filter($args), Hash::filter($named));
foreach (self::$_prefixes as $prefix) { foreach (self::$_prefixes as $prefix) {
if (!empty($url[$prefix])) { if (!empty($url[$prefix])) {
$url['action'] = str_replace($prefix . '_', '', $url['action']); $url['action'] = str_replace($prefix . '_', '', $url['action']);
@ -923,7 +923,7 @@ class Router {
if (!empty($named)) { if (!empty($named)) {
foreach ($named as $name => $value) { foreach ($named as $name => $value) {
if (is_array($value)) { if (is_array($value)) {
$flattend = Set::flatten($value, ']['); $flattend = Hash::flatten($value, '][');
foreach ($flattend as $namedKey => $namedValue) { foreach ($flattend as $namedKey => $namedValue) {
$output .= '/' . $name . "[$namedKey]" . self::$_namedConfig['separator'] . rawurlencode($namedValue); $output .= '/' . $name . "[$namedKey]" . self::$_namedConfig['separator'] . rawurlencode($namedValue);
} }

2
lib/Cake/Test/Case/Console/ShellTest.php
View file

@ -161,7 +161,7 @@ class ShellTest extends CakeTestCase {
$this->assertEquals($expected, $this->Shell->tasks); $this->assertEquals($expected, $this->Shell->tasks);
$expected = array('Fixture' => null, 'DbConfig' => array('one', 'two')); $expected = array('Fixture' => null, 'DbConfig' => array('one', 'two'));
$this->assertEquals($expected, Set::normalize($this->Shell->tasks), 'Normalized results are wrong.'); $this->assertEquals($expected, Hash::normalize($this->Shell->tasks), 'Normalized results are wrong.');
$this->assertEquals(array('Comment', 'Posts'), $this->Shell->uses, 'Merged models are wrong.'); $this->assertEquals(array('Comment', 'Posts'), $this->Shell->uses, 'Merged models are wrong.');
} }

38
lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
View file

@ -108,7 +108,7 @@ class PaginatorControllerPost extends CakeTestModel {
public function find($conditions = null, $fields = array(), $order = null, $recursive = null) { public function find($conditions = null, $fields = array(), $order = null, $recursive = null) {
if ($conditions == 'popular') { if ($conditions == 'popular') {
$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1'); $conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
$options = Set::merge($fields, compact('conditions')); $options = Hash::merge($fields, compact('conditions'));
return parent::find('all', $options); return parent::find('all', $options);
} }
return parent::find($conditions, $fields); return parent::find($conditions, $fields);
@ -352,47 +352,47 @@ class PaginatorComponentTest extends CakeTestCase {
$Controller->request->query = array(); $Controller->request->query = array();
$Controller->constructClasses(); $Controller->constructClasses();
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerComment'), '{n}.PaginatorControllerComment.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerComment'), '{n}.PaginatorControllerComment.id');
$this->assertEquals(array(1, 2, 3, 4, 5, 6), $results); $this->assertEquals(array(1, 2, 3, 4, 5, 6), $results);
$Controller->modelClass = null; $Controller->modelClass = null;
$Controller->uses[0] = 'Plugin.PaginatorControllerPost'; $Controller->uses[0] = 'Plugin.PaginatorControllerPost';
$results = Set::extract($Controller->Paginator->paginate(), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate(), '{n}.PaginatorControllerPost.id');
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$Controller->request->params['named'] = array('page' => '-1'); $Controller->request->params['named'] = array('page' => '-1');
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'asc'); $Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'asc');
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'desc'); $Controller->request->params['named'] = array('sort' => 'PaginatorControllerPost.id', 'direction' => 'desc');
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(3, 2, 1), $results); $this->assertEquals(array(3, 2, 1), $results);
$Controller->request->params['named'] = array('sort' => 'id', 'direction' => 'desc'); $Controller->request->params['named'] = array('sort' => 'id', 'direction' => 'desc');
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(3, 2, 1), $results); $this->assertEquals(array(3, 2, 1), $results);
$Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc'); $Controller->request->params['named'] = array('sort' => 'NotExisting.field', 'direction' => 'desc');
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page'], 'Invalid field in query %s'); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page'], 'Invalid field in query %s');
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$Controller->request->params['named'] = array( $Controller->request->params['named'] = array(
'sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase' 'sort' => 'PaginatorControllerPost.author_id', 'direction' => 'allYourBase'
); );
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals(array('PaginatorControllerPost.author_id' => 'asc'), $Controller->PaginatorControllerPost->lastQueries[1]['order'][0]); $this->assertEquals(array('PaginatorControllerPost.author_id' => 'asc'), $Controller->PaginatorControllerPost->lastQueries[1]['order'][0]);
$this->assertEquals(array(1, 3, 2), $results); $this->assertEquals(array(1, 3, 2), $results);
@ -469,7 +469,7 @@ class PaginatorComponentTest extends CakeTestCase {
$Controller->request->params['named'] = array('page' => '-1', 'contain' => array('PaginatorControllerComment')); $Controller->request->params['named'] = array('page' => '-1', 'contain' => array('PaginatorControllerComment'));
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(1, 2, 3), Set::extract($result, '{n}.PaginatorControllerPost.id')); $this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain'])); $this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
$Controller->request->params['named'] = array('page' => '-1'); $Controller->request->params['named'] = array('page' => '-1');
@ -482,7 +482,7 @@ class PaginatorComponentTest extends CakeTestCase {
); );
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']); $this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
$this->assertEquals(array(1, 2, 3), Set::extract($result, '{n}.PaginatorControllerPost.id')); $this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
$this->assertTrue(isset($Controller->PaginatorControllerPost->lastQueries[1]['contain'])); $this->assertTrue(isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
$Controller->Paginator->settings = array( $Controller->Paginator->settings = array(
@ -491,7 +491,7 @@ class PaginatorComponentTest extends CakeTestCase {
), ),
); );
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(array(2, 3), Set::extract($result, '{n}.PaginatorControllerPost.id')); $this->assertEquals(array(2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
$this->assertEquals(array('PaginatorControllerPost.id > ' => '1'), $Controller->PaginatorControllerPost->lastQueries[1]['conditions']); $this->assertEquals(array('PaginatorControllerPost.id > ' => '1'), $Controller->PaginatorControllerPost->lastQueries[1]['conditions']);
$Controller->request->params['named'] = array('limit' => 12); $Controller->request->params['named'] = array('limit' => 12);
@ -566,7 +566,7 @@ class PaginatorComponentTest extends CakeTestCase {
); );
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(array(2, 3), Set::extract($result, '{n}.PaginatorControllerPost.id')); $this->assertEquals(array(2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
$this->assertEquals( $this->assertEquals(
$Controller->PaginatorControllerPost->lastQueries[1]['conditions'], $Controller->PaginatorControllerPost->lastQueries[1]['conditions'],
array('PaginatorControllerPost.id > ' => '1') array('PaginatorControllerPost.id > ' => '1')
@ -589,7 +589,7 @@ class PaginatorComponentTest extends CakeTestCase {
'maxLimit' => 10, 'maxLimit' => 10,
'paramType' => 'named' 'paramType' => 'named'
); );
$results = Set::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id'); $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
$this->assertEquals('PaginatorControllerPost.id DESC', $Controller->params['paging']['PaginatorControllerPost']['order']); $this->assertEquals('PaginatorControllerPost.id DESC', $Controller->params['paging']['PaginatorControllerPost']['order']);
$this->assertEquals(array(3, 2, 1), $results); $this->assertEquals(array(3, 2, 1), $results);
} }
@ -615,7 +615,7 @@ class PaginatorComponentTest extends CakeTestCase {
'paramType' => 'named' 'paramType' => 'named'
); );
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(array(4, 3, 2), Set::extract($result, '{n}.PaginatorControllerPost.offset_test')); $this->assertEquals(array(4, 3, 2), Hash::extract($result, '{n}.PaginatorControllerPost.offset_test'));
$Controller->request->params['named'] = array('sort' => 'offset_test', 'direction' => 'asc'); $Controller->request->params['named'] = array('sort' => 'offset_test', 'direction' => 'asc');
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
@ -639,11 +639,11 @@ class PaginatorComponentTest extends CakeTestCase {
'paramType' => 'named' 'paramType' => 'named'
); );
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(array(4, 2, 2), Set::extract($result, '{n}.PaginatorAuthor.joined_offset')); $this->assertEquals(array(4, 2, 2), Hash::extract($result, '{n}.PaginatorAuthor.joined_offset'));
$Controller->request->params['named'] = array('sort' => 'PaginatorAuthor.joined_offset', 'direction' => 'asc'); $Controller->request->params['named'] = array('sort' => 'PaginatorAuthor.joined_offset', 'direction' => 'asc');
$result = $Controller->Paginator->paginate('PaginatorControllerPost'); $result = $Controller->Paginator->paginate('PaginatorControllerPost');
$this->assertEquals(array(2, 2, 4), Set::extract($result, '{n}.PaginatorAuthor.joined_offset')); $this->assertEquals(array(2, 2, 4), Hash::extract($result, '{n}.PaginatorAuthor.joined_offset'));
} }
/** /**
@ -968,7 +968,7 @@ class PaginatorComponentTest extends CakeTestCase {
); );
$Controller->passedArgs = array('sort' => 'PaginatorControllerPost.title', 'dir' => 'asc'); $Controller->passedArgs = array('sort' => 'PaginatorControllerPost.title', 'dir' => 'asc');
$result = $Controller->paginate('PaginatorControllerComment'); $result = $Controller->paginate('PaginatorControllerComment');
$this->assertEquals(array(1, 2, 3, 4, 5, 6), Set::extract($result, '{n}.PaginatorControllerComment.id')); $this->assertEquals(array(1, 2, 3, 4, 5, 6), Hash::extract($result, '{n}.PaginatorControllerComment.id'));
} }
/** /**

6
lib/Cake/Test/Case/Controller/ControllerTest.php
View file

@ -104,7 +104,7 @@ class ControllerPost extends CakeTestModel {
public function find($type = 'first', $options = array()) { public function find($type = 'first', $options = array()) {
if ($type == 'popular') { if ($type == 'popular') {
$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1'); $conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
$options = Set::merge($options, compact('conditions')); $options = Hash::merge($options, compact('conditions'));
return parent::find('all', $options); return parent::find('all', $options);
} }
return parent::find($type, $options); return parent::find($type, $options);
@ -898,7 +898,7 @@ class ControllerTest extends CakeTestCase {
$this->assertEquals(0, count(array_diff_key($TestController->helpers, array_flip($helpers)))); $this->assertEquals(0, count(array_diff_key($TestController->helpers, array_flip($helpers))));
$this->assertEquals(0, count(array_diff($TestController->uses, $uses))); $this->assertEquals(0, count(array_diff($TestController->uses, $uses)));
$this->assertEquals(count(array_diff_assoc(Set::normalize($TestController->components), Set::normalize($components))), 0); $this->assertEquals(count(array_diff_assoc(Hash::normalize($TestController->components), Hash::normalize($components))), 0);
$expected = array('ControllerComment', 'ControllerAlias', 'ControllerPost'); $expected = array('ControllerComment', 'ControllerAlias', 'ControllerPost');
$this->assertEquals($expected, $TestController->uses, '$uses was merged incorrectly, ControllerTestAppController models should be last.'); $this->assertEquals($expected, $TestController->uses, '$uses was merged incorrectly, ControllerTestAppController models should be last.');
@ -1275,7 +1275,7 @@ class ControllerTest extends CakeTestCase {
$expected = array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'); $expected = array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named');
$this->assertEquals($expected, $Controller->paginate); $this->assertEquals($expected, $Controller->paginate);
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id'); $results = Hash::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
$this->assertEquals(array(1, 2, 3), $results); $this->assertEquals(array(1, 2, 3), $results);
$Controller->passedArgs = array(); $Controller->passedArgs = array();

28
lib/Cake/Test/Case/Model/AclNodeTest.php
View file

@ -254,35 +254,33 @@ class AclNodeTest extends CakeTestCase {
*/ */
public function testNode() { public function testNode() {
$Aco = new DbAcoTest(); $Aco = new DbAcoTest();
$result = Set::extract($Aco->node('Controller1'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller1'), '{n}.DbAcoTest.id');
$expected = array(2, 1); $expected = array(2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller1/action1'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller1/action1'), '{n}.DbAcoTest.id');
$expected = array(3, 2, 1); $expected = array(3, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller2/action1'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller2/action1'), '{n}.DbAcoTest.id');
$expected = array(7, 6, 1); $expected = array(7, 6, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller1/action2'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller1/action2'), '{n}.DbAcoTest.id');
$expected = array(5, 2, 1); $expected = array(5, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller1/action1/record1'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller1/action1/record1'), '{n}.DbAcoTest.id');
$expected = array(4, 3, 2, 1); $expected = array(4, 3, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller2/action1/record1'), '{n}.DbAcoTest.id'); $result = Hash::extract($Aco->node('Controller2/action1/record1'), '{n}.DbAcoTest.id');
$expected = array(8, 7, 6, 1); $expected = array(8, 7, 6, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::extract($Aco->node('Controller2/action3'), '{n}.DbAcoTest.id'); $this->assertFalse($Aco->node('Controller2/action3'));
$this->assertNull($result);
$result = Set::extract($Aco->node('Controller2/action3/record5'), '{n}.DbAcoTest.id'); $this->assertFalse($Aco->node('Controller2/action3/record5'));
$this->assertNull($result);
$result = $Aco->node(''); $result = $Aco->node('');
$this->assertEquals(null, $result); $this->assertEquals(null, $result);
@ -307,12 +305,12 @@ class AclNodeTest extends CakeTestCase {
public function testNodeArrayFind() { public function testNodeArrayFind() {
$Aro = new DbAroTest(); $Aro = new DbAroTest();
Configure::write('DbAclbindMode', 'string'); Configure::write('DbAclbindMode', 'string');
$result = Set::extract($Aro->node(array('DbAroUserTest' => array('id' => '1', 'foreign_key' => '1'))), '{n}.DbAroTest.id'); $result = Hash::extract($Aro->node(array('DbAroUserTest' => array('id' => '1', 'foreign_key' => '1'))), '{n}.DbAroTest.id');
$expected = array(3, 2, 1); $expected = array(3, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
Configure::write('DbAclbindMode', 'array'); Configure::write('DbAclbindMode', 'array');
$result = Set::extract($Aro->node(array('DbAroUserTest' => array('id' => 4, 'foreign_key' => 2))), '{n}.DbAroTest.id'); $result = Hash::extract($Aro->node(array('DbAroUserTest' => array('id' => 4, 'foreign_key' => 2))), '{n}.DbAroTest.id');
$expected = array(4); $expected = array(4);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
@ -326,12 +324,12 @@ class AclNodeTest extends CakeTestCase {
$Aro = new DbAroTest(); $Aro = new DbAroTest();
$Model = new DbAroUserTest(); $Model = new DbAroUserTest();
$Model->id = 1; $Model->id = 1;
$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id'); $result = Hash::extract($Aro->node($Model), '{n}.DbAroTest.id');
$expected = array(3, 2, 1); $expected = array(3, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$Model->id = 2; $Model->id = 2;
$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id'); $result = Hash::extract($Aro->node($Model), '{n}.DbAroTest.id');
$expected = array(4, 2, 1); $expected = array(4, 2, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
@ -379,7 +377,7 @@ class AclNodeTest extends CakeTestCase {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$node = $Aro->node(array('TestPlugin.TestPluginAuthUser' => array('id' => 1, 'user' => 'mariano'))); $node = $Aro->node(array('TestPlugin.TestPluginAuthUser' => array('id' => 1, 'user' => 'mariano')));
$result = Set::extract($node, '0.DbAroTest.id'); $result = Hash::get($node, '0.DbAroTest.id');
$expected = $Aro->id; $expected = $Aro->id;
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
CakePlugin::unload('TestPlugin'); CakePlugin::unload('TestPlugin');

4
lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
View file

@ -631,8 +631,8 @@ class TranslateBehaviorTest extends CakeTestCase {
$translations = array('title' => 'Title', 'content' => 'Content'); $translations = array('title' => 'Title', 'content' => 'Content');
$TestModel->bindTranslation($translations, false); $TestModel->bindTranslation($translations, false);
$result = $TestModel->read(null, 1); $result = $TestModel->read(null, 1);
$result['Title'] = Set::sort($result['Title'], '{n}.id', 'asc'); $result['Title'] = Hash::sort($result['Title'], '{n}.id', 'asc');
$result['Content'] = Set::sort($result['Content'], '{n}.id', 'asc'); $result['Content'] = Hash::sort($result['Content'], '{n}.id', 'asc');
$expected = array( $expected = array(
'TranslatedItem' => array('id' => 1, 'slug' => 'first_translated', 'locale' => 'cze', 'title' => 'Titulek #1', 'content' => 'Upraveny obsah #1'), 'TranslatedItem' => array('id' => 1, 'slug' => 'first_translated', 'locale' => 'cze', 'title' => 'Titulek #1', 'content' => 'Upraveny obsah #1'),
'Title' => array( 'Title' => array(

12
lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View file

@ -102,7 +102,7 @@ class TestBehavior extends ModelBehavior {
return null; return null;
break; break;
case 'modify': case 'modify':
return Set::extract($results, "{n}.{$model->alias}"); return Hash::extract($results, "{n}.{$model->alias}");
break; break;
} }
} }
@ -839,7 +839,7 @@ class BehaviorCollectionTest extends CakeTestCase {
$this->assertSame($expected, $result); $this->assertSame($expected, $result);
$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify')); $Sample->Behaviors->attach('Test', array('beforeSave' => 'modify'));
$expected = Set::insert($record, 'Sample.name', 'sample99 modified before'); $expected = Hash::insert($record, 'Sample.name', 'sample99 modified before');
$Sample->create(); $Sample->create();
$result = $Sample->save($record); $result = $Sample->save($record);
$expected['Sample']['id'] = $Sample->id; $expected['Sample']['id'] = $Sample->id;
@ -849,14 +849,14 @@ class BehaviorCollectionTest extends CakeTestCase {
$this->assertSame($record, $Sample->save($record)); $this->assertSame($record, $Sample->save($record));
$Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'on')); $Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'on'));
$expected = Set::merge($record, array('Sample' => array('aftersave' => 'modified after on create'))); $expected = Hash::merge($record, array('Sample' => array('aftersave' => 'modified after on create')));
$Sample->create(); $Sample->create();
$result = $Sample->save($record); $result = $Sample->save($record);
$expected['Sample']['id'] = $Sample->id; $expected['Sample']['id'] = $Sample->id;
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify', 'afterSave' => 'modify')); $Sample->Behaviors->attach('Test', array('beforeSave' => 'modify', 'afterSave' => 'modify'));
$expected = Set::merge($record, array('Sample' => array('name' => 'sample99 modified before modified after on create'))); $expected = Hash::merge($record, array('Sample' => array('name' => 'sample99 modified before modified after on create')));
$Sample->create(); $Sample->create();
$result = $Sample->save($record); $result = $Sample->save($record);
$expected['Sample']['id'] = $Sample->id; $expected['Sample']['id'] = $Sample->id;
@ -881,12 +881,12 @@ class BehaviorCollectionTest extends CakeTestCase {
$record2 = $Sample->read(null, 1); $record2 = $Sample->read(null, 1);
$Sample->Behaviors->attach('Test', array('afterSave' => 'on')); $Sample->Behaviors->attach('Test', array('afterSave' => 'on'));
$expected = Set::merge($record2, array('Sample' => array('aftersave' => 'modified after'))); $expected = Hash::merge($record2, array('Sample' => array('aftersave' => 'modified after')));
$Sample->create(); $Sample->create();
$this->assertSame($expected, $Sample->save($record2)); $this->assertSame($expected, $Sample->save($record2));
$Sample->Behaviors->attach('Test', array('afterSave' => 'modify')); $Sample->Behaviors->attach('Test', array('afterSave' => 'modify'));
$expected = Set::merge($record2, array('Sample' => array('name' => 'sample1 modified after'))); $expected = Hash::merge($record2, array('Sample' => array('name' => 'sample1 modified after')));
$Sample->create(); $Sample->create();
$this->assertSame($expected, $Sample->save($record2)); $this->assertSame($expected, $Sample->save($record2));
} }

18
lib/Cake/Test/Case/Model/ModelReadTest.php
View file

@ -3015,7 +3015,7 @@ class ModelReadTest extends BaseModelTest {
$this->loadFixtures('Apple', 'Sample'); $this->loadFixtures('Apple', 'Sample');
$Apple = new Apple(); $Apple = new Apple();
$result = $Apple->find('threaded'); $result = $Apple->find('threaded');
$result = Set::extract($result, '{n}.children'); $result = Hash::extract($result, '{n}.children');
$expected = array(array(), array(), array(), array(), array(), array(), array()); $expected = array(array(), array(), array(), array(), array(), array(), array());
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
@ -3030,7 +3030,7 @@ class ModelReadTest extends BaseModelTest {
$Model = new Person(); $Model = new Person();
$Model->recursive = -1; $Model->recursive = -1;
$result = $Model->find('threaded'); $result = $Model->find('threaded');
$result = Set::extract($result, '{n}.children'); $result = Hash::extract($result, '{n}.children');
$expected = array(array(), array(), array(), array(), array(), array(), array()); $expected = array(array(), array(), array(), array(), array(), array(), array());
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
@ -6479,7 +6479,7 @@ class ModelReadTest extends BaseModelTest {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
$result = Set::combine( $result = Hash::combine(
$TestModel->find('all', array( $TestModel->find('all', array(
'order' => 'Article.title ASC', 'order' => 'Article.title ASC',
'fields' => array('id', 'title') 'fields' => array('id', 'title')
@ -6493,7 +6493,7 @@ class ModelReadTest extends BaseModelTest {
); );
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::combine( $result = Hash::combine(
$TestModel->find('all', array( $TestModel->find('all', array(
'order' => 'Article.title ASC' 'order' => 'Article.title ASC'
)), )),
@ -6530,7 +6530,7 @@ class ModelReadTest extends BaseModelTest {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::combine( $result = Hash::combine(
$TestModel->find('all', array( $TestModel->find('all', array(
'order' => 'Article.title ASC' 'order' => 'Article.title ASC'
)), )),
@ -6569,7 +6569,7 @@ class ModelReadTest extends BaseModelTest {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = Set::combine( $result = Hash::combine(
$TestModel->find('all', array( $TestModel->find('all', array(
'order' => 'Article.title ASC', 'order' => 'Article.title ASC',
'fields' => array('id', 'title', 'user_id') 'fields' => array('id', 'title', 'user_id')
@ -7689,17 +7689,17 @@ class ModelReadTest extends BaseModelTest {
$Post->Author->virtualFields = array('joined' => 'Post.id * Author.id'); $Post->Author->virtualFields = array('joined' => 'Post.id * Author.id');
$result = $Post->find('all'); $result = $Post->find('all');
$result = Set::extract('{n}.Author.joined', $result); $result = Hash::extract($result, '{n}.Author.joined');
$expected = array(1, 6, 3); $expected = array(1, 6, 3);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $Post->find('all', array('order' => array('Author.joined' => 'ASC'))); $result = $Post->find('all', array('order' => array('Author.joined' => 'ASC')));
$result = Set::extract('{n}.Author.joined', $result); $result = Hash::extract($result, '{n}.Author.joined');
$expected = array(1, 3, 6); $expected = array(1, 3, 6);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $Post->find('all', array('order' => array('Author.joined' => 'DESC'))); $result = $Post->find('all', array('order' => array('Author.joined' => 'DESC')));
$result = Set::extract('{n}.Author.joined', $result); $result = Hash::extract($result, '{n}.Author.joined');
$expected = array(6, 3, 1); $expected = array(6, 3, 1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }

20
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -411,7 +411,7 @@ class ModelWriteTest extends BaseModelTest {
$Category = new CategoryThread(); $Category = new CategoryThread();
$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count'; $Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
$Category->updateCounterCache(array('parent_id' => 5)); $Category->updateCounterCache(array('parent_id' => 5));
$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count'); $result = Hash::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
$expected = array(1); $expected = array(1);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
@ -1680,7 +1680,7 @@ class ModelWriteTest extends BaseModelTest {
$TestModel->id = 2; $TestModel->id = 2;
$TestModel->save($data); $TestModel->save($data);
$result = $TestModel->findById(2); $result = $TestModel->findById(2);
$result['Item'] = Set::sort($result['Item'], '{n}.id', 'asc'); $result['Item'] = Hash::sort($result['Item'], '{n}.id', 'asc');
$expected = array( $expected = array(
'Portfolio' => array( 'Portfolio' => array(
'id' => 2, 'id' => 2,
@ -2400,12 +2400,12 @@ class ModelWriteTest extends BaseModelTest {
public function testUpdateMultiple() { public function testUpdateMultiple() {
$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread'); $this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
$TestModel = new Comment(); $TestModel = new Comment();
$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id'); $result = Hash::extract($TestModel->find('all'), '{n}.Comment.user_id');
$expected = array('2', '4', '1', '1', '1', '2'); $expected = array('2', '4', '1', '1', '1', '2');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2)); $TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id'); $result = Hash::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5); $expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
@ -2414,7 +2414,7 @@ class ModelWriteTest extends BaseModelTest {
array('Comment.user_id' => 5) array('Comment.user_id' => 5)
); );
$this->assertFalse(empty($result)); $this->assertFalse(empty($result));
$result = Set::extract( $result = Hash::extract(
$TestModel->find('all', array( $TestModel->find('all', array(
'conditions' => array( 'conditions' => array(
'Comment.user_id' => 5 'Comment.user_id' => 5
@ -3075,7 +3075,7 @@ class ModelWriteTest extends BaseModelTest {
'First new comment', 'First new comment',
'Second new comment' 'Second new comment'
); );
$result = Set::extract(Set::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment'); $result = Hash::extract(Hash::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $TestModel->Comment->User->field('id', array('user' => 'newuser', 'password' => 'newuserpass')); $result = $TestModel->Comment->User->field('id', array('user' => 'newuser', 'password' => 'newuserpass'));
@ -3098,7 +3098,7 @@ class ModelWriteTest extends BaseModelTest {
'Third new comment', 'Third new comment',
'Fourth new comment' 'Fourth new comment'
); );
$result = Set::extract(Set::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment'); $result = Hash::extract(Hash::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $TestModel->Comment->Attachment->field('id', array('attachment' => 'deepsaved')); $result = $TestModel->Comment->Attachment->field('id', array('attachment' => 'deepsaved'));
@ -3850,7 +3850,7 @@ class ModelWriteTest extends BaseModelTest {
'First new comment', 'First new comment',
'Second new comment' 'Second new comment'
); );
$result = Set::extract(Set::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment'); $result = Hash::extract(Hash::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $TestModel->saveAll( $result = $TestModel->saveAll(
@ -3874,7 +3874,7 @@ class ModelWriteTest extends BaseModelTest {
'Second new comment', 'Second new comment',
'Third new comment' 'Third new comment'
); );
$result = Set::extract(Set::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment'); $result = Hash::extract(Hash::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$TestModel->beforeSaveReturn = false; $TestModel->beforeSaveReturn = false;
@ -3899,7 +3899,7 @@ class ModelWriteTest extends BaseModelTest {
'Second new comment', 'Second new comment',
'Third new comment' 'Third new comment'
); );
$result = Set::extract(Set::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment'); $result = Hash::extract(Hash::sort($result['Comment'], '{n}.id', 'ASC'), '{n}.comment');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }

4
lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
View file

@ -531,13 +531,13 @@ class HttpSocketTest extends CakeTestCase {
foreach ($tests as $i => $test) { foreach ($tests as $i => $test) {
if (strpos($i, 'reset') === 0) { if (strpos($i, 'reset') === 0) {
foreach ($test as $path => $val) { foreach ($test as $path => $val) {
$expectation = Set::insert($expectation, $path, $val); $expectation = Hash::insert($expectation, $path, $val);
} }
continue; continue;
} }
if (isset($test['expectation'])) { if (isset($test['expectation'])) {
$expectation = Set::merge($expectation, $test['expectation']); $expectation = Hash::merge($expectation, $test['expectation']);
} }
$this->Socket->request($test['request']); $this->Socket->request($test['request']);

2
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -6860,7 +6860,7 @@ class FormHelperTest extends CakeTestCase {
$result = $this->Form->input('Contact.non_existing'); $result = $this->Form->input('Contact.non_existing');
$expected = array( $expected = array(
'div' => array('class' => 'input text required'), 'div' => array('class' => 'input text'),
'label' => array('for' => 'ContactNonExisting'), 'label' => array('for' => 'ContactNonExisting'),
'Non Existing', 'Non Existing',
'/label', '/label',

2
lib/Cake/Utility/Debugger.php
View file

@ -288,7 +288,7 @@ class Debugger {
'scope' => null, 'scope' => null,
'exclude' => array('call_user_func_array', 'trigger_error') 'exclude' => array('call_user_func_array', 'trigger_error')
); );
$options = Set::merge($defaults, $options); $options = Hash::merge($defaults, $options);
$backtrace = debug_backtrace(); $backtrace = debug_backtrace();
$count = count($backtrace); $count = count($backtrace);

10
lib/Cake/Utility/Hash.php
View file

@ -317,7 +317,7 @@ class Hash {
/** /**
* Creates an associative array using `$keyPath` as the path to build its keys, and optionally * Creates an associative array using `$keyPath` as the path to build its keys, and optionally
* `$valuePath` as path to get the values. If `$valuePath` is not specified, all values will be initialized * `$valuePath` as path to get the values. If `$valuePath` is not specified, all values will be initialized
* to null (useful for Set::merge). You can optionally group the values by what is obtained when * to null (useful for Hash::merge). You can optionally group the values by what is obtained when
* following the path specified in `$groupPath`. * following the path specified in `$groupPath`.
* *
* @param array $data Array from where to extract keys and values * @param array $data Array from where to extract keys and values
@ -383,7 +383,7 @@ class Hash {
* Usage: * Usage:
* *
* {{{ * {{{
* $result = Set::format($users, array('{n}.User.id', '{n}.User.name'), '%s : %s'); * $result = Hash::format($users, array('{n}.User.id', '{n}.User.name'), '%s : %s');
* }}} * }}}
* *
* The `$format` string can use any format options that `vsprintf()` and `sprintf()` do. * The `$format` string can use any format options that `vsprintf()` and `sprintf()` do.
@ -405,7 +405,7 @@ class Hash {
} }
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$extracted[] = Set::extract($data, $paths[$i]); $extracted[] = self::extract($data, $paths[$i]);
} }
$out = array(); $out = array();
$data = $extracted; $data = $extracted;
@ -639,7 +639,7 @@ class Hash {
$depth = array(); $depth = array();
if (is_array($data) && reset($data) !== false) { if (is_array($data) && reset($data) !== false) {
foreach ($data as $value) { foreach ($data as $value) {
$depth[] = Hash::dimensions((array)$value) + 1; $depth[] = self::dimensions((array)$value) + 1;
} }
} }
return max($depth); return max($depth);
@ -830,7 +830,7 @@ class Hash {
* @param mixed $data The data to nest. * @param mixed $data The data to nest.
* @param array $options Options are: * @param array $options Options are:
* @return array of results, nested * @return array of results, nested
* @see Set::extract() * @see Hash::extract()
*/ */
public static function nest(array $data, $options = array()) { public static function nest(array $data, $options = array()) {
if (!$data) { if (!$data) {

4
lib/Cake/View/Helper.php
View file

@ -471,7 +471,7 @@ class Helper extends Object {
if ($setScope === true) { if ($setScope === true) {
$this->_modelScope = $entity; $this->_modelScope = $entity;
} }
$parts = array_values(Set::filter(explode('.', $entity), true)); $parts = array_values(Hash::filter(explode('.', $entity)));
if (empty($parts)) { if (empty($parts)) {
return; return;
} }
@ -673,7 +673,7 @@ class Helper extends Object {
$entity = $this->entity(); $entity = $this->entity();
if (!empty($data) && !empty($entity)) { if (!empty($data) && !empty($entity)) {
$result = Set::extract(implode('.', $entity), $data); $result = Hash::get($data, implode('.', $entity));
} }
$habtmKey = $this->field(); $habtmKey = $this->field();

6
lib/Cake/View/Helper/FormHelper.php
View file

@ -243,7 +243,7 @@ class FormHelper extends AppHelper {
return true; return true;
} elseif (is_array($validateProperties)) { } elseif (is_array($validateProperties)) {
$dims = Set::countDim($validateProperties); $dims = Hash::dimensions($validateProperties);
if ($dims == 1 || ($dims == 2 && isset($validateProperties['rule']))) { if ($dims == 1 || ($dims == 2 && isset($validateProperties['rule']))) {
$validateProperties = array($validateProperties); $validateProperties = array($validateProperties);
} }
@ -312,7 +312,7 @@ class FormHelper extends AppHelper {
if (empty($errors)) { if (empty($errors)) {
return false; return false;
} }
$errors = Set::classicExtract($errors, join('.', $entity)); $errors = Hash::get($errors, join('.', $entity));
return $errors === null ? false : $errors; return $errors === null ? false : $errors;
} }
@ -623,7 +623,7 @@ class FormHelper extends AppHelper {
if (!$field) { if (!$field) {
$field = $this->entity(); $field = $this->entity();
} elseif (is_string($field)) { } elseif (is_string($field)) {
$field = Set::filter(explode('.', $field), true); $field = Hash::filter(explode('.', $field));
} }
foreach ($this->_unlockedFields as $unlockField) { foreach ($this->_unlockedFields as $unlockField) {

2
lib/Cake/View/Helper/NumberHelper.php
View file

@ -53,7 +53,7 @@ class NumberHelper extends AppHelper {
* @throws CakeException When the engine class could not be found. * @throws CakeException When the engine class could not be found.
*/ */
public function __construct(View $View, $settings = array()) { public function __construct(View $View, $settings = array()) {
$settings = Set::merge(array('engine' => 'CakeNumber'), $settings); $settings = Hash::merge(array('engine' => 'CakeNumber'), $settings);
parent::__construct($View, $settings); parent::__construct($View, $settings);
list($plugin, $engineClass) = pluginSplit($settings['engine'], true); list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
App::uses($engineClass, $plugin . 'Utility'); App::uses($engineClass, $plugin . 'Utility');

2
lib/Cake/View/Helper/TextHelper.php
View file

@ -66,7 +66,7 @@ class TextHelper extends AppHelper {
* @throws CakeException when the engine class could not be found. * @throws CakeException when the engine class could not be found.
*/ */
public function __construct(View $View, $settings = array()) { public function __construct(View $View, $settings = array()) {
$settings = Set::merge(array('engine' => 'String'), $settings); $settings = Hash::merge(array('engine' => 'String'), $settings);
parent::__construct($View, $settings); parent::__construct($View, $settings);
list($plugin, $engineClass) = pluginSplit($settings['engine'], true); list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
App::uses($engineClass, $plugin . 'Utility'); App::uses($engineClass, $plugin . 'Utility');

2
lib/Cake/View/Helper/TimeHelper.php
View file

@ -50,7 +50,7 @@ class TimeHelper extends AppHelper {
* @throws CakeException When the engine class could not be found. * @throws CakeException When the engine class could not be found.
*/ */
public function __construct(View $View, $settings = array()) { public function __construct(View $View, $settings = array()) {
$settings = Set::merge(array('engine' => 'CakeTime'), $settings); $settings = Hash::merge(array('engine' => 'CakeTime'), $settings);
parent::__construct($View, $settings); parent::__construct($View, $settings);
list($plugin, $engineClass) = pluginSplit($settings['engine'], true); list($plugin, $engineClass) = pluginSplit($settings['engine'], true);
App::uses($engineClass, $plugin . 'Utility'); App::uses($engineClass, $plugin . 'Utility');