Source
';
$output .= '
';
foreach ($lines as $offset => $line) {
- $line = htmlentities($line, ENT_COMPAT, 'UTF-8');
+ $line = htmlentities((string) $line, ENT_COMPAT, 'UTF-8');
if ($offset == $errline) {
$output .= "$offset $line";
} else {
@@ -370,7 +370,7 @@ public function renderVariable($val, $caller)
$output = '';
$output .= "" . $this->formatCaller($caller) . " - \n";
if (is_string($val)) {
- $output .= wordwrap($val, self::config()->columns);
+ $output .= wordwrap((string) $val, (int) self::config()->columns);
} else {
$output .= var_export($val, true);
}
diff --git a/src/Dev/Deprecation.php b/src/Dev/Deprecation.php
index 6a025c3168a..615d2d424f1 100644
--- a/src/Dev/Deprecation.php
+++ b/src/Dev/Deprecation.php
@@ -180,10 +180,10 @@ public static function notice($atVersion, $string = '', $scope = Deprecation::SC
$backtrace = null;
// If you pass #.#, assume #.#.0
- if (preg_match('/^[0-9]+\.[0-9]+$/', $atVersion)) {
+ if (preg_match('/^[0-9]+\.[0-9]+$/', (string) $atVersion)) {
$atVersion .= '.0';
}
- if (preg_match('/^[0-9]+\.[0-9]+$/', $checkVersion)) {
+ if (preg_match('/^[0-9]+\.[0-9]+$/', (string) $checkVersion)) {
$checkVersion .= '.0';
}
@@ -203,7 +203,7 @@ public static function notice($atVersion, $string = '', $scope = Deprecation::SC
}
// Check the version against the notice version
- if ($checkVersion && version_compare($checkVersion, $atVersion, '>=')) {
+ if ($checkVersion && version_compare((string) $checkVersion, (string) $atVersion, '>=')) {
// Get the calling scope
if ($scope == Deprecation::SCOPE_METHOD) {
if (!$backtrace) {
@@ -226,16 +226,16 @@ public static function notice($atVersion, $string = '', $scope = Deprecation::SC
}
// Then raise the notice
- if (substr($string, -1) != '.') {
+ if (substr((string) $string, -1) != '.') {
$string .= ".";
}
$string .= " Called from " . self::get_called_method_from_trace($backtrace, 2) . '.';
if ($caller) {
- user_error($caller . ' is deprecated.' . ($string ? ' ' . $string : ''), $level);
+ user_error($caller . ' is deprecated.' . ($string ? ' ' . $string : ''), (int) $level);
} else {
- user_error($string, $level);
+ user_error((string) $string, (int) $level);
}
}
}
diff --git a/src/Dev/DevConfigController.php b/src/Dev/DevConfigController.php
index 71e57e75f01..358bd702b8c 100644
--- a/src/Dev/DevConfigController.php
+++ b/src/Dev/DevConfigController.php
@@ -43,7 +43,7 @@ public function index()
$subtitle = "Config manifest";
if (Director::is_cli()) {
- $body .= sprintf("\n%s\n\n", strtoupper($subtitle));
+ $body .= sprintf("\n%s\n\n", strtoupper((string) $subtitle));
$body .= Yaml::dump(Config::inst()->getAll(), 99, 2, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
} else {
$renderer = DebugView::create();
@@ -73,9 +73,9 @@ public function audit()
$subtitle = "Missing Config property definitions";
foreach ($this->array_keys_recursive(Config::inst()->getAll(), 2) as $className => $props) {
- $props = array_keys($props);
+ $props = array_keys($props ?: []);
- if (!count($props)) {
+ if (!count($props ?: [])) {
// We can skip this entry
continue;
}
@@ -89,7 +89,7 @@ public function audit()
$defined = false;
// Check ancestry (private properties don't inherit natively)
foreach (ClassInfo::ancestry($className) as $cn) {
- if (property_exists($cn, $prop)) {
+ if (property_exists($cn, (string) $prop)) {
$defined = true;
break;
}
@@ -104,12 +104,12 @@ public function audit()
}
}
- $output = count($missing)
+ $output = count($missing ?: [])
? implode("\n", $missing)
: "All configured properties are defined\n";
if (Director::is_cli()) {
- $body .= sprintf("\n%s\n\n", strtoupper($subtitle));
+ $body .= sprintf("\n%s\n\n", strtoupper((string) $subtitle));
$body .= $output;
} else {
$renderer = DebugView::create();
@@ -142,7 +142,7 @@ private function array_keys_recursive($array, $maxdepth = 20, $depth = 0, $array
{
if ($depth < $maxdepth) {
$depth++;
- $keys = array_keys($array);
+ $keys = array_keys($array ?: []);
foreach ($keys as $key) {
if (!is_array($array[$key])) {
diff --git a/src/Dev/DevelopmentAdmin.php b/src/Dev/DevelopmentAdmin.php
index 8bc81fabd1b..ca7ba1fb437 100644
--- a/src/Dev/DevelopmentAdmin.php
+++ b/src/Dev/DevelopmentAdmin.php
@@ -86,8 +86,8 @@ protected function init()
}
// Special case for dev/build: Defer permission checks to DatabaseAdmin->init() (see #4957)
- $requestedDevBuild = (stripos($this->getRequest()->getURL(), 'dev/build') === 0)
- && (stripos($this->getRequest()->getURL(), 'dev/build/defaults') === false);
+ $requestedDevBuild = (stripos((string) $this->getRequest()->getURL(), 'dev/build') === 0)
+ && (stripos((string) $this->getRequest()->getURL(), 'dev/build/defaults') === false);
// We allow access to this controller regardless of live-status or ADMIN permission only
// if on CLI. Access to this controller is always allowed in "dev-mode", or of the user is ADMIN.
@@ -152,7 +152,7 @@ public function runRegisteredController(HTTPRequest $request)
$controllerClass = $reg[$baseUrlPart]['controller'];
}
- if ($controllerClass && class_exists($controllerClass)) {
+ if ($controllerClass && class_exists((string) $controllerClass)) {
return $controllerClass::create();
}
diff --git a/src/Dev/FixtureBlueprint.php b/src/Dev/FixtureBlueprint.php
index 604c7bd65fc..f85f69126cd 100644
--- a/src/Dev/FixtureBlueprint.php
+++ b/src/Dev/FixtureBlueprint.php
@@ -172,8 +172,8 @@ public function createObject($identifier, $data = null, $fixtures = null)
$extrafields = [];
if (is_array($relVal)) {
// Item is either first row, or key in yet another nested array
- $item = key($relVal);
- if (is_array($relVal[$item]) && count($relVal) === 1) {
+ $item = key($relVal ?: []);
+ if (is_array($relVal[$item]) && count($relVal ?: []) === 1) {
// Extra fields from nested array
$extrafields = $relVal[$item];
} else {
@@ -194,13 +194,13 @@ public function createObject($identifier, $data = null, $fixtures = null)
} else {
$items = is_array($fieldVal)
? $fieldVal
- : preg_split('/ *, */', trim($fieldVal));
+ : preg_split('/ *, */', trim((string) $fieldVal));
$parsedItems = [];
foreach ($items as $item) {
// Check for correct format: =>..
// Ignore if the item has already been replaced with a numeric DB identifier
- if (!is_numeric($item) && !preg_match('/^=>[^\.]+\.[^\.]+/', $item)) {
+ if (!is_numeric($item) && !preg_match('/^=>[^\.]+\.[^\.]+/', (string) $item)) {
throw new InvalidArgumentException(sprintf(
'Invalid format for relation "%s" on class "%s" ("%s")',
$fieldName,
@@ -219,7 +219,7 @@ public function createObject($identifier, $data = null, $fixtures = null)
}
}
} else {
- $hasOneField = preg_replace('/ID$/', '', $fieldName);
+ $hasOneField = preg_replace('/ID$/', '', $fieldName ?: '');
if ($className = $schema->hasOneComponent($class, $hasOneField)) {
$obj->{$hasOneField . 'ID'} = $this->parseValue($fieldVal, $fixtures, $fieldClass);
// Inject class for polymorphic relation
@@ -233,7 +233,7 @@ public function createObject($identifier, $data = null, $fixtures = null)
$obj->write();
// If LastEdited was set in the fixture, set it here
- if ($data && array_key_exists('LastEdited', $data)) {
+ if ($data && array_key_exists('LastEdited', $data ?: [])) {
$this->overrideField($obj, 'LastEdited', $data['LastEdited'], $fixtures);
}
} catch (Exception $e) {
@@ -282,7 +282,7 @@ public function getClass()
*/
public function addCallback($type, $callback)
{
- if (!array_key_exists($type, $this->callbacks)) {
+ if (!array_key_exists($type, $this->callbacks ?: [])) {
throw new InvalidArgumentException(sprintf('Invalid type "%s"', $type));
}
@@ -308,7 +308,7 @@ public function removeCallback($type, $callback)
protected function invokeCallbacks($type, $args = [])
{
foreach ($this->callbacks[$type] as $callback) {
- call_user_func_array($callback, $args);
+ call_user_func_array($callback, $args ?: []);
}
}
@@ -324,9 +324,9 @@ protected function invokeCallbacks($type, $args = [])
*/
protected function parseValue($value, $fixtures = null, &$class = null)
{
- if (substr($value, 0, 2) == '=>') {
+ if (substr((string) $value, 0, 2) == '=>') {
// Parse a dictionary reference - used to set foreign keys
- list($class, $identifier) = explode('.', substr($value, 2), 2);
+ list($class, $identifier) = explode('.', substr((string) $value, 2), 2);
if ($fixtures && !isset($fixtures[$class][$identifier])) {
throw new InvalidArgumentException(sprintf(
diff --git a/src/Dev/FixtureFactory.php b/src/Dev/FixtureFactory.php
index 09812c04ada..aac1d566c4b 100644
--- a/src/Dev/FixtureFactory.php
+++ b/src/Dev/FixtureFactory.php
@@ -174,9 +174,9 @@ public function get($class, $identifier)
}
// If the class doesn't exist, look for a table instead
- if (!class_exists($class)) {
+ if (!class_exists((string) $class)) {
$tableNames = DataObject::getSchema()->getTableNames();
- $potential = array_search($class, $tableNames);
+ $potential = array_search($class, $tableNames ?: []);
if (!$potential) {
throw new \LogicException("'$class' is neither a class nor a table name");
}
@@ -206,11 +206,11 @@ public function getFixtures()
*/
public function clear($limitToClass = null, $metadata = false)
{
- $classes = ($limitToClass) ? [$limitToClass] : array_keys($this->fixtures);
+ $classes = ($limitToClass) ? [$limitToClass] : array_keys($this->fixtures ?: []);
foreach ($classes as $class) {
$ids = $this->fixtures[$class];
foreach ($ids as $id => $dbId) {
- if (class_exists($class)) {
+ if (class_exists((string) $class)) {
$instance = DataObject::get($class)->byId($dbId);
if ($instance) {
$instance->delete();
@@ -256,10 +256,10 @@ public function getBlueprint($name)
*/
protected function parseValue($value)
{
- if (substr($value, 0, 2) == '=>') {
+ if (substr((string) $value, 0, 2) == '=>') {
// Parse a dictionary reference - used to set foreign keys
- if (strpos($value, '.') !== false) {
- list($class, $identifier) = explode('.', substr($value, 2), 2);
+ if (strpos((string) $value, '.') !== false) {
+ list($class, $identifier) = explode('.', substr((string) $value, 2), 2);
} else {
throw new \LogicException("Bad fixture lookup identifier: " . $value);
}
diff --git a/src/Dev/FunctionalTest.php b/src/Dev/FunctionalTest.php
index 0dbe683c8b3..56e01586e7f 100644
--- a/src/Dev/FunctionalTest.php
+++ b/src/Dev/FunctionalTest.php
@@ -750,7 +750,7 @@ public function assertPartialMatchBySelector($selector, $expectedMatches, $messa
$message = $message ?:
"Failed asserting the CSS selector '$selector' has a partial match to the expected elements:\n'"
. implode("'\n'", $expectedMatches) . "'\n\n"
- . "Instead the following elements were found:\n'" . implode("'\n'", array_keys($actuals)) . "'";
+ . "Instead the following elements were found:\n'" . implode("'\n'", array_keys($actuals ?: [])) . "'";
foreach ($expectedMatches as $match) {
$this->assertTrue(isset($actuals[$match]), $message);
@@ -780,7 +780,7 @@ public function assertExactMatchBySelector($selector, $expectedMatches, $message
$actuals = [];
if ($items) {
foreach ($items as $item) {
- $actuals[] = trim(preg_replace('/\s+/', ' ', (string)$item));
+ $actuals[] = trim((string) preg_replace('/\s+/', ' ', (string)$item));
}
}
@@ -823,7 +823,7 @@ public function assertPartialHTMLMatchBySelector($selector, $expectedMatches, $m
$message = $message ?:
"Failed asserting the CSS selector '$selector' has a partial match to the expected elements:\n'"
. implode("'\n'", $expectedMatches) . "'\n\n"
- . "Instead the following elements were found:\n'" . implode("'\n'", array_keys($actuals)) . "'";
+ . "Instead the following elements were found:\n'" . implode("'\n'", array_keys($actuals ?: [])) . "'";
foreach ($expectedMatches as $match) {
$this->assertTrue(isset($actuals[$match]), $message);
diff --git a/src/Dev/Install/DatabaseAdapterRegistry.php b/src/Dev/Install/DatabaseAdapterRegistry.php
index e2632125d1f..7c4015dfbd8 100644
--- a/src/Dev/Install/DatabaseAdapterRegistry.php
+++ b/src/Dev/Install/DatabaseAdapterRegistry.php
@@ -72,7 +72,7 @@ class DatabaseAdapterRegistry implements Flushable
public static function register($config)
{
// Validate config
- $missing = array_diff(['title', 'class', 'helperClass', 'supported'], array_keys($config));
+ $missing = array_diff(['title', 'class', 'helperClass', 'supported'], array_keys($config ?: []));
if ($missing) {
throw new InvalidArgumentException(
"Missing database helper config keys: '" . implode("', '", $missing) . "'"
@@ -256,6 +256,6 @@ public static function getDatabaseConfigurationHelper($databaseClass)
// Construct
$class = $adapters[$databaseClass]['helperClass'];
- return (class_exists($class)) ? new $class() : null;
+ return (class_exists((string) $class)) ? new $class() : null;
}
}
diff --git a/src/Dev/Install/MySQLDatabaseConfigurationHelper.php b/src/Dev/Install/MySQLDatabaseConfigurationHelper.php
index 74b0500266f..5d4453c858e 100644
--- a/src/Dev/Install/MySQLDatabaseConfigurationHelper.php
+++ b/src/Dev/Install/MySQLDatabaseConfigurationHelper.php
@@ -173,7 +173,7 @@ public function requireDatabaseVersion($databaseConfig)
$success = false;
$error = '';
if ($version) {
- $success = version_compare($version, '5.0', '>=');
+ $success = version_compare((string) $version, '5.0', '>=');
if (!$success) {
$error = "Your MySQL server version is $version. It's recommended you use at least MySQL 5.0.";
}
@@ -213,13 +213,13 @@ public function checkValidDatabaseName($database)
{
// Reject filename unsafe characters (cross platform)
- if (preg_match('/[\\\\\/\?%\*\:\|"\<\>\.]+/', $database)) {
+ if (preg_match('/[\\\\\/\?%\*\:\|"\<\>\.]+/', (string) $database)) {
return false;
}
// Restricted to characters in the ASCII and Extended ASCII range
// @see http://dev.mysql.com/doc/refman/5.0/en/identifiers.html
- return preg_match('/^[\x{0001}-\x{FFFF}]+$/u', $database);
+ return preg_match('/^[\x{0001}-\x{FFFF}]+$/u', (string) $database);
}
/**
@@ -239,7 +239,7 @@ public function checkDatabasePermissionGrant($database, $permission, $grant)
}
// Escape all valid database patterns (permission must exist on all tables)
- $sqlDatabase = addcslashes($database, '_%'); // See http://dev.mysql.com/doc/refman/5.7/en/string-literals.html
+ $sqlDatabase = addcslashes((string) $database, '_%'); // See http://dev.mysql.com/doc/refman/5.7/en/string-literals.html
$dbPattern = sprintf(
'((%s)|(%s)|(%s)|(%s))',
preg_quote("\"$sqlDatabase\".*"), // Regexp escape sql-escaped db identifier
@@ -248,7 +248,7 @@ public function checkDatabasePermissionGrant($database, $permission, $grant)
preg_quote('*.*')
);
$expression = '/GRANT[ ,\w]+((ALL PRIVILEGES)|(' . $permission . '(?! ((VIEW)|(ROUTINE)))))[ ,\w]+ON ' . $dbPattern . '/i';
- return preg_match($expression, $grant);
+ return preg_match((string) $expression, (string) $grant);
}
/**
@@ -277,7 +277,7 @@ public function requireDatabaseOrCreatePermissions($databaseConfig)
$conn = $this->createConnection($databaseConfig, $error);
if ($conn) {
$list = $this->column($conn->query("SHOW DATABASES"));
- if (in_array($databaseConfig['database'], $list)) {
+ if (in_array($databaseConfig['database'], $list ?: [])) {
$success = true;
$alreadyExists = true;
} else {
diff --git a/src/Dev/SapphireTest.php b/src/Dev/SapphireTest.php
index 479a08311f8..898e6b35f1e 100644
--- a/src/Dev/SapphireTest.php
+++ b/src/Dev/SapphireTest.php
@@ -1902,7 +1902,7 @@ protected function getCurrentAbsolutePath()
throw new LogicException('getItemPath returned null for ' . static::class
. '. Try adding flush=1 to the test run.');
}
- return dirname($filename);
+ return dirname((string) $filename);
}
/**
@@ -1912,8 +1912,8 @@ protected function getCurrentRelativePath()
{
$base = Director::baseFolder();
$path = $this->getCurrentAbsolutePath();
- if (substr($path, 0, strlen($base)) == $base) {
- $path = preg_replace('/^\/*/', '', substr($path, strlen($base)));
+ if (substr((string) $path, 0, strlen((string) $base)) == $base) {
+ $path = preg_replace('/^\/*/', '', substr((string) $path, strlen((string) $base)));
}
return $path;
}
@@ -2255,7 +2255,7 @@ public function assertDOSAllMatch($match, SS_List $dataObjectSet)
*/
protected static function normaliseSQL($sql)
{
- return trim(preg_replace('/\s+/m', ' ', $sql));
+ return trim((string) preg_replace('/\s+/m', ' ', $sql ?: ''));
}
/**
@@ -2353,7 +2353,7 @@ public static function start()
$request = CLIRequestBuilder::createFromEnvironment();
$app = new HTTPApplication($kernel);
- $flush = array_key_exists('flush', $request->getVars());
+ $flush = array_key_exists('flush', $request->getVars() ?: []);
// Custom application
$res = $app->execute($request, function (HTTPRequest $request) {
@@ -2378,7 +2378,7 @@ public static function start()
// Allow flush from the command line in the absence of HTTPApplication's special sauce
$flush = false;
foreach ($_SERVER['argv'] as $arg) {
- if (preg_match('/^(--)?flush(=1)?$/', $arg)) {
+ if (preg_match('/^(--)?flush(=1)?$/', (string) $arg)) {
$flush = true;
}
}
@@ -2536,8 +2536,8 @@ public function logOut()
protected function useTestTheme($themeBaseDir, $theme, $callback)
{
Config::nest();
- if (strpos($themeBaseDir, BASE_PATH) === 0) {
- $themeBaseDir = substr($themeBaseDir, strlen(BASE_PATH));
+ if (strpos((string) $themeBaseDir, BASE_PATH) === 0) {
+ $themeBaseDir = substr((string) $themeBaseDir, strlen(BASE_PATH));
}
SSViewer::config()->update('theme_enabled', true);
SSViewer::set_themes([$themeBaseDir . '/themes/' . $theme, '$default']);
@@ -2565,7 +2565,7 @@ protected function getFixturePaths()
return array_map(function ($fixtureFilePath) {
return $this->resolveFixturePath($fixtureFilePath);
- }, $fixtureFiles);
+ }, $fixtureFiles ?: []);
}
/**
@@ -2596,7 +2596,7 @@ public static function getExtraControllers()
protected function resolveFixturePath($fixtureFilePath)
{
// support loading via composer name path.
- if (strpos($fixtureFilePath, ':') !== false) {
+ if (strpos((string) $fixtureFilePath, ':') !== false) {
return ModuleResourceLoader::singleton()->resolvePath($fixtureFilePath);
}
@@ -2650,7 +2650,7 @@ protected function getExtraRoutes()
foreach ($this->getExtraControllers() as $class) {
$controllerInst = Controller::singleton($class);
$link = Director::makeRelative($controllerInst->Link());
- $route = rtrim($link, '/') . '//$Action/$ID/$OtherID';
+ $route = rtrim((string) $link, '/') . '//$Action/$ID/$OtherID';
$rules[$route] = $class;
}
return $rules;
diff --git a/src/Dev/State/ExtensionTestState.php b/src/Dev/State/ExtensionTestState.php
index 29c4dd09c31..bbba4dba028 100644
--- a/src/Dev/State/ExtensionTestState.php
+++ b/src/Dev/State/ExtensionTestState.php
@@ -47,14 +47,14 @@ public function setUpOnce($class)
/** @var string|DataObject $dataClass */
// Remove any illegal extensions that are present
foreach ($class::getIllegalExtensions() as $dataClass => $extensions) {
- if (!class_exists($dataClass)) {
+ if (!class_exists((string) $dataClass)) {
continue;
}
if ($extensions === '*') {
$extensions = $dataClass::get_extensions();
}
foreach ($extensions as $extension) {
- if (!class_exists($extension) || !$dataClass::has_extension($extension)) {
+ if (!class_exists((string) $extension) || !$dataClass::has_extension($extension)) {
continue;
}
if (!isset($this->extensionsToReapply[$dataClass])) {
@@ -68,12 +68,12 @@ public function setUpOnce($class)
// Add any required extensions that aren't present
foreach ($class::getRequiredExtensions() as $dataClass => $extensions) {
- if (!class_exists($dataClass)) {
+ if (!class_exists((string) $dataClass)) {
throw new LogicException("Test {$class} requires dataClass {$dataClass} which doesn't exist");
}
foreach ($extensions as $extension) {
$extension = Extension::get_classname_without_arguments($extension);
- if (!class_exists($extension)) {
+ if (!class_exists((string) $extension)) {
throw new LogicException("Test {$class} requires extension {$extension} which doesn't exist");
}
if (!$dataClass::has_extension($extension)) {
diff --git a/src/Dev/State/FixtureTestState.php b/src/Dev/State/FixtureTestState.php
index 80ac22e4fd4..2b9c8c4f6d6 100644
--- a/src/Dev/State/FixtureTestState.php
+++ b/src/Dev/State/FixtureTestState.php
@@ -124,8 +124,8 @@ public function tearDownOnce($class)
*/
public function getFixtureFactory($class)
{
- $testClass = strtolower($class);
- if (array_key_exists($testClass, $this->fixtureFactories)) {
+ $testClass = strtolower((string) $class);
+ if (array_key_exists($testClass, $this->fixtureFactories ?: [])) {
return $this->fixtureFactories[$testClass];
}
return false;
@@ -151,7 +151,7 @@ protected function getFixturePaths($fixtures, SapphireTest $test)
{
return array_map(function ($fixtureFilePath) use ($test) {
return $this->resolveFixturePath($fixtureFilePath, $test);
- }, $fixtures);
+ }, $fixtures ?: []);
}
/**
@@ -220,7 +220,7 @@ protected function getTestAbsolutePath(SapphireTest $test)
throw new LogicException('getItemPath returned null for ' . static::class
. '. Try adding flush=1 to the test run.');
}
- return dirname($filename);
+ return dirname((string) $filename);
}
/**
@@ -265,7 +265,7 @@ protected function testNeedsDB(SapphireTest $test)
*/
protected function resetFixtureFactory($class)
{
- $class = strtolower($class);
+ $class = strtolower((string) $class);
$this->fixtureFactories[$class] = Injector::inst()->create(FixtureFactory::class);
$this->loaded[$class] = false;
}
diff --git a/src/Dev/State/SapphireTestState.php b/src/Dev/State/SapphireTestState.php
index f8dbcd3a4fd..62425bd8335 100644
--- a/src/Dev/State/SapphireTestState.php
+++ b/src/Dev/State/SapphireTestState.php
@@ -30,7 +30,7 @@ public function getStates()
public function getStateByName($name)
{
$states = $this->getStates();
- if (array_key_exists($name, $states)) {
+ if (array_key_exists($name, $states ?: [])) {
return $states[$name];
}
return false;
@@ -43,7 +43,7 @@ public function getStateByName($name)
*/
public function getStateByClass($class)
{
- $lClass = strtolower($class);
+ $lClass = strtolower((string) $class);
foreach ($this->getStates() as $state) {
if ($lClass === strtolower(get_class($state))) {
return $state;
@@ -73,7 +73,7 @@ public function tearDown(SapphireTest $test)
{
// Tear down in reverse order
/** @var TestState $state */
- foreach (array_reverse($this->states) as $state) {
+ foreach (array_reverse($this->states ?: []) as $state) {
$state->tearDown($test);
}
}
@@ -94,7 +94,7 @@ public function tearDownOnce($class)
{
// Tear down in reverse order
/** @var TestState $state */
- foreach (array_reverse($this->states) as $state) {
+ foreach (array_reverse($this->states ?: []) as $state) {
$state->tearDownOnce($class);
}
}
diff --git a/src/Dev/TaskRunner.php b/src/Dev/TaskRunner.php
index bb911d7126b..223c6450b28 100644
--- a/src/Dev/TaskRunner.php
+++ b/src/Dev/TaskRunner.php
@@ -150,7 +150,7 @@ protected function getTasks()
$singleton = BuildTask::singleton($class);
$description = $singleton->getDescription();
- $description = trim($description);
+ $description = trim((string) $description);
$desc = (Director::is_cli())
? Convert::html2raw($description)
@@ -202,7 +202,7 @@ protected function addCssToHeader($header)
// inject CSS into the heaader
$element = sprintf('', $path);
- $header = str_replace('', $element . '', $header);
+ $header = str_replace('', $element . '', $header ?: '');
}
return $header;
diff --git a/src/Dev/Tasks/MigrateFileTask.php b/src/Dev/Tasks/MigrateFileTask.php
index fffa7622607..576ef72247b 100644
--- a/src/Dev/Tasks/MigrateFileTask.php
+++ b/src/Dev/Tasks/MigrateFileTask.php
@@ -76,7 +76,7 @@ public function run($request)
$subtasks = !empty($args['only']) ? explode(',', $args['only']) : $this->defaultSubtasks;
$subtask = 'move-files';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(FileMigrationHelper::class)) {
$this->logger->error("No file migration helper detected");
} else {
@@ -95,7 +95,7 @@ public function run($request)
}
$subtask = 'migrate-folders';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(FolderMigrationHelper::class)) {
$this->logger->error("No folder migration helper detected");
} else {
@@ -114,7 +114,7 @@ public function run($request)
}
$subtask = 'move-thumbnails';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(LegacyThumbnailMigrationHelper::class)) {
$this->logger->error("LegacyThumbnailMigrationHelper not found");
} else {
@@ -139,7 +139,7 @@ public function run($request)
}
$subtask = 'generate-cms-thumbnails';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(ImageThumbnailHelper::class)) {
$this->logger->error("ImageThumbnailHelper not found");
} else {
@@ -164,7 +164,7 @@ public function run($request)
}
$subtask = 'fix-folder-permissions';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(FixFolderPermissionsHelper::class)) {
$this->logger->error("FixFolderPermissionsHelper not found");
} else {
@@ -190,7 +190,7 @@ public function run($request)
}
$subtask = 'fix-secureassets';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(SecureAssetsMigrationHelper::class)) {
$this->logger->error("SecureAssetsMigrationHelper not found");
} else {
@@ -205,7 +205,7 @@ public function run($request)
->setLogger($this->logger)
->run($this->getStore());
- if (count($paths) > 0) {
+ if (count($paths ?: []) > 0) {
$this->logger->info(sprintf("Repaired %d folders broken folder restrictions", count($paths)));
} else {
$this->logger->info("No folders required fixes");
@@ -216,7 +216,7 @@ public function run($request)
}
$subtask = 'normalise-access';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(NormaliseAccessMigrationHelper::class)) {
$this->logger->error("No normalise access migration helper detected");
} else {
@@ -235,7 +235,7 @@ public function run($request)
}
$subtask = 'relocate-userform-uploads-2020-9280';
- if (in_array($subtask, $subtasks)) {
+ if (in_array($subtask, $subtasks ?: [])) {
if (!class_exists(RecoverUploadLocationsHelper::class)) {
$this->logger->error("No UserForms helper detected");
} else {
@@ -296,8 +296,8 @@ protected function validateArgs($args)
if (!empty($args['only'])) {
$only = explode(',', $args['only']);
- $diff = array_diff($only, $this->defaultSubtasks);
- $diff = array_diff($diff, $this->optInSubtasks);
+ $diff = array_diff($only ?: [], $this->defaultSubtasks);
+ $diff = array_diff($diff ?: [], $this->optInSubtasks);
if ($diff) {
throw new \InvalidArgumentException('Invalid subtasks detected: ' . implode(', ', $diff));
diff --git a/src/Dev/TestMailer.php b/src/Dev/TestMailer.php
index 667454ecd14..04535343f3a 100644
--- a/src/Dev/TestMailer.php
+++ b/src/Dev/TestMailer.php
@@ -113,7 +113,7 @@ public function findEmail($to, $from = null, $subject = null, $content = null)
$value = $this->normaliseSpaces($value);
}
if ($value[0] === '/') {
- $matched = preg_match($value, $emailValue);
+ $matched = preg_match((string) $value, (string) $emailValue);
} else {
$matched = ($value === $emailValue);
}
@@ -135,6 +135,6 @@ public function findEmail($to, $from = null, $subject = null, $content = null)
*/
private function normaliseSpaces(string $value)
{
- return str_replace([', ', '; '], [',', ';'], $value);
+ return str_replace([', ', '; '], [',', ';'], $value ?: '');
}
}
diff --git a/src/Dev/TestSession.php b/src/Dev/TestSession.php
index 68fa685fdaa..5e40d248808 100644
--- a/src/Dev/TestSession.php
+++ b/src/Dev/TestSession.php
@@ -235,7 +235,7 @@ public function submitForm($formID, $button = null, $data = [])
$url = Director::makeRelative($form->getAction()->asString());
$postVars = [];
- parse_str($submission->_encode(), $postVars);
+ parse_str((string) $submission->_encode(), $postVars);
return $this->post($url, $postVars);
} else {
user_error("TestSession::submitForm called when there is no form loaded."
@@ -252,7 +252,7 @@ public function followRedirection()
{
if ($this->lastResponse->getHeader('Location')) {
$url = Director::makeRelative($this->lastResponse->getHeader('Location'));
- $url = strtok($url, '#');
+ $url = strtok((string) $url, '#');
return $this->get($url);
}
}
diff --git a/src/Dev/Validation/RelationValidationService.php b/src/Dev/Validation/RelationValidationService.php
index 2cff1926e95..450adb77225 100644
--- a/src/Dev/Validation/RelationValidationService.php
+++ b/src/Dev/Validation/RelationValidationService.php
@@ -108,7 +108,7 @@ public function validateRelations(): array
public function executeValidation(): void
{
$errors = $this->validateRelations();
- $count = count($errors);
+ $count = count($errors ?: []);
if ($count === 0) {
return;
@@ -231,7 +231,7 @@ protected function matchRules(string $class, string $rule): bool
continue;
}
- if (mb_strpos($class, $pattern) === 0) {
+ if (mb_strpos((string) $class, (string) $pattern) === 0) {
// Classname prefix matches the pattern
return true;
}
@@ -295,7 +295,7 @@ protected function validateHasOne(string $class): void
continue;
}
- if (mb_strpos($relationData, '.') !== false) {
+ if (mb_strpos((string) $relationData, '.') !== false) {
$this->logError(
$class,
$relationName,
@@ -395,7 +395,7 @@ protected function validateBelongsTo(string $class): void
$relatedObject = DataObject::singleton($relatedClass);
$relatedRelations = (array) $relatedObject->config()->uninherited('has_one');
- if (array_key_exists($relatedRelation, $relatedRelations)) {
+ if (array_key_exists($relatedRelation, $relatedRelations ?: [])) {
continue;
}
@@ -444,7 +444,7 @@ protected function validateHasMany(string $class): void
$relatedObject = DataObject::singleton($relatedClass);
$relatedRelations = (array) $relatedObject->config()->uninherited('has_one');
- if (array_key_exists($relatedRelation, $relatedRelations)) {
+ if (array_key_exists($relatedRelation, $relatedRelations ?: [])) {
continue;
}
@@ -556,7 +556,7 @@ protected function validateBelongsManyMany(string $class): void
$relatedObject = DataObject::singleton($relatedClass);
$relatedRelations = (array) $relatedObject->config()->uninherited('many_many');
- if (array_key_exists($relatedRelation, $relatedRelations)) {
+ if (array_key_exists($relatedRelation, $relatedRelations ?: [])) {
continue;
}
@@ -570,13 +570,13 @@ protected function validateBelongsManyMany(string $class): void
*/
protected function parsePlainRelation(string $relationData): ?array
{
- if (mb_strpos($relationData, '.') === false) {
+ if (mb_strpos((string) $relationData, '.') === false) {
return null;
}
- $segments = explode('.', $relationData);
+ $segments = explode('.', (string) $relationData);
- if (count($segments) !== 2) {
+ if (count($segments ?: []) !== 2) {
return null;
}
@@ -597,7 +597,7 @@ protected function parseManyManyRelation($relationData): ?string
{
if (is_array($relationData)) {
foreach (['through', 'to'] as $key) {
- if (!array_key_exists($key, $relationData)) {
+ if (!array_key_exists($key, $relationData ?: [])) {
return null;
}
}
@@ -612,7 +612,7 @@ protected function parseManyManyRelation($relationData): ?string
$throughObject = DataObject::singleton($through);
$throughRelations = (array) $throughObject->config()->uninherited('has_one');
- if (!array_key_exists($to, $throughRelations)) {
+ if (!array_key_exists($to, $throughRelations ?: [])) {
return null;
}
diff --git a/src/Dev/YamlFixture.php b/src/Dev/YamlFixture.php
index 3071c134b20..04bf595e84e 100644
--- a/src/Dev/YamlFixture.php
+++ b/src/Dev/YamlFixture.php
@@ -91,14 +91,14 @@ class YamlFixture
*/
public function __construct($fixture)
{
- if (false !== strpos($fixture, "\n")) {
+ if (false !== strpos((string) $fixture, "\n")) {
$this->fixtureString = $fixture;
} else {
if (!Director::is_absolute($fixture)) {
$fixture = Director::baseFolder() . '/' . $fixture;
}
- if (!file_exists($fixture)) {
+ if (!file_exists((string) $fixture)) {
throw new InvalidArgumentException('YamlFixture::__construct(): Fixture path "' . $fixture
. '" not found');
}
@@ -136,11 +136,11 @@ public function writeInto(FixtureFactory $factory)
if (isset($this->fixtureString)) {
$fixtureContent = $parser->parse($this->fixtureString);
} else {
- if (!file_exists($this->fixtureFile) || is_dir($this->fixtureFile)) {
+ if (!file_exists((string) $this->fixtureFile) || is_dir((string) $this->fixtureFile)) {
return;
}
- $contents = file_get_contents($this->fixtureFile);
+ $contents = file_get_contents((string) $this->fixtureFile);
$fixtureContent = $parser->parse($contents);
if (!$fixtureContent) {
diff --git a/src/Forms/CheckboxSetField.php b/src/Forms/CheckboxSetField.php
index 2d814595a21..bf88c0f09ed 100644
--- a/src/Forms/CheckboxSetField.php
+++ b/src/Forms/CheckboxSetField.php
@@ -82,10 +82,10 @@ public function getOptions()
$itemID = Convert::raw2htmlid("{$formID}_{$itemValue}");
$odd = !$odd;
$extraClass = $odd ? 'odd' : 'even';
- $extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue);
+ $extraClass .= ' val' . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $itemValue ?: '');
- $itemChecked = in_array($itemValue, $selectedValues) || in_array($itemValue, $defaultItems);
- $itemDisabled = $this->isDisabled() || in_array($itemValue, $disabledItems);
+ $itemChecked = in_array($itemValue, $selectedValues ?: []) || in_array($itemValue, $defaultItems ?: []);
+ $itemDisabled = $this->isDisabled() || in_array($itemValue, $disabledItems ?: []);
$options->push(new ArrayData([
'ID' => $itemID,
diff --git a/src/Forms/CompositeField.php b/src/Forms/CompositeField.php
index 5ea266af63a..ea6e40dd9d1 100644
--- a/src/Forms/CompositeField.php
+++ b/src/Forms/CompositeField.php
@@ -146,7 +146,7 @@ public function getName()
if ($count === 1) {
$compositeTitle .= 'Group';
}
- return preg_replace("/[^a-zA-Z0-9]+/", "", $compositeTitle);
+ return preg_replace("/[^a-zA-Z0-9]+/", "", $compositeTitle ?: '');
}
/**
diff --git a/src/Forms/CompositeValidator.php b/src/Forms/CompositeValidator.php
index 3135e2cf6e4..a5b04cb2ea0 100644
--- a/src/Forms/CompositeValidator.php
+++ b/src/Forms/CompositeValidator.php
@@ -49,7 +49,7 @@ class CompositeValidator extends Validator
*/
public function __construct(array $validators = [])
{
- $this->validators = array_values($validators);
+ $this->validators = array_values($validators ?: []);
parent::__construct();
}
@@ -216,7 +216,7 @@ public function canBeCached(): bool
*/
protected function removeValidatorByKey(int $key): CompositeValidator
{
- if (!array_key_exists($key, $this->validators)) {
+ if (!array_key_exists($key, $this->validators ?: [])) {
throw new InvalidArgumentException(
sprintf('Key "%s" does not exist in $validators array', $key)
);
diff --git a/src/Forms/ConfirmedPasswordField.php b/src/Forms/ConfirmedPasswordField.php
index 5cd8ece1e57..b30ae05ee21 100644
--- a/src/Forms/ConfirmedPasswordField.php
+++ b/src/Forms/ConfirmedPasswordField.php
@@ -194,7 +194,7 @@ public function Field($properties = [])
$field->setDisabled($this->isDisabled());
$field->setReadonly($this->isReadonly());
- if (count($this->attributes)) {
+ if (count($this->attributes ?: [])) {
foreach ($this->attributes as $name => $value) {
$field->setAttribute($name, $value);
}
@@ -310,7 +310,7 @@ public function setRightTitle($title)
public function setChildrenTitles($titles)
{
$expectedChildren = $this->getRequireExistingPassword() ? 3 : 2;
- if (is_array($titles) && count($titles) === $expectedChildren) {
+ if (is_array($titles) && count($titles ?: []) === $expectedChildren) {
foreach ($this->getChildren() as $field) {
if (isset($titles[0])) {
/** @var FormField $field */
@@ -476,7 +476,7 @@ public function validate($validator)
);
}
$limitRegex = '/^.' . $limit . '$/';
- if (!empty($value) && !preg_match($limitRegex, $value)) {
+ if (!empty($value) && !preg_match((string) $limitRegex, (string) $value)) {
$validator->validationError(
$name,
$errorMsg,
@@ -488,7 +488,7 @@ public function validate($validator)
}
if ($this->getRequireStrongPassword()) {
- if (!preg_match('/^(([a-zA-Z]+\d+)|(\d+[a-zA-Z]+))[a-zA-Z0-9]*$/', $value)) {
+ if (!preg_match('/^(([a-zA-Z]+\d+)|(\d+[a-zA-Z]+))[a-zA-Z0-9]*$/', (string) $value)) {
$validator->validationError(
$name,
_t(
diff --git a/src/Forms/CurrencyField.php b/src/Forms/CurrencyField.php
index 5e2555c704b..6e6fbfaa84b 100644
--- a/src/Forms/CurrencyField.php
+++ b/src/Forms/CurrencyField.php
@@ -28,7 +28,7 @@ public function setValue($value, $data = null)
$value = 0.00;
}
$this->value = DBCurrency::config()->uninherited('currency_symbol')
- . number_format((double)preg_replace('/[^0-9.\-]/', '', $value), 2);
+ . number_format((double)preg_replace('/[^0-9.\-]/', '', $value ?: ''), 2);
return $this;
}
/**
@@ -38,7 +38,7 @@ public function setValue($value, $data = null)
public function dataValue()
{
if ($this->value) {
- return preg_replace('/[^0-9.\-]/', '', $this->value);
+ return preg_replace('/[^0-9.\-]/', '', $this->value ?: '');
}
return 0.00;
}
@@ -58,9 +58,9 @@ public function performReadonlyTransformation()
public function validate($validator)
{
- $currencySymbol = preg_quote(DBCurrency::config()->uninherited('currency_symbol'));
+ $currencySymbol = preg_quote((string) DBCurrency::config()->uninherited('currency_symbol'));
$regex = '/^\s*(\-?' . $currencySymbol . '?|' . $currencySymbol . '\-?)?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?\s*$/';
- if (!empty($this->value) && !preg_match($regex, $this->value)) {
+ if (!empty($this->value) && !preg_match((string) $regex, (string) $this->value)) {
$validator->validationError(
$this->name,
_t('SilverStripe\\Forms\\Form.VALIDCURRENCY', "Please enter a valid currency"),
diff --git a/src/Forms/CurrencyField_Disabled.php b/src/Forms/CurrencyField_Disabled.php
index 80ef0c25676..52537118f7e 100644
--- a/src/Forms/CurrencyField_Disabled.php
+++ b/src/Forms/CurrencyField_Disabled.php
@@ -24,7 +24,7 @@ public function Field($properties = [])
if ($this->value) {
$val = Convert::raw2xml($this->value);
$val = DBCurrency::config()->get('currency_symbol')
- . number_format(preg_replace('/[^0-9.-]/', '', $val), 2);
+ . number_format((float) preg_replace('/[^0-9.-]/', '', $val ?: ''), 2);
$valforInput = Convert::raw2att($val);
} else {
$valforInput = '';
diff --git a/src/Forms/CurrencyField_Readonly.php b/src/Forms/CurrencyField_Readonly.php
index e96c90083bf..e5495fb4919 100644
--- a/src/Forms/CurrencyField_Readonly.php
+++ b/src/Forms/CurrencyField_Readonly.php
@@ -22,7 +22,7 @@ public function Field($properties = [])
$currencySymbol = DBCurrency::config()->get('currency_symbol');
if ($this->value) {
$val = Convert::raw2xml($this->value);
- $val = $currencySymbol . number_format(preg_replace('/[^0-9.-]/', '', $val), 2);
+ $val = $currencySymbol . number_format((float) preg_replace('/[^0-9.-]/', '', $val ?: ''), 2);
$valforInput = Convert::raw2att($val);
} else {
$val = '' . $currencySymbol . '0.00';
diff --git a/src/Forms/DateField.php b/src/Forms/DateField.php
index f9563fc9038..5aecff99604 100644
--- a/src/Forms/DateField.php
+++ b/src/Forms/DateField.php
@@ -388,7 +388,7 @@ public function validate($validator)
// Check min date
$min = $this->getMinDate();
if ($min) {
- $oops = strtotime($this->value) < strtotime($min);
+ $oops = strtotime((string) $this->value) < strtotime((string) $min);
if ($oops) {
$validator->validationError(
$this->name,
@@ -413,7 +413,7 @@ public function validate($validator)
// Check max date
$max = $this->getMaxDate();
if ($max) {
- $oops = strtotime($this->value) > strtotime($max);
+ $oops = strtotime((string) $this->value) > strtotime((string) $max);
if ($oops) {
$validator->validationError(
$this->name,
@@ -570,7 +570,7 @@ protected function tidyInternal($date)
$timestamp = $formatter->parse($date);
if ($timestamp === false) {
// Fallback to strtotime
- $timestamp = strtotime($date, DBDatetime::now()->getTimestamp());
+ $timestamp = strtotime((string) $date, DBDatetime::now()->getTimestamp());
if ($timestamp === false) {
return null;
}
diff --git a/src/Forms/DatetimeField.php b/src/Forms/DatetimeField.php
index c7d86a7281c..a756905c53d 100644
--- a/src/Forms/DatetimeField.php
+++ b/src/Forms/DatetimeField.php
@@ -411,7 +411,7 @@ public function tidyInternal($datetime)
$timestamp = $formatter->parse($datetime);
if ($timestamp === false) {
// Fallback to strtotime
- $timestamp = strtotime($datetime, DBDatetime::now()->getTimestamp());
+ $timestamp = strtotime((string) $datetime, DBDatetime::now()->getTimestamp());
if ($timestamp === false) {
return null;
}
@@ -584,7 +584,7 @@ public function validate($validator)
// Check min date (in server timezone)
$min = $this->getMinDatetime();
if ($min) {
- $oops = strtotime($this->value) < strtotime($min);
+ $oops = strtotime((string) $this->value) < strtotime((string) $min);
if ($oops) {
$validator->validationError(
$this->name,
@@ -609,7 +609,7 @@ public function validate($validator)
// Check max date (in server timezone)
$max = $this->getMaxDatetime();
if ($max) {
- $oops = strtotime($this->value) > strtotime($max);
+ $oops = strtotime((string) $this->value) > strtotime((string) $max);
if ($oops) {
$validator->validationError(
$this->name,
diff --git a/src/Forms/EmailField.php b/src/Forms/EmailField.php
index be432e1e677..38498de959e 100644
--- a/src/Forms/EmailField.php
+++ b/src/Forms/EmailField.php
@@ -29,14 +29,14 @@ public function Type()
*/
public function validate($validator)
{
- $this->value = trim($this->value);
+ $this->value = trim((string) $this->value);
$pattern = '^[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$';
// Escape delimiter characters.
- $safePattern = str_replace('/', '\\/', $pattern);
+ $safePattern = str_replace('/', '\\/', $pattern ?: '');
- if ($this->value && !preg_match('/' . $safePattern . '/i', $this->value)) {
+ if ($this->value && !preg_match('/' . $safePattern . '/i', (string) $this->value)) {
$validator->validationError(
$this->name,
_t('SilverStripe\\Forms\\EmailField.VALIDATION', 'Please enter an email address'),
diff --git a/src/Forms/FieldGroup.php b/src/Forms/FieldGroup.php
index ed14f4419b1..407171fe5cc 100644
--- a/src/Forms/FieldGroup.php
+++ b/src/Forms/FieldGroup.php
@@ -120,7 +120,7 @@ public function getName()
return parent::getName();
}
- return preg_replace("/[^a-zA-Z0-9]+/", "", $this->title);
+ return preg_replace("/[^a-zA-Z0-9]+/", "", $this->title ?: '');
}
/**
@@ -160,7 +160,7 @@ public function getMessage()
foreach ($dataFields as $subfield) {
$message = $subfield->obj('Message')->forTemplate();
if ($message) {
- $messages[] = rtrim($message, ".");
+ $messages[] = rtrim((string) $message, ".");
}
}
diff --git a/src/Forms/FieldList.php b/src/Forms/FieldList.php
index 7df1b80ada8..26ccf2eb1be 100644
--- a/src/Forms/FieldList.php
+++ b/src/Forms/FieldList.php
@@ -144,7 +144,7 @@ public function saveableFields()
*/
public function dataFieldNames()
{
- return array_keys($this->dataFields());
+ return array_keys($this->dataFields() ?: []);
}
/**
@@ -359,7 +359,7 @@ public function removeByName($fieldName, $dataFieldOnly = false)
}
if (($childName == $fieldName) && (!$dataFieldOnly || $child->hasData())) {
- array_splice($this->items, $i, 1);
+ array_splice($this->items, (int) $i, 1);
break;
} elseif ($child instanceof CompositeField) {
$child->removeByName($fieldName, $dataFieldOnly);
@@ -436,8 +436,8 @@ public function hasTabSet()
*/
public function findTab($tabName)
{
- $parts = explode('.', $tabName);
- $last_idx = count($parts) - 1;
+ $parts = explode('.', (string) $tabName);
+ $last_idx = count($parts ?: []) - 1;
$currentPointer = $this;
@@ -465,8 +465,8 @@ public function findTab($tabName)
*/
public function findOrMakeTab($tabName, $title = null)
{
- $parts = explode('.', $tabName);
- $last_idx = count($parts) - 1;
+ $parts = explode('.', (string) $tabName);
+ $last_idx = count($parts ?: []) - 1;
// We could have made this recursive, but I've chosen to keep all the logic code within FieldList rather than
// add it to TabSet and Tab too.
$currentPointer = $this;
@@ -512,16 +512,16 @@ public function findOrMakeTab($tabName, $title = null)
public function fieldByName($name)
{
$fullName = $name;
- if (strpos($name, '.') !== false) {
- list($name, $remainder) = explode('.', $name, 2);
+ if (strpos((string) $name, '.') !== false) {
+ list($name, $remainder) = explode('.', (string) $name, 2);
} else {
$remainder = null;
}
foreach ($this as $child) {
- if (trim($fullName) == trim($child->getName()) || $fullName == $child->id) {
+ if (trim((string) $fullName) == trim((string) $child->getName()) || $fullName == $child->id) {
return $child;
- } elseif (trim($name) == trim($child->getName()) || $name == $child->id) {
+ } elseif (trim((string) $name) == trim((string) $child->getName()) || $name == $child->id) {
if ($remainder) {
if ($child instanceof CompositeField) {
return $child->fieldByName($remainder);
@@ -552,7 +552,7 @@ public function dataFieldByName($name)
{
if ($dataFields = $this->dataFields()) {
foreach ($dataFields as $child) {
- if (trim($name) == trim($child->getName()) || $name == $child->id) {
+ if (trim((string) $name) == trim((string) $child->getName()) || $name == $child->id) {
return $child;
}
}
@@ -582,7 +582,7 @@ public function insertBefore($name, $item, $appendIfMissing = true)
$i = 0;
foreach ($this as $child) {
if ($name == $child->getName() || $name == $child->id) {
- array_splice($this->items, $i, 0, [$item]);
+ array_splice($this->items, (int) $i, 0, [$item]);
return $item;
} elseif ($child instanceof CompositeField) {
$ret = $child->insertBefore($name, $item, false);
diff --git a/src/Forms/FileField.php b/src/Forms/FileField.php
index 6a6b54b4973..aa868677432 100644
--- a/src/Forms/FileField.php
+++ b/src/Forms/FileField.php
@@ -120,7 +120,7 @@ protected function getAcceptFileTypes()
}
}
- return array_unique($accept);
+ return array_unique($accept ?: []);
}
/**
@@ -181,8 +181,8 @@ public function validate($validator)
// $_FILES super-global so it will be stored as $_FILES['mutli_file_syntax']
// multi-file uploads, which are not officially supported by Silverstripe, though may be
// implemented in custom code, so we should still ensure they are at least validated
- $isMultiFileUpload = strpos($this->name, '[') !== false;
- $fieldName = preg_replace('#\[(.*?)\]$#', '', $this->name);
+ $isMultiFileUpload = strpos((string) $this->name, '[') !== false;
+ $fieldName = preg_replace('#\[(.*?)\]$#', '', $this->name ?: '');
if (!isset($_FILES[$fieldName])) {
return true;
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 4f4816f7156..0f491d23bfb 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -433,7 +433,7 @@ public function getSessionValidationResult()
{
$resultData = $this->getSession()->get("FormInfo.{$this->FormName()}.result");
if (isset($resultData)) {
- return unserialize($resultData);
+ return unserialize((string) $resultData);
}
return null;
}
@@ -525,7 +525,7 @@ public function setFieldMessage(
public function castingHelper($field)
{
// Override casting for field message
- if (strcasecmp($field, 'Message') === 0 && ($helper = $this->getMessageCastingHelper())) {
+ if (strcasecmp((string) $field, 'Message') === 0 && ($helper = $this->getMessageCastingHelper())) {
return $helper;
}
return parent::castingHelper($field);
@@ -699,7 +699,7 @@ public function actionIsValidationExempt($action)
if ($action->getValidationExempt()) {
return true;
}
- if (in_array($action->actionName(), $this->getValidationExemptActions())) {
+ if (in_array($action->actionName(), $this->getValidationExemptActions() ?: [])) {
return true;
}
return false;
@@ -724,7 +724,7 @@ public function getExtraFields()
$this->securityTokenAdded = true;
// add the "real" HTTP method if necessary (for PUT, DELETE and HEAD)
- if (strtoupper($this->FormMethod()) != $this->FormHttpMethod()) {
+ if (strtoupper((string) $this->FormMethod()) != $this->FormHttpMethod()) {
$methodField = new HiddenField('_method', '', $this->FormHttpMethod());
$methodField->setForm($this);
$extraFields->push($methodField);
@@ -1017,7 +1017,7 @@ public function FormMethod()
*/
public function setFormMethod($method, $strict = null)
{
- $this->formMethod = strtoupper($method);
+ $this->formMethod = strtoupper((string) $method);
if ($strict !== null) {
$this->setStrictFormMethodCheck($strict);
}
@@ -1378,7 +1378,7 @@ public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
$name = $field->getName();
// Skip fields that have been excluded
- if ($fieldList && !in_array($name, $fieldList)) {
+ if ($fieldList && !in_array($name, $fieldList ?: [])) {
continue;
}
@@ -1394,7 +1394,7 @@ public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
if (is_object($data)) {
// Allow dot-syntax traversal of has-one relations fields
- if (strpos($name, '.') !== false) {
+ if (strpos((string) $name, '.') !== false) {
$exists = (
$data->hasMethod('relField')
);
@@ -1419,21 +1419,21 @@ public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
// Regular array access. Note that dot-syntax not supported here
} elseif (is_array($data)) {
- if (array_key_exists($name, $data)) {
+ if (array_key_exists($name, $data ?: [])) {
$exists = true;
$val = $data[$name];
// PHP turns the '.'s in POST vars into '_'s
- } elseif (array_key_exists($altName = str_replace('.', '_', $name), $data)) {
+ } elseif (array_key_exists($altName = str_replace('.', '_', $name ?: ''), $data ?: [])) {
$exists = true;
$val = $data[$altName];
- } elseif (preg_match_all('/(.*)\[(.*)\]/U', $name, $matches)) {
+ } elseif (preg_match_all('/(.*)\[(.*)\]/U', (string) $name, $matches)) {
// If field is in array-notation we need to access nested data
//discard first match which is just the whole string
array_shift($matches);
$keys = array_pop($matches);
$name = array_shift($matches);
$name = array_shift($name);
- if (array_key_exists($name, $data)) {
+ if (array_key_exists($name, $data ?: [])) {
$tmpData = &$data[$name];
// drill down into the data array looking for the corresponding value
foreach ($keys as $arrayKey) {
@@ -1491,7 +1491,7 @@ public function saveInto(DataObjectInterface $dataObject, $fieldList = null)
if ($dataFields) {
foreach ($dataFields as $field) {
// Skip fields that have been excluded
- if ($fieldList && is_array($fieldList) && !in_array($field->getName(), $fieldList)) {
+ if ($fieldList && is_array($fieldList) && !in_array($field->getName(), $fieldList ?: [])) {
continue;
}
@@ -1707,7 +1707,7 @@ public function getSecurityToken()
*/
public function extraClass()
{
- return implode(' ', array_unique($this->extraClasses));
+ return implode(' ', array_unique($this->extraClasses ?: []));
}
/**
@@ -1720,7 +1720,7 @@ public function extraClass()
public function hasExtraClass($class)
{
//split at white space
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
if (!isset($this->extraClasses[$class])) {
return false;
@@ -1740,7 +1740,7 @@ public function hasExtraClass($class)
public function addExtraClass($class)
{
//split at white space
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
//add classes one by one
$this->extraClasses[$class] = $class;
@@ -1758,7 +1758,7 @@ public function addExtraClass($class)
public function removeExtraClass($class)
{
//split at white space
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
//unset one by one
unset($this->extraClasses[$class]);
diff --git a/src/Forms/FormAction.php b/src/Forms/FormAction.php
index ae9b32627e6..17e620525e3 100644
--- a/src/Forms/FormAction.php
+++ b/src/Forms/FormAction.php
@@ -125,7 +125,7 @@ public function setIcon($icon)
*/
public function actionName()
{
- return substr($this->name, 7);
+ return substr((string) $this->name, 7);
}
/**
diff --git a/src/Forms/FormField.php b/src/Forms/FormField.php
index ecd9ede9a20..a74c3a2fc87 100644
--- a/src/Forms/FormField.php
+++ b/src/Forms/FormField.php
@@ -302,11 +302,11 @@ class FormField extends RequestHandler
public static function name_to_label($fieldName)
{
// Handle dot delimiters
- if (strpos($fieldName, '.') !== false) {
- $parts = explode('.', $fieldName);
+ if (strpos((string) $fieldName, '.') !== false) {
+ $parts = explode('.', (string) $fieldName);
// Ensure that any letter following a dot is uppercased, so that the regex below can break it up
// into words
- $label = implode(array_map('ucfirst', $parts));
+ $label = implode(array_map('ucfirst', $parts ?: []));
} else {
$label = $fieldName;
}
@@ -315,13 +315,13 @@ public static function name_to_label($fieldName)
// version of itself then the remaining lowercase letters.
$labelWithSpaces = preg_replace_callback('/([A-Z])([a-z]+)/', function ($matches) {
return ' ' . strtolower($matches[1]) . $matches[2];
- }, $label);
+ }, $label ?: '');
// Add a space before any capital letter block that is at the end of the string
- $labelWithSpaces = preg_replace('/([a-z])([A-Z]+)$/', '$1 $2', $labelWithSpaces);
+ $labelWithSpaces = preg_replace('/([a-z])([A-Z]+)$/', '$1 $2', $labelWithSpaces ?: '');
// The first letter should be uppercase
- return ucfirst(trim($labelWithSpaces));
+ return ucfirst(trim((string) $labelWithSpaces));
}
/**
@@ -469,9 +469,9 @@ public function saveInto(DataObjectInterface $record)
$fieldName = $this->name;
// Allow for dot syntax
- if (($pos = strrpos($this->name, '.')) !== false) {
- $relation = substr($this->name, 0, $pos);
- $fieldName = substr($this->name, $pos + 1);
+ if (($pos = strrpos((string) $this->name, '.')) !== false) {
+ $relation = substr((string) $this->name, 0, $pos);
+ $fieldName = substr((string) $this->name, $pos + 1);
$component = $record->relObject($relation);
}
@@ -574,7 +574,7 @@ public function extraClass()
if ($this->extraClasses) {
$classes = array_merge(
$classes,
- array_values($this->extraClasses)
+ array_values($this->extraClasses ?: [])
);
}
@@ -603,7 +603,7 @@ public function extraClass()
public function hasExtraClass($class)
{
//split at white space
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
if (!isset($this->extraClasses[$class])) {
return false;
@@ -623,7 +623,7 @@ public function hasExtraClass($class)
*/
public function addExtraClass($class)
{
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
$this->extraClasses[$class] = $class;
@@ -641,7 +641,7 @@ public function addExtraClass($class)
*/
public function removeExtraClass($class)
{
- $classes = preg_split('/\s+/', $class);
+ $classes = preg_split('/\s+/', (string) $class);
foreach ($classes as $class) {
unset($this->extraClasses[$class]);
@@ -794,7 +794,7 @@ public function securityTokenEnabled()
public function castingHelper($field)
{
// Override casting for field message
- if (strcasecmp($field, 'Message') === 0 && ($helper = $this->getMessageCastingHelper())) {
+ if (strcasecmp((string) $field, 'Message') === 0 && ($helper = $this->getMessageCastingHelper())) {
return $helper;
}
return parent::castingHelper($field);
@@ -921,7 +921,7 @@ public function Field($properties = [])
$this->extend('onBeforeRender', $context, $properties);
- if (count($properties)) {
+ if (count($properties ?: [])) {
$context = $context->customise($properties);
}
@@ -929,7 +929,7 @@ public function Field($properties = [])
// Trim whitespace from the result, so that trailing newlines are suppressed. Works for strings and HTMLText values
if (is_string($result)) {
- $result = trim($result);
+ $result = trim((string) $result);
} elseif ($result instanceof DBField) {
$result->setValue(trim($result->getValue()));
}
@@ -956,7 +956,7 @@ public function FieldHolder($properties = [])
$this->extend('onBeforeRenderHolder', $context, $properties);
- if (count($properties)) {
+ if (count($properties ?: [])) {
$context = $this->customise($properties);
}
@@ -974,7 +974,7 @@ public function SmallFieldHolder($properties = [])
{
$context = $this;
- if (count($properties)) {
+ if (count($properties ?: [])) {
$context = $this->customise($properties);
}
@@ -1198,8 +1198,8 @@ public function transform(FormTransformation $transformation)
*/
public function hasClass($class)
{
- $classes = explode(' ', strtolower($this->extraClass()));
- return in_array(strtolower(trim($class)), $classes);
+ $classes = explode(' ', strtolower((string) $this->extraClass()));
+ return in_array(strtolower(trim((string) $class)), $classes ?: []);
}
/**
@@ -1216,7 +1216,7 @@ public function hasClass($class)
public function Type()
{
$type = new ReflectionClass($this);
- return strtolower(preg_replace('/Field$/', '', $type->getShortName()));
+ return strtolower((string) preg_replace('/Field$/', '', $type->getShortName() ?: ''));
}
/**
@@ -1420,7 +1420,7 @@ public function getSchemaComponent()
public function setSchemaData($schemaData = [])
{
$defaults = $this->getSchemaData();
- $this->schemaData = array_merge($this->schemaData, array_intersect_key($schemaData, $defaults));
+ $this->schemaData = array_merge($this->schemaData, array_intersect_key($schemaData ?: [], $defaults));
return $this;
}
@@ -1432,7 +1432,7 @@ public function setSchemaData($schemaData = [])
public function getSchemaData()
{
$defaults = $this->getSchemaDataDefaults();
- return array_replace_recursive($defaults, array_intersect_key($this->schemaData, $defaults));
+ return array_replace_recursive($defaults ?: [], array_intersect_key($this->schemaData ?: [], $defaults));
}
/**
@@ -1496,7 +1496,7 @@ public function getSchemaDataDefaults()
public function setSchemaState($schemaState = [])
{
$defaults = $this->getSchemaState();
- $this->schemaState = array_merge($this->schemaState, array_intersect_key($schemaState, $defaults));
+ $this->schemaState = array_merge($this->schemaState, array_intersect_key($schemaState ?: [], $defaults));
return $this;
}
@@ -1508,7 +1508,7 @@ public function setSchemaState($schemaState = [])
public function getSchemaState()
{
$defaults = $this->getSchemaStateDefaults();
- return array_merge($defaults, array_intersect_key($this->schemaState, $defaults));
+ return array_merge($defaults, array_intersect_key($this->schemaState ?: [], $defaults));
}
/**
diff --git a/src/Forms/FormRequestHandler.php b/src/Forms/FormRequestHandler.php
index ee40828d8f8..1393d69fed6 100644
--- a/src/Forms/FormRequestHandler.php
+++ b/src/Forms/FormRequestHandler.php
@@ -131,7 +131,7 @@ public function httpSubmission($request)
}
// Ensure we only process saveable fields (non structural, readonly, or disabled)
- $allowedFields = array_keys($this->form->Fields()->saveableFields());
+ $allowedFields = array_keys($this->form->Fields()->saveableFields() ?: []);
// Populate the form
$this->form->loadDataFrom($vars, true, $allowedFields);
@@ -165,17 +165,17 @@ public function httpSubmission($request)
// Determine the action button clicked
$funcName = null;
foreach ($vars as $paramName => $paramVal) {
- if (substr($paramName, 0, 7) == 'action_') {
+ if (substr((string) $paramName, 0, 7) == 'action_') {
// Break off querystring arguments included in the action
- if (strpos($paramName, '?') !== false) {
- list($paramName, $paramVars) = explode('?', $paramName, 2);
+ if (strpos((string) $paramName, '?') !== false) {
+ list($paramName, $paramVars) = explode('?', (string) $paramName, 2);
$newRequestParams = [];
- parse_str($paramVars, $newRequestParams);
+ parse_str((string) $paramVars, $newRequestParams);
$vars = array_merge((array)$vars, (array)$newRequestParams);
}
// Cleanup action_, _x and _y from image fields
- $funcName = preg_replace(['/^action_/','/_x$|_y$/'], '', $paramName);
+ $funcName = preg_replace(['/^action_/','/_x$|_y$/'], '', $paramName ?: '');
break;
}
}
@@ -375,7 +375,7 @@ protected function getAjaxErrorResponse(ValidationResult $result)
{
// Ajax form submissions accept json encoded errors by default
$acceptType = $this->getRequest()->getHeader('Accept');
- if (strpos($acceptType, 'application/json') !== false) {
+ if (strpos((string) $acceptType, 'application/json') !== false) {
// Send validation errors back as JSON with a flag at the start
$response = new HTTPResponse(json_encode($result->getMessages()));
$response->addHeader('Content-Type', 'application/json');
@@ -473,7 +473,7 @@ protected function getAllActions()
$actions = $this->form->Actions()->dataFields();
$fieldsAndActions = array_merge($fields, $actions);
- $actions = array_filter($fieldsAndActions, function ($fieldOrAction) {
+ $actions = array_filter($fieldsAndActions ?: [], function ($fieldOrAction) {
return $fieldOrAction instanceof FormAction;
});
diff --git a/src/Forms/FormScaffolder.php b/src/Forms/FormScaffolder.php
index 8b35404d3b4..67854668275 100644
--- a/src/Forms/FormScaffolder.php
+++ b/src/Forms/FormScaffolder.php
@@ -83,7 +83,7 @@ public function getFieldList()
// Add logical fields directly specified in db config
foreach ($this->obj->config()->get('db') as $fieldName => $fieldType) {
// Skip restricted fields
- if ($this->restrictFields && !in_array($fieldName, $this->restrictFields)) {
+ if ($this->restrictFields && !in_array($fieldName, $this->restrictFields ?: [])) {
continue;
}
@@ -112,7 +112,7 @@ public function getFieldList()
// add has_one relation fields
if ($this->obj->hasOne()) {
foreach ($this->obj->hasOne() as $relationship => $component) {
- if ($this->restrictFields && !in_array($relationship, $this->restrictFields)) {
+ if ($this->restrictFields && !in_array($relationship, $this->restrictFields ?: [])) {
continue;
}
$fieldName = $component === 'SilverStripe\\ORM\\DataObject'
diff --git a/src/Forms/FormTemplateHelper.php b/src/Forms/FormTemplateHelper.php
index a487ac44aff..a8231eeada1 100644
--- a/src/Forms/FormTemplateHelper.php
+++ b/src/Forms/FormTemplateHelper.php
@@ -39,7 +39,7 @@ public function generateFormID($form)
}
$reflection = new ReflectionClass($form);
- $shortName = str_replace(['.', '/'], '', $form->getName());
+ $shortName = str_replace(['.', '/'], '', $form->getName() ?: '');
return Convert::raw2htmlid($reflection->getShortName() . '_' . $shortName);
}
@@ -62,7 +62,7 @@ public function generateFieldHolderID($field)
public function generateFieldID($field)
{
// Don't include '.'s in IDs, they confused JavaScript
- $name = str_replace('.', '_', $field->getName());
+ $name = str_replace('.', '_', $field->getName() ?: '');
if ($form = $field->getForm()) {
return sprintf(
diff --git a/src/Forms/FormTransformation.php b/src/Forms/FormTransformation.php
index 9b64a1c1e63..741484f1782 100644
--- a/src/Forms/FormTransformation.php
+++ b/src/Forms/FormTransformation.php
@@ -44,16 +44,16 @@ public function transform(FormField $field)
function ($name) {
return ClassInfo::shortName($name);
},
- array_values(ClassInfo::ancestry($this))
+ array_values(ClassInfo::ancestry($this) ?: [])
));
$fieldClasses = array_reverse(array_map(
function ($name) {
return ClassInfo::shortName($name);
},
- array_values(ClassInfo::ancestry($field))
+ array_values(ClassInfo::ancestry($field) ?: [])
));
- $len = max(sizeof($transNames), sizeof($fieldClasses));
+ $len = max(sizeof($transNames ?: []), sizeof($fieldClasses ?: []));
for ($i=0; $i<$len; $i++) {
// This is lets fieldClasses be longer than transNames
if (!empty($transNames[$i])) {
diff --git a/src/Forms/GridField/GridField.php b/src/Forms/GridField/GridField.php
index ae25e1ec379..4802007c331 100644
--- a/src/Forms/GridField/GridField.php
+++ b/src/Forms/GridField/GridField.php
@@ -263,7 +263,7 @@ public function performReadonlyTransformation()
$allowedComponents = $this->getReadonlyComponents();
foreach ($this->getConfig()->getComponents() as $component) {
// if a component doesn't exist, remove it from the readonly version.
- if (!in_array(get_class($component), $allowedComponents)) {
+ if (!in_array(get_class($component), $allowedComponents ?: [])) {
$copyConfig->removeComponent($component);
}
}
@@ -354,18 +354,18 @@ public function getCastedValue($value, $castingDefinition)
$castingDefinition = array_shift($castingDefinition);
}
- if (strpos($castingDefinition, '->') === false) {
+ if (strpos((string) $castingDefinition, '->') === false) {
$castingFieldType = $castingDefinition;
$castingField = DBField::create_field($castingFieldType, $value);
- return call_user_func_array([$castingField, 'XML'], $castingParams);
+ return call_user_func_array([$castingField, 'XML'], $castingParams ?: []);
}
- list($castingFieldType, $castingMethod) = explode('->', $castingDefinition);
+ list($castingFieldType, $castingMethod) = explode('->', (string) $castingDefinition);
$castingField = DBField::create_field($castingFieldType, $value);
- return call_user_func_array([$castingField, $castingMethod], $castingParams);
+ return call_user_func_array([$castingField, $castingMethod], $castingParams ?: []);
}
/**
@@ -471,7 +471,7 @@ public function FieldHolder($properties = [])
if ($fragments) {
foreach ($fragments as $fragmentKey => $fragmentValue) {
- $fragmentKey = strtolower($fragmentKey);
+ $fragmentKey = strtolower((string) $fragmentKey);
if (!isset($content[$fragmentKey])) {
$content[$fragmentKey] = '';
@@ -484,7 +484,7 @@ public function FieldHolder($properties = [])
}
foreach ($content as $contentKey => $contentValue) {
- $content[$contentKey] = trim($contentValue);
+ $content[$contentKey] = trim((string) $contentValue);
}
// Replace custom fragments and check which fragments are defined. Circular dependencies
@@ -501,16 +501,16 @@ public function FieldHolder($properties = [])
// TODO: Break the below into separate reducer methods
// Continue looping if any placeholders exist
- while (array_filter($content, function ($value) {
- return preg_match(self::FRAGMENT_REGEX, $value);
+ while (array_filter($content ?: [], function ($value) {
+ return preg_match((string) self::FRAGMENT_REGEX, (string) $value);
})) {
foreach ($content as $contentKey => $contentValue) {
// Skip if this specific content has no placeholders
- if (!preg_match_all(self::FRAGMENT_REGEX, $contentValue, $matches)) {
+ if (!preg_match_all((string) self::FRAGMENT_REGEX, (string) $contentValue, $matches)) {
continue;
}
foreach ($matches[1] as $match) {
- $fragmentName = strtolower($match);
+ $fragmentName = strtolower((string) $match);
$fragmentDefined[$fragmentName] = true;
$fragment = '';
@@ -522,7 +522,7 @@ public function FieldHolder($properties = [])
// If the fragment still has a fragment definition in it, when we should defer
// this item until later.
- if (preg_match(self::FRAGMENT_REGEX, $fragment, $matches)) {
+ if (preg_match((string) self::FRAGMENT_REGEX, (string) $fragment, $matches)) {
if (isset($fragmentDeferred[$contentKey]) && $fragmentDeferred[$contentKey] > 5) {
throw new LogicException(sprintf(
'GridField HTML fragment "%s" and "%s" appear to have a circular dependency.',
@@ -545,7 +545,7 @@ public function FieldHolder($properties = [])
} else {
$content[$contentKey] = preg_replace(
sprintf('/\$DefineFragment\(%s\)/i', $fragmentName),
- $fragment,
+ $fragment ?: '',
$content[$contentKey]
);
}
@@ -565,7 +565,7 @@ public function FieldHolder($properties = [])
}
}
- $total = count($list);
+ $total = count($list ?: []);
if ($total > 0) {
$rows = [];
@@ -632,7 +632,7 @@ public function FieldHolder($properties = [])
$this->addExtraClass('ss-gridfield grid-field field');
$fieldsetAttributes = array_diff_key(
- $this->getAttributes(),
+ $this->getAttributes() ?: [],
[
'value' => false,
'type' => false,
@@ -997,7 +997,7 @@ public function getColumnCount()
$this->buildColumnDispatch();
}
- return count($this->columnDispatch);
+ return count($this->columnDispatch ?: []);
}
/**
@@ -1062,7 +1062,7 @@ public function gridFieldAlterAction($data, $form, HTTPRequest $request)
$store = Injector::inst()->create(StateStore::class . '.' . $this->getName());
foreach ($data as $dataKey => $dataValue) {
- if (preg_match('/^action_gridFieldAlterAction\?StateID=(.*)/', $dataKey, $matches)) {
+ if (preg_match('/^action_gridFieldAlterAction\?StateID=(.*)/', (string) $dataKey, $matches)) {
$stateChange = $store->load($matches[1]);
$actionName = $stateChange['actionName'];
@@ -1104,13 +1104,13 @@ public function gridFieldAlterAction($data, $form, HTTPRequest $request)
*/
public function handleAlterAction($actionName, $arguments, $data)
{
- $actionName = strtolower($actionName);
+ $actionName = strtolower((string) $actionName);
foreach ($this->getComponents() as $component) {
if ($component instanceof GridField_ActionProvider) {
$actions = array_map('strtolower', (array) $component->getActions($this));
- if (in_array($actionName, $actions)) {
+ if (in_array($actionName, $actions ?: [])) {
return $component->handleAction($this, $actionName, $arguments, $data);
}
}
diff --git a/src/Forms/GridField/GridFieldAddExistingAutocompleter.php b/src/Forms/GridField/GridFieldAddExistingAutocompleter.php
index 6bec9d026d5..84f74f2fb50 100644
--- a/src/Forms/GridField/GridFieldAddExistingAutocompleter.php
+++ b/src/Forms/GridField/GridFieldAddExistingAutocompleter.php
@@ -241,7 +241,7 @@ public function doSearch($gridField, $request)
$params = [];
foreach ($searchFields as $searchField) {
- $name = (strpos($searchField, ':') !== false) ? $searchField : "$searchField:StartsWith";
+ $name = (strpos((string) $searchField, ':') !== false) ? $searchField : "$searchField:StartsWith";
$params[$name] = $searchStr;
}
@@ -342,12 +342,12 @@ public function scaffoldSearchFields($dataClass)
if ($fieldSpecs = $obj->searchableFields()) {
$customSearchableFields = $obj->config()->get('searchable_fields');
foreach ($fieldSpecs as $name => $spec) {
- if (is_array($spec) && array_key_exists('filter', $spec)) {
+ if (is_array($spec) && array_key_exists('filter', $spec ?: [])) {
// The searchableFields() spec defaults to PartialMatch,
// so we need to check the original setting.
// If the field is defined $searchable_fields = array('MyField'),
// then default to StartsWith filter, which makes more sense in this context.
- if (!$customSearchableFields || array_search($name, $customSearchableFields)) {
+ if (!$customSearchableFields || array_search($name, $customSearchableFields ?: [])) {
$filter = 'StartsWith';
} else {
$filterName = $spec['filter'];
@@ -356,12 +356,12 @@ public function scaffoldSearchFields($dataClass)
$filterName = get_class($filterName);
}
// It can be a fully qualified class name
- if (strpos($filterName, '\\') !== false) {
- $filterNameParts = explode("\\", $filterName);
+ if (strpos((string) $filterName, '\\') !== false) {
+ $filterNameParts = explode("\\", (string) $filterName);
// We expect an alias matching the class name without namespace, see #coresearchaliases
$filterName = array_pop($filterNameParts);
}
- $filter = preg_replace('/Filter$/', '', $filterName);
+ $filter = preg_replace('/Filter$/', '', $filterName ?: '');
}
$fields[] = "{$name}:{$filter}";
} else {
@@ -397,7 +397,7 @@ public function getPlaceholderText($dataClass)
$labels = [];
if ($searchFields) {
foreach ($searchFields as $searchField) {
- $searchField = explode(':', $searchField);
+ $searchField = explode(':', (string) $searchField);
$label = singleton($dataClass)->fieldLabel($searchField[0]);
if ($label) {
$labels[] = $label;
diff --git a/src/Forms/GridField/GridFieldDataColumns.php b/src/Forms/GridField/GridFieldDataColumns.php
index 39ee1ecfe43..e3373db5d4b 100644
--- a/src/Forms/GridField/GridFieldDataColumns.php
+++ b/src/Forms/GridField/GridFieldDataColumns.php
@@ -38,13 +38,13 @@ class GridFieldDataColumns extends AbstractGridFieldComponent implements GridFie
*/
public function augmentColumns($gridField, &$columns)
{
- $baseColumns = array_keys($this->getDisplayFields($gridField));
+ $baseColumns = array_keys($this->getDisplayFields($gridField) ?: []);
foreach ($baseColumns as $col) {
$columns[] = $col;
}
- $columns = array_unique($columns);
+ $columns = array_unique($columns ?: []);
}
/**
@@ -55,7 +55,7 @@ public function augmentColumns($gridField, &$columns)
*/
public function getColumnsHandled($gridField)
{
- return array_keys($this->getDisplayFields($gridField));
+ return array_keys($this->getDisplayFields($gridField) ?: []);
}
/**
@@ -154,7 +154,7 @@ public function getColumnContent($gridField, $record, $columnName)
{
// Find the data column for the given named column
$columns = $this->getDisplayFields($gridField);
- $columnInfo = array_key_exists($columnName, $columns) ? $columns[$columnName] : null;
+ $columnInfo = array_key_exists($columnName, $columns ?: []) ? $columns[$columnName] : null;
// Allow callbacks
if (is_array($columnInfo) && isset($columnInfo['callback'])) {
@@ -222,12 +222,12 @@ public function getColumnMetadata($gridField, $column)
*/
protected function getValueFromRelation($record, $columnName)
{
- $fieldNameParts = explode('.', $columnName);
+ $fieldNameParts = explode('.', (string) $columnName);
$tmpItem = clone($record);
- for ($idx = 0; $idx < sizeof($fieldNameParts); $idx++) {
+ for ($idx = 0; $idx < sizeof($fieldNameParts ?: []); $idx++) {
$methodName = $fieldNameParts[$idx];
// Last mmethod call from $columnName return what that method is returning
- if ($idx == sizeof($fieldNameParts) - 1) {
+ if ($idx == sizeof($fieldNameParts ?: []) - 1) {
return $tmpItem->XML_val($methodName);
}
// else get the object from this $methodName
@@ -247,20 +247,20 @@ protected function getValueFromRelation($record, $columnName)
protected function castValue($gridField, $fieldName, $value)
{
// If a fieldCasting is specified, we assume the result is safe
- if (array_key_exists($fieldName, $this->fieldCasting)) {
+ if (array_key_exists($fieldName, $this->fieldCasting ?: [])) {
$value = $gridField->getCastedValue($value, $this->fieldCasting[$fieldName]);
} elseif (is_object($value)) {
// If the value is an object, we do one of two things
if (method_exists($value, 'Nice')) {
// If it has a "Nice" method, call that & make sure the result is safe
- $value = nl2br(Convert::raw2xml($value->Nice()));
+ $value = nl2br((string) Convert::raw2xml($value->Nice()));
} else {
// Otherwise call forTemplate - the result of this should already be safe
$value = $value->forTemplate();
}
} else {
// Otherwise, just treat as a text string & make sure the result is safe
- $value = nl2br(Convert::raw2xml($value));
+ $value = nl2br((string) Convert::raw2xml($value));
}
return $value;
@@ -276,7 +276,7 @@ protected function castValue($gridField, $fieldName, $value)
*/
protected function formatValue($gridField, $item, $fieldName, $value)
{
- if (!array_key_exists($fieldName, $this->fieldFormatting)) {
+ if (!array_key_exists($fieldName, $this->fieldFormatting ?: [])) {
return $value;
}
@@ -284,9 +284,9 @@ protected function formatValue($gridField, $item, $fieldName, $value)
if (!is_string($spec) && is_callable($spec)) {
return $spec($value, $item);
} else {
- $format = str_replace('$value', "__VAL__", $spec);
- $format = preg_replace('/\$([A-Za-z0-9-_]+)/', '$item->$1', $format);
- $format = str_replace('__VAL__', '$value', $format);
+ $format = str_replace('$value', "__VAL__", $spec ?: '');
+ $format = preg_replace('/\$([A-Za-z0-9-_]+)/', '$item->$1', $format ?: '');
+ $format = str_replace('__VAL__', '$value', $format ?: '');
eval('$value = "' . $format . '";');
return $value;
}
@@ -306,7 +306,7 @@ protected function escapeValue($gridField, $value)
}
foreach ($escape as $search => $replace) {
- $value = str_replace($search, $replace, $value);
+ $value = str_replace($search ?: '', $replace ?: '', $value ?: '');
}
return $value;
}
diff --git a/src/Forms/GridField/GridFieldDeleteAction.php b/src/Forms/GridField/GridFieldDeleteAction.php
index e5bc0434991..b1473d33cf6 100644
--- a/src/Forms/GridField/GridFieldDeleteAction.php
+++ b/src/Forms/GridField/GridFieldDeleteAction.php
@@ -96,7 +96,7 @@ public function getExtraData($gridField, $record, $columnName)
*/
public function augmentColumns($gridField, &$columns)
{
- if (!in_array('Actions', $columns)) {
+ if (!in_array('Actions', $columns ?: [])) {
$columns[] = 'Actions';
}
}
diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
index ee04715d640..68f526a2403 100644
--- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
@@ -523,7 +523,7 @@ public function doSave($data, $form)
$this->saveFormIntoRecord($data, $form);
$link = '"'
- . htmlspecialchars($this->record->Title, ENT_QUOTES)
+ . htmlspecialchars((string) $this->record->Title, ENT_QUOTES)
. '"';
$message = _t(
'SilverStripe\\Forms\\GridField\\GridFieldDetailForm.Saved',
@@ -583,7 +583,7 @@ private function getAdjacentRecordID($offset)
$limitOffset = max(0, $itemsPerPage * ($currentPage-1) -1);
$map = $list->limit($limit, $limitOffset)->column('ID');
- $index = array_search($this->record->ID, $map);
+ $index = array_search($this->record->ID, $map ?: []);
return isset($map[$index+$offset]) ? $map[$index+$offset] : false;
}
diff --git a/src/Forms/GridField/GridFieldEditButton.php b/src/Forms/GridField/GridFieldEditButton.php
index aac826507af..6e771e6a2c7 100644
--- a/src/Forms/GridField/GridFieldEditButton.php
+++ b/src/Forms/GridField/GridFieldEditButton.php
@@ -85,7 +85,7 @@ public function getUrl($gridField, $record, $columnName, $addState = true)
*/
public function augmentColumns($gridField, &$columns)
{
- if (!in_array('Actions', $columns)) {
+ if (!in_array('Actions', $columns ?: [])) {
$columns[] = 'Actions';
}
}
@@ -167,7 +167,7 @@ public function getColumnContent($gridField, $record, $columnName)
*/
public function getExtraClass()
{
- return implode(' ', array_keys($this->extraClass));
+ return implode(' ', array_keys($this->extraClass ?: []));
}
/**
diff --git a/src/Forms/GridField/GridFieldExportButton.php b/src/Forms/GridField/GridFieldExportButton.php
index 1954eb00628..40a751d7a51 100644
--- a/src/Forms/GridField/GridFieldExportButton.php
+++ b/src/Forms/GridField/GridFieldExportButton.php
@@ -192,7 +192,7 @@ public function generateExportFileData($gridField)
// determine the CSV headers. If a field is callable (e.g. anonymous function) then use the
// source name as the header instead
foreach ($csvColumns as $columnSource => $columnHeader) {
- if (is_array($columnHeader) && array_key_exists('title', $columnHeader)) {
+ if (is_array($columnHeader) && array_key_exists('title', $columnHeader ?: [])) {
$headers[] = $columnHeader['title'];
} else {
$headers[] = (!is_string($columnHeader) && is_callable($columnHeader)) ? $columnSource : $columnHeader;
@@ -242,9 +242,9 @@ public function generateExportFileData($gridField)
}
$value = $columnHeader($relObj);
- } elseif ($gridFieldColumnsComponent && array_key_exists($columnSource, $columnsHandled)) {
+ } elseif ($gridFieldColumnsComponent && array_key_exists($columnSource, $columnsHandled ?: [])) {
$value = strip_tags(
- $gridFieldColumnsComponent->getColumnContent($gridField, $item, $columnSource)
+ (string) $gridFieldColumnsComponent->getColumnContent($gridField, $item, $columnSource)
);
} else {
$value = $gridField->getDataFieldValue($item, $columnSource);
diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php
index 9bd3bf37a98..1bbe0c601e0 100755
--- a/src/Forms/GridField/GridFieldFilterHeader.php
+++ b/src/Forms/GridField/GridFieldFilterHeader.php
@@ -284,7 +284,7 @@ public function getSearchFieldSchema(GridField $gridField)
$context = $this->getSearchContext($gridField);
$params = $gridField->getRequest()->postVar('filter') ?: [];
- if (array_key_exists($gridField->getName(), $params)) {
+ if (array_key_exists($gridField->getName(), $params ?: [])) {
$params = $params[$gridField->getName()];
}
if ($context->getSearchParams()) {
@@ -302,7 +302,7 @@ public function getSearchFieldSchema(GridField $gridField)
if (!$this->useLegacyFilterHeader && !empty($filters)) {
$filters = array_combine(array_map(function ($key) {
return 'Search__' . $key;
- }, array_keys($filters)), $filters);
+ }, array_keys($filters ?: [])), $filters ?: []);
}
$searchAction = GridField_FormAction::create($gridField, 'filter', false, 'filter', null);
@@ -352,7 +352,7 @@ public function getSearchForm(GridField $gridField)
foreach ($columns as $columnField) {
$metadata = $gridField->getColumnMetadata($columnField);
// Get the field name, without any modifications
- $name = explode('.', $columnField);
+ $name = explode('.', (string) $columnField);
$title = $metadata['title'];
$field = $searchFields->fieldByName($name[0]);
@@ -465,7 +465,7 @@ public function getLegacyFilterHeader(GridField $gridField)
);
}
- if ($currentColumn == count($columns)) {
+ if ($currentColumn == count($columns ?: [])) {
$fields->push(
GridField_FormAction::create($gridField, 'filter', false, 'filter', null)
->addExtraClass('btn font-icon-search btn--no-text btn--icon-large grid-field__filter-submit ss-gridfield-button-filter')
diff --git a/src/Forms/GridField/GridFieldGroupDeleteAction.php b/src/Forms/GridField/GridFieldGroupDeleteAction.php
index 36721002cb9..7fc506156ba 100644
--- a/src/Forms/GridField/GridFieldGroupDeleteAction.php
+++ b/src/Forms/GridField/GridFieldGroupDeleteAction.php
@@ -93,11 +93,11 @@ protected function canUnlink($record)
&& Permission::checkMember($record, 'ADMIN')
) {
$adminGroups = array_intersect(
- $record->Groups()->column(),
+ $record->Groups()->column() ?: [],
Permission::get_groups_by_permission('ADMIN')->column()
);
- if (count($adminGroups) === 1 && array_search($this->groupID, $adminGroups) !== false) {
+ if (count($adminGroups ?: []) === 1 && array_search($this->groupID, $adminGroups ?: []) !== false) {
return false;
}
}
diff --git a/src/Forms/GridField/GridFieldSortableHeader.php b/src/Forms/GridField/GridFieldSortableHeader.php
index 7255cc8b584..94a0b388915 100644
--- a/src/Forms/GridField/GridFieldSortableHeader.php
+++ b/src/Forms/GridField/GridFieldSortableHeader.php
@@ -127,7 +127,7 @@ public function getHTMLFragments($gridField)
foreach ($columns as $columnField) {
$currentColumn++;
$metadata = $gridField->getColumnMetadata($columnField);
- $fieldName = str_replace('.', '-', $columnField);
+ $fieldName = str_replace('.', '-', $columnField ?: '');
$title = $metadata['title'];
if (isset($this->fieldSorting[$columnField]) && $this->fieldSorting[$columnField]) {
@@ -136,12 +136,12 @@ public function getHTMLFragments($gridField)
$allowSort = ($title && $list->canSortBy($columnField));
- if (!$allowSort && strpos($columnField, '.') !== false) {
+ if (!$allowSort && strpos((string) $columnField, '.') !== false) {
// we have a relation column with dot notation
// @see DataObject::relField for approximation
- $parts = explode('.', $columnField);
+ $parts = explode('.', (string) $columnField);
$tmpItem = singleton($list->dataClass());
- for ($idx = 0; $idx < sizeof($parts); $idx++) {
+ for ($idx = 0; $idx < sizeof($parts ?: []); $idx++) {
$methodName = $parts[$idx];
if ($tmpItem instanceof SS_List) {
// It's impossible to sort on a HasManyList/ManyManyList
@@ -154,7 +154,7 @@ public function getHTMLFragments($gridField)
) {
// Else, if we've found a database field at the end of the chain, we can sort on it.
// If a method is applied further to this field (E.g. 'Cost.Currency') then don't try to sort.
- $allowSort = $idx === sizeof($parts) - 1;
+ $allowSort = $idx === sizeof($parts ?: []) - 1;
break;
} else {
// If neither method nor field, then unable to sort
@@ -187,7 +187,7 @@ public function getHTMLFragments($gridField)
}
}
} else {
- if ($currentColumn == count($columns)) {
+ if ($currentColumn == count($columns ?: [])) {
$filter = $gridField->getConfig()->getComponentByType(GridFieldFilterHeader::class);
if ($filter && $filter->useLegacyFilterHeader && $filter->canFilterAnyColumns($gridField)) {
diff --git a/src/Forms/GridField/GridFieldViewButton.php b/src/Forms/GridField/GridFieldViewButton.php
index 9848f7a25cc..22ee5e4e845 100644
--- a/src/Forms/GridField/GridFieldViewButton.php
+++ b/src/Forms/GridField/GridFieldViewButton.php
@@ -49,7 +49,7 @@ public function getUrl($gridField, $record, $columnName)
public function augmentColumns($field, &$columns)
{
- if (!in_array('Actions', $columns)) {
+ if (!in_array('Actions', $columns ?: [])) {
$columns[] = 'Actions';
}
}
diff --git a/src/Forms/GridField/GridField_ActionMenu.php b/src/Forms/GridField/GridField_ActionMenu.php
index caf535b573c..0f90ed967a3 100644
--- a/src/Forms/GridField/GridField_ActionMenu.php
+++ b/src/Forms/GridField/GridField_ActionMenu.php
@@ -12,7 +12,7 @@ class GridField_ActionMenu extends AbstractGridFieldComponent implements GridFie
{
public function augmentColumns($gridField, &$columns)
{
- if (!in_array('Actions', $columns)) {
+ if (!in_array('Actions', $columns ?: [])) {
$columns[] = 'Actions';
}
}
@@ -86,7 +86,7 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
$actions = $item->getActions($gridField);
}
- if (in_array($actionName, $actions)) {
+ if (in_array($actionName, $actions ?: [])) {
$item->handleAction($gridField, $actionName, $arguments, $data);
}
}
diff --git a/src/Forms/GridField/GridField_FormAction.php b/src/Forms/GridField/GridField_FormAction.php
index 789b34c9ae9..23d73748780 100644
--- a/src/Forms/GridField/GridField_FormAction.php
+++ b/src/Forms/GridField/GridField_FormAction.php
@@ -69,7 +69,7 @@ public function __construct(GridField $gridField, $name, $title, $actionName, $a
*/
public function nameEncode($value)
{
- return (string)preg_replace_callback('/[^\w]/', [$this, '_nameEncode'], $value);
+ return (string)preg_replace_callback('/[^\w]/', [$this, '_nameEncode'], $value ?: '');
}
/**
diff --git a/src/Forms/GridField/GridState.php b/src/Forms/GridField/GridState.php
index 2a5efe7ba0d..059ed2a082b 100644
--- a/src/Forms/GridField/GridState.php
+++ b/src/Forms/GridField/GridState.php
@@ -51,7 +51,7 @@ public static function array_to_object($d)
if (is_array($d)) {
return (object) array_map(function ($item) {
return GridState::array_to_object($item);
- }, $d);
+ }, $d ?: []);
}
return $d;
@@ -60,7 +60,7 @@ public static function array_to_object($d)
public function setValue($value, $data = null)
{
// Apply the value on top of the existing defaults
- $data = json_decode($value, true);
+ $data = json_decode((string) $value, true);
if ($data) {
$this->mergeValues($this->getData(), $data);
}
diff --git a/src/Forms/GridField/GridState_Data.php b/src/Forms/GridField/GridState_Data.php
index e73da7a7004..be4e7c4b4ea 100644
--- a/src/Forms/GridField/GridState_Data.php
+++ b/src/Forms/GridField/GridState_Data.php
@@ -63,7 +63,7 @@ public function initDefaults(array $defaults): void
*/
public function getData($name, $default = null)
{
- if (!array_key_exists($name, $this->data)) {
+ if (!array_key_exists($name, $this->data ?: [])) {
$this->data[$name] = $default;
} else {
if (is_array($this->data[$name])) {
@@ -129,7 +129,7 @@ public function getChangesArray(): array
} else {
$value = $v;
// Check if we have a default value for this key and if it matches our current value
- if (array_key_exists($k, $this->defaults) && $this->defaults[$k] === $value) {
+ if (array_key_exists($k, $this->defaults ?: []) && $this->defaults[$k] === $value) {
continue;
}
}
diff --git a/src/Forms/HTMLEditor/HTMLEditorSanitiser.php b/src/Forms/HTMLEditor/HTMLEditorSanitiser.php
index 9cc194de190..2fb705a7261 100644
--- a/src/Forms/HTMLEditor/HTMLEditorSanitiser.php
+++ b/src/Forms/HTMLEditor/HTMLEditorSanitiser.php
@@ -70,7 +70,7 @@ public function __construct(HTMLEditorConfig $config)
*/
protected function patternToRegex($str)
{
- return '/^' . preg_replace('/([?+*])/', '.$1', $str) . '$/';
+ return '/^' . preg_replace('/([?+*])/', '.$1', $str ?: '') . '$/';
}
/**
@@ -87,8 +87,8 @@ protected function addValidElements($validElements)
$attrRuleRegExp = '/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/';
$hasPatternsRegExp = '/[*?+]/';
- foreach (explode(',', $validElements) as $validElement) {
- if (preg_match($elementRuleRegExp, $validElement, $matches)) {
+ foreach (explode(',', (string) $validElements) as $validElement) {
+ if (preg_match((string) $elementRuleRegExp, (string) $validElement, $matches)) {
$prefix = isset($matches[1]) ? $matches[1] : null;
$elementName = isset($matches[2]) ? $matches[2] : null;
$outputName = isset($matches[3]) ? $matches[3] : null;
@@ -114,8 +114,8 @@ protected function addValidElements($validElements)
// Attributes defined
if ($attrData) {
- foreach (explode('|', $attrData) as $attr) {
- if (preg_match($attrRuleRegExp, $attr, $matches)) {
+ foreach (explode('|', (string) $attrData) as $attr) {
+ if (preg_match((string) $attrRuleRegExp, (string) $attr, $matches)) {
$attr = new stdClass();
$attrType = isset($matches[1]) ? $matches[1] : null;
@@ -144,12 +144,12 @@ protected function addValidElements($validElements)
$attr->forcedValue = $value;
} elseif ($prefix === '<') {
// Required values
- $attr->validValues = explode('?', $value);
+ $attr->validValues = explode('?', (string) $value);
}
}
// Check for attribute patterns
- if (preg_match($hasPatternsRegExp, $attrName)) {
+ if (preg_match((string) $hasPatternsRegExp, (string) $attrName)) {
$attr->pattern = $this->patternToRegex($attrName);
$element->attributePatterns[] = $attr;
} else {
@@ -171,7 +171,7 @@ protected function addValidElements($validElements)
}
// Add pattern or exact element
- if (preg_match($hasPatternsRegExp, $elementName)) {
+ if (preg_match((string) $hasPatternsRegExp, (string) $elementName)) {
$element->pattern = $this->patternToRegex($elementName);
$this->elementPatterns[] = $element;
} else {
@@ -192,7 +192,7 @@ protected function getRuleForElement($tag)
return $this->elements[$tag];
}
foreach ($this->elementPatterns as $element) {
- if (preg_match($element->pattern, $tag)) {
+ if (preg_match((string) $element->pattern, (string) $tag)) {
return $element;
}
}
@@ -212,7 +212,7 @@ protected function getRuleForAttribute($elementRule, $name)
return $elementRule->attributes[$name];
}
foreach ($elementRule->attributePatterns as $attribute) {
- if (preg_match($attribute->pattern, $name)) {
+ if (preg_match((string) $attribute->pattern, (string) $name)) {
return $attribute;
}
}
@@ -271,7 +271,7 @@ protected function attributeMatchesRule($attr, $rule = null)
}
// If the rule has a set of valid values, check them to see if this attribute is one
- if (isset($rule->validValues) && !in_array($attr->value, $rule->validValues)) {
+ if (isset($rule->validValues) && !in_array($attr->value, $rule->validValues ?: [])) {
return false;
}
diff --git a/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php b/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php
index a037cb35565..2189963be45 100644
--- a/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php
+++ b/src/Forms/HTMLEditor/TinyMCECombinedGenerator.php
@@ -124,7 +124,7 @@ public function generateContent(TinyMCEConfig $config)
}
// Process source files
- $files = array_filter($files);
+ $files = array_filter($files ?: []);
$libResource = $this->resolveRelativeResource($tinymceDir, 'tinymce');
$libContent = $this->getFileContents($libResource);
@@ -165,7 +165,7 @@ public function generateContent(TinyMCEConfig $config)
return Director::makeRelative($path->getURL());
}
return $path;
- }, $files);
+ }, $files ?: []);
// Join list of paths
$filesList = Convert::raw2js(implode(',', $fileURLS));
@@ -189,14 +189,14 @@ protected function getFileContents($file)
} else {
$path = Director::baseFolder() . '/' . $file;
}
- if (!file_exists($path)) {
+ if (!file_exists((string) $path)) {
return null;
}
- $content = file_get_contents($path);
+ $content = file_get_contents((string) $path);
// Remove UTF-8 BOM
- if (substr($content, 0, 3) === pack("CCC", 0xef, 0xbb, 0xbf)) {
- $content = substr($content, 3);
+ if (substr((string) $content, 0, 3) === pack("CCC", 0xef, 0xbb, 0xbf)) {
+ $content = substr((string) $content, 3);
}
return $content;
@@ -227,12 +227,12 @@ protected function checkName(TinyMCEConfig $config)
*/
public function generateFilename(TinyMCEConfig $config)
{
- $hash = substr(sha1(json_encode($config->getAttributes())), 0, 10);
+ $hash = substr(sha1((string) json_encode($config->getAttributes())), 0, 10);
$name = $this->checkName($config);
$url = str_replace(
['{name}', '{hash}'],
[$name, $hash],
- $this->config()->get('filename_base')
+ $this->config()->get('filename_base') ?: ''
);
return $url;
}
@@ -246,7 +246,7 @@ public function generateFilename(TinyMCEConfig $config)
*/
public static function flush()
{
- $dir = dirname(static::config()->get('filename_base'));
+ $dir = dirname((string) static::config()->get('filename_base'));
static::singleton()->getAssetHandler()->removeContent($dir);
}
@@ -265,7 +265,7 @@ protected function resolveRelativeResource($base, $resource)
if ($base instanceof ModuleResource) {
$next = $base->getRelativeResource($resource . $ext);
} else {
- $next = rtrim($base, '/') . '/' . $resource . $ext;
+ $next = rtrim((string) $base, '/') . '/' . $resource . $ext;
}
// Ensure resource exists
if ($this->resourceExists($next)) {
@@ -289,7 +289,7 @@ protected function resourceExists($resource)
if ($resource instanceof ModuleResource) {
return $resource->exists();
}
- $base = rtrim(Director::baseFolder(), '/');
+ $base = rtrim((string) Director::baseFolder(), '/');
return file_exists($base . '/' . $resource);
}
}
diff --git a/src/Forms/HTMLEditor/TinyMCEConfig.php b/src/Forms/HTMLEditor/TinyMCEConfig.php
index 62a839229ba..b5cf9b7e4ae 100644
--- a/src/Forms/HTMLEditor/TinyMCEConfig.php
+++ b/src/Forms/HTMLEditor/TinyMCEConfig.php
@@ -414,8 +414,8 @@ public function getAttributes()
public function enablePlugins($plugin)
{
$plugins = func_get_args();
- if (is_array(current($plugins))) {
- $plugins = current($plugins);
+ if (is_array(current($plugins ?: []))) {
+ $plugins = current($plugins ?: []);
}
foreach ($plugins as $name => $path) {
// if plugins are passed without a path
@@ -423,7 +423,7 @@ public function enablePlugins($plugin)
$name = $path;
$path = null;
}
- if (!array_key_exists($name, $this->plugins)) {
+ if (!array_key_exists($name, $this->plugins ?: [])) {
$this->plugins[$name] = $path;
}
}
@@ -438,8 +438,8 @@ public function enablePlugins($plugin)
public function disablePlugins($plugin)
{
$plugins = func_get_args();
- if (is_array(current($plugins))) {
- $plugins = current($plugins);
+ if (is_array(current($plugins ?: []))) {
+ $plugins = current($plugins ?: []);
}
foreach ($plugins as $name) {
unset($this->plugins[$name]);
@@ -485,7 +485,7 @@ public function getInternalPlugins()
*/
public function getButtons()
{
- return array_filter($this->buttons);
+ return array_filter($this->buttons ?: []);
}
/**
@@ -541,7 +541,7 @@ public function addButtonsToLine($line, $buttons)
protected function modifyButtons($name, $offset, $del = 0, $add = null)
{
foreach ($this->buttons as &$buttons) {
- if (($idx = array_search($name, $buttons)) !== false) {
+ if (($idx = array_search($name, $buttons ?: [])) !== false) {
if ($add) {
array_splice($buttons, $idx + $offset, $del, $add);
} else {
@@ -659,7 +659,7 @@ protected function getConfig()
$settings['toolbar'] = [];
foreach ($buttons as $rowButtons) {
$row = implode(' ', $rowButtons);
- if (count($buttons) > 1) {
+ if (count($buttons ?: []) > 1) {
$settings['toolbar'][] = $row;
} else {
$settings['toolbar'] = $row;
diff --git a/src/Forms/HTMLReadonlyField.php b/src/Forms/HTMLReadonlyField.php
index 36c83bd956e..813ebe61037 100644
--- a/src/Forms/HTMLReadonlyField.php
+++ b/src/Forms/HTMLReadonlyField.php
@@ -34,6 +34,6 @@ public function Field($properties = [])
*/
public function ValueEntities()
{
- return htmlentities($this->Value(), ENT_COMPAT, 'UTF-8');
+ return htmlentities((string) $this->Value(), ENT_COMPAT, 'UTF-8');
}
}
diff --git a/src/Forms/ListboxField.php b/src/Forms/ListboxField.php
index 0b6b8a56e99..937e46208d3 100644
--- a/src/Forms/ListboxField.php
+++ b/src/Forms/ListboxField.php
@@ -87,10 +87,10 @@ public function getOptions()
$options = [];
$selectedValue = $this->getValueArray();
foreach ($this->getSource() as $itemValue => $title) {
- $itemSelected = in_array($itemValue, $selectedValue)
- || in_array($itemValue, $this->getDefaultItems());
+ $itemSelected = in_array($itemValue, $selectedValue ?: [])
+ || in_array($itemValue, $this->getDefaultItems() ?: []);
$itemDisabled = $this->isDisabled()
- || in_array($itemValue, $this->getDisabledItems());
+ || in_array($itemValue, $this->getDisabledItems() ?: []);
$options[] = new ArrayData([
'Title' => $title,
'Value' => $itemValue,
diff --git a/src/Forms/LookupField.php b/src/Forms/LookupField.php
index 33c160e6e08..de3556ad65d 100644
--- a/src/Forms/LookupField.php
+++ b/src/Forms/LookupField.php
@@ -51,8 +51,8 @@ public function Field($properties = [])
}
if ($mapped) {
- $attrValue = implode(', ', array_values($mapped));
- $inputValue = implode(', ', array_values($values));
+ $attrValue = implode(', ', array_values($mapped ?: []));
+ $inputValue = implode(', ', array_values($values ?: []));
} else {
$attrValue = '(' . _t('SilverStripe\\Forms\\FormField.NONE', 'none') . ')';
$inputValue = '';
diff --git a/src/Forms/MoneyField.php b/src/Forms/MoneyField.php
index cb5e7a5450b..c9105b78f51 100644
--- a/src/Forms/MoneyField.php
+++ b/src/Forms/MoneyField.php
@@ -89,11 +89,11 @@ protected function buildCurrencyField()
// Validate allowed currencies
$currencyValue = $this->fieldCurrency ? $this->fieldCurrency->dataValue() : null;
$allowedCurrencies = $this->getAllowedCurrencies();
- if (count($allowedCurrencies) === 1) {
+ if (count($allowedCurrencies ?: []) === 1) {
// Hidden field for single currency
$field = HiddenField::create("{$name}[Currency]");
reset($allowedCurrencies);
- $currencyValue = key($allowedCurrencies);
+ $currencyValue = key($allowedCurrencies ?: []);
} elseif ($allowedCurrencies) {
// Dropdown field for multiple currencies
$field = DropdownField::create(
@@ -153,7 +153,7 @@ public function setValue($value, $data = null)
// Convert string to array
// E.g. `44.00 NZD`
if (is_string($value) &&
- preg_match('/^(?[\\d\\.]+)( (?\w{3}))?$/i', $value, $matches)
+ preg_match('/^(?[\\d\\.]+)( (?\w{3}))?$/i', (string) $value, $matches)
) {
$currency = isset($matches['currency']) ? strtoupper($matches['currency']) : null;
$value = [
@@ -274,7 +274,7 @@ public function setAllowedCurrencies($currencies)
} elseif (!is_array($currencies)) {
throw new InvalidArgumentException("Invalid currency list");
} elseif (!ArrayLib::is_associative($currencies)) {
- $currencies = array_combine($currencies, $currencies);
+ $currencies = array_combine($currencies ?: [], $currencies ?: []);
}
$this->allowedCurrencies = $currencies;
@@ -326,7 +326,7 @@ public function validate($validator)
// Validate currency
$currencies = $this->getAllowedCurrencies();
$currency = $this->fieldCurrency->dataValue();
- if ($currency && $currencies && !in_array($currency, $currencies)) {
+ if ($currency && $currencies && !in_array($currency, $currencies ?: [])) {
$validator->validationError(
$this->getName(),
_t(
diff --git a/src/Forms/MultiSelectField.php b/src/Forms/MultiSelectField.php
index 6c34e7d62c8..25b399e149f 100644
--- a/src/Forms/MultiSelectField.php
+++ b/src/Forms/MultiSelectField.php
@@ -96,7 +96,7 @@ public function loadFrom(DataObjectInterface $record)
// Detect DB relation or field
if ($relation instanceof Relation) {
// Load ids from relation
- $value = array_values($relation->getIDList());
+ $value = array_values($relation->getIDList() ?: []);
parent::setValue($value);
} elseif ($record->hasField($fieldName)) {
// Load dataValue from field... a CSV for DBMultiEnum
@@ -176,7 +176,7 @@ protected function stringDecode($value)
}
// If json deserialisation fails, then fallover to legacy format
- $result = json_decode($value, true);
+ $result = json_decode((string) $value, true);
if ($result !== false) {
return $result;
}
@@ -200,9 +200,9 @@ protected function csvEncode($value)
',',
array_map(
function ($x) {
- return str_replace(',', '', $x);
+ return str_replace(',', '', $x ?: '');
},
- array_values($value)
+ array_values($value ?: [])
)
);
}
@@ -220,7 +220,7 @@ protected function csvDecode($value)
return [];
}
- return preg_split('/\s*,\s*/', trim($value));
+ return preg_split('/\s*,\s*/', trim((string) $value));
}
/**
@@ -237,7 +237,7 @@ public function validate($validator)
// Filter out selected values not in the data source
$self = $this;
$invalidValues = array_filter(
- $values,
+ $values ?: [],
function ($userValue) use ($self, $validValues) {
foreach ($validValues as $formValue) {
if ($self->isSelectedValue($formValue, $userValue)) {
diff --git a/src/Forms/NullableField.php b/src/Forms/NullableField.php
index 25c601e192c..500fe7b0428 100644
--- a/src/Forms/NullableField.php
+++ b/src/Forms/NullableField.php
@@ -138,7 +138,7 @@ public function setValue($value, $data = null)
{
$id = $this->getIsNullId();
- if (is_array($data) && array_key_exists($id, $data) && $data[$id]) {
+ if (is_array($data) && array_key_exists($id, $data ?: []) && $data[$id]) {
$value = null;
}
diff --git a/src/Forms/NumericField.php b/src/Forms/NumericField.php
index 65392a9543b..ae9e007a283 100644
--- a/src/Forms/NumericField.php
+++ b/src/Forms/NumericField.php
@@ -104,11 +104,11 @@ protected function getNumberType()
public function setSubmittedValue($value, $data = null)
{
// Save original value in case parse fails
- $value = trim($value);
+ $value = trim((string) $value);
$this->originalValue = $value;
// Empty string is no-number (not 0)
- if (strlen($value) === 0) {
+ if (strlen((string) $value) === 0) {
$this->value = null;
return $this;
}
@@ -118,7 +118,7 @@ public function setSubmittedValue($value, $data = null)
$parsed = 0;
$this->value = $formatter->parse($value, $this->getNumberType(), $parsed); // Note: may store literal `false` for invalid values
// Ensure that entire string is parsed
- if ($parsed < strlen($value)) {
+ if ($parsed < strlen((string) $value)) {
$this->value = false;
}
return $this;
@@ -154,7 +154,7 @@ public function setValue($value, $data = null)
*/
protected function cast($value)
{
- if (strlen($value) === 0) {
+ if (strlen((string) $value) === 0) {
return null;
}
if ($this->getScale() === 0) {
diff --git a/src/Forms/PopoverField.php b/src/Forms/PopoverField.php
index 0ec7589b7a6..187fcb34efd 100644
--- a/src/Forms/PopoverField.php
+++ b/src/Forms/PopoverField.php
@@ -101,7 +101,7 @@ public function setPlacement($placement)
{
$valid = ['top', 'right', 'bottom', 'left'];
- if (!in_array($placement, $valid)) {
+ if (!in_array($placement, $valid ?: [])) {
throw new InvalidArgumentException(
'Invalid placement value. Valid: top, left, bottom, right'
);
diff --git a/src/Forms/ReadonlyField.php b/src/Forms/ReadonlyField.php
index fcfe3107270..e4fef000bf8 100644
--- a/src/Forms/ReadonlyField.php
+++ b/src/Forms/ReadonlyField.php
@@ -59,7 +59,7 @@ public function Type()
public function castingHelper($field)
{
// Get dynamic cast for 'Value' field
- if (strcasecmp($field, 'Value') === 0) {
+ if (strcasecmp((string) $field, 'Value') === 0) {
return $this->getValueCast();
}
diff --git a/src/Forms/RequiredFields.php b/src/Forms/RequiredFields.php
index 3b693a3c230..2f974b0845c 100644
--- a/src/Forms/RequiredFields.php
+++ b/src/Forms/RequiredFields.php
@@ -113,11 +113,11 @@ public function php($data)
if ($formField instanceof FileField && isset($value['error']) && $value['error']) {
$error = true;
} else {
- $error = (count($value)) ? false : true;
+ $error = (count($value ?: [])) ? false : true;
}
} else {
// assume a string or integer
- $error = (strlen($value)) ? false : true;
+ $error = (strlen((string) $value)) ? false : true;
}
if ($formField && $error) {
@@ -213,7 +213,7 @@ public function fieldIsRequired($fieldName)
*/
public function getRequired()
{
- return array_values($this->required);
+ return array_values($this->required ?: []);
}
/**
@@ -221,6 +221,6 @@ public function getRequired()
*/
public function canBeCached(): bool
{
- return count($this->getRequired()) === 0;
+ return count($this->getRequired() ?: []) === 0;
}
}
diff --git a/src/Forms/Schema/FormSchema.php b/src/Forms/Schema/FormSchema.php
index 4adc1ca8b04..9dbc668ecaf 100644
--- a/src/Forms/Schema/FormSchema.php
+++ b/src/Forms/Schema/FormSchema.php
@@ -52,12 +52,12 @@ class FormSchema
public function getMultipartSchema($schemaParts, $schemaID, Form $form = null, ValidationResult $result = null)
{
if (!is_array($schemaParts)) {
- $schemaParts = preg_split('#\s*,\s*#', $schemaParts) ?: [];
+ $schemaParts = preg_split('#\s*,\s*#', (string) $schemaParts) ?: [];
}
- $wantSchema = in_array('schema', $schemaParts);
- $wantState = in_array('state', $schemaParts);
- $wantErrors = in_array('errors', $schemaParts);
- $auto = in_array('auto', $schemaParts);
+ $wantSchema = in_array('schema', $schemaParts ?: []);
+ $wantState = in_array('state', $schemaParts ?: []);
+ $wantErrors = in_array('errors', $schemaParts ?: []);
+ $auto = in_array('auto', $schemaParts ?: []);
// Require ID
if (empty($schemaID)) {
diff --git a/src/Forms/SelectField.php b/src/Forms/SelectField.php
index 6d4477aafc1..0c110e2d24e 100644
--- a/src/Forms/SelectField.php
+++ b/src/Forms/SelectField.php
@@ -100,7 +100,7 @@ protected function isDisabledValue($value)
if ($this->isDisabled()) {
return true;
}
- return in_array($value, $this->getDisabledItems());
+ return in_array($value, $this->getDisabledItems() ?: []);
}
public function getAttributes()
@@ -118,7 +118,7 @@ public function getAttributes()
*/
protected function getSourceValues()
{
- return array_keys($this->getSource());
+ return array_keys($this->getSource() ?: []);
}
/**
@@ -130,9 +130,9 @@ protected function getSourceValues()
*/
public function getValidValues()
{
- $valid = array_diff($this->getSourceValues(), $this->getDisabledItems());
+ $valid = array_diff($this->getSourceValues() ?: [], $this->getDisabledItems());
// Renumber indexes from 0
- return array_values($valid);
+ return array_values($valid ?: []);
}
/**
@@ -195,7 +195,7 @@ protected function getListValues($values)
// Direct array
if (is_array($values)) {
- return array_values($values);
+ return array_values($values ?: []);
}
// Extract lists
diff --git a/src/Forms/SelectionGroup.php b/src/Forms/SelectionGroup.php
index 3ff48eece66..749d53c8739 100644
--- a/src/Forms/SelectionGroup.php
+++ b/src/Forms/SelectionGroup.php
@@ -54,8 +54,8 @@ public function __construct($name, $items, $value = null)
$selectionItems[] = $item;
} else {
// Convert legacy format
- if (strpos($key, '//') !== false) {
- list($key,$title) = explode('//', $key, 2);
+ if (strpos((string) $key, '//') !== false) {
+ list($key,$title) = explode('//', (string) $key, 2);
} else {
$title = null;
}
diff --git a/src/Forms/SingleLookupField.php b/src/Forms/SingleLookupField.php
index b17cc8ed0e5..bd2690bb3f8 100644
--- a/src/Forms/SingleLookupField.php
+++ b/src/Forms/SingleLookupField.php
@@ -29,7 +29,7 @@ protected function valueToLabel()
$source = $this->getSource();
$source = ($source instanceof Map) ? $source->toArray() : $source;
- if (array_key_exists($value, $source)) {
+ if (array_key_exists($value, $source ?: [])) {
return $source[$value];
}
diff --git a/src/Forms/SingleSelectField.php b/src/Forms/SingleSelectField.php
index 7d0a218196d..3d03201aacb 100644
--- a/src/Forms/SingleSelectField.php
+++ b/src/Forms/SingleSelectField.php
@@ -133,7 +133,7 @@ public function validate($validator)
$selected = $this->Value();
$validValues = $this->getValidValues();
- if (strlen($selected)) {
+ if (strlen((string) $selected)) {
// Use selection rules to check which are valid
foreach ($validValues as $formValue) {
if ($this->isSelectedValue($formValue, $selected)) {
@@ -141,7 +141,7 @@ public function validate($validator)
}
}
} else {
- if ($this->getHasEmptyDefault() || !$validValues || in_array('', $validValues)) {
+ if ($this->getHasEmptyDefault() || !$validValues || in_array('', $validValues ?: [])) {
// Check empty value
return true;
}
diff --git a/src/Forms/TabSet.php b/src/Forms/TabSet.php
index f8aabcf63ab..7a80a81299e 100644
--- a/src/Forms/TabSet.php
+++ b/src/Forms/TabSet.php
@@ -79,7 +79,7 @@ public function __construct($name, $titleOrTab = null, $tabs = null)
}
// Normalise children list
- if (count($tabs) === 1 && (is_array($tabs[0]) || $tabs[0] instanceof FieldList)) {
+ if (count($tabs ?: []) === 1 && (is_array($tabs[0]) || $tabs[0] instanceof FieldList)) {
$tabs = $tabs[0];
}
diff --git a/src/Forms/TextField.php b/src/Forms/TextField.php
index f1e171b78c8..5e7b694627d 100644
--- a/src/Forms/TextField.php
+++ b/src/Forms/TextField.php
@@ -141,7 +141,7 @@ public function InternallyLabelledField()
*/
public function validate($validator)
{
- if (!is_null($this->maxLength) && mb_strlen($this->value) > $this->maxLength) {
+ if (!is_null($this->maxLength) && mb_strlen((string) $this->value) > $this->maxLength) {
$name = strip_tags($this->Title() ? $this->Title() : $this->getName());
$validator->validationError(
$this->name,
diff --git a/src/Forms/TextareaField.php b/src/Forms/TextareaField.php
index a4023221ceb..a08923673ad 100644
--- a/src/Forms/TextareaField.php
+++ b/src/Forms/TextareaField.php
@@ -174,6 +174,6 @@ public function Type()
*/
public function ValueEntities()
{
- return htmlentities($this->Value(), ENT_COMPAT, 'UTF-8');
+ return htmlentities((string) $this->Value(), ENT_COMPAT, 'UTF-8');
}
}
diff --git a/src/Forms/TimeField.php b/src/Forms/TimeField.php
index 748ea49e5df..8d196c0e87e 100644
--- a/src/Forms/TimeField.php
+++ b/src/Forms/TimeField.php
@@ -457,7 +457,7 @@ protected function tidyInternal($time)
$timestamp = $formatter->parse($time);
if ($timestamp === false) {
// Fallback to strtotime
- $timestamp = strtotime($time, DBDatetime::now()->getTimestamp());
+ $timestamp = strtotime((string) $time, DBDatetime::now()->getTimestamp());
if ($timestamp === false) {
return null;
}
@@ -498,7 +498,7 @@ protected function withTimezone($timezone, $callback)
$currentTimezone = date_default_timezone_get();
try {
if ($timezone) {
- date_default_timezone_set($timezone);
+ date_default_timezone_set((string) $timezone);
}
return $callback();
} finally {
diff --git a/src/Forms/Tip.php b/src/Forms/Tip.php
index 508e3451c09..e501b92a574 100644
--- a/src/Forms/Tip.php
+++ b/src/Forms/Tip.php
@@ -83,7 +83,7 @@ public function getImportanceLevel(): string
*/
public function setImportanceLevel(string $importance_level): self
{
- if (!in_array($importance_level, self::IMPORTANCE_LEVELS)) {
+ if (!in_array($importance_level, self::IMPORTANCE_LEVELS ?: [])) {
throw new InvalidArgumentException(
'Provided importance level must be defined in Tip::IMPORTANCE_LEVELS'
);
diff --git a/src/Forms/ToggleCompositeField.php b/src/Forms/ToggleCompositeField.php
index 5aecc5f3a1f..be6aef6000f 100644
--- a/src/Forms/ToggleCompositeField.php
+++ b/src/Forms/ToggleCompositeField.php
@@ -46,7 +46,7 @@ public function FieldHolder($properties = [])
{
$context = $this;
- if (count($properties)) {
+ if (count($properties ?: [])) {
$context = $this->customise($properties);
}
diff --git a/src/Forms/TreeDropdownField.php b/src/Forms/TreeDropdownField.php
index a6f21ec14bf..d5c552dcdfb 100644
--- a/src/Forms/TreeDropdownField.php
+++ b/src/Forms/TreeDropdownField.php
@@ -242,7 +242,7 @@ public function __construct(
$this->setShowSearch($showSearch);
// Extra settings for Folders
- if (strcasecmp($sourceObject, Folder::class) === 0) {
+ if (strcasecmp((string) $sourceObject, Folder::class) === 0) {
$this->setChildrenMethod('ChildFolders');
$this->setNumChildrenMethod('numChildFolders');
}
@@ -514,7 +514,7 @@ public function tree(HTTPRequest $request)
// Allow to pass values to be selected within the ajax request
$value = $request->requestVar('forceValue') ?: $this->value;
- if ($value && ($values = preg_split('/,\s*/', $value))) {
+ if ($value && ($values = preg_split('/,\s*/', (string) $value))) {
foreach ($values as $value) {
if (!$value || $value == 'unchanged') {
continue;
@@ -724,7 +724,7 @@ protected function flattenChildrenArray($children, $parentTitles = [])
$child['contextString'] = ($contextString !== '') ? $contextString . '/' : '';
unset($child['children']);
- if (!$this->search || in_array($child['id'], $this->realSearchIds)) {
+ if (!$this->search || in_array($child['id'], $this->realSearchIds ?: [])) {
$output[] = $child;
}
$output = array_merge($output, $this->flattenChildrenArray($grandChildren, $childTitles));
diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php
index 516acf6bee7..ae6818fccc2 100644
--- a/src/Forms/TreeMultiselectField.php
+++ b/src/Forms/TreeMultiselectField.php
@@ -104,7 +104,7 @@ public function getSchemaStateDefaults()
$data['data']['valueObjects'] = $values;
// cannot rely on $this->value as this could be a many-many relationship
- $value = array_column($values, 'id');
+ $value = array_column($values ?: [], 'id');
if ($value) {
sort($value);
$data['value'] = $value;
@@ -151,13 +151,13 @@ public function getItems()
$ids = [];
if (is_string($value)) {
- $ids = preg_split("#\s*,\s*#", trim($value));
+ $ids = preg_split("#\s*,\s*#", trim((string) $value));
} elseif (is_array($value)) {
- $ids = array_values($value);
+ $ids = array_values($value ?: []);
}
// Filter out empty strings
- $ids = array_filter($ids);
+ $ids = array_filter($ids ?: []);
// No value
if (empty($ids)) {
@@ -208,7 +208,7 @@ public function Field($properties = [])
$items = $this->getItems();
$emptyTitle = _t('SilverStripe\\Forms\\DropdownField.CHOOSE', '(Choose)', 'start value of a dropdown');
- if ($items && count($items)) {
+ if ($items && count($items ?: [])) {
foreach ($items as $item) {
$idArray[] = $item->ID;
$titleArray[] = ($item instanceof ViewableData)
@@ -314,7 +314,7 @@ protected function objectForKey($key)
if ($this->getKeyField() === 'ID' && $key === 'unchanged') {
$key = null;
} elseif (is_string($key)) {
- $key = preg_split('/\s*,\s*/', trim($key));
+ $key = preg_split('/\s*,\s*/', trim((string) $key));
}
return parent::objectForKey($key);
diff --git a/src/Logging/DebugViewFriendlyErrorFormatter.php b/src/Logging/DebugViewFriendlyErrorFormatter.php
index 857fbfb70d5..13cf8d05dab 100644
--- a/src/Logging/DebugViewFriendlyErrorFormatter.php
+++ b/src/Logging/DebugViewFriendlyErrorFormatter.php
@@ -157,7 +157,7 @@ private function addContactAdministratorInfo()
return 'Contact an administrator: ' . Email::obfuscate($adminEmail);
}
- if (!is_array($adminEmail) || !count($adminEmail)) {
+ if (!is_array($adminEmail) || !count($adminEmail ?: [])) {
return null;
}
diff --git a/src/Logging/DetailedErrorFormatter.php b/src/Logging/DetailedErrorFormatter.php
index 187c85357f5..9432117d3ec 100644
--- a/src/Logging/DetailedErrorFormatter.php
+++ b/src/Logging/DetailedErrorFormatter.php
@@ -39,7 +39,7 @@ public function format(array $record)
// call to the fatal error handler and is not useful, so exclude it entirely
$i = $this->findInTrace($trace, $context['file'], $context['line']);
if ($i !== null) {
- $context['trace'] = array_slice($trace, $i);
+ $context['trace'] = array_slice($trace ?: [], (int) $i);
} else {
$context['trace'] = null;
}
@@ -57,7 +57,7 @@ public function format(array $record)
public function formatBatch(array $records)
{
- return implode("\n", array_map([$this, 'format'], $records));
+ return implode("\n", array_map([$this, 'format'], $records ?: []));
}
/**
@@ -105,15 +105,15 @@ protected function output($errno, $errstr, $errfile, $errline, $errcontext)
$output = $reporter->renderHeader();
$output .= $reporter->renderError($httpRequest, $errno, $errstr, $errfile, $errline);
- if (file_exists($errfile)) {
- $lines = file($errfile);
+ if (file_exists((string) $errfile)) {
+ $lines = file((string) $errfile);
// Make the array 1-based
array_unshift($lines, "");
unset($lines[0]);
$offset = $errline-10;
- $lines = array_slice($lines, $offset, 16, true);
+ $lines = array_slice($lines ?: [], (int) $offset, 16, true);
$output .= $reporter->renderSourceFragment($lines, $errline);
}
$output .= $reporter->renderTrace($errcontext);
diff --git a/src/ORM/ArrayLib.php b/src/ORM/ArrayLib.php
index 296a202164d..645ec70e30e 100644
--- a/src/ORM/ArrayLib.php
+++ b/src/ORM/ArrayLib.php
@@ -71,7 +71,7 @@ public static function invert($arr)
*/
public static function valuekey($arr)
{
- return array_combine($arr, $arr);
+ return array_combine($arr ?: [], $arr ?: []);
}
/**
@@ -97,7 +97,7 @@ public static function array_values_recursive($array)
public static function filter_keys($arr, $keys)
{
foreach ($arr as $key => $v) {
- if (!in_array($key, $keys)) {
+ if (!in_array($key, $keys ?: [])) {
unset($arr[$key]);
}
}
@@ -119,7 +119,7 @@ public static function is_associative($array)
{
$isAssociative = !empty($array)
&& is_array($array)
- && ($array !== array_values($array));
+ && ($array !== array_values($array ?: []));
return $isAssociative;
}
@@ -142,7 +142,7 @@ public static function in_array_recursive($needle, $haystack, $strict = false)
return false;
}
- if (in_array($needle, $haystack, $strict)) {
+ if (in_array($needle, $haystack ?: [], (bool) $strict)) {
return true;
} else {
foreach ($haystack as $obj) {
@@ -170,7 +170,7 @@ public static function array_map_recursive($f, $array)
return is_array($v) ? ArrayLib::array_map_recursive($f, $v) : call_user_func($f, $v);
};
- return array_map($applyOrRecurse, $array);
+ return array_map($applyOrRecurse, $array ?: []);
}
/**
@@ -190,7 +190,7 @@ public static function array_merge_recursive($array)
$arrays = func_get_args();
$merged = [];
- if (count($arrays) == 1) {
+ if (count($arrays ?: []) == 1) {
return $array;
}
@@ -210,7 +210,7 @@ public static function array_merge_recursive($array)
}
foreach ($array as $key => $value) {
- if (is_array($value) && array_key_exists($key, $merged) && is_array($merged[$key])) {
+ if (is_array($value) && array_key_exists($key, $merged ?: []) && is_array($merged[$key])) {
$merged[$key] = ArrayLib::array_merge_recursive($merged[$key], $value);
} else {
$merged[$key] = $value;
@@ -262,11 +262,11 @@ public static function iterateVolatile(array &$list)
// Keyed by already-iterated items
$iterated = [];
// Get all items not yet iterated
- while ($items = array_diff_key($list, $iterated)) {
+ while ($items = array_diff_key($list ?: [], $iterated)) {
// Yield all results
foreach ($items as $key => $value) {
// Skip items removed by a prior step
- if (array_key_exists($key, $list)) {
+ if (array_key_exists($key, $list ?: [])) {
// Ensure we yield from the source list
$iterated[$key] = true;
yield $key => $list[$key];
diff --git a/src/ORM/ArrayList.php b/src/ORM/ArrayList.php
index 8911f3326b4..a581763635d 100644
--- a/src/ORM/ArrayList.php
+++ b/src/ORM/ArrayList.php
@@ -40,7 +40,7 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
*/
public function __construct(array $items = [])
{
- $this->items = array_values($items);
+ $this->items = array_values($items ?: []);
parent::__construct();
}
@@ -61,7 +61,7 @@ public function dataClass()
if ($this->dataClass) {
return $this->dataClass;
}
- if (count($this->items) > 0) {
+ if (count($this->items ?: []) > 0) {
return get_class($this->items[0]);
}
return null;
@@ -84,9 +84,10 @@ public function setDataClass($class)
*
* @return int
*/
+ #[\ReturnTypeWillChange]
public function count()
{
- return count($this->items);
+ return count($this->items ?: []);
}
/**
@@ -105,13 +106,14 @@ public function exists()
*
* @return ArrayIterator
*/
+ #[\ReturnTypeWillChange]
public function getIterator()
{
$items = array_map(
function ($item) {
return is_array($item) ? new ArrayData($item) : $item;
},
- $this->items
+ $this->items ?: []
);
return new ArrayIterator($items);
}
@@ -206,11 +208,11 @@ public function limit($length, $offset = 0)
);
}
- $length = count($this->items);
+ $length = count($this->items ?: []);
}
$list = clone $this;
- $list->items = array_slice($this->items, $offset, $length);
+ $list->items = array_slice($this->items ?: [], (int) $offset, $length);
return $list;
}
@@ -240,7 +242,7 @@ public function remove($item)
}
}
if ($renumberKeys) {
- $this->items = array_values($this->items);
+ $this->items = array_values($this->items ?: []);
}
}
@@ -289,7 +291,7 @@ public function removeDuplicates($field = 'ID')
foreach ($this->items as $key => $item) {
$value = $this->extractValue($item, $field);
- if (array_key_exists($value, $seen)) {
+ if (array_key_exists($value, $seen ?: [])) {
$renumberKeys = true;
unset($this->items[$key]);
}
@@ -298,7 +300,7 @@ public function removeDuplicates($field = 'ID')
}
if ($renumberKeys) {
- $this->items = array_values($this->items);
+ $this->items = array_values($this->items ?: []);
}
return $this;
@@ -427,7 +429,7 @@ public function column($colName = 'ID')
*/
public function columnUnique($colName = 'ID')
{
- return array_unique($this->column($colName));
+ return array_unique($this->column($colName) ?: []);
}
/**
@@ -449,7 +451,7 @@ public function canSortBy($by)
public function reverse()
{
$list = clone $this;
- $list->items = array_reverse($this->items);
+ $list->items = array_reverse($this->items ?: []);
return $list;
}
@@ -471,7 +473,7 @@ protected function parseSortColumn($column, $direction = null)
// Parse column specification, considering possible ansi sql quoting
// Note that table prefix is allowed, but discarded
- if (preg_match('/^("?(?[^"\s]+)"?\\.)?"?(?[^"\s]+)"?(\s+(?((asc)|(desc))(ending)?))?$/i', $column, $match)) {
+ if (preg_match('/^("?(?[^"\s]+)"?\\.)?"?(?[^"\s]+)"?(\s+(?((asc)|(desc))(ending)?))?$/i', (string) $column, $match)) {
$column = $match['column'];
if (empty($direction) && !empty($match['direction'])) {
$direction = $match['direction'];
@@ -481,9 +483,9 @@ protected function parseSortColumn($column, $direction = null)
}
// Parse sort direction specification
- if (empty($direction) || preg_match('/^asc(ending)?$/i', $direction)) {
+ if (empty($direction) || preg_match('/^asc(ending)?$/i', (string) $direction)) {
$direction = SORT_ASC;
- } elseif (preg_match('/^desc(ending)?$/i', $direction)) {
+ } elseif (preg_match('/^desc(ending)?$/i', (string) $direction)) {
$direction = SORT_DESC;
} else {
throw new InvalidArgumentException("Invalid sort() direction");
@@ -509,19 +511,19 @@ public function sort()
{
$args = func_get_args();
- if (count($args)==0) {
+ if (count($args ?: [])==0) {
return $this;
}
- if (count($args)>2) {
+ if (count($args ?: [])>2) {
throw new InvalidArgumentException('This method takes zero, one or two arguments');
}
$columnsToSort = [];
// One argument and it's a string
- if (count($args)==1 && is_string($args[0])) {
+ if (count($args ?: [])==1 && is_string($args[0])) {
list($column, $direction) = $this->parseSortColumn($args[0]);
$columnsToSort[$column] = $direction;
- } elseif (count($args)==2) {
+ } elseif (count($args ?: [])==2) {
list($column, $direction) = $this->parseSortColumn($args[0], $args[1]);
$columnsToSort[$column] = $direction;
} elseif (is_array($args[0])) {
@@ -536,7 +538,7 @@ public function sort()
// Store the original keys of the items as a sort fallback, so we can preserve the original order in the event
// that array_multisort is unable to work out a sort order for them. This also prevents array_multisort trying
// to inspect object properties which can result in errors with circular dependencies
- $originalKeys = array_keys($this->items);
+ $originalKeys = array_keys($this->items ?: []);
// This the main sorting algorithm that supports infinite sorting params
$multisortArgs = [];
@@ -549,7 +551,7 @@ public function sort()
$sortDirection[$column] = $direction;
// We need to subtract every value into a temporary array for sorting
foreach ($this->items as $index => $item) {
- $values[$column][] = strtolower($this->extractValue($item, $column));
+ $values[$column][] = strtolower((string) $this->extractValue($item, $column));
}
// PHP 5.3 requires below arguments to be reference when using array_multisort together
// with call_user_func_array
@@ -568,7 +570,7 @@ public function sort()
$list = clone $this;
// As the last argument we pass in a reference to the items that all the sorting will be applied upon
$multisortArgs[] = &$list->items;
- call_user_func_array('array_multisort', $multisortArgs);
+ call_user_func_array('array_multisort', $multisortArgs ?: []);
return $list;
}
@@ -600,7 +602,7 @@ public function canFilterBy($by)
$firstRecord = $this->first();
- return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($by, $firstRecord);
+ return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($by, (string) $firstRecord);
}
/**
@@ -624,7 +626,7 @@ public function filter()
foreach ($this->items as $item) {
$keepItem = true;
foreach ($keepUs as $column => $value) {
- if ((is_array($value) && !in_array($this->extractValue($item, $column), $value))
+ if ((is_array($value) && !in_array($this->extractValue($item, $column), $value ?: []))
|| (!is_array($value) && $this->extractValue($item, $column) != $value)
) {
$keepItem = false;
@@ -676,7 +678,7 @@ public function filterAny()
}
$list = clone $this;
- $list->items = array_unique($itemsToKeep, SORT_REGULAR);
+ $list->items = array_unique($itemsToKeep ?: [], SORT_REGULAR);
return $list;
}
@@ -692,20 +694,20 @@ public function filterAny()
protected function normaliseFilterArgs($column, $value = null)
{
$args = func_get_args();
- if (count($args) > 2) {
+ if (count($args ?: []) > 2) {
throw new InvalidArgumentException('filter takes one array or two arguments');
}
- if (count($args) === 1 && !is_array($args[0])) {
+ if (count($args ?: []) === 1 && !is_array($args[0])) {
throw new InvalidArgumentException('filter takes one array or two arguments');
}
$keepUs = [];
- if (count($args) === 2) {
+ if (count($args ?: []) === 2) {
$keepUs[$args[0]] = $args[1];
}
- if (count($args) === 1 && is_array($args[0])) {
+ if (count($args ?: []) === 1 && is_array($args[0])) {
foreach ($args[0] as $key => $val) {
$keepUs[$key] = $val;
}
@@ -722,7 +724,7 @@ protected function normaliseFilterArgs($column, $value = null)
*/
public function byIDs($ids)
{
- $ids = array_map('intval', $ids); // sanitize
+ $ids = array_map('intval', $ids ?: []); // sanitize
return $this->filter('ID', $ids);
}
@@ -780,23 +782,23 @@ public function exclude()
{
$removeUs = $this->normaliseFilterArgs(...func_get_args());
- $hitsRequiredToRemove = count($removeUs);
+ $hitsRequiredToRemove = count($removeUs ?: []);
$matches = [];
foreach ($removeUs as $column => $excludeValue) {
foreach ($this->items as $key => $item) {
if (!is_array($excludeValue) && $this->extractValue($item, $column) == $excludeValue) {
$matches[$key] = isset($matches[$key]) ? $matches[$key] + 1 : 1;
- } elseif (is_array($excludeValue) && in_array($this->extractValue($item, $column), $excludeValue)) {
+ } elseif (is_array($excludeValue) && in_array($this->extractValue($item, $column), $excludeValue ?: [])) {
$matches[$key] = isset($matches[$key]) ? $matches[$key] + 1 : 1;
}
}
}
- $keysToRemove = array_keys($matches, $hitsRequiredToRemove);
+ $keysToRemove = array_keys($matches ?: [], $hitsRequiredToRemove);
$itemsToKeep = [];
foreach ($this->items as $key => $value) {
- if (!in_array($key, $keysToRemove)) {
+ if (!in_array($key, $keysToRemove ?: [])) {
$itemsToKeep[] = $value;
}
}
@@ -817,9 +819,10 @@ protected function shouldExclude($item, $args)
* @param mixed $offset
* @return bool
*/
+ #[\ReturnTypeWillChange]
public function offsetExists($offset)
{
- return array_key_exists($offset, $this->items);
+ return array_key_exists($offset, $this->items ?: []);
}
/**
@@ -828,6 +831,7 @@ public function offsetExists($offset)
* @param mixed $offset
* @return DataObject
*/
+ #[\ReturnTypeWillChange]
public function offsetGet($offset)
{
if ($this->offsetExists($offset)) {
@@ -842,6 +846,7 @@ public function offsetGet($offset)
* @param mixed $offset
* @param mixed $value
*/
+ #[\ReturnTypeWillChange]
public function offsetSet($offset, $value)
{
if ($offset === null) {
@@ -856,6 +861,7 @@ public function offsetSet($offset, $value)
*
* @param mixed $offset
*/
+ #[\ReturnTypeWillChange]
public function offsetUnset($offset)
{
unset($this->items[$offset]);
@@ -878,7 +884,7 @@ protected function extractValue($item, $key)
return $item->{$key};
}
- if (array_key_exists($key, $item)) {
+ if (array_key_exists($key, $item ?: [])) {
return $item[$key];
}
diff --git a/src/ORM/Connect/DBConnector.php b/src/ORM/Connect/DBConnector.php
index 50f83a36bee..6d7b42927f7 100644
--- a/src/ORM/Connect/DBConnector.php
+++ b/src/ORM/Connect/DBConnector.php
@@ -63,7 +63,7 @@ protected function databaseError($msg, $errorLevel = E_USER_ERROR, $sql = null,
// in code, such as credential checking during installation
throw new DatabaseException($msg, 0, null, $sql, $parameters);
} else {
- user_error($msg, $errorLevel);
+ user_error((string) $msg, (int) $errorLevel);
}
}
@@ -116,14 +116,14 @@ public function isQueryWrite($sql)
*/
protected function isQueryType($sql, $type)
{
- if (!preg_match('/^(?\w+)\b/', $sql, $matches)) {
+ if (!preg_match('/^(?\w+)\b/', (string) $sql, $matches)) {
return false;
}
$operation = $matches['operation'];
if (is_array($type)) {
- return in_array(strtolower($operation), $type);
+ return in_array(strtolower((string) $operation), $type ?: []);
}
- return strcasecmp($sql, $type) === 0;
+ return strcasecmp((string) $sql, (string) $type) === 0;
}
/**
diff --git a/src/ORM/Connect/DBQueryBuilder.php b/src/ORM/Connect/DBQueryBuilder.php
index 47769f6226b..a495386d5fc 100644
--- a/src/ORM/Connect/DBQueryBuilder.php
+++ b/src/ORM/Connect/DBQueryBuilder.php
@@ -171,7 +171,7 @@ protected function buildSelectFragment(SQLSelect $query, array &$parameters)
foreach ($select as $alias => $field) {
// Don't include redundant aliases.
$fieldAlias = "\"{$alias}\"";
- if ($alias === $field || substr($field, -strlen($fieldAlias)) === $fieldAlias) {
+ if ($alias === $field || substr((string) $field, -strlen((string) $fieldAlias)) === $fieldAlias) {
$clauses[] = $field;
} else {
$clauses[] = "$field AS $fieldAlias";
diff --git a/src/ORM/Connect/DBSchemaManager.php b/src/ORM/Connect/DBSchemaManager.php
index 3332f46904b..81badf3f371 100644
--- a/src/ORM/Connect/DBSchemaManager.php
+++ b/src/ORM/Connect/DBSchemaManager.php
@@ -376,7 +376,7 @@ public function requireTable(
$tableOptionsChanged = false;
// Check for DB constant on the schema class
$dbIDName = sprintf('%s::ID', static::class);
- $dbID = defined($dbIDName) ? constant($dbIDName) : null;
+ $dbID = defined((string) $dbIDName) ? constant($dbIDName) : null;
if ($dbID && isset($options[$dbID])) {
if (preg_match('/ENGINE=([^\s]*)/', $options[$dbID], $alteredEngineMatches)) {
$alteredEngine = $alteredEngineMatches[1];
@@ -400,11 +400,11 @@ public function requireTable(
foreach ($fieldSchema as $fieldName => $fieldSpec) {
//Is this an array field?
$arrayValue = '';
- if (strpos($fieldSpec, '[') !== false) {
+ if (strpos((string) $fieldSpec, '[') !== false) {
//If so, remove it and store that info separately
- $pos = strpos($fieldSpec, '[');
- $arrayValue = substr($fieldSpec, $pos);
- $fieldSpec = substr($fieldSpec, 0, $pos);
+ $pos = strpos((string) $fieldSpec, '[');
+ $arrayValue = substr((string) $fieldSpec, (int) $pos);
+ $fieldSpec = substr((string) $fieldSpec, 0, $pos);
}
/** @var DBField $fieldObj */
@@ -535,11 +535,11 @@ protected function explodeColumnString($spec)
{
// Remove any leading/trailing brackets and outlying modifiers
// E.g. 'unique (Title, "QuotedColumn");' => 'Title, "QuotedColumn"'
- $containedSpec = preg_replace('/(.*\(\s*)|(\s*\).*)/', '', $spec);
+ $containedSpec = preg_replace('/(.*\(\s*)|(\s*\).*)/', '', $spec ?: '');
// Split potentially quoted modifiers
// E.g. 'Title, "QuotedColumn"' => ['Title', 'QuotedColumn']
- return preg_split('/"?\s*,\s*"?/', trim($containedSpec, '(") '));
+ return preg_split('/"?\s*,\s*"?/', trim((string) $containedSpec, '(") '));
}
/**
@@ -581,7 +581,7 @@ protected function determineIndexType($spec)
// check array spec
if (is_array($spec) && isset($spec['type'])) {
return $spec['type'];
- } elseif (!is_array($spec) && preg_match('/(?\w+)\s*\(/', $spec, $matchType)) {
+ } elseif (!is_array($spec) && preg_match('/(?\w+)\s*\(/', (string) $spec, $matchType)) {
return strtolower($matchType['type']);
} else {
return 'index';
@@ -604,10 +604,10 @@ protected function convertIndexSpec($indexSpec)
{
// Return already converted spec
if (!is_array($indexSpec)
- || !array_key_exists('type', $indexSpec)
- || !array_key_exists('columns', $indexSpec)
+ || !array_key_exists('type', $indexSpec ?: [])
+ || !array_key_exists('columns', $indexSpec ?: [])
|| !is_array($indexSpec['columns'])
- || array_key_exists('value', $indexSpec)
+ || array_key_exists('value', $indexSpec ?: [])
) {
throw new \InvalidArgumentException(
sprintf(
@@ -642,7 +642,7 @@ public function hasField($tableName, $fieldName)
return false;
}
$fields = $this->fieldList($tableName);
- return array_key_exists($fieldName, $fields);
+ return array_key_exists($fieldName, $fields ?: []);
}
/**
@@ -677,7 +677,7 @@ public function requireField($table, $field, $spec)
// collations.
// TODO: move this to the MySQLDatabase file, or drop it altogether?
if (!$this->database->supportsCollations()) {
- $spec = preg_replace('/ *character set [^ ]+( collate [^ ]+)?( |$)/', '\\2', $spec);
+ $spec = preg_replace('/ *character set [^ ]+( collate [^ ]+)?( |$)/', '\\2', $spec ?: '');
}
if (!isset($this->tableList[strtolower($table)])) {
@@ -719,23 +719,23 @@ public function requireField($table, $field, $spec)
// If enums/sets are being modified, then we need to fix existing data in the table.
// Update any records where the enum is set to a legacy value to be set to the default.
$enumValuesExpr = "/^(enum|set)\\s*\\(['\"](?[^'\"]+)['\"]\\).*/i";
- if (preg_match($enumValuesExpr, $specValue, $specMatches)
- && preg_match($enumValuesExpr, $spec_orig, $oldMatches)
+ if (preg_match((string) $enumValuesExpr, (string) $specValue, $specMatches)
+ && preg_match((string) $enumValuesExpr, (string) $spec_orig, $oldMatches)
) {
$new = preg_split("/'\\s*,\\s*'/", $specMatches['values']);
$old = preg_split("/'\\s*,\\s*'/", $oldMatches['values']);
$holder = [];
foreach ($old as $check) {
- if (!in_array($check, $new)) {
+ if (!in_array($check, $new ?: [])) {
$holder[] = $check;
}
}
- if (count($holder)) {
+ if (count($holder ?: [])) {
// Get default pre-escaped for SQL. We just use this directly, as we don't have a real way to
// de-encode SQL values
- $default = explode('default ', $spec_orig);
+ $default = explode('default ', (string) $spec_orig);
$defaultSQL = isset($default[1]) ? $default[1] : 'NULL';
// Reset to default any value in that is in the old enum, but not the new one
$placeholders = DB::placeholders($holder);
@@ -764,7 +764,7 @@ public function requireField($table, $field, $spec)
public function dontRequireField($table, $fieldName)
{
$fieldList = $this->fieldList($table);
- if (array_key_exists($fieldName, $fieldList)) {
+ if (array_key_exists($fieldName, $fieldList ?: [])) {
$suffix = '';
while (isset($fieldList[strtolower("_obsolete_{$fieldName}$suffix")])) {
$suffix = $suffix
@@ -808,7 +808,7 @@ public function alterationMessage($message, $type = "")
default:
$sign = ' ';
}
- $message = strip_tags($message);
+ $message = strip_tags((string) $message);
echo " $sign $message\n";
} else {
switch ($type) {
@@ -862,7 +862,7 @@ public function fixTableCase($tableName)
{
// Check if table exists
$tables = $this->tableList();
- if (!array_key_exists(strtolower($tableName), $tables)) {
+ if (!array_key_exists(strtolower((string) $tableName), $tables ?: [])) {
return;
}
diff --git a/src/ORM/Connect/Database.php b/src/ORM/Connect/Database.php
index c7ef09be1ff..32591beba46 100644
--- a/src/ORM/Connect/Database.php
+++ b/src/ORM/Connect/Database.php
@@ -236,7 +236,7 @@ protected function benchmarkQuery($sql, $callback, $parameters = [])
$displaySql = false;
foreach (self::$whitelist_array as $query => $searchType) {
$fullQuery = ($searchType === self::FULL_QUERY && $query === $sql);
- $partialQuery = ($searchType === self::PARTIAL_QUERY && mb_strpos($sql, $query) !== false);
+ $partialQuery = ($searchType === self::PARTIAL_QUERY && mb_strpos((string) $sql, (string) $query) !== false);
if (!$fullQuery && !$partialQuery) {
continue;
}
@@ -348,7 +348,7 @@ public function escapeIdentifier($value, $separator = '.')
{
// Split string into components
if (!is_array($value)) {
- $value = explode($separator, $value);
+ $value = explode((string) $separator, (string) $value);
}
// Implode quoted column
@@ -478,7 +478,7 @@ public function nullCheckClause($field, $isNull)
$clause = $isNull
? "%s IS NULL"
: "%s IS NOT NULL";
- return sprintf($clause, $field);
+ return sprintf((string) $clause, $field);
}
/**
@@ -906,7 +906,7 @@ public function selectDatabase($name, $create = false, $errorLevel = E_USER_ERRO
// Check DB creation permission
if (!$create) {
if ($errorLevel !== false) {
- user_error("Attempted to connect to non-existing database \"$name\"", $errorLevel);
+ user_error("Attempted to connect to non-existing database \"$name\"", (int) $errorLevel);
}
// Unselect database
$this->connector->unloadDatabase();
diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
index 7f5d3547711..3e06744e2cd 100644
--- a/src/ORM/Connect/MySQLDatabase.php
+++ b/src/ORM/Connect/MySQLDatabase.php
@@ -184,15 +184,15 @@ public function searchEngine(
) {
$pageClass = SiteTree::class;
$fileClass = File::class;
- if (!class_exists($pageClass)) {
+ if (!class_exists((string) $pageClass)) {
throw new Exception('MySQLDatabase->searchEngine() requires "SiteTree" class');
}
- if (!class_exists($fileClass)) {
+ if (!class_exists((string) $fileClass)) {
throw new Exception('MySQLDatabase->searchEngine() requires "File" class');
}
$keywords = $this->escapeString($keywords);
- $htmlEntityKeywords = htmlentities($keywords, ENT_NOQUOTES, 'UTF-8');
+ $htmlEntityKeywords = htmlentities((string) $keywords, ENT_NOQUOTES, 'UTF-8');
$extraFilters = [$pageClass => '', $fileClass => ''];
@@ -218,7 +218,7 @@ public function searchEngine(
// by checking for its existence first
$fileTable = DataObject::getSchema()->tableName($fileClass);
$fields = $this->getSchemaManager()->fieldList($fileTable);
- if (array_key_exists('ShowInSearch', $fields)) {
+ if (array_key_exists('ShowInSearch', $fields ?: [])) {
$extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
}
@@ -237,8 +237,8 @@ public function searchEngine(
// We make the relevance search by converting a boolean mode search into a normal one
$booleanChars = ['*', '+', '@', '-', '(', ')', '<', '>'];
- $relevanceKeywords = str_replace($booleanChars, '', $keywords);
- $htmlEntityRelevanceKeywords = str_replace($booleanChars, '', $htmlEntityKeywords);
+ $relevanceKeywords = str_replace($booleanChars ?: '', '', $keywords ?: '');
+ $htmlEntityRelevanceKeywords = str_replace($booleanChars ?: '', '', $htmlEntityKeywords ?: '');
$relevance[$pageClass] = "MATCH (Title, MenuTitle, Content, MetaDescription) "
. "AGAINST ('$relevanceKeywords') "
. "+ MATCH (Title, MenuTitle, Content, MetaDescription) AGAINST ('$htmlEntityRelevanceKeywords')";
@@ -444,16 +444,16 @@ public function comparisonClause(
public function formattedDatetimeClause($date, $format)
{
- preg_match_all('/%(.)/', $format, $matches);
+ preg_match_all('/%(.)/', (string) $format, $matches);
foreach ($matches[1] as $match) {
if (array_search($match, ['Y', 'm', 'd', 'H', 'i', 's', 'U']) === false) {
user_error('formattedDatetimeClause(): unsupported format character %' . $match, E_USER_WARNING);
}
}
- if (preg_match('/^now$/i', $date)) {
+ if (preg_match('/^now$/i', (string) $date)) {
$date = "NOW()";
- } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date)) {
+ } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', (string) $date)) {
$date = "'$date'";
}
@@ -466,11 +466,11 @@ public function formattedDatetimeClause($date, $format)
public function datetimeIntervalClause($date, $interval)
{
- $interval = preg_replace('/(year|month|day|hour|minute|second)s/i', '$1', $interval);
+ $interval = preg_replace('/(year|month|day|hour|minute|second)s/i', '$1', $interval ?: '');
- if (preg_match('/^now$/i', $date)) {
+ if (preg_match('/^now$/i', (string) $date)) {
$date = "NOW()";
- } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date)) {
+ } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', (string) $date)) {
$date = "'$date'";
}
@@ -480,15 +480,15 @@ public function datetimeIntervalClause($date, $interval)
public function datetimeDifferenceClause($date1, $date2)
{
// First date format
- if (preg_match('/^now$/i', $date1)) {
+ if (preg_match('/^now$/i', (string) $date1)) {
$date1 = "NOW()";
- } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date1)) {
+ } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', (string) $date1)) {
$date1 = "'$date1'";
}
// Second date format
- if (preg_match('/^now$/i', $date2)) {
+ if (preg_match('/^now$/i', (string) $date2)) {
$date2 = "NOW()";
- } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', $date2)) {
+ } elseif (preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/i', (string) $date2)) {
$date2 = "'$date2'";
}
diff --git a/src/ORM/Connect/MySQLQuery.php b/src/ORM/Connect/MySQLQuery.php
index f1dbfefd289..03a70c1add9 100644
--- a/src/ORM/Connect/MySQLQuery.php
+++ b/src/ORM/Connect/MySQLQuery.php
@@ -75,7 +75,7 @@ public function nextRecord()
if (!isset($this->columns[$i])) {
throw new DatabaseException("Can't get metadata for column $i");
}
- if (in_array($this->columns[$i]->type, $floatTypes)) {
+ if (in_array($this->columns[$i]->type, $floatTypes ?: [])) {
$value = (float)$value;
}
$data[$this->columns[$i]->name] = $value;
diff --git a/src/ORM/Connect/MySQLQueryBuilder.php b/src/ORM/Connect/MySQLQueryBuilder.php
index da7791c13d1..a6a48f53e83 100644
--- a/src/ORM/Connect/MySQLQueryBuilder.php
+++ b/src/ORM/Connect/MySQLQueryBuilder.php
@@ -40,7 +40,7 @@ public function buildLimitFragment(SQLSelect $query, array &$parameters)
}
// Assert that the array version provides the 'limit' key
- if (!array_key_exists('limit', $limit) || ($limit['limit'] !== null && ! is_numeric($limit['limit']))) {
+ if (!array_key_exists('limit', $limit ?: []) || ($limit['limit'] !== null && ! is_numeric($limit['limit']))) {
throw new InvalidArgumentException(
'MySQLQueryBuilder::buildLimitSQL(): Wrong format for $limit: ' . var_export($limit, true)
);
diff --git a/src/ORM/Connect/MySQLSchemaManager.php b/src/ORM/Connect/MySQLSchemaManager.php
index fd02b38cafa..d4f9c164a7f 100644
--- a/src/ORM/Connect/MySQLSchemaManager.php
+++ b/src/ORM/Connect/MySQLSchemaManager.php
@@ -180,7 +180,7 @@ public function hasTable($table)
{
// MySQLi doesn't like parameterised queries for some queries
// underscores need to be escaped in a SHOW TABLES LIKE query
- $sqlTable = str_replace('_', '\\_', $this->database->quoteString($table));
+ $sqlTable = str_replace('_', '\\_', $this->database->quoteString($table) ?: '');
return (bool) ($this->query("SHOW TABLES LIKE $sqlTable")->value());
}
@@ -197,7 +197,7 @@ public function databaseList()
public function databaseExists($name)
{
// MySQLi doesn't like parameterised queries for some queries
- $sqlName = addcslashes($this->database->quoteString($name), '%_');
+ $sqlName = addcslashes((string) $this->database->quoteString($name), '%_');
return !!($this->query("SHOW DATABASES LIKE $sqlName")->value());
}
@@ -234,7 +234,7 @@ public function alterField($tableName, $fieldName, $fieldSpec)
public function renameField($tableName, $oldName, $newName)
{
$fieldList = $this->fieldList($tableName);
- if (array_key_exists($oldName, $fieldList)) {
+ if (array_key_exists($oldName, $fieldList ?: [])) {
$this->query("ALTER TABLE \"$tableName\" CHANGE \"$oldName\" \"$newName\" " . $fieldList[$oldName]);
}
}
@@ -251,11 +251,11 @@ private function shouldUseIntegerWidth()
return $forceWidth;
}
$v = $this->database->getVersion();
- if (false !== strpos($v, 'MariaDB')) {
+ if (false !== strpos((string) $v, 'MariaDB')) {
// MariaDB is included in the version string: https://mariadb.com/kb/en/version/
return true;
}
- return version_compare($v, '8.0.17', '<');
+ return version_compare((string) $v, '8.0.17', '<');
}
public function fieldList($table)
@@ -391,7 +391,7 @@ public function enumValuesForField($tableName, $fieldName)
$classes = [];
foreach ($matches[0] as $value) {
- $classes[] = stripslashes(trim($value, "'"));
+ $classes[] = stripslashes(trim((string) $value, "'"));
}
return $classes;
}
@@ -461,10 +461,10 @@ public function decimal($values)
// Fix format of default value to match precision
if (isset($values['default']) && is_numeric($values['default'])) {
- $decs = strpos($precision, ',') !== false
+ $decs = strpos((string) $precision, ',') !== false
? (int) substr($precision, strpos($precision, ',') + 1)
: 0;
- $values['default'] = number_format($values['default'], $decs, '.', '');
+ $values['default'] = number_format($values['default'], (int) $decs, '.', '');
} else {
unset($values['default']);
}
diff --git a/src/ORM/Connect/MySQLStatement.php b/src/ORM/Connect/MySQLStatement.php
index d79cf94c822..1b33bc1ce00 100644
--- a/src/ORM/Connect/MySQLStatement.php
+++ b/src/ORM/Connect/MySQLStatement.php
@@ -79,7 +79,7 @@ protected function bind()
// Buffer all results
$this->statement->store_result();
- call_user_func_array([$this->statement, 'bind_result'], $variables);
+ call_user_func_array([$this->statement, 'bind_result'], $variables ?: []);
}
/**
@@ -129,7 +129,7 @@ public function nextRecord()
$row = [];
foreach ($this->boundValues as $key => $value) {
$floatTypes = [MYSQLI_TYPE_FLOAT, MYSQLI_TYPE_DOUBLE, MYSQLI_TYPE_DECIMAL, MYSQLI_TYPE_NEWDECIMAL];
- if (in_array($this->types[$key], $floatTypes)) {
+ if (in_array($this->types[$key], $floatTypes ?: [])) {
$value = (float)$value;
}
$row[$key] = $value;
diff --git a/src/ORM/Connect/MySQLiConnector.php b/src/ORM/Connect/MySQLiConnector.php
index 8f2c9107976..901bc452000 100644
--- a/src/ORM/Connect/MySQLiConnector.php
+++ b/src/ORM/Connect/MySQLiConnector.php
@@ -91,9 +91,9 @@ public function connect($parameters, $selectDB = false)
}
// Set SSL parameters if they exist. All parameters are required.
- if (array_key_exists('ssl_key', $parameters) &&
- array_key_exists('ssl_cert', $parameters) &&
- array_key_exists('ssl_ca', $parameters)) {
+ if (array_key_exists('ssl_key', $parameters ?: []) &&
+ array_key_exists('ssl_cert', $parameters ?: []) &&
+ array_key_exists('ssl_ca', $parameters ?: [])) {
$this->dbConn->ssl_set(
$parameters['ssl_key'],
$parameters['ssl_cert'],
@@ -198,7 +198,7 @@ public function parsePreparedParameters($parameters, &$blobs)
$types = '';
$values = [];
$blobs = [];
- $parametersCount = count($parameters);
+ $parametersCount = count($parameters ?: []);
for ($index = 0; $index < $parametersCount; $index++) {
$value = $parameters[$index];
$phpType = gettype($value);
@@ -258,7 +258,7 @@ public function bindParameters(mysqli_stmt $statement, array $parameters)
// Because mysqli_stmt::bind_param arguments must be passed by reference
// we need to do a bit of hackery
$boundNames = [];
- $parametersCount = count($parameters);
+ $parametersCount = count($parameters ?: []);
for ($i = 0; $i < $parametersCount; $i++) {
$boundName = "param$i";
$$boundName = $parameters[$i];
diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php
index 84f4b0026a9..5a39e2987c0 100644
--- a/src/ORM/Connect/PDOConnector.php
+++ b/src/ORM/Connect/PDOConnector.php
@@ -118,7 +118,7 @@ public function getOrPrepareStatement($sql)
$statementHandle = ($statement === false) ? false : new PDOStatementHandle($statement);
// Only cache select statements
- if (preg_match('/^(\s*)select\b/i', $sql)) {
+ if (preg_match('/^(\s*)select\b/i', (string) $sql)) {
$this->cachedStatements[$sql] = $statementHandle;
}
return $statementHandle;
@@ -212,17 +212,17 @@ public function connect($parameters, $selectDB = false)
}
// Set SSL options if they are defined
- if (array_key_exists('ssl_key', $parameters) &&
- array_key_exists('ssl_cert', $parameters)
+ if (array_key_exists('ssl_key', $parameters ?: []) &&
+ array_key_exists('ssl_cert', $parameters ?: [])
) {
$options[PDO::MYSQL_ATTR_SSL_KEY] = $parameters['ssl_key'];
$options[PDO::MYSQL_ATTR_SSL_CERT] = $parameters['ssl_cert'];
- if (array_key_exists('ssl_ca', $parameters)) {
+ if (array_key_exists('ssl_ca', $parameters ?: [])) {
$options[PDO::MYSQL_ATTR_SSL_CA] = $parameters['ssl_ca'];
}
// use default cipher if not provided
$options[PDO::MYSQL_ATTR_SSL_CIPHER] =
- array_key_exists('ssl_cipher', $parameters) ?
+ array_key_exists('ssl_cipher', $parameters ?: []) ?
$parameters['ssl_cipher'] :
self::config()->get('ssl_cipher_default');
}
@@ -278,7 +278,7 @@ public function escapeString($value)
// Since the PDO library quotes the value, we should remove this to maintain
// consistency with MySQLDatabase::escapeString
- if (preg_match('/^\'(?.*)\'$/', $value, $matches)) {
+ if (preg_match('/^\'(?.*)\'$/', (string) $value, $matches)) {
$value = $matches['value'];
}
return $value;
@@ -383,7 +383,7 @@ public function getPDOParamType($phpType)
public function bindParameters(PDOStatement $statement, $parameters)
{
// Bind all parameters
- $parameterCount = count($parameters);
+ $parameterCount = count($parameters ?: []);
for ($index = 0; $index < $parameterCount; $index++) {
$value = $parameters[$index];
$phpType = gettype($value);
diff --git a/src/ORM/Connect/PDOQuery.php b/src/ORM/Connect/PDOQuery.php
index 718fd6f8b7c..026f6510490 100644
--- a/src/ORM/Connect/PDOQuery.php
+++ b/src/ORM/Connect/PDOQuery.php
@@ -34,7 +34,7 @@ public function seek($row)
public function numRecords()
{
- return count($this->results);
+ return count($this->results ?: []);
}
public function nextRecord()
diff --git a/src/ORM/Connect/PDOStatementHandle.php b/src/ORM/Connect/PDOStatementHandle.php
index 4eae21fef14..9ad81cd632a 100644
--- a/src/ORM/Connect/PDOStatementHandle.php
+++ b/src/ORM/Connect/PDOStatementHandle.php
@@ -85,7 +85,7 @@ function ($rowArray) {
}
return $row;
},
- $this->statement->fetchAll(PDO::FETCH_NUM)
+ $this->statement->fetchAll(PDO::FETCH_NUM) ?: []
);
}
diff --git a/src/ORM/Connect/Query.php b/src/ORM/Connect/Query.php
index 122de024b95..af9e0c3a540 100644
--- a/src/ORM/Connect/Query.php
+++ b/src/ORM/Connect/Query.php
@@ -170,6 +170,7 @@ public function table()
*
* @return void
*/
+ #[\ReturnTypeWillChange]
public function rewind()
{
if ($this->queryHasBegun && $this->numRecords() > 0) {
@@ -184,6 +185,7 @@ public function rewind()
*
* @return array
*/
+ #[\ReturnTypeWillChange]
public function current()
{
if (!$this->currentRecord) {
@@ -209,6 +211,7 @@ public function first()
*
* @return int
*/
+ #[\ReturnTypeWillChange]
public function key()
{
return $this->rowNum;
@@ -220,6 +223,7 @@ public function key()
*
* @return array
*/
+ #[\ReturnTypeWillChange]
public function next()
{
$this->queryHasBegun = true;
@@ -233,6 +237,7 @@ public function next()
*
* @return bool
*/
+ #[\ReturnTypeWillChange]
public function valid()
{
if (!$this->queryHasBegun) {
diff --git a/src/ORM/Connect/TempDatabase.php b/src/ORM/Connect/TempDatabase.php
index 4a5a30b5a4a..77506553aa1 100644
--- a/src/ORM/Connect/TempDatabase.php
+++ b/src/ORM/Connect/TempDatabase.php
@@ -58,8 +58,8 @@ protected function isDBTemp($name)
{
$prefix = Environment::getEnv('SS_DATABASE_PREFIX') ?: 'ss_';
$result = preg_match(
- sprintf('/^%stmpdb_[0-9]+_[0-9]+$/i', preg_quote($prefix, '/')),
- $name
+ sprintf('/^%stmpdb_[0-9]+_[0-9]+$/i', preg_quote((string) $prefix, '/')),
+ (string) $name
);
return $result === 1;
}
diff --git a/src/ORM/DB.php b/src/ORM/DB.php
index 1b45c1c81c8..15e2cc302cb 100644
--- a/src/ORM/DB.php
+++ b/src/ORM/DB.php
@@ -268,7 +268,7 @@ public static function valid_alternative_database_name($name)
$prefix = Environment::getEnv('SS_DATABASE_PREFIX') ?: 'ss_';
$pattern = strtolower(sprintf('/^%stmpdb\d{7}$/', $prefix));
- return (bool)preg_match($pattern, $name);
+ return (bool)preg_match((string) $pattern, (string) $name);
}
/**
@@ -365,7 +365,7 @@ public static function query($sql, $errorLevel = E_USER_ERROR)
public static function placeholders($input, $join = ', ')
{
if (is_array($input)) {
- $number = count($input);
+ $number = count($input ?: []);
} elseif (is_numeric($input)) {
$number = intval($input);
} else {
@@ -374,7 +374,7 @@ public static function placeholders($input, $join = ', ')
if ($number === 0) {
return null;
}
- return implode($join, array_fill(0, $number, '?'));
+ return implode($join ?: '', array_fill(0, (int) $number, '?'));
}
/**
@@ -385,10 +385,10 @@ public static function placeholders($input, $join = ', ')
*/
public static function inline_parameters($sql, $parameters)
{
- $segments = preg_split('/\?/', $sql);
+ $segments = preg_split('/\?/', (string) $sql);
$joined = '';
$inString = false;
- $numSegments = count($segments);
+ $numSegments = count($segments ?: []);
for ($i = 0; $i < $numSegments; $i++) {
$input = $segments[$i];
// Append next segment
@@ -399,10 +399,10 @@ public static function inline_parameters($sql, $parameters)
}
// check string escape on previous fragment
// Remove escaped backslashes, count them!
- $input = preg_replace('/\\\\\\\\/', '', $input);
+ $input = preg_replace('/\\\\\\\\/', '', $input ?: '');
// Count quotes
- $totalQuotes = substr_count($input, "'"); // Includes double quote escaped quotes
- $escapedQuotes = substr_count($input, "\\'");
+ $totalQuotes = substr_count((string) $input, "'"); // Includes double quote escaped quotes
+ $escapedQuotes = substr_count((string) $input, "\\'");
if ((($totalQuotes - $escapedQuotes) % 2) !== 0) {
$inString = !$inString;
}
diff --git a/src/ORM/DataExtension.php b/src/ORM/DataExtension.php
index 4fbf3f211d3..077431d2557 100644
--- a/src/ORM/DataExtension.php
+++ b/src/ORM/DataExtension.php
@@ -264,8 +264,8 @@ public function updateSummaryFields(&$fields)
if ($summary_fields) {
// if summary_fields were passed in numeric array,
// convert to an associative array
- if ($summary_fields && array_key_exists(0, $summary_fields)) {
- $summary_fields = array_combine(array_values($summary_fields), array_values($summary_fields));
+ if ($summary_fields && array_key_exists(0, $summary_fields ?: [])) {
+ $summary_fields = array_combine(array_values($summary_fields ?: []), array_values($summary_fields ?: []));
}
if ($summary_fields) {
$fields = array_merge($fields, $summary_fields);
diff --git a/src/ORM/DataList.php b/src/ORM/DataList.php
index dff1db476a0..464a7810262 100644
--- a/src/ORM/DataList.php
+++ b/src/ORM/DataList.php
@@ -250,7 +250,7 @@ public function canSortBy($fieldName)
public function canFilterBy($fieldName)
{
$model = singleton($this->dataClass);
- $relations = explode(".", $fieldName);
+ $relations = explode(".", (string) $fieldName);
// First validate the relationships
$fieldName = array_pop($relations);
foreach ($relations as $r) {
@@ -330,7 +330,7 @@ public function sort()
list($col, $dir) = func_get_args();
// Validate direction
- if (!in_array(strtolower($dir), ['desc', 'asc'])) {
+ if (!in_array(strtolower((string) $dir), ['desc', 'asc'])) {
user_error('Second argument to sort must be either ASC or DESC');
}
@@ -387,7 +387,7 @@ public function filter()
{
// Validate and process arguments
$arguments = func_get_args();
- switch (sizeof($arguments)) {
+ switch (sizeof($arguments ?: [])) {
case 1:
$filters = $arguments[0];
@@ -526,7 +526,7 @@ public function applyRelation($field, &$columnName = null, $linearOnly = false)
}
// Simple fields without relations are mapped directly
- if (strpos($field, '.') === false) {
+ if (strpos((string) $field, '.') === false) {
$columnName = '"' . $field . '"';
return $this;
}
@@ -555,7 +555,7 @@ function (DataQuery $query) use ($field, &$columnName, $linearOnly) {
*/
protected function isValidRelationName($field)
{
- return preg_match('/^[A-Z0-9._]+$/i', $field);
+ return preg_match('/^[A-Z0-9._]+$/i', (string) $field);
}
/**
@@ -568,7 +568,7 @@ protected function isValidRelationName($field)
protected function createSearchFilter($filter, $value)
{
// Field name is always the first component
- $fieldArgs = explode(':', $filter);
+ $fieldArgs = explode(':', (string) $filter);
$fieldName = array_shift($fieldArgs);
// Inspect type of second argument to determine context
@@ -582,7 +582,7 @@ protected function createSearchFilter($filter, $value)
// Whether this is a valid modifier on the default filter, or a filter itself.
/** @var SearchFilter $defaultFilterInstance */
$defaultFilterInstance = Injector::inst()->get('DataListFilter.default');
- if (in_array(strtolower($secondArg), $defaultFilterInstance->getSupportedModifiers())) {
+ if (in_array(strtolower((string) $secondArg), $defaultFilterInstance->getSupportedModifiers() ?: [])) {
// Treat second (and any subsequent) argument as modifiers, using default filter
$filterServiceName = 'DataListFilter.default';
array_unshift($modifiers, $secondArg);
@@ -866,6 +866,7 @@ public function getQueryParams()
*
* @return ArrayIterator
*/
+ #[\ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->toArray());
@@ -876,6 +877,7 @@ public function getIterator()
*
* @return int
*/
+ #[\ReturnTypeWillChange]
public function count()
{
return $this->dataQuery->count();
@@ -1248,6 +1250,7 @@ public function reverse()
* @param mixed $key
* @return bool
*/
+ #[\ReturnTypeWillChange]
public function offsetExists($key)
{
return ($this->limit(1, $key)->first() != null);
@@ -1261,6 +1264,7 @@ public function offsetExists($key)
* @param mixed $key
* @return DataObject
*/
+ #[\ReturnTypeWillChange]
public function offsetGet($key)
{
return $this->limit(1, $key)->first();
@@ -1272,6 +1276,7 @@ public function offsetGet($key)
* @param mixed $key
* @param mixed $value
*/
+ #[\ReturnTypeWillChange]
public function offsetSet($key, $value)
{
throw new \BadMethodCallException("Can't alter items in a DataList using array-access");
@@ -1282,6 +1287,7 @@ public function offsetSet($key, $value)
*
* @param mixed $key
*/
+ #[\ReturnTypeWillChange]
public function offsetUnset($key)
{
throw new \BadMethodCallException("Can't alter items in a DataList using array-access");
diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index a21f55211a3..d2d0e04bb87 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -464,8 +464,8 @@ private function hydrate(array $record, bool $mustHaveID)
);
foreach ($fields as $field => $fieldSpec) {
- $fieldClass = strtok($fieldSpec, ".");
- if (!array_key_exists($field, $record)) {
+ $fieldClass = strtok((string) $fieldSpec, ".");
+ if (!array_key_exists($field, $record ?: [])) {
$this->record[$field . '_Lazy'] = $fieldClass;
}
}
@@ -479,7 +479,7 @@ private function hydrate(array $record, bool $mustHaveID)
// If a corresponding lazy-load field exists, remove it as the value has been provided
$lazyName = $field . '_Lazy';
- if (array_key_exists($lazyName, $this->record)) {
+ if (array_key_exists($lazyName, $this->record ?: [])) {
unset($this->record[$lazyName]);
}
}
@@ -519,7 +519,7 @@ public function duplicate($doWrite = true, $relations = null)
$relations = 'many_many';
}
Deprecation::notice('5.0', 'Use cascade_duplicates config instead of providing a string to duplicate()');
- $relations = array_keys($this->config()->get($relations)) ?: [];
+ $relations = array_keys($this->config()->get($relations) ?: []) ?: [];
}
// Get duplicates
@@ -527,7 +527,7 @@ public function duplicate($doWrite = true, $relations = null)
$relations = $this->config()->get('cascade_duplicates');
// Remove any duplicate entries before duplicating them
if (is_array($relations)) {
- $relations = array_unique($relations);
+ $relations = array_unique($relations ?: []);
}
}
@@ -756,7 +756,7 @@ public function getClassName()
*/
public function setClassName($className)
{
- $className = trim($className);
+ $className = trim((string) $className);
if (!$className || !is_subclass_of($className, self::class)) {
return $this;
}
@@ -832,7 +832,7 @@ public function defineMethods()
}
}
if ($belongsTo = $this->belongsTo()) {
- foreach (array_keys($belongsTo) as $relationship) {
+ foreach (array_keys($belongsTo ?: []) as $relationship) {
$this->addWrapperMethod($relationship, 'getComponent');
}
}
@@ -907,10 +907,10 @@ public function singular_name()
if ($name) {
return $name;
}
- return ucwords(trim(strtolower(preg_replace(
+ return ucwords(trim(strtolower((string) preg_replace(
'/_?([A-Z])/',
' $1',
- ClassInfo::shortName($this)
+ ClassInfo::shortName($this) ?: ''
))));
}
@@ -944,8 +944,8 @@ public function plural_name()
}
$name = $this->singular_name();
//if the penultimate character is not a vowel, replace "y" with "ies"
- if (preg_match('/[^aeiou]y$/i', $name)) {
- $name = substr($name, 0, -1) . 'ie';
+ if (preg_match('/[^aeiou]y$/i', (string) $name)) {
+ $name = substr((string) $name, 0, -1) . 'ie';
}
return ucfirst($name . 's');
}
@@ -1017,7 +1017,7 @@ public function data()
public function toMap()
{
$this->loadLazyFields();
- return array_filter($this->record, function ($val) {
+ return array_filter($this->record ?: [], function ($val) {
return $val !== null;
});
}
@@ -1054,8 +1054,8 @@ public function update($data)
{
foreach ($data as $key => $value) {
// Implement dot syntax for updates
- if (strpos($key, '.') !== false) {
- $relations = explode('.', $key);
+ if (strpos((string) $key, '.') !== false) {
+ $relations = explode('.', (string) $key);
$fieldName = array_pop($relations);
/** @var static $relObj */
$relObj = $this;
@@ -1067,7 +1067,7 @@ public function update($data)
$parentObj = $relObj;
$relObj = $relObj->$relation();
// If the intermediate relationship objects haven't been created, then write them
- if ($i < sizeof($relations) - 1 && !$relObj->ID || (!$relObj->ID && $parentObj !== $this)) {
+ if ($i < sizeof($relations ?: []) - 1 && !$relObj->ID || (!$relObj->ID && $parentObj !== $this)) {
$relObj->write();
$relatedFieldName = $relation . "ID";
$parentObj->$relatedFieldName = $relObj->ID;
@@ -1227,7 +1227,7 @@ public function forceChange()
$this->loadLazyFields();
// Populate the null values in record so that they actually get written
- foreach (array_keys(static::getSchema()->fieldSpecs(static::class)) as $fieldName) {
+ foreach (array_keys(static::getSchema()->fieldSpecs(static::class) ?: []) as $fieldName) {
if (!isset($this->record[$fieldName])) {
$this->record[$fieldName] = null;
}
@@ -1355,7 +1355,7 @@ protected function onAfterDelete()
*/
public function populateDefaults()
{
- $classes = array_reverse(ClassInfo::ancestry($this));
+ $classes = array_reverse(ClassInfo::ancestry($this) ?: []);
foreach ($classes as $class) {
$defaults = Config::inst()->get($class, 'defaults', Config::UNINHERITED);
@@ -1964,7 +1964,7 @@ public function setComponent($componentName, $item)
// For belongs_to, add to has_one on other component
$joinField = $schema->getRemoteJoinField(static::class, $componentName, 'belongs_to', $polymorphic);
if (!$polymorphic) {
- $joinField = substr($joinField, 0, -2);
+ $joinField = substr((string) $joinField, 0, -2);
}
$item->setComponent($joinField, $this);
}
@@ -2051,8 +2051,8 @@ public function getRelationClass($relationName)
$remoteClass = $candidates[$relationName];
// If dot notation is present, extract just the first part that contains the class.
- if (($fieldPos = strpos($remoteClass, '.')) !== false) {
- return substr($remoteClass, 0, $fieldPos);
+ if (($fieldPos = strpos((string) $remoteClass, '.')) !== false) {
+ return substr((string) $remoteClass, 0, $fieldPos);
}
// Otherwise just return the class
@@ -2120,7 +2120,7 @@ public function inferReciprocalComponent($remoteClass, $remoteRelation)
if ($class === self::class) {
return null;
}
- if (!is_a($this, $class, true)) {
+ if (!is_a($this, (string) $class, true)) {
throw new InvalidArgumentException(sprintf(
"Relation %s on %s does not refer to objects of type %s",
$remoteRelation,
@@ -2287,7 +2287,7 @@ public function belongsTo($classOnly = true)
{
$belongsTo = (array)$this->config()->get('belongs_to');
if ($belongsTo && $classOnly) {
- return preg_replace('/(.+)?\..+/', '$1', $belongsTo);
+ return preg_replace('/(.+)?\..+/', '$1', $belongsTo ?: '');
} else {
return $belongsTo ? $belongsTo : [];
}
@@ -2305,7 +2305,7 @@ public function hasMany($classOnly = true)
{
$hasMany = (array)$this->config()->get('has_many');
if ($hasMany && $classOnly) {
- return preg_replace('/(.+)?\..+/', '$1', $hasMany);
+ return preg_replace('/(.+)?\..+/', '$1', $hasMany ?: '');
} else {
return $hasMany ? $hasMany : [];
}
@@ -2444,7 +2444,7 @@ public function scaffoldSearchFields($_params = null)
continue;
}
- if (strstr($fieldName, '.')) {
+ if (strstr((string) $fieldName, '.')) {
$field->setName(str_replace('.', '__', $fieldName));
}
$field->setTitle($spec['title']);
@@ -2667,7 +2667,7 @@ protected function loadLazyFields($class = null)
$loaded = [];
foreach ($this->record as $key => $value) {
- if (strlen($key) > 5 && substr($key, -5) == '_Lazy' && !array_key_exists($value, $loaded)) {
+ if (strlen((string) $key) > 5 && substr((string) $key, -5) == '_Lazy' && !array_key_exists($value, $loaded ?: [])) {
$this->loadLazyFields($value);
$loaded[$value] = $value;
}
@@ -2715,7 +2715,7 @@ protected function loadLazyFields($class = null)
// Load the data into record
if ($newData) {
foreach ($newData as $k => $v) {
- if (in_array($k, $columns)) {
+ if (in_array($k, $columns ?: [])) {
$this->record[$k] = $v;
$this->original[$k] = $v;
unset($this->record[$k . '_Lazy']);
@@ -2761,7 +2761,7 @@ public function getChangedFields($databaseFieldsOnly = false, $changeLevel = sel
// Update the changed array with references to changed obj-fields
foreach ($this->record as $k => $v) {
// Prevents DBComposite infinite looping on isChanged
- if (is_array($databaseFieldsOnly) && !in_array($k, $databaseFieldsOnly)) {
+ if (is_array($databaseFieldsOnly) && !in_array($k, $databaseFieldsOnly ?: [])) {
continue;
}
if (is_object($v) && method_exists($v, 'isChanged') && $v->isChanged()) {
@@ -2772,8 +2772,8 @@ public function getChangedFields($databaseFieldsOnly = false, $changeLevel = sel
// If change was forced, then derive change data from $this->record
if ($this->changeForced && $changeLevel <= self::CHANGE_STRICT) {
$changed = array_combine(
- array_keys($this->record),
- array_fill(0, count($this->record), self::CHANGE_STRICT)
+ array_keys($this->record ?: []),
+ array_fill(0, count($this->record ?: []), self::CHANGE_STRICT)
);
// @todo Find better way to allow versioned to write a new version after forceChange
unset($changed['Version']);
@@ -2782,10 +2782,10 @@ public function getChangedFields($databaseFieldsOnly = false, $changeLevel = sel
}
if (is_array($databaseFieldsOnly)) {
- $fields = array_intersect_key($changed, array_flip($databaseFieldsOnly));
+ $fields = array_intersect_key($changed ?: [], array_flip($databaseFieldsOnly ?: []));
} elseif ($databaseFieldsOnly) {
$fieldsSpecs = static::getSchema()->fieldSpecs(static::class);
- $fields = array_intersect_key($changed, $fieldsSpecs);
+ $fields = array_intersect_key($changed ?: [], $fieldsSpecs);
} else {
$fields = $changed;
}
@@ -2829,7 +2829,7 @@ public function isChanged($fieldName = null, $changeLevel = self::CHANGE_STRICT)
if (!isset($fieldName)) {
return !empty($changed);
} else {
- return array_key_exists($fieldName, $changed);
+ return array_key_exists($fieldName, $changed ?: []);
}
}
@@ -2845,7 +2845,7 @@ public function setField($fieldName, $val)
{
$this->objCacheClear();
//if it's a has_one component, destroy the cache
- if (substr($fieldName, -2) == 'ID') {
+ if (substr((string) $fieldName, -2) == 'ID') {
unset($this->components[substr($fieldName, 0, -2)]);
}
@@ -2900,14 +2900,14 @@ public function setField($fieldName, $val)
}
// if a field is not existing or has strictly changed
- if (!array_key_exists($fieldName, $this->original) || $this->original[$fieldName] !== $val) {
+ if (!array_key_exists($fieldName, $this->original ?: []) || $this->original[$fieldName] !== $val) {
// TODO Add check for php-level defaults which are not set in the db
// TODO Add check for hidden input-fields (readonly) which are not set in the db
// At the very least, the type has changed
$this->changed[$fieldName] = self::CHANGE_STRICT;
- if ((!array_key_exists($fieldName, $this->original) && $val)
- || (array_key_exists($fieldName, $this->original) && $this->original[$fieldName] != $val)
+ if ((!array_key_exists($fieldName, $this->original ?: []) && $val)
+ || (array_key_exists($fieldName, $this->original ?: []) && $this->original[$fieldName] != $val)
) {
// Value has changed as well, not just the type
$this->changed[$fieldName] = self::CHANGE_VALUE;
@@ -2984,8 +2984,8 @@ public function hasField($field)
{
$schema = static::getSchema();
return (
- array_key_exists($field, $this->record)
- || array_key_exists($field, $this->components)
+ array_key_exists($field, $this->record ?: [])
+ || array_key_exists($field, $this->components ?: [])
|| $schema->fieldSpec(static::class, $field)
|| $schema->unaryComponent(static::class, $field)
|| $this->hasMethod("get{$field}")
@@ -3026,8 +3026,8 @@ public function can($perm, $member = null, $context = [])
return true;
}
- if (is_string($perm) && method_exists($this, 'can' . ucfirst($perm))) {
- $method = 'can' . ucfirst($perm);
+ if (is_string($perm) && method_exists($this, 'can' . ucfirst((string) $perm))) {
+ $method = 'can' . ucfirst((string) $perm);
return $this->$method($member);
}
@@ -3065,7 +3065,7 @@ public function extendedCan($methodName, $member, $context = [])
$results = $this->extend($methodName, $member, $context);
if ($results && is_array($results)) {
// Remove NULLs
- $results = array_filter($results, function ($v) {
+ $results = array_filter($results ?: [], function ($v) {
return !is_null($v);
});
// If there are any non-NULL responses, then return the lowest one of them.
@@ -3182,9 +3182,9 @@ public function dbObject($fieldName)
return $value;
}
- $pos = strpos($helper, '.');
- $class = substr($helper, 0, $pos);
- $spec = substr($helper, $pos + 1);
+ $pos = strpos((string) $helper, '.');
+ $class = substr((string) $helper, 0, $pos);
+ $spec = substr((string) $helper, $pos + 1);
/** @var DBField $obj */
$table = $schema->tableName($class);
@@ -3216,7 +3216,7 @@ public function relObject($fieldPath)
$component = $this;
// Parse all relations
- foreach (explode('.', $fieldPath) as $relation) {
+ foreach (explode('.', (string) $fieldPath) as $relation) {
if (!$component) {
return null;
}
@@ -3252,9 +3252,9 @@ public function relField($fieldName)
{
// Navigate to relative parent using relObject() if needed
$component = $this;
- if (($pos = strrpos($fieldName, '.')) !== false) {
- $relation = substr($fieldName, 0, $pos);
- $fieldName = substr($fieldName, $pos + 1);
+ if (($pos = strrpos((string) $fieldName, '.')) !== false) {
+ $relation = substr((string) $fieldName, 0, $pos);
+ $fieldName = substr((string) $fieldName, $pos + 1);
$component = $this->relObject($relation);
}
@@ -3278,20 +3278,20 @@ public function relField($fieldName)
public function getReverseAssociation($className)
{
if (is_array($this->manyMany())) {
- $many_many = array_flip($this->manyMany());
- if (array_key_exists($className, $many_many)) {
+ $many_many = array_flip($this->manyMany() ?: []);
+ if (array_key_exists($className, $many_many ?: [])) {
return $many_many[$className];
}
}
if (is_array($this->hasMany())) {
- $has_many = array_flip($this->hasMany());
- if (array_key_exists($className, $has_many)) {
+ $has_many = array_flip($this->hasMany() ?: []);
+ if (array_key_exists($className, $has_many ?: [])) {
return $has_many[$className];
}
}
if (is_array($this->hasOne())) {
- $has_one = array_flip($this->hasOne());
- if (array_key_exists($className, $has_one)) {
+ $has_one = array_flip($this->hasOne() ?: []);
+ if (array_key_exists($className, $has_one ?: [])) {
return $has_one[$className];
}
}
@@ -3351,8 +3351,8 @@ public static function get(
if ($sort) {
$result = $result->sort($sort);
}
- if ($limit && strpos($limit, ',') !== false) {
- $limitArguments = explode(',', $limit);
+ if ($limit && strpos((string) $limit, ',') !== false) {
+ $limitArguments = explode(',', (string) $limit);
$result = $result->limit($limitArguments[1], $limitArguments[0]);
} elseif ($limit) {
$result = $result->limit($limit);
@@ -3606,7 +3606,7 @@ public function requireTable()
}
if ($fields) {
- $hasAutoIncPK = get_parent_class($this) === self::class;
+ $hasAutoIncPK = get_parent_class($this ?: '') === self::class;
DB::require_table(
$table,
$fields,
@@ -3630,7 +3630,7 @@ public function requireTable()
$tableOrClass = $manyManyComponent['join'];
// Skip if backed by actual class
- if (class_exists($tableOrClass)) {
+ if (class_exists((string) $tableOrClass)) {
continue;
}
@@ -3718,7 +3718,7 @@ public function searchableFields()
// fallback to summary fields (unless empty array is explicitly specified)
if (!$fields && !is_array($fields)) {
- $summaryFields = array_keys($this->summaryFields());
+ $summaryFields = array_keys($this->summaryFields() ?: []);
$fields = [];
// remove the custom getters as the search should not include them
@@ -3728,8 +3728,8 @@ public function searchableFields()
$spec = $name;
// Extract field name in case this is a method called on a field (e.g. "Date.Nice")
- if (($fieldPos = strpos($name, '.')) !== false) {
- $name = substr($name, 0, $fieldPos);
+ if (($fieldPos = strpos((string) $name, '.')) !== false) {
+ $name = substr((string) $name, 0, $fieldPos);
}
if ($schema->fieldSpec($this, $name)) {
@@ -3823,7 +3823,7 @@ public function fieldLabels($includerelations = true)
// get all translated static properties as defined in i18nCollectStatics()
$ancestry = ClassInfo::ancestry(static::class);
- $ancestry = array_reverse($ancestry);
+ $ancestry = array_reverse($ancestry ?: []);
if ($ancestry) {
foreach ($ancestry as $ancestorClass) {
if ($ancestorClass === ViewableData::class) {
@@ -4218,7 +4218,7 @@ public function provideI18nEntities()
// Best guess for a/an rule. Better guesses require overriding in subclasses
$pluralName = $this->plural_name();
$singularName = $this->singular_name();
- $conjunction = preg_match('/^[aeiou]/i', $singularName) ? 'An ' : 'A ';
+ $conjunction = preg_match('/^[aeiou]/i', (string) $singularName) ? 'An ' : 'A ';
return [
static::class . '.SINGULARNAME' => $this->singular_name(),
static::class . '.PLURALNAME' => $pluralName,
diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php
index 9e85e0dfbed..7f510ea31e1 100644
--- a/src/ORM/DataObjectSchema.php
+++ b/src/ORM/DataObjectSchema.php
@@ -145,7 +145,7 @@ public function tableName($class)
public function baseDataClass($class)
{
$current = $class;
- while ($next = get_parent_class($current)) {
+ while ($next = get_parent_class($current ?: '')) {
if ($next === DataObject::class) {
// Only use ClassInfo::class_name() to format the class if we've not used get_parent_class()
return ($current === $class) ? ClassInfo::class_name($current) : $current;
@@ -261,16 +261,16 @@ public function fieldSpec($classOrInstance, $fieldName, $options = 0)
public function tableClass($table)
{
$tables = $this->getTableNames();
- $class = array_search($table, $tables, true);
+ $class = array_search($table, $tables ?: [], true);
if ($class) {
return $class;
}
// If there is no class for this table, strip table modifiers (e.g. _Live / _Versions)
// from the end and re-attempt a search.
- if (preg_match('/^(?.+)(_[^_]+)$/i', $table, $matches)) {
+ if (preg_match('/^(?.+)(_[^_]+)$/i', (string) $table, $matches)) {
$table = $matches['class'];
- $class = array_search($table, $tables, true);
+ $class = array_search($table, $tables ?: [], true);
if ($class) {
return $class;
}
@@ -294,7 +294,7 @@ protected function cacheTableNames()
$table = $this->buildTableName($class);
// Check for conflicts
- $conflict = array_search($table, $this->tableNames, true);
+ $conflict = array_search($table, $this->tableNames ?: [], true);
if ($conflict) {
throw new LogicException(
"Multiple classes (\"{$class}\", \"{$conflict}\") map to the same table: \"{$table}\""
@@ -323,12 +323,12 @@ protected function buildTableName($class)
return $table;
}
- if (strpos($class, '\\') === false) {
+ if (strpos((string) $class, '\\') === false) {
return $class;
}
$separator = DataObjectSchema::config()->uninherited('table_namespace_separator');
- $table = str_replace('\\', $separator, trim($class, '\\'));
+ $table = str_replace('\\', $separator ?: '', trim((string) $class, '\\'));
if (!ClassInfo::classImplements($class, TestOnly::class) && $this->classHasTable($class)) {
DBSchemaManager::showTableNameWarning($table, $class);
@@ -361,7 +361,7 @@ public function databaseFields($class, $aggregated = true)
// Recursively merge
$parentFields = $this->databaseFields(get_parent_class($class));
- return array_merge($fields, array_diff_key($parentFields, $fields));
+ return array_merge($fields, array_diff_key($parentFields ?: [], $fields));
}
/**
@@ -446,7 +446,7 @@ public function compositeFields($class, $aggregated = true)
// Recursively merge
$parentFields = $this->compositeFields(get_parent_class($class));
- return array_merge($compositeFields, array_diff_key($parentFields, $compositeFields));
+ return array_merge($compositeFields, array_diff_key($parentFields ?: [], $compositeFields));
}
/**
@@ -481,7 +481,7 @@ protected function cacheDatabaseFields($class)
// Ensure fixed fields appear at the start
$fixedFields = DataObject::config()->uninherited('fixed_fields');
- if (get_parent_class($class) === DataObject::class) {
+ if (get_parent_class($class ?: '') === DataObject::class) {
// Merge fixed with ClassName spec and custom db fields
$dbFields = $fixedFields;
} else {
@@ -491,7 +491,7 @@ protected function cacheDatabaseFields($class)
// Check each DB value as either a field or composite field
$db = Config::inst()->get($class, 'db', Config::UNINHERITED) ?: [];
foreach ($db as $fieldName => $fieldSpec) {
- $fieldClass = strtok($fieldSpec, '(');
+ $fieldClass = strtok((string) $fieldSpec, '(');
if (singleton($fieldClass) instanceof DBComposite) {
$compositeFields[$fieldName] = $fieldSpec;
} else {
@@ -520,7 +520,7 @@ protected function cacheDatabaseFields($class)
}
// Prevent field-less tables with only 'ID'
- if (count($dbFields) < 2) {
+ if (count($dbFields ?: []) < 2) {
$dbFields = [];
}
@@ -536,7 +536,7 @@ protected function cacheDatabaseFields($class)
*/
protected function cacheDatabaseIndexes($class)
{
- if (!array_key_exists($class, $this->databaseIndexes)) {
+ if (!array_key_exists($class, $this->databaseIndexes ?: [])) {
$this->databaseIndexes[$class] = array_merge(
$this->buildSortDatabaseIndexes($class),
$this->cacheDefaultDatabaseIndexes($class),
@@ -554,7 +554,7 @@ protected function cacheDatabaseIndexes($class)
*/
protected function cacheDefaultDatabaseIndexes($class)
{
- if (array_key_exists($class, $this->defaultDatabaseIndexes)) {
+ if (array_key_exists($class, $this->defaultDatabaseIndexes ?: [])) {
return $this->defaultDatabaseIndexes[$class];
}
$this->defaultDatabaseIndexes[$class] = [];
@@ -584,7 +584,7 @@ protected function buildCustomDatabaseIndexes($class)
$indexes = [];
$classIndexes = Config::inst()->get($class, 'indexes', Config::UNINHERITED) ?: [];
foreach ($classIndexes as $indexName => $indexSpec) {
- if (array_key_exists($indexName, $indexes)) {
+ if (array_key_exists($indexName, $indexes ?: [])) {
throw new InvalidArgumentException(sprintf(
'Index named "%s" already exists on class %s',
$indexName,
@@ -627,13 +627,13 @@ protected function buildSortDatabaseIndexes($class)
$indexes = [];
if ($sort && is_string($sort)) {
- $sort = preg_split('/,(?![^()]*+\\))/', $sort);
+ $sort = preg_split('/,(?![^()]*+\\))/', (string) $sort);
foreach ($sort as $value) {
try {
list ($table, $column) = $this->parseSortColumn(trim($value));
- $table = trim($table, '"');
- $column = trim($column, '"');
- if ($table && strtolower($table) !== strtolower(self::tableName($class))) {
+ $table = trim((string) $table, '"');
+ $column = trim((string) $column, '"');
+ if ($table && strtolower((string) $table) !== strtolower((string) self::tableName($class))) {
continue;
}
if ($this->databaseField($class, $column, false)) {
@@ -660,7 +660,7 @@ protected function parseSortColumn($column)
{
// Parse column specification, considering possible ansi sql quoting
// Note that table prefix is allowed, but discarded
- if (preg_match('/^("?(?[^"\s]+)"?\\.)?"?(?[^"\s]+)"?(\s+(?((asc)|(desc))(ending)?))?$/i', $column, $match)) {
+ if (preg_match('/^("?(?[^"\s]+)"?\\.)?"?(?[^"\s]+)"?(\s+(?((asc)|(desc))(ending)?))?$/i', (string) $column, $match)) {
$table = $match['table'];
$column = $match['column'];
} else {
@@ -718,7 +718,7 @@ public function classForField($candidateClass, $fieldName)
if (isset($fields[$fieldName])) {
return $candidateClass;
}
- $candidateClass = get_parent_class($candidateClass);
+ $candidateClass = get_parent_class($candidateClass ?: '');
}
return null;
}
@@ -796,12 +796,12 @@ protected function parseBelongsManyManyComponent($parentClass, $component, $spec
{
$childClass = $specification;
$relationName = null;
- if (strpos($specification, '.') !== false) {
- list($childClass, $relationName) = explode('.', $specification, 2);
+ if (strpos((string) $specification, '.') !== false) {
+ list($childClass, $relationName) = explode('.', (string) $specification, 2);
}
// Check child class exists
- if (!class_exists($childClass)) {
+ if (!class_exists((string) $childClass)) {
throw new LogicException(
"belongs_many_many relation {$parentClass}.{$component} points to "
. "{$childClass} which does not exist"
@@ -856,7 +856,7 @@ public function manyManyExtraFieldsForComponent($class, $component)
);
return $this->manyManyExtraFieldsForComponent($belongs['childClass'], $belongs['relationName']);
}
- $class = get_parent_class($class);
+ $class = get_parent_class($class ?: '');
}
return null;
}
@@ -880,7 +880,7 @@ public function hasManyComponent($class, $component, $classOnly = true)
// Remove has_one specifier if given
$hasMany = $hasMany[$component];
- $hasManyClass = strtok($hasMany, '.');
+ $hasManyClass = strtok((string) $hasMany, '.');
// Validate
$this->checkRelationClass($class, $component, $hasManyClass, 'has_many');
@@ -927,7 +927,7 @@ public function belongsToComponent($class, $component, $classOnly = true)
// Remove has_one specifier if given
$belongsTo = $belongsTo[$component];
- $belongsToClass = strtok($belongsTo, '.');
+ $belongsToClass = strtok((string) $belongsTo, '.');
// Validate
$this->checkRelationClass($class, $component, $belongsToClass, 'belongs_to');
@@ -1065,8 +1065,8 @@ public function getRemoteJoinField($class, $component, $type = 'has_many', &$pol
// If presented with an explicit field name (using dot notation) then extract field name
$remoteField = null;
- if (strpos($remoteClass, '.') !== false) {
- list($remoteClass, $remoteField) = explode('.', $remoteClass);
+ if (strpos((string) $remoteClass, '.') !== false) {
+ list($remoteClass, $remoteField) = explode('.', (string) $remoteClass);
}
// Reference remote has_one to check against
@@ -1076,9 +1076,9 @@ public function getRemoteJoinField($class, $component, $type = 'has_many', &$pol
// with the same type as the current class
if (empty($remoteField)) {
// look for remote has_one joins on this class or any parent classes
- $remoteRelationsMap = array_flip($remoteRelations);
- foreach (array_reverse(ClassInfo::ancestry($class)) as $ancestryClass) {
- if (array_key_exists($ancestryClass, $remoteRelationsMap)) {
+ $remoteRelationsMap = array_flip($remoteRelations ?: []);
+ foreach (array_reverse(ClassInfo::ancestry($class) ?: []) as $ancestryClass) {
+ if (array_key_exists($ancestryClass, $remoteRelationsMap ?: [])) {
$remoteField = $remoteRelationsMap[$ancestryClass];
break;
}
@@ -1196,7 +1196,7 @@ protected function checkManyManyJoinClass($parentClass, $component, $specificati
);
}
$joinClass = $specification['through'];
- if (!class_exists($joinClass)) {
+ if (!class_exists((string) $joinClass)) {
throw new InvalidArgumentException(
"many_many relation {$parentClass}.{$component} has through class \"{$joinClass}\" which does not exist"
);
@@ -1224,7 +1224,7 @@ protected function checkRelationClass($class, $component, $relationClass, $type)
"{$type} relation {$class}.{$component} is not a class name"
);
}
- if (!class_exists($relationClass)) {
+ if (!class_exists((string) $relationClass)) {
throw new InvalidArgumentException(
"{$type} relation {$class}.{$component} references class {$relationClass} which doesn't exist"
);
diff --git a/src/ORM/DataQuery.php b/src/ORM/DataQuery.php
index 30042330c5f..32568d67b7a 100644
--- a/src/ORM/DataQuery.php
+++ b/src/ORM/DataQuery.php
@@ -124,7 +124,7 @@ public function removeFilterOn($fieldExpression)
// If given a parameterised condition extract only the condition
if (is_array($fieldExpression)) {
reset($fieldExpression);
- $fieldExpression = key($fieldExpression);
+ $fieldExpression = key($fieldExpression ?: []);
}
$where = $this->query->getWhere();
@@ -140,7 +140,7 @@ public function removeFilterOn($fieldExpression)
// iteration to extract the predicate and parameters
foreach ($condition as $predicate => $parameters) {
// @see SQLSelect::addWhere for why this is required here
- if (strpos($predicate, $fieldExpression) !== false) {
+ if (strpos((string) $predicate, (string) $fieldExpression) !== false) {
unset($where[$i]);
$matched = true;
}
@@ -233,13 +233,13 @@ public function getFinalisedQuery($queriedColumns = null)
// Check for any columns in the form '"Column" = ?' or '"Table"."Column"' = ?
if (preg_match_all(
'/(?:"(?[^"]+)"\.)?"(?[^"]+)"(?:[^\.]|$)/',
- $where,
+ (string) $where,
$matches,
PREG_SET_ORDER
)) {
foreach ($matches as $match) {
$column = $match['column'];
- if (!in_array($column, $queriedColumns)) {
+ if (!in_array($column, $queriedColumns ?: [])) {
$queriedColumns[] = $column;
}
}
@@ -258,11 +258,11 @@ public function getFinalisedQuery($queriedColumns = null)
// Restrict queried columns to that on the selected table
$tableFields = $schema->databaseFields($tableClass, false);
unset($tableFields['ID']);
- $selectColumns = array_intersect($queriedColumns, array_keys($tableFields));
+ $selectColumns = array_intersect($queriedColumns ?: [], array_keys($tableFields ?: []));
}
// If this is a subclass without any explicitly requested columns, omit this from the query
- if (!in_array($tableClass, $ancestorClasses) && empty($selectColumns)) {
+ if (!in_array($tableClass, $ancestorClasses ?: []) && empty($selectColumns)) {
continue;
}
@@ -288,7 +288,7 @@ public function getFinalisedQuery($queriedColumns = null)
foreach ($this->collidingFields as $collisionField => $collisions) {
$caseClauses = [];
foreach ($collisions as $collision) {
- if (preg_match('/^"(?[^"]+)"\./', $collision, $matches)) {
+ if (preg_match('/^"(?[^"]+)"\./', (string) $collision, $matches)) {
$collisionTable = $matches['table'];
$collisionClass = $schema->tableClass($collisionTable);
if ($collisionClass) {
@@ -362,22 +362,22 @@ protected function ensureSelectContainsOrderbyColumns($query, $originalSelect =
// don't touch functions in the ORDER BY or public function calls
// selected as fields
- if (strpos($k, '(') !== false) {
+ if (strpos((string) $k, '(') !== false) {
continue;
}
- $col = str_replace('"', '', trim($k));
- $parts = explode('.', $col);
+ $col = str_replace('"', '', trim((string) $k));
+ $parts = explode('.', (string) $col);
// Pull through SortColumn references from the originalSelect variables
- if (preg_match('/_SortColumn/', $col)) {
+ if (preg_match('/_SortColumn/', (string) $col)) {
if (isset($originalSelect[$col])) {
$query->selectField($originalSelect[$col], $col);
}
continue;
}
- if (count($parts) == 1) {
+ if (count($parts ?: []) == 1) {
// Get expression for sort value
$qualCol = "\"{$parts[0]}\"";
$table = DataObject::getSchema()->tableForField($this->dataClass(), $parts[0]);
@@ -394,9 +394,9 @@ protected function ensureSelectContainsOrderbyColumns($query, $originalSelect =
// To-do: Remove this if block once SQLSelect::$select has been refactored to store getSelect()
// format internally; then this check can be part of selectField()
$selects = $query->getSelect();
- if (!isset($selects[$col]) && !in_array($qualCol, $selects)) {
+ if (!isset($selects[$col]) && !in_array($qualCol, $selects ?: [])) {
// Use the original select if possible.
- if (array_key_exists($col, $originalSelect)) {
+ if (array_key_exists($col, $originalSelect ?: [])) {
$query->selectField($originalSelect[$col], $col);
} else {
$query->selectField($qualCol);
@@ -405,7 +405,7 @@ protected function ensureSelectContainsOrderbyColumns($query, $originalSelect =
} else {
$qualCol = '"' . implode('"."', $parts) . '"';
- if (!in_array($qualCol, $query->getSelect())) {
+ if (!in_array($qualCol, $query->getSelect() ?: [])) {
unset($newOrderby[$k]);
// Find the first free "_SortColumnX" slot
@@ -605,7 +605,7 @@ protected function selectColumnsFromTable(SQLSelect &$query, $tableClass, $colum
$compositeFields = $schema->compositeFields($tableClass, false);
unset($databaseFields['ID']);
foreach ($databaseFields as $k => $v) {
- if ((is_null($columns) || in_array($k, $columns)) && !isset($compositeFields[$k])) {
+ if ((is_null($columns) || in_array($k, $columns ?: [])) && !isset($compositeFields[$k])) {
// Update $collidingFields if necessary
$expressionForField = $query->expressionForField($k);
$quotedField = $schema->sqlColumnForField($tableClass, $k);
@@ -620,7 +620,7 @@ protected function selectColumnsFromTable(SQLSelect &$query, $tableClass, $colum
}
}
foreach ($compositeFields as $k => $v) {
- if ((is_null($columns) || in_array($k, $columns)) && $v) {
+ if ((is_null($columns) || in_array($k, $columns ?: [])) && $v) {
$tableName = $schema->tableName($tableClass);
$dbO = Injector::inst()->create($v, $k);
$dbO->setTable($tableName);
@@ -829,7 +829,7 @@ public static function applyRelationPrefix($relation)
return null;
}
if (is_string($relation)) {
- $relation = explode(".", $relation);
+ $relation = explode(".", (string) $relation);
}
return strtolower(implode('_', $relation)) . '_';
}
@@ -855,7 +855,7 @@ public function applyRelation($relation, $linearOnly = false)
}
if (is_string($relation)) {
- $relation = explode(".", $relation);
+ $relation = explode(".", (string) $relation);
}
$modelClass = $this->dataClass;
@@ -980,7 +980,7 @@ protected function joinHasManyRelation(
// Add join clause to the component's ancestry classes so that the search filter could search on
// its ancestor fields.
$ancestry = ClassInfo::ancestry($foreignClass, true);
- $ancestry = array_reverse($ancestry);
+ $ancestry = array_reverse($ancestry ?: []);
foreach ($ancestry as $ancestor) {
$ancestorTable = $schema->tableName($ancestor);
if ($ancestorTable !== $foreignTable) {
@@ -1041,7 +1041,7 @@ protected function joinHasOneRelation(
// its ancestor fields.
$ancestry = ClassInfo::ancestry($foreignClass, true);
if (!empty($ancestry)) {
- $ancestry = array_reverse($ancestry);
+ $ancestry = array_reverse($ancestry ?: []);
foreach ($ancestry as $ancestor) {
$ancestorTable = $schema->tableName($ancestor);
if ($ancestorTable !== $foreignBaseTable) {
@@ -1080,7 +1080,7 @@ protected function joinManyManyRelationship(
) {
$schema = DataObject::getSchema();
- if (class_exists($relationClassOrTable)) {
+ if (class_exists((string) $relationClassOrTable)) {
// class is provided
$relationTable = $schema->tableName($relationClassOrTable);
$relationTableUpdated = $this->getJoinTableName($relationClassOrTable, $relationTable);
@@ -1118,7 +1118,7 @@ protected function joinManyManyRelationship(
// Add join clause to the component's ancestry classes so that the search filter could search on
// its ancestor fields.
$ancestry = ClassInfo::ancestry($componentClass, true);
- $ancestry = array_reverse($ancestry);
+ $ancestry = array_reverse($ancestry ?: []);
foreach ($ancestry as $ancestor) {
$ancestorTable = $schema->tableName($ancestor);
if ($ancestorTable !== $componentBaseTable) {
@@ -1163,7 +1163,7 @@ public function selectFromTable($table, $fields)
{
$fieldExpressions = array_map(function ($item) use ($table) {
return Convert::symbol2sql("{$table}.{$item}");
- }, $fields);
+ }, $fields ?: []);
$this->query->setSelect($fieldExpressions);
@@ -1181,7 +1181,7 @@ public function addSelectFromTable($table, $fields)
{
$fieldExpressions = array_map(function ($item) use ($table) {
return Convert::symbol2sql("{$table}.{$item}");
- }, $fields);
+ }, $fields ?: []);
$this->query->addSelect($fieldExpressions);
@@ -1340,11 +1340,11 @@ public function pushQueryManipulator(DataQueryManipulator $manipulator)
private function validateColumnField($field, SQLSelect $query)
{
// standard column - nothing to process here
- if (strpos($field, '.') === false) {
+ if (strpos((string) $field, '.') === false) {
return false;
}
- $fieldData = explode('.', $field);
+ $fieldData = explode('.', (string) $field);
$tablePrefix = str_replace('"', '', $fieldData[0]);
// check if related table is available
diff --git a/src/ORM/DataQuery_SubGroup.php b/src/ORM/DataQuery_SubGroup.php
index 46d21124f97..225cfb9f410 100644
--- a/src/ORM/DataQuery_SubGroup.php
+++ b/src/ORM/DataQuery_SubGroup.php
@@ -61,6 +61,6 @@ public function conditionSQL(&$parameters)
// Allow database to manage joining of conditions
$sql = DB::get_conn()->getQueryBuilder()->buildWhereFragment($this->whereQuery, $parameters);
- return preg_replace('/^\s*WHERE\s*/i', '', $sql);
+ return preg_replace('/^\s*WHERE\s*/i', '', $sql ?: '');
}
}
diff --git a/src/ORM/DatabaseAdmin.php b/src/ORM/DatabaseAdmin.php
index 0f4e60ae8bd..541e06b0d77 100644
--- a/src/ORM/DatabaseAdmin.php
+++ b/src/ORM/DatabaseAdmin.php
@@ -95,7 +95,7 @@ public function groupedDataClasses()
$allClasses = get_declared_classes();
$rootClasses = [];
foreach ($allClasses as $class) {
- if (get_parent_class($class) == DataObject::class) {
+ if (get_parent_class($class ?: '') == DataObject::class) {
$rootClasses[$class] = [];
}
}
@@ -104,7 +104,7 @@ public function groupedDataClasses()
foreach ($allClasses as $class) {
if (!isset($rootClasses[$class]) && is_subclass_of($class, DataObject::class)) {
foreach ($rootClasses as $rootClass => $dummy) {
- if (is_subclass_of($class, $rootClass)) {
+ if (is_subclass_of($class, (string) $rootClass)) {
$rootClasses[$rootClass][] = $class;
break;
}
@@ -135,7 +135,7 @@ public function build()
// If this code is being run outside of a dev/build or without a ?flush query string param,
// the class manifest hasn't been flushed, so do it here
$request = $this->getRequest();
- if (!array_key_exists('flush', $request->getVars()) && strpos($request->getURL(), 'dev/build') !== 0) {
+ if (!array_key_exists('flush', $request->getVars() ?: []) && strpos((string) $request->getURL(), 'dev/build') !== 0) {
ClassLoader::inst()->getManifest()->regenerate(false);
}
@@ -209,10 +209,10 @@ public static function lastBuilt()
$file = TEMP_PATH
. DIRECTORY_SEPARATOR
. 'database-last-generated-'
- . str_replace(['\\', '/', ':'], '.', Director::baseFolder());
+ . str_replace(['\\', '/', ':'], '.', Director::baseFolder() ?: '');
- if (file_exists($file)) {
- return filemtime($file);
+ if (file_exists((string) $file)) {
+ return filemtime((string) $file);
}
return null;
}
@@ -273,7 +273,7 @@ public function doBuild($quiet = false, $populate = true, $testMode = false)
// Check to ensure that the re-instated SS_DATABASE_SUFFIX functionality won't unexpectedly
// rename the database. To be removed for SS5
if ($suffix = Environment::getEnv('SS_DATABASE_SUFFIX')) {
- $previousName = preg_replace("/{$suffix}$/", '', $database);
+ $previousName = preg_replace("/{$suffix}$/", '', $database ?: '');
if (!isset($_GET['force_suffix_rename']) && DB::get_conn()->databaseExists($previousName)) {
throw new DatabaseException(
@@ -366,7 +366,7 @@ public function doBuild($quiet = false, $populate = true, $testMode = false)
foreach ($dataClasses as $dataClass) {
// Check if class exists before trying to instantiate - this sidesteps any manifest weirdness
// Test_ indicates that it's the data class is part of testing system
- if (strpos($dataClass, 'Test_') === false && class_exists($dataClass)) {
+ if (strpos((string) $dataClass, 'Test_') === false && class_exists((string) $dataClass)) {
if (!$quiet) {
if (Director::is_cli()) {
echo " * $dataClass\n";
@@ -387,7 +387,7 @@ public function doBuild($quiet = false, $populate = true, $testMode = false)
touch(TEMP_PATH
. DIRECTORY_SEPARATOR
. 'database-last-generated-'
- . str_replace(['\\', '/', ':'], '.', Director::baseFolder()));
+ . str_replace(['\\', '/', ':'], '.', Director::baseFolder() ?: ''));
if (isset($_REQUEST['from_installer'])) {
echo "OK";
@@ -443,12 +443,12 @@ protected function updateLegacyClassNameField($dataClass, $fieldName, $mapping)
$currentClassNameList = DB::query("SELECT DISTINCT(\"{$fieldName}\") FROM \"{$table}\"")->column();
// Get all invalid classes for this field
- $invalidClasses = array_intersect($currentClassNameList, array_keys($mapping));
+ $invalidClasses = array_intersect($currentClassNameList ?: [], array_keys($mapping ?: []));
if (!$invalidClasses) {
return;
}
- $numberClasses = count($invalidClasses);
+ $numberClasses = count($invalidClasses ?: []);
DB::alteration_message(
"Correcting obsolete {$fieldName} values for {$numberClasses} outdated types",
'obsolete'
@@ -527,7 +527,7 @@ public function cleanup()
{
$baseClasses = [];
foreach (ClassInfo::subclassesFor(DataObject::class) as $class) {
- if (get_parent_class($class) == DataObject::class) {
+ if (get_parent_class($class ?: '') == DataObject::class) {
$baseClasses[] = $class;
}
}
@@ -559,7 +559,7 @@ public function cleanup()
$subclassTable = $schema->tableName($subclass);
$id = $record['ID'];
if (($record['ClassName'] != $subclass)
- && (!is_subclass_of($record['ClassName'], $subclass))
+ && (!is_subclass_of($record['ClassName'], (string) $subclass))
&& isset($recordExists[$subclass][$id])
) {
$sql = "DELETE FROM \"$subclassTable\" WHERE \"ID\" = ?";
diff --git a/src/ORM/FieldType/DBBoolean.php b/src/ORM/FieldType/DBBoolean.php
index bc74dc9a08a..183c44cb646 100644
--- a/src/ORM/FieldType/DBBoolean.php
+++ b/src/ORM/FieldType/DBBoolean.php
@@ -85,7 +85,7 @@ public function prepValueForDB($value)
return 0;
}
if (is_string($value)) {
- switch (strtolower($value)) {
+ switch (strtolower((string) $value)) {
case 'false':
case 'f':
return 0;
diff --git a/src/ORM/FieldType/DBClassName.php b/src/ORM/FieldType/DBClassName.php
index 183fcf9dd21..cf794c87e64 100644
--- a/src/ORM/FieldType/DBClassName.php
+++ b/src/ORM/FieldType/DBClassName.php
@@ -140,7 +140,7 @@ public function getEnum()
$classNames = ClassInfo::subclassesFor($this->getBaseClass());
$dataobject = strtolower(DataObject::class);
unset($classNames[$dataobject]);
- return array_values($classNames);
+ return array_values($classNames ?: []);
}
public function setValue($value, $record = null, $markChanged = true)
@@ -163,7 +163,7 @@ public function getDefault()
// Allow classes to set default class
$baseClass = $this->getBaseClass();
$defaultClass = Config::inst()->get($baseClass, 'default_classname');
- if ($defaultClass && class_exists($defaultClass)) {
+ if ($defaultClass && class_exists((string) $defaultClass)) {
return $defaultClass;
}
diff --git a/src/ORM/FieldType/DBCurrency.php b/src/ORM/FieldType/DBCurrency.php
index a6962f3e007..90b4ec66a37 100644
--- a/src/ORM/FieldType/DBCurrency.php
+++ b/src/ORM/FieldType/DBCurrency.php
@@ -35,7 +35,7 @@ public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $def
*/
public function Nice()
{
- $val = $this->config()->currency_symbol . number_format(abs($this->value), 2);
+ $val = $this->config()->currency_symbol . number_format((float) abs($this->value ?: 0.0), 2);
if ($this->value < 0) {
return "($val)";
}
@@ -48,7 +48,7 @@ public function Nice()
*/
public function Whole()
{
- $val = $this->config()->currency_symbol . number_format(abs($this->value), 0);
+ $val = $this->config()->currency_symbol . number_format((float) abs($this->value ?: 0.0), 0);
if ($this->value < 0) {
return "($val)";
}
@@ -60,7 +60,7 @@ public function setValue($value, $record = null, $markChanged = true)
$matches = null;
if (is_numeric($value)) {
$this->value = $value;
- } elseif (preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
+ } elseif (preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', (string) $value, $matches)) {
$this->value = str_replace(['$', ',', $this->config()->currency_symbol], '', $matches[0]);
} else {
$this->value = 0;
diff --git a/src/ORM/FieldType/DBDate.php b/src/ORM/FieldType/DBDate.php
index 3fe6c696e92..2f2cbef9ae6 100644
--- a/src/ORM/FieldType/DBDate.php
+++ b/src/ORM/FieldType/DBDate.php
@@ -76,7 +76,7 @@ protected function parseDate($value)
if (is_null($value)) {
return null;
}
- $source = strtotime($value); // convert string to timestamp
+ $source = strtotime((string) $value); // convert string to timestamp
}
if ($value === false) {
return false;
@@ -275,8 +275,8 @@ public function Format($format)
}
// Replace {o} with ordinal representation of day of the month
- if (strpos($format, '{o}') !== false) {
- $format = str_replace('{o}', "'{$this->DayOfMonth(true)}'", $format);
+ if (strpos((string) $format, '{o}') !== false) {
+ $format = str_replace('{o}', "'{$this->DayOfMonth(true)}'", $format ?: '');
}
$formatter = $this->getCustomFormatter($locale, $format);
@@ -291,7 +291,7 @@ public function Format($format)
public function getTimestamp()
{
if ($this->value) {
- return strtotime($this->value);
+ return strtotime((string) $this->value);
}
return 0;
}
@@ -525,7 +525,7 @@ public function requireField()
*/
public function InPast()
{
- return strtotime($this->value) < DBDatetime::now()->getTimestamp();
+ return strtotime((string) $this->value) < DBDatetime::now()->getTimestamp();
}
/**
@@ -534,7 +534,7 @@ public function InPast()
*/
public function InFuture()
{
- return strtotime($this->value) > DBDatetime::now()->getTimestamp();
+ return strtotime((string) $this->value) > DBDatetime::now()->getTimestamp();
}
/**
@@ -561,7 +561,7 @@ public function IsToday()
*/
public function modify(string $adjustment): self
{
- $modifiedTime = strtotime($adjustment, $this->getTimestamp());
+ $modifiedTime = strtotime((string) $adjustment, $this->getTimestamp());
return $this->setValue($modifiedTime);
}
@@ -572,7 +572,7 @@ public function modify(string $adjustment): self
*/
public function URLDate()
{
- return rawurlencode($this->Format(self::ISO_DATE, self::ISO_LOCALE));
+ return rawurlencode((string) $this->Format(self::ISO_DATE, self::ISO_LOCALE));
}
public function scaffoldFormField($title = null, $params = null)
@@ -598,7 +598,7 @@ protected function fixInputDate($value)
return null;
}
// Validate date
- if (!checkdate($month, $day, $year)) {
+ if (!checkdate((int) $month, (int) $day, (int) $year)) {
throw new InvalidArgumentException(
"Invalid date: '$value'. Use " . self::ISO_DATE . " to prevent this error."
);
@@ -619,7 +619,7 @@ protected function explodeDateString($value)
// split on known delimiters (. / -)
if (!preg_match(
'#^(?\\d+)[-/\\.](?\\d+)[-/\\.](?\\d+)(?