adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 19:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.6

Browse source
This commit is contained in:
mark_story 2014-11-07 15:13:46 -05:00
commit 0e4fb9d648
26 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/basics.php
View file

@ -160,7 +160,7 @@ if (!function_exists('sortByKey')) {
* @param string $sortBy Sort by this key
* @param string $order Sort order asc/desc (ascending or descending).
* @param int $type Type of sorting to perform
* @return mixed Sorted array
* @return array|null Sorted array, or null if not an array.
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#sortByKey
*/
function sortByKey(&$array, $sortBy, $order = 'asc', $type = SORT_NUMERIC) {
@ -315,7 +315,7 @@ if (!function_exists('env')) {
* environment information.
*
* @param string $key Environment variable name.
* @return string Environment variable setting.
* @return string|bool|null Environment variable setting.
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#env
*/
function env($key) {