From 668457b4e636758a0730cc576a8fd76218eaa687 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 7 Mar 2015 12:48:39 +1100 Subject: [PATCH] Updated deprecated references Str::evalHtmlId -> October\Rain\Html\Helper::nameToId Str::evalHtmlArray -> October\Rain\Html\Helper::nameToArray Str::stripHtml -> October\Rain\Html\Helper::strip Str::limitHtml -> October\Rain\Html\Helper::limit Str::cleanHtml -> October\Rain\Html\Helper::clean --- modules/backend/classes/ControllerBehavior.php | 4 ++-- modules/backend/classes/FilterScope.php | 4 ++-- modules/backend/classes/FormField.php | 12 ++++++------ modules/backend/classes/FormWidgetBase.php | 6 +++--- modules/backend/classes/WidgetBase.php | 7 ++++--- modules/backend/widgets/Form.php | 12 ++++++------ modules/backend/widgets/Lists.php | 4 ++-- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php index f7ca08dbb..faa7452e9 100644 --- a/modules/backend/classes/ControllerBehavior.php +++ b/modules/backend/classes/ControllerBehavior.php @@ -1,10 +1,10 @@ idPrefix . '-' . $id; } - return Str::evalHtmlId($id); + return HtmlHelper::nameToId($id); } } diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php index 6f8127f00..51ffd485c 100644 --- a/modules/backend/classes/FormField.php +++ b/modules/backend/classes/FormField.php @@ -1,8 +1,8 @@ arrayName) { - $fullTriggerField = $this->arrayName.'['.implode('][', Str::evalHtmlArray($triggerField)).']'; + $fullTriggerField = $this->arrayName.'['.implode('][', HtmlHelper::nameToArray($triggerField)).']'; } else { $fullTriggerField = $triggerField; @@ -446,7 +446,7 @@ class FormField $presetType = array_get($this->preset, 'type'); if ($this->arrayName) { - $fullPresetField = $this->arrayName.'['.implode('][', Str::evalHtmlArray($presetField)).']'; + $fullPresetField = $this->arrayName.'['.implode('][', HtmlHelper::nameToArray($presetField)).']'; } else { $fullPresetField = $presetField; @@ -478,7 +478,7 @@ class FormField } if ($arrayName) { - return $arrayName.'['.implode('][', Str::evalHtmlArray($this->fieldName)).']'; + return $arrayName.'['.implode('][', HtmlHelper::nameToArray($this->fieldName)).']'; } else { return $this->fieldName; @@ -505,7 +505,7 @@ class FormField $id = $this->idPrefix . '-' . $id; } - return Str::evalHtmlId($id); + return HtmlHelper::nameToId($id); } /** @@ -521,7 +521,7 @@ class FormField /* * Array field name, eg: field[key][key2][key3] */ - $keyParts = Str::evalHtmlArray($fieldName); + $keyParts = HtmlHelper::nameToArray($fieldName); $lastField = end($keyParts); $result = $data; diff --git a/modules/backend/classes/FormWidgetBase.php b/modules/backend/classes/FormWidgetBase.php index ab6cc10f4..90516423b 100644 --- a/modules/backend/classes/FormWidgetBase.php +++ b/modules/backend/classes/FormWidgetBase.php @@ -1,6 +1,6 @@ fieldName; - return Str::evalHtmlId($id); + return HtmlHelper::nameToId($id); } /** @@ -125,7 +125,7 @@ abstract class FormWidgetBase extends WidgetBase */ public function resolveModelAttribute($attribute) { - $parts = Str::evalHtmlArray($attribute); + $parts = HtmlHelper::nameToArray($attribute); return $this->model->resolveAttribute($parts); } diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index e71510cc3..0e98bfdf0 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -2,8 +2,9 @@ use Str; use File; -use stdClass; use Session; +use October\Rain\Html\Helper as HtmlHelper; +use stdClass; /** * Widget base class. @@ -154,7 +155,7 @@ abstract class WidgetBase $id .= '-' . $suffix; } - return Str::evalHtmlId($id); + return HtmlHelper::nameToId($id); } /** @@ -178,7 +179,7 @@ abstract class WidgetBase /* * Array field name, eg: field[key][key2][key3] */ - $keyParts = Str::evalHtmlArray($name); + $keyParts = HtmlHelper::nameToArray($name); /* * First part will be the field name, pop it off diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php index abae743a9..f7446e71a 100644 --- a/modules/backend/widgets/Form.php +++ b/modules/backend/widgets/Form.php @@ -1,7 +1,6 @@ makeConfig($field->config); - $widgetConfig->alias = $this->alias . studly_case(Str::evalHtmlId($field->fieldName)); + $widgetConfig->alias = $this->alias . studly_case(HtmlHelper::nameToId($field->fieldName)); $widgetConfig->sessionKey = $this->getSessionKey(); $widgetConfig->previewMode = $this->previewMode; $widgetConfig->model = $this->model; @@ -833,7 +833,7 @@ class Form extends WidgetBase /* * Handle HTML array, eg: item[key][another] */ - $parts = Str::evalHtmlArray($field->fieldName); + $parts = HtmlHelper::nameToArray($field->fieldName); $dotted = implode('.', $parts); if (($value = array_get($data, $dotted)) !== null) { $value = !strlen(trim($value)) ? null : (float) $value; @@ -845,7 +845,7 @@ class Form extends WidgetBase * Give widgets an opportunity to process the data. */ foreach ($this->formWidgets as $field => $widget) { - $parts = Str::evalHtmlArray($field); + $parts = HtmlHelper::nameToArray($field); $dotted = implode('.', $parts); $widgetValue = $widget->getSaveValue(array_get($data, $dotted)); @@ -865,7 +865,7 @@ class Form extends WidgetBase /* * Get the value, remove it from the data collection */ - $parts = Str::evalHtmlArray($field->fieldName); + $parts = HtmlHelper::nameToArray($field->fieldName); $dotted = implode('.', $parts); $value = array_get($data, $dotted); array_forget($data, $dotted); @@ -873,7 +873,7 @@ class Form extends WidgetBase /* * Set the new value to the data collection */ - $parts = Str::evalHtmlArray($field->valueFrom); + $parts = HtmlHelper::nameToArray($field->valueFrom); $dotted = implode('.', $parts); array_set($remappedFields, $dotted, $value); } diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php index 3adb8f82e..627ec5441 100644 --- a/modules/backend/widgets/Lists.php +++ b/modules/backend/widgets/Lists.php @@ -2,7 +2,6 @@ use Db; use HTML as Html; -use Str; use App; use Lang; use Input; @@ -10,6 +9,7 @@ use Event; use Backend; use DbDongle; use Carbon\Carbon; +use October\Rain\Html\Helper as HtmlHelper; use October\Rain\Router\Helper as RouterHelper; use Backend\Classes\ListColumn; use Backend\Classes\WidgetBase; @@ -736,7 +736,7 @@ class Lists extends WidgetBase * Handle taking value from model attribute. */ elseif ($column->valueFrom) { - $keyParts = Str::evalHtmlArray($column->valueFrom); + $keyParts = HtmlHelper::nameToArray($column->valueFrom); $value = $record; foreach ($keyParts as $key) { $value = $value->{$key};