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

Fixing most coding standard issues in Utility/

Browse source
This commit is contained in:
mark_story 2012-03-03 17:31:47 -05:00
parent acccdcde1f
commit 9d325fe46e
13 changed files with 58 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Utility/CakeNumber.php
View file

@ -206,15 +206,15 @@ class CakeNumber {
} }
} }
$position = $options[$symbolKey.'Position'] != 'after' ? 'before' : 'after'; $position = $options[$symbolKey . 'Position'] != 'after' ? 'before' : 'after';
$options[$position] = $options[$symbolKey.'Symbol']; $options[$position] = $options[$symbolKey . 'Symbol'];
$abs = abs($number); $abs = abs($number);
$result = self::format($abs, $options); $result = self::format($abs, $options);
if ($number < 0 ) { if ($number < 0 ) {
if ($options['negative'] == '()') { if ($options['negative'] == '()') {
$result = '(' . $result .')'; $result = '(' . $result . ')';
} else { } else {
$result = $options['negative'] . $result; $result = $options['negative'] . $result;
} }

43
lib/Cake/Utility/CakeTime.php
View file

@ -52,11 +52,11 @@ class CakeTime {
*/ */
public function __set($name, $value) { public function __set($name, $value) {
switch ($name) { switch ($name) {
case 'niceFormat': case 'niceFormat':
self::${$name} = $value; self::${$name} = $value;
break; break;
default: default:
break; break;
} }
} }
@ -67,12 +67,12 @@ class CakeTime {
*/ */
public function __get($name) { public function __get($name) {
switch ($name) { switch ($name) {
case 'niceFormat': case 'niceFormat':
return self::${$name}; return self::${$name};
break; break;
default: default:
return null; return null;
break; break;
} }
} }
@ -140,13 +140,13 @@ class CakeTime {
case 'h': case 'h':
$months = __dc('cake', 'abmon', 5); $months = __dc('cake', 'abmon', 5);
if (is_array($months)) { if (is_array($months)) {
return $months[date('n', self::$_time) -1]; return $months[date('n', self::$_time) - 1];
} }
return '%b'; return '%b';
case 'B': case 'B':
$months = __dc('cake', 'mon', 5); $months = __dc('cake', 'mon', 5);
if (is_array($months)) { if (is_array($months)) {
return $months[date('n', self::$_time) -1]; return $months[date('n', self::$_time) - 1];
} }
break; break;
case 'n': case 'n':
@ -202,7 +202,7 @@ class CakeTime {
public static function convert($serverTime, $userOffset) { public static function convert($serverTime, $userOffset) {
$serverOffset = self::serverOffset(); $serverOffset = self::serverOffset();
$gmtTime = $serverTime - $serverOffset; $gmtTime = $serverTime - $serverOffset;
$userTime = $gmtTime + $userOffset * (60*60); $userTime = $gmtTime + $userOffset * (60 * 60);
return $userTime; return $userTime;
} }
@ -378,7 +378,7 @@ class CakeTime {
*/ */
public static function isThisYear($dateString, $userOffset = null) { public static function isThisYear($dateString, $userOffset = null) {
$date = self::fromString($dateString, $userOffset); $date = self::fromString($dateString, $userOffset);
return date('Y', $date) == date('Y', time()); return date('Y', $date) == date('Y', time());
} }
/** /**
@ -429,16 +429,16 @@ class CakeTime {
switch ($date) { switch ($date) {
case 1: case 1:
$date = array($year.'-01-01', $year.'-03-31'); $date = array($year . '-01-01', $year . '-03-31');
break; break;
case 2: case 2:
$date = array($year.'-04-01', $year.'-06-30'); $date = array($year . '-04-01', $year . '-06-30');
break; break;
case 3: case 3:
$date = array($year.'-07-01', $year.'-09-30'); $date = array($year . '-07-01', $year . '-09-30');
break; break;
case 4: case 4:
$date = array($year.'-10-01', $year.'-12-31'); $date = array($year . '-10-01', $year . '-12-31');
break; break;
} }
} }
@ -485,8 +485,8 @@ class CakeTime {
if ($userOffset == 0) { if ($userOffset == 0) {
$timezone = '+0000'; $timezone = '+0000';
} else { } else {
$hours = (int) floor(abs($userOffset)); $hours = (int)floor(abs($userOffset));
$minutes = (int) (fmod(abs($userOffset), $hours) * 60); $minutes = (int)(fmod(abs($userOffset), $hours) * 60);
$timezone = ($userOffset < 0 ? '-' : '+') . str_pad($hours, 2, '0', STR_PAD_LEFT) . str_pad($minutes, 2, '0', STR_PAD_LEFT); $timezone = ($userOffset < 0 ? '-' : '+') . str_pad($hours, 2, '0', STR_PAD_LEFT) . str_pad($minutes, 2, '0', STR_PAD_LEFT);
} }
return date('D, d M Y H:i:s', $date) . ' ' . $timezone; return date('D, d M Y H:i:s', $date) . ' ' . $timezone;
@ -795,4 +795,5 @@ class CakeTime {
} }
return $format; return $format;
} }
} }

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

@ -1,11 +1,5 @@
<?php <?php
/** /**
* Class collections.
*
* A repository for class objects, each registered with a key.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* *
@ -370,4 +364,5 @@ class ClassRegistry {
$_this->_objects = array(); $_this->_objects = array();
$_this->_map = array(); $_this->_map = array();
} }
} }

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

@ -203,7 +203,7 @@ class Debugger {
* @deprecated This function is superseded by Debugger::outputError() * @deprecated This function is superseded by Debugger::outputError()
*/ */
public static function showError($code, $description, $file = null, $line = null, $context = null) { public static function showError($code, $description, $file = null, $line = null, $context = null) {
$_this = Debugger::getInstance(); $self = Debugger::getInstance();
if (empty($file)) { if (empty($file)) {
$file = '[internal]'; $file = '[internal]';
@ -214,8 +214,8 @@ class Debugger {
$path = self::trimPath($file); $path = self::trimPath($file);
$info = compact('code', 'description', 'file', 'line'); $info = compact('code', 'description', 'file', 'line');
if (!in_array($info, $_this->errors)) { if (!in_array($info, $self->errors)) {
$_this->errors[] = $info; $self->errors[] = $info;
} else { } else {
return; return;
} }
@ -254,7 +254,7 @@ class Debugger {
$data = compact( $data = compact(
'level', 'error', 'code', 'description', 'file', 'path', 'line', 'context' 'level', 'error', 'code', 'description', 'file', 'path', 'line', 'context'
); );
echo $_this->outputError($data); echo $self->outputError($data);
if ($error == 'Fatal Error') { if ($error == 'Fatal Error') {
exit(); exit();
@ -279,10 +279,10 @@ class Debugger {
* @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::trace * @link http://book.cakephp.org/2.0/en/development/debugging.html#Debugger::trace
*/ */
public static function trace($options = array()) { public static function trace($options = array()) {
$_this = Debugger::getInstance(); $self = Debugger::getInstance();
$defaults = array( $defaults = array(
'depth' => 999, 'depth' => 999,
'format' => $_this->_outputFormat, 'format' => $self->_outputFormat,
'args' => false, 'args' => false,
'start' => 0, 'start' => 0,
'scope' => null, 'scope' => null,
@ -330,10 +330,10 @@ class Debugger {
} elseif ($options['format'] == 'array') { } elseif ($options['format'] == 'array') {
$back[] = $trace; $back[] = $trace;
} else { } else {
if (isset($_this->_templates[$options['format']]['traceLine'])) { if (isset($self->_templates[$options['format']]['traceLine'])) {
$tpl = $_this->_templates[$options['format']]['traceLine']; $tpl = $self->_templates[$options['format']]['traceLine'];
} else { } else {
$tpl = $_this->_templates['base']['traceLine']; $tpl = $self->_templates['base']['traceLine'];
} }
$trace['path'] = self::trimPath($trace['file']); $trace['path'] = self::trimPath($trace['file']);
$trace['reference'] = $reference; $trace['reference'] = $reference;
@ -665,7 +665,7 @@ class Debugger {
* in 3.0 * in 3.0
*/ */
public function output($format = null, $strings = array()) { public function output($format = null, $strings = array()) {
$_this = Debugger::getInstance(); $self = Debugger::getInstance();
$data = null; $data = null;
if (is_null($format)) { if (is_null($format)) {
@ -676,9 +676,9 @@ class Debugger {
return Debugger::addFormat($format, $strings); return Debugger::addFormat($format, $strings);
} }
if ($format === true && !empty($_this->_data)) { if ($format === true && !empty($self->_data)) {
$data = $_this->_data; $data = $self->_data;
$_this->_data = array(); $self->_data = array();
$format = false; $format = false;
} }
Debugger::outputAs($format); Debugger::outputAs($format);
@ -810,4 +810,5 @@ class Debugger {
trigger_error(__d('cake_dev', 'Please change the value of \'Security.cipherSeed\' in app/Config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE); trigger_error(__d('cake_dev', 'Please change the value of \'Security.cipherSeed\' in app/Config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE);
} }
} }
} }

4
lib/Cake/Utility/File.php
View file

@ -528,7 +528,7 @@ class File {
* @return Folder Current folder * @return Folder Current folder
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::Folder * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::Folder
*/ */
public function &Folder() { public function &folder() {
return $this->Folder; return $this->Folder;
} }
@ -566,5 +566,5 @@ class File {
} }
return false; return false;
} }
} }

9
lib/Cake/Utility/Folder.php
View file

@ -1,9 +1,5 @@
<?php <?php
/** /**
* Convenience class for handling directories.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* *
@ -192,7 +188,7 @@ class Folder {
*/ */
public function find($regexpPattern = '.*', $sort = false) { public function find($regexpPattern = '.*', $sort = false) {
list($dirs, $files) = $this->read($sort); list($dirs, $files) = $this->read($sort);
return array_values(preg_grep('/^' . $regexpPattern . '$/i', $files)); ; return array_values(preg_grep('/^' . $regexpPattern . '$/i', $files));
} }
/** /**
@ -750,7 +746,7 @@ class Folder {
$newpath = DS; $newpath = DS;
} }
while (($part = array_shift($parts)) !== NULL) { while (($part = array_shift($parts)) !== null) {
if ($part === '.' || $part === '') { if ($part === '.' || $part === '') {
continue; continue;
} }
@ -780,4 +776,5 @@ class Folder {
$lastChar = $path[strlen($path) - 1]; $lastChar = $path[strlen($path) - 1];
return $lastChar === '/' || $lastChar === '\\'; return $lastChar === '/' || $lastChar === '\\';
} }
} }

9
lib/Cake/Utility/Inflector.php
View file

@ -1,11 +1,5 @@
<?php <?php
/** /**
* Pluralize and singularize English words.
*
* Used by Cake's naming conventions throughout the framework.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org) * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* *
@ -350,7 +344,6 @@ class Inflector {
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::pluralize * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::pluralize
*/ */
public static function pluralize($word) { public static function pluralize($word) {
if (isset(self::$_cache['pluralize'][$word])) { if (isset(self::$_cache['pluralize'][$word])) {
return self::$_cache['pluralize'][$word]; return self::$_cache['pluralize'][$word];
} }
@ -394,7 +387,6 @@ class Inflector {
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::singularize * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html#Inflector::singularize
*/ */
public static function singularize($word) { public static function singularize($word) {
if (isset(self::$_cache['singularize'][$word])) { if (isset(self::$_cache['singularize'][$word])) {
return self::$_cache['singularize'][$word]; return self::$_cache['singularize'][$word];
} }
@ -552,6 +544,7 @@ class Inflector {
$map = self::$_transliteration + $merge; $map = self::$_transliteration + $merge;
return preg_replace(array_keys($map), array_values($map), $string); return preg_replace(array_keys($map), array_values($map), $string);
} }
} }
// Store the initial state // Store the initial state

1
lib/Cake/Utility/ObjectCollection.php
View file

@ -322,4 +322,5 @@ abstract class ObjectCollection {
} }
return $normal; return $normal;
} }
} }

1
lib/Cake/Utility/Sanitize.php
View file

@ -260,4 +260,5 @@ class Sanitize {
return $data; return $data;
} }
} }
} }

1
lib/Cake/Utility/Security.php
View file

@ -154,4 +154,5 @@ class Security {
srand(); srand();
return $out; return $out;
} }
} }

3
lib/Cake/Utility/Set.php
View file

@ -47,7 +47,7 @@ class Set {
$r = (array)current($args); $r = (array)current($args);
while (($arg = next($args)) !== false) { while (($arg = next($args)) !== false) {
foreach ((array)$arg as $key => $val) { foreach ((array)$arg as $key => $val) {
if (!empty($r[$key]) && is_array($r[$key]) && is_array($val)) { if (!empty($r[$key]) && is_array($r[$key]) && is_array($val)) {
$r[$key] = Set::merge($r[$key], $val); $r[$key] = Set::merge($r[$key], $val);
} elseif (is_int($key)) { } elseif (is_int($key)) {
@ -1214,4 +1214,5 @@ class Set {
} }
return $return; return $return;
} }
} }

8
lib/Cake/Utility/String.php
View file

@ -40,13 +40,13 @@ class String {
'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node '::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
); );
} }
$node = explode(':', $node) ; $node = explode(':', $node);
$ipv6 = '' ; $ipv6 = '';
foreach ($node as $id) { foreach ($node as $id) {
$ipv6 .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT); $ipv6 .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT);
} }
$node = base_convert($ipv6, 2, 10); $node = base_convert($ipv6, 2, 10);
if (strlen($node) < 38) { if (strlen($node) < 38) {
$node = null; $node = null;
@ -551,7 +551,7 @@ class String {
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::excerpt
*/ */
public static function excerpt($text, $phrase, $radius = 100, $ending = '...') { public static function excerpt($text, $phrase, $radius = 100, $ending = '...') {
if (empty($text) or empty($phrase)) { if (empty($text) || empty($phrase)) {
return self::truncate($text, $radius * 2, array('ending' => $ending)); return self::truncate($text, $radius * 2, array('ending' => $ending));
} }

4
lib/Cake/Utility/Validation.php
View file

@ -580,7 +580,8 @@ class Validation {
case 'us': case 'us':
case 'all': case 'all':
case 'can': case 'can':
// includes all NANPA members. see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories // includes all NANPA members.
// see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
$regex = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/'; $regex = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/';
break; break;
} }
@ -880,4 +881,5 @@ class Validation {
protected static function _reset() { protected static function _reset() {
self::$errors = array(); self::$errors = array();
} }
} }