'Object' keyword reserved

site upgraded to PHP 7.3 and 'object' is a reserved keyword, this fix replaced every instance with 'SS_object'
jareddreyerss · Nov 13, 2019 · 0438665 · 0438665
1 parent 2eb6213
commit 0438665
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/code/GridFieldAddNewInlineButton.php b/code/GridFieldAddNewInlineButton.php
@@ -85,7 +85,7 @@ private function getRowTemplate(GridField $grid, GridFieldEditableColumns $edita
 		$handled = array_keys($editable->getDisplayFields($grid));
 
 		if($grid->getList()) {
-			$record = Object::create($grid->getModelClass());
+			$record = SS_Object::create($grid->getModelClass());
 		} else {
 			$record = null;
 		}

diff --git a/code/GridFieldAddNewMultiClass.php b/code/GridFieldAddNewMultiClass.php
@@ -174,7 +174,7 @@ public function handleAdd($grid, $request) {
 		}
 
 		$unsanitisedClass = $this->unsanitiseClassName($class);
-		$handler = Object::create($this->itemRequestClass,
+		$handler = SS_Object::create($this->itemRequestClass,
 			$grid, $component, new $unsanitisedClass(), $grid->getForm()->getController(), 'add-multi-class'
 		);
 		$handler->setTemplate($component->getTemplate());

diff --git a/code/GridFieldEditableColumns.php b/code/GridFieldEditableColumns.php
@@ -196,7 +196,7 @@ public function getFields(GridField $grid, DataObjectInterface $record) {
 				$extra = $list->getExtraFields();
 
 				if($extra && array_key_exists($col, $extra)) {
-					$field = Object::create_from_string($extra[$col], $col)->scaffoldFormField();
+					$field = SS_Object::create_from_string($extra[$col], $col)->scaffoldFormField();
 				}
 			}