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

only use and test SORT_NATURAL on PHP 5.4

Browse source
This commit is contained in:
Ceeram 2012-04-04 18:21:52 +02:00
parent e5ca80b711
commit 7700a0261b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Test/Case/Utility/HashTest.php
View file

@ -1043,6 +1043,9 @@ class HashTest extends CakeTestCase {
* @return void
*/
public function testSortNatural() {
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
$this->markTestSkipped('SORT_NATURAL is available since PHP 5.4.');
}
$items = array(
array('Item' => array('image' => 'img1.jpg')),
array('Item' => array('image' => 'img99.jpg')),

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

@ -379,7 +379,7 @@ class Hash {
/**
* Returns a formated series of values extracted from `$data`, using
* `$format` as the format and `$paths` as the values to extract.
*
*
* Usage:
*
* {{{
@ -486,7 +486,7 @@ class Hash {
* Recursively filters a data set.
*
* @param array $data Either an array to filter, or value when in callback
* @param callable $callback A function to filter the data with. Defaults to
* @param callable $callback A function to filter the data with. Defaults to
* `self::_filter()` Which strips out all non-zero empty values.
* @return array Filtered array
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::filter
@ -756,6 +756,9 @@ class Hash {
$dir = strtolower($dir);
$type = strtolower($type);
if ($type == 'natural' && version_compare(PHP_VERSION, '5.4.0', '<')) {
$type == 'regular';
}
if ($dir === 'asc') {
$dir = SORT_ASC;
} else {