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

Simplify conditionals.

Browse source 
Set default values to remove else cases.
This commit is contained in:
mark_story 2014-02-19 21:46:53 -05:00
parent a254d2dd6d
commit a80cbc205a
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2116,11 +2116,10 @@ class FormHelper extends AppHelper {
$attributes = $this->_dateTimeSelected('day', $fieldName, $attributes);
if (strlen($attributes['value']) > 2) {
$Date = date_create($attributes['value']);
if ($Date) {
$attributes['value'] = $Date->format('d');
} else {
$attributes['value'] = null;
$date = date_create($attributes['value']);
$attributes['value'] = null;
if ($date) {
$attributes['value'] = $date->format('d');
}
} elseif ($attributes['value'] === false) {
$attributes['value'] = null;
@ -2168,11 +2167,10 @@ class FormHelper extends AppHelper {
}
if (strlen($attributes['value']) > 4 || $attributes['value'] === 'now') {
$Date = date_create($attributes['value']);
if ($Date) {
$attributes['value'] = $Date->format('Y');
} else {
$attributes['value'] = null;
$date = date_create($attributes['value']);
$attributes['value'] = null;
if ($date) {
$attributes['value'] = $date->format('Y');
}
} elseif ($attributes['value'] === false) {
$attributes['value'] = null;
@ -2209,11 +2207,10 @@ class FormHelper extends AppHelper {
$attributes = $this->_dateTimeSelected('month', $fieldName, $attributes);
if (strlen($attributes['value']) > 2) {
$Date = date_create($attributes['value']);
if ($Date) {
$attributes['value'] = $Date->format('m');
} else {
$attributes['value'] = null;
$date = date_create($attributes['value']);
$attributes['value'] = null;
if ($date) {
$attributes['value'] = $date->format('m');
}
} elseif ($attributes['value'] === false) {
$attributes['value'] = null;
@ -2251,11 +2248,11 @@ class FormHelper extends AppHelper {
if (strlen($attributes['value']) > 2) {
try {
$Date = new DateTime($attributes['value']);
$date = new DateTime($attributes['value']);
if ($format24Hours) {
$attributes['value'] = $Date->format('H');
$attributes['value'] = $date->format('H');
} else {
$attributes['value'] = $Date->format('g');
$attributes['value'] = $date->format('g');
}
} catch (Exception $e) {
$attributes['value'] = null;
@ -2297,11 +2294,10 @@ class FormHelper extends AppHelper {
$attributes = $this->_dateTimeSelected('min', $fieldName, $attributes);
if (strlen($attributes['value']) > 2) {
$Date = date_create($attributes['value']);
if ($Date) {
$attributes['value'] = $Date->format('i');
} else {
$attributes['value'] = null;
$date = date_create($attributes['value']);
$attributes['value'] = null;
if ($date) {
$attributes['value'] = $date->format('i');
}
} elseif ($attributes['value'] === false) {
$attributes['value'] = null;
@ -2370,11 +2366,10 @@ class FormHelper extends AppHelper {
$attributes['value'] = date('a');
}
} else {
$Date = date_create($attributes['value']);
if ($Date) {
$attributes['value'] = $Date->format('a');
} else {
$attributes['value'] = null;
$date = date_create($attributes['value']);
$attributes['value'] = null;
if ($date) {
$attributes['value'] = $date->format('a');
}
}
}