tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix deprecated php syntax

Browse Source
This commit is contained in:
Dan Hensby 2020-04-01 13:32:31 +01:00
parent 3f3f6854fe
commit 6c8dc0fd99
No known key found for this signature in database
GPG Key ID: F76D6B5FE0626A99
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -31,8 +31,11 @@ matrix:
- php: 7.3
env: DB=SQLITE
- php: 7.4snapshot
- php: 7.4
env: DB=SQLITE INSTALL_PHPUNIT_FORK=1
dist: xenial
services:
- mysql
# CMS test
- php: 5.5

2
admin/code/LeftAndMain.php
View File

@ -1993,7 +1993,7 @@ class LeftAndMain_TreeNode extends ViewableData {
// Get additional filter classes
if($this->filter && ($filterClasses = $this->filter->getPageClasses($this->obj))) {
if(is_array($filterClasses)) {
$filterClasses = implode(' ' . $filterClasses);
$filterClasses = implode(' ', $filterClasses);
}
$classes .= ' ' . $filterClasses;
}

2
email/Email.php
View File

@ -768,7 +768,7 @@ class Email extends ViewableData {
return strtr($email, $obfuscated);
case 'hex' :
$encoded = '';
for ($x=0; $x < strlen($email); $x++) $encoded .= '&#x' . bin2hex($email{$x}).';';
for ($x=0; $x < strlen($email); $x++) $encoded .= '&#x' . bin2hex($email[$x]).';';
return $encoded;
default:
user_error('Email::obfuscate(): Unknown obfuscation method', E_USER_NOTICE);

2
forms/Form.php
View File

@ -1810,7 +1810,7 @@ class Form extends RequestHandler {
* @return string
*/
public function extraClass() {
return implode(array_unique($this->extraClasses), ' ');
return implode(' ', array_unique($this->extraClasses));
}
/**

2
i18n/i18n.php
View File

@ -2615,7 +2615,7 @@ class i18n extends SS_Object implements TemplateGlobalProvider, Flushable {
if(is_dir($themesBase)) {
foreach(scandir($themesBase) as $theme) {
if(
strpos($theme, Config::inst()->get('SSViewer', 'theme')) === 0
strpos($theme, (string)Config::inst()->get('SSViewer', 'theme')) === 0
&& file_exists("{$themesBase}/{$theme}/lang/")
) {
$filename = $adapter->getFilenameForLocale($locale);

2
model/Image.php
View File

@ -767,7 +767,7 @@ class Image extends File implements Flushable {
foreach($matches as $formatdir) {
$prepend[] = $formatdir[0];
}
$filename = implode($prepend) . $filename;
$filename = implode('', $prepend) . $filename;
if (!preg_match($pattern['FullPattern'], $filename)) {
throw new InvalidArgumentException('Filename ' . $filename

2
model/fieldtypes/Text.php
View File

@ -88,7 +88,7 @@ class Text extends StringField {
}
}
return count($output)==0 ? '' : implode($output, '. ') . '.';
return count($output)==0 ? '' : implode('. ', $output) . '.';
}