Index: typo3_src/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php	(revision )
@@ -229,7 +229,7 @@
 			$this->getFileName_backPath = PATH_site;
 			foreach ($setupArray as $key => $val) {
 				// We don't want 'TSConstantEditor' in the flattend setup.
-				if ($prefix || substr($key, 0, 16) != 'TSConstantEditor') {
+				if ($prefix || strpos($key, 'TSConstantEditor') !== 0) {
 					if (is_array($val)) {
 						$this->flattenSetup($val, $prefix . $key, $key == 'file.');
 					} elseif ($resourceFlag && $this->resourceCheck) {
@@ -415,7 +415,7 @@
 			$a++;
 			$depth = $depth_in . $key;
 			// This excludes all constants starting with '_' from being shown.
-			if ($this->bType != 'const' || substr($depth, 0, 1) != '_') {
+			if ($this->bType != 'const' || $depth{0} != '_') {
 				$goto = substr(md5($depth), 0, 6);
 				$deeper = is_array($arr[$key . '.']) && ($this->tsbrowser_depthKeys[$depth] || $this->ext_expandAllNotes) ? 1 : 0;
 				$PM = 'join';
@@ -666,7 +666,7 @@
 			$HTML .= $depthData;
 			$alttext = '[' . $row['templateID'] . ']';
 			$alttext .= $row['pid'] ? ' - ' . BackendUtility::getRecordPath($row['pid'], $GLOBALS['SOBE']->perms_clause, 20) : '';
-			$icon = substr($row['templateID'], 0, 3) == 'sys' ? \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('sys_template', $row, array('title' => $alttext)) : \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('mimetypes-x-content-template-static', array('title' => $alttext));
+			$icon = strpos($row['templateID'], 'sys') === 0 ? \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('sys_template', $row, array('title' => $alttext)) : \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('mimetypes-x-content-template-static', array('title' => $alttext));
 			if (in_array($row['templateID'], $this->clearList_const) || in_array($row['templateID'], $this->clearList_setup)) {
 				$urlParameters = array(
 					'id' => $GLOBALS['SOBE']->id,
@@ -772,7 +772,7 @@
 	public function ext_fixed_lgd($string, $chars) {
 		if ($chars >= 4) {
 			if (strlen($string) > $chars) {
-				if (strlen($string) > 24 && substr($string, 0, 12) == '##' . $this->Cmarker . '_B##') {
+				if (strlen($string) > 24 && strpos($string, '##') === 0 . $this->Cmarker . '_B##') {
 					return '##' . $this->Cmarker . '_B##' . GeneralUtility::fixed_lgd_cs(substr($string, 12, -12), ($chars - 3)) . '##' . $this->Cmarker . '_E##';
 				} else {
 					return GeneralUtility::fixed_lgd_cs($string, $chars - 3);
@@ -1013,7 +1013,7 @@
 					$retArr['paramstr'] = $p;
 					switch ($retArr['type']) {
 						case 'int':
-							if (substr($retArr['paramstr'], 0, 1) == '-') {
+							if ($retArr['paramstr']{0} == '-') {
 								$retArr['params'] = GeneralUtility::intExplode('-', substr($retArr['paramstr'], 1));
 								$retArr['params'][0] = intval('-' . $retArr['params'][0]);
 							} else {
@@ -1089,10 +1089,10 @@
 	 * @todo Define visibility
 	 */
 	public function ext_getTSCE_config_image($imgConf) {
-		if (substr($imgConf, 0, 4) == 'gfx/') {
+		if (strpos($imgConf, 'gfx/') === 0) {
 			$iFile = $this->ext_localGfxPrefix . $imgConf;
 			$tFile = $this->ext_localWebGfxPrefix . $imgConf;
-		} elseif (substr($imgConf, 0, 4) == 'EXT:') {
+		} elseif (strpos($imgConf, 'EXT:') === 0) {
 			$iFile = GeneralUtility::getFileAbsFileName($imgConf);
 			if ($iFile) {
 				$f = \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($iFile);
@@ -1282,7 +1282,7 @@
 					$checkboxName = 'check[' . $params['name'] . ']';
 					$checkboxID = $checkboxName;
 					// Handle type=color specially
-					if ($typeDat['type'] == 'color' && substr($params['value'], 0, 2) != '{$') {
+					if ($typeDat['type'] == 'color' && strpos($params['value'], '{$') !== 0) {
 						$color = '<div id="colorbox-' . $fN . '" class="typo3-tstemplate-ceditor-colorblock" style="background-color:' . $params['value'] . ';">&nbsp;</div>';
 					} else {
 						$color = '';
@@ -1369,13 +1369,13 @@
 			}
 			$this->rawP++;
 			if ($line) {
-				if (substr($line, 0, 1) == '[') {
+				if ($line{0} == '[') {
 
 				} elseif (strcspn($line, '}#/') != 0) {
 					$varL = strcspn($line, ' {=<');
 					$var = substr($line, 0, $varL);
 					$line = ltrim(substr($line, $varL));
-					switch (substr($line, 0, 1)) {
+					switch ($line{0}) {
 						case '=':
 							$this->objReg[$pre . $var] = $this->rawP - 1;
 							break;
@@ -1385,7 +1385,7 @@
 							break;
 					}
 					$this->lastComment = '';
-				} elseif (substr($line, 0, 1) == '}') {
+				} elseif ($line{0} == '}') {
 					$this->lastComment = '';
 					$this->ext_inBrace--;
 					if ($this->ext_inBrace < 0) {
@@ -1513,13 +1513,13 @@
 								if ($var && !GeneralUtility::inList($this->HTMLcolorList, strtolower($var))) {
 									$var = preg_replace('/[^A-Fa-f0-9]*/', '', $var);
 									$useFulHex = strlen($var) > 3;
-									$col[] = HexDec(substr($var, 0, 1));
-									$col[] = HexDec(substr($var, 1, 1));
-									$col[] = HexDec(substr($var, 2, 1));
+									$col[] = HexDec($var{0});
+									$col[] = HexDec($var{1});
+									$col[] = HexDec($var{2});
 									if ($useFulHex) {
-										$col[] = HexDec(substr($var, 3, 1));
-										$col[] = HexDec(substr($var, 4, 1));
-										$col[] = HexDec(substr($var, 5, 1));
+										$col[] = HexDec($var{3});
+										$col[] = HexDec($var{4});
+										$col[] = HexDec($var{5});
 									}
 									$var = substr(('0' . DecHex($col[0])), -1) . substr(('0' . DecHex($col[1])), -1) . substr(('0' . DecHex($col[2])), -1);
 									if ($useFulHex) {
Index: typo3_src/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php	(revision )
@@ -144,7 +144,7 @@
 	 */
 	private function isNameOfInjectMethod($methodName) {
 		if (
-			substr($methodName, 0, 6) === 'inject'
+			strpos($methodName, 'inject') === 0
 			&& $methodName[6] === strtoupper($methodName[6])
 			&& $methodName !== 'injectSettings'
 		) {
Index: typo3_src/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Utility/ClassNamingUtility.php	(revision )
@@ -96,7 +96,7 @@
 		$matches = array();
 
 		if (strpos($controllerObjectName, '\\') !== FALSE) {
-			if (substr($controllerObjectName, 0, 9) === 'TYPO3\\CMS') {
+			if (strpos($controllerObjectName, 'TYPO3\\CMS') === 0) {
 				$extensionName = '^(?P<vendorName>[^\\\\]+\\\[^\\\\]+)\\\(?P<extensionName>[^\\\\]+)';
 			} else {
 				$extensionName = '^(?P<vendorName>[^\\\\]+)\\\\(?P<extensionName>[^\\\\]+)';
Index: typo3_src/typo3/sysext/core/Classes/Package/PackageFactory.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Package/PackageFactory.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Package/PackageFactory.php	(revision )
@@ -88,7 +88,7 @@
 		if (!is_object($manifest)) {
 			throw new  \TYPO3\Flow\Package\Exception\InvalidPackageManifestException('Invalid composer manifest.', 1348146450);
 		}
-		if (isset($manifest->type) && substr($manifest->type, 0, 10) === 'typo3-cms-') {
+		if (isset($manifest->type) && strpos($manifest->type, 'typo3-cms-') === 0) {
 			$relativePackagePath = substr($packagePath, strlen($packagesBasePath));
 			$packageKey = substr($relativePackagePath, strpos($relativePackagePath, '/') + 1, -1);
 			/**
Index: typo3_src/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php	(revision )
@@ -382,7 +382,7 @@
 				$isRelativePath = TRUE;
 			}
 		} else {
-			if (substr($scriptPath, 0, 1) !== '/') {
+			if ($scriptPath{0} !== '/') {
 				$isRelativePath = TRUE;
 			}
 		}
@@ -447,7 +447,7 @@
 	 * @return string Absolute path to document root of installation
 	 */
 	static protected function getPathSiteByTypo3ModulePath() {
-		if (substr(TYPO3_MOD_PATH, 0, 7) === 'sysext/' || substr(TYPO3_MOD_PATH, 0, 4) === 'ext/' || substr(TYPO3_MOD_PATH, 0, 8) === 'install/') {
+		if (strpos(TYPO3_MOD_PATH, 'sysext/') === 0 || strpos(TYPO3_MOD_PATH, 'ext/') === 0 || strpos(TYPO3_MOD_PATH, 'install/') === 0) {
 			$pathPartRelativeToDocumentRoot = TYPO3_mainDir . TYPO3_MOD_PATH;
 		} elseif (substr(TYPO3_MOD_PATH, 0, strlen('../typo3conf/')) === '../typo3conf/') {
 			$pathPartRelativeToDocumentRoot = substr(TYPO3_MOD_PATH, 3);
Index: typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php	(revision )
@@ -465,7 +465,7 @@
 			$cmd = 'row_down';
 		}
 		if ($cmd && MathUtility::canBeInterpretedAsInteger($kk)) {
-			if (substr($cmd, 0, 4) == 'row_') {
+			if (strpos($cmd, 'row_') === 0) {
 				switch ($cmd) {
 					case 'row_remove':
 						unset($this->TABLECFG['c'][$kk]);
@@ -502,7 +502,7 @@
 				}
 				ksort($this->TABLECFG['c']);
 			}
-			if (substr($cmd, 0, 4) == 'col_') {
+			if (strpos($cmd, 'col_') === 0) {
 				foreach ($this->TABLECFG['c'] as $cAK => $value) {
 					switch ($cmd) {
 						case 'col_remove':
@@ -590,7 +590,7 @@
 			$vParts = explode($this->tableParsing_delimiter, $v);
 			// Traverse columns:
 			for ($a = 0; $a < $cols; $a++) {
-				if ($this->tableParsing_quote && substr($vParts[$a], 0, 1) == $this->tableParsing_quote && substr($vParts[$a], -1, 1) == $this->tableParsing_quote) {
+				if ($this->tableParsing_quote && $vParts[$a]{0} == $this->tableParsing_quote && substr($vParts[$a], -1, 1) == $this->tableParsing_quote) {
 					$vParts[$a] = substr(trim($vParts[$a]), 1, -1);
 				}
 				$cfgArr[$k][$a] = $vParts[$a];
Index: typo3_src/typo3/sysext/core/Classes/Database/QueryView.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Database/QueryView.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Database/QueryView.php	(revision )
@@ -780,7 +780,7 @@
 		}
 		if ($fieldSetup['type'] == 'multiple') {
 			foreach ($fieldSetup['items'] as $key => $val) {
-				if (substr($val[0], 0, 4) == 'LLL:') {
+				if (strpos($val[0], 'LLL:') === 0) {
 					$value = $GLOBALS['LANG']->sL($val[0]);
 				} else {
 					$value = $val[0];
@@ -796,7 +796,7 @@
 		}
 		if ($fieldSetup['type'] == 'binary') {
 			foreach ($fieldSetup['items'] as $Key => $val) {
-				if (substr($val[0], 0, 4) == 'LLL:') {
+				if (strpos($val[0], 'LLL:') === 0) {
 					$value = $GLOBALS['LANG']->sL($val[0]);
 				} else {
 					$value = $val[0];
@@ -811,7 +811,7 @@
 		if ($fieldSetup['type'] == 'relation') {
 			if ($fieldSetup['items']) {
 				foreach ($fieldSetup['items'] as $key => $val) {
-					if (substr($val[0], 0, 4) == 'LLL:') {
+					if (strpos($val[0], 'LLL:') === 0) {
 						$value = $GLOBALS['LANG']->sL($val[0]);
 					} else {
 						$value = $val[0];
@@ -869,7 +869,7 @@
 					$altLabelField = $GLOBALS['TCA'][$from_table]['ctrl']['label_alt'];
 					if ($GLOBALS['TCA'][$from_table]['columns'][$labelField]['config']['items']) {
 						foreach ($GLOBALS['TCA'][$from_table]['columns'][$labelField]['config']['items'] as $labelArray) {
-							if (substr($labelArray[0], 0, 4) == 'LLL:') {
+							if (strpos($labelArray[0], 'LLL:') === 0) {
 								$labelFieldSelect[$labelArray[1]] = $GLOBALS['LANG']->sL($labelArray[0]);
 							} else {
 								$labelFieldSelect[$labelArray[1]] = $labelArray[0];
@@ -879,7 +879,7 @@
 					}
 					if ($GLOBALS['TCA'][$from_table]['columns'][$altLabelField]['config']['items']) {
 						foreach ($GLOBALS['TCA'][$from_table]['columns'][$altLabelField]['config']['items'] as $altLabelArray) {
-							if (substr($altLabelArray[0], 0, 4) == 'LLL:') {
+							if (strpos($altLabelArray[0], 'LLL:') === 0) {
 								$altLabelFieldSelect[$altLabelArray[1]] = $GLOBALS['LANG']->sL($altLabelArray[0]);
 							} else {
 								$altLabelFieldSelect[$altLabelArray[1]] = $altLabelArray[0];
Index: typo3_src/typo3/sysext/backend/Classes/Utility/IconUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Utility/IconUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Utility/IconUtility.php	(revision )
@@ -187,7 +187,7 @@
 			$iconfile = 'gfx/i/' . $iconfile;
 		}
 		// Setting the absolute path where the icon should be found as a file:
-		if (substr($iconfile, 0, 3) == '../') {
+		if (strpos($iconfile, '../') === 0) {
 			$absfile = PATH_site . substr($iconfile, 3);
 		} else {
 			$absfile = PATH_typo3 . $iconfile;
Index: typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/Package.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/Package.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/Package.php	(revision )
@@ -108,7 +108,7 @@
 		if (substr($packagePath, -1, 1) !== '/') {
 			throw new \TYPO3\Flow\Package\Exception\InvalidPackagePathException(sprintf('The package path "%s" provided for package "%s" has no trailing forward slash.', $packagePath, $packageKey), 1166633720);
 		}
-		if (substr($classesPath, 1, 1) === '/') {
+		if ($classesPath{1} === '/') {
 			throw new \TYPO3\Flow\Package\Exception\InvalidPackagePathException(sprintf('The package classes path provided for package "%s" has a leading forward slash.', $packageKey), 1334841320);
 		}
 		if (!file_exists($packagePath . $manifestPath . 'composer.json')) {
\ No newline at end of file
Index: typo3_src/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php	(revision )
@@ -454,9 +454,9 @@
 				$iP = explode(':', $val);
 				$iPUrl = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('|', $val);
 				// URL reference:
-				if (substr($iPUrl[1], 0, 4) == 'http') {
+				if (strpos($iPUrl[1], 'http') === 0) {
 					$lines[] = '<a href="' . htmlspecialchars($iPUrl[1]) . '" target="_blank"><em>' . htmlspecialchars($iPUrl[0]) . '</em></a>';
-				} elseif (substr($iPUrl[1], 0, 5) == 'FILE:') {
+				} elseif (strpos($iPUrl[1], 'FILE:') === 0) {
 					$fileName = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName(substr($iPUrl[1], 5), 1, 1);
 					if ($fileName && @is_file($fileName)) {
 						$fileName = '../' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($fileName);
Index: typo3_src/typo3/sysext/install/Classes/SystemEnvironment/Check.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/install/Classes/SystemEnvironment/Check.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/install/Classes/SystemEnvironment/Check.php	(revision )
@@ -801,7 +801,7 @@
 	protected function checkWindowsApacheThreadStackSize() {
 		if (
 			$this->isWindowsOs()
-			&& substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'
+			&& strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === 0
 		) {
 			$status = new Status\WarningStatus();
 			$status->setTitle('Windows apache thread stack size');
Index: typo3_src/typo3/sysext/core/Classes/Html/HtmlParser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Html/HtmlParser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Html/HtmlParser.php	(revision )
@@ -599,7 +599,7 @@
 		$matches = array();
 		if (preg_match_all('/("[^"]*"|\'[^\']*\'|[^\\s"\'\\=]+|\\=)/s', $tag_tmp, $matches) > 0) {
 			foreach ($matches[1] as $part) {
-				$firstChar = substr($part, 0, 1);
+				$firstChar = $part{0};
 				if ($firstChar == '"' || $firstChar == '\'') {
 					$metaValue[] = $firstChar;
 					$value[] = substr($part, 1, -1);
@@ -736,7 +736,7 @@
 				$tok = substr($tok, $eocPos + 3);
 				$inComment = FALSE;
 				$skipTag = TRUE;
-			} elseif (substr($tok, 0, 3) == '!--') {
+			} elseif (strpos($tok, '!--') === 0) {
 				if (($eocPos = strpos($tok, '-->')) === FALSE) {
 					// Comment started in this token but it does end in the same token. Set a flag to skip till the end of comment
 					$newContent[$c++] = '<' . $tok;
@@ -748,7 +748,7 @@
 				$tok = substr($tok, $eocPos + 3);
 				$skipTag = TRUE;
 			}
-			$firstChar = substr($tok, 0, 1);
+			$firstChar = $tok{0};
 			// It is a tag... (first char is a-z0-9 or /) (fixed 19/01 2004). This also avoids triggering on <?xml..> and <!DOCTYPE..>
 			if (!$skipTag && preg_match('/[[:alnum:]\\/]/', $firstChar) == 1) {
 				$tagEnd = strpos($tok, '>');
@@ -855,7 +855,7 @@
 												unset($tagAttrib[0][$attr]);
 											}
 											if ($params['prefixLocalAnchors']) {
-												if (substr($tagAttrib[0][$attr], 0, 1) == '#') {
+												if ($tagAttrib[0][$attr]{0} == '#') {
 													$prefix = GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL');
 													$tagAttrib[0][$attr] = $prefix . $tagAttrib[0][$attr];
 													if ($params['prefixLocalAnchors'] == 2 && GeneralUtility::isFirstPartOfStr($prefix, GeneralUtility::getIndpEnv('TYPO3_SITE_URL'))) {
@@ -865,7 +865,7 @@
 											}
 											if ($params['prefixRelPathWith']) {
 												$urlParts = parse_url($tagAttrib[0][$attr]);
-												if (!$urlParts['scheme'] && substr($urlParts['path'], 0, 1) != '/') {
+												if (!$urlParts['scheme'] && $urlParts['path']{0} != '/') {
 													// If it is NOT an absolute URL (by http: or starting "/")
 													$tagAttrib[0][$attr] = $params['prefixRelPathWith'] . $tagAttrib[0][$attr];
 												}
@@ -1103,7 +1103,7 @@
 	public function prefixRelPath($prefix, $srcVal, $suffix = '') {
 		// Only prefix if it's not an absolute URL or
 		// only a link to a section within the page.
-		if (substr($srcVal, 0, 1) != '/' && substr($srcVal, 0, 1) != '#') {
+		if ($srcVal{0} != '/' && $srcVal{0} != '#') {
 			$urlParts = parse_url($srcVal);
 			// Only prefix URLs without a scheme
 			if (!$urlParts['scheme']) {
@@ -1183,7 +1183,7 @@
 		next($contentParts);
 		// bypass the first
 		while (list($k, $tok) = each($contentParts)) {
-			$firstChar = substr($tok, 0, 1);
+			$firstChar = $tok{0};
 			if (trim($firstChar) !== '') {
 				$subparts = explode('&gt;', $tok, 2);
 				$tagEnd = strlen($subparts[0]);
@@ -1500,7 +1500,7 @@
 			// Endtags are just set lowercase right away
 			if ($endTag) {
 				$value = strtolower($value);
-			} elseif (substr($value, 0, 4) != '<!--') {
+			} elseif (strpos($value, '<!--') !== 0) {
 				// ... and comments are ignored.
 				// Finding inner value with out < >
 				$inValue = substr($value, 1, substr($value, -2) == '/>' ? -2 : -1);
Index: typo3_src/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php	(revision )
@@ -785,7 +785,7 @@
 	 * @todo Define visibility
 	 */
 	public function itemLabel($inlabel, $modName, $M_modName = '') {
-		if (substr($modName, 0, 5) == 'xMOD_') {
+		if (strpos($modName, 'xMOD_') === 0) {
 			$label = substr($modName, 5);
 		} else {
 			$split = explode('_', $modName);
Index: typo3_src/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php	(revision )
@@ -4218,7 +4218,7 @@
 			list($tagName) = explode(' ', $subparts[0], 2);
 			// adds/overrides attributes
 			foreach ($conf as $pkey => $val) {
-				if (substr($pkey, -1) != '.' && substr($pkey, 0, 1) != '_') {
+				if (substr($pkey, -1) != '.' && $pkey{0} != '_') {
 					$tmpVal = isset($conf[$pkey . '.']) ? $this->stdWrap($conf[$pkey], $conf[$pkey . '.']) : (string)$val;
 					if ($lowerCaseAttributes) {
 						$pkey = strtolower($pkey);
@@ -4894,7 +4894,7 @@
 				$data = substr($theValue, $pointer, $len);
 				$tag = explode(' ', trim(substr($data, 1, -1)), 2);
 				$tag[0] = strtolower($tag[0]);
-				if (substr($tag[0], 0, 1) == '/') {
+				if ($tag[0]{0} == '/') {
 					$tag[0] = substr($tag[0], 1);
 					$tag['out'] = 1;
 				}
@@ -5010,7 +5010,7 @@
 			$l = trim($l);
 			$attrib = array();
 			$nWrapped = 0;
-			if (substr($l, 0, 1) == '<' && substr($l, -1) == '>') {
+			if ($l{0} == '<' && substr($l, -1) == '>') {
 				$fwParts = explode('>', substr($l, 1), 2);
 				list($tagName, $tagParams) = explode(' ', $fwParts[0], 2);
 				if (!$fwParts[1]) {
@@ -5983,7 +5983,7 @@
 						// Query Params:
 						$addQueryParams = $conf['addQueryString'] ? $this->getQueryArguments($conf['addQueryString.']) : '';
 						$addQueryParams .= isset($conf['additionalParams.']) ? trim($this->stdWrap($conf['additionalParams'], $conf['additionalParams.'])) : trim($conf['additionalParams']);
-						if ($addQueryParams == '&' || substr($addQueryParams, 0, 1) != '&') {
+						if ($addQueryParams == '&' || $addQueryParams{0} != '&') {
 							$addQueryParams = '';
 						}
 						if ($conf['useCacheHash']) {
@@ -6599,8 +6599,9 @@
 		$lines = GeneralUtility::trimExplode(LF, $params, TRUE);
 		foreach ($lines as $val) {
 			$pair = explode('=', $val, 2);
-			if (!GeneralUtility::inList('#,/', substr(trim($pair[0]), 0, 1))) {
-				$paramArr[trim($pair[0])] = trim($pair[1]);
+			$pair[0] = trim($pair[0]);
+			if (!GeneralUtility::inList('#,/', $pair[0]{0})) {
+				$paramArr[$pair[0]] = trim($pair[1]);
 			}
 		}
 		return $paramArr;
@@ -6823,7 +6824,7 @@
 	 * @todo Define visibility
 	 */
 	public function mergeTSRef($confArr, $prop) {
-		if (substr($confArr[$prop], 0, 1) == '<') {
+		if ($confArr[$prop]{0} == '<') {
 			$key = trim(substr($confArr[$prop], 1));
 			$cF = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
 			// $name and $conf is loaded with the referenced values.
@@ -7718,7 +7719,7 @@
 			$pid_uid_flag++;
 		}
 		// Static_* tables are allowed to be fetched from root page
-		if (substr($table, 0, 7) == 'static_') {
+		if (strpos($table, 'static_') === 0) {
 			$pid_uid_flag++;
 		}
 		if (trim($conf['pidInList'])) {
Index: typo3_src/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php	(revision )
@@ -153,7 +153,7 @@
 	public function _getProperties() {
 		$properties = get_object_vars($this);
 		foreach ($properties as $propertyName => $propertyValue) {
-			if (substr($propertyName, 0, 1) === '_') {
+			if ($propertyName{0} === '_') {
 				unset($properties[$propertyName]);
 			}
 		}
@@ -193,7 +193,7 @@
 			$this->_cleanProperties = array();
 			$properties = get_object_vars($this);
 			foreach ($properties as $propertyName => $propertyValue) {
-				if (substr($propertyName, 0, 1) === '_') {
+				if ($propertyName{0} === '_') {
 					continue;
 				}
 				// Do not memorize "internal" properties
Index: typo3_src/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php	(revision )
@@ -100,7 +100,7 @@
 			// Ok, we got the private key. Get the modulus.
 			$command = $this->opensslPath . ' rsa -noout -modulus -in ' . escapeshellarg($privateKeyFile);
 			$value = \TYPO3\CMS\Core\Utility\CommandUtility::exec($command);
-			if (substr($value, 0, 8) === 'Modulus=') {
+			if (strpos($value, 'Modulus=') === 0) {
 				$publicKey = substr($value, 8);
 
 				$keyPair->setExponent(self::DEFAULT_EXPONENT);
@@ -150,7 +150,7 @@
 		if ($this->opensslPath) {
 			// If path exists, test that command runs and can produce output
 			$test = \TYPO3\CMS\Core\Utility\CommandUtility::exec($this->opensslPath . ' version');
-			$result = substr($test, 0, 8) == 'OpenSSL ';
+			$result = strpos($test, 'OpenSSL ') === 0;
 		}
 		return $result;
 	}
\ No newline at end of file
Index: typo3_src/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php	(revision )
@@ -1269,7 +1269,7 @@
 	public function getPageConfigLabel($string, $JScharCode = 1) {
 		global $LANG, $TSFE, $TYPO3_CONF_VARS;
 		if ($this->is_FE()) {
-			if (substr($string, 0, 4) !== 'LLL:') {
+			if (strpos($string, 'LLL:') !== 0) {
 				// A pure string coming from Page TSConfig must be in utf-8
 				$label = $TSFE->csConvObj->conv($TSFE->sL(trim($string)), 'utf-8', $this->OutputCharset);
 			} else {
@@ -1278,7 +1278,7 @@
 			$label = str_replace('"', '\\"', str_replace('\\\'', '\'', $label));
 			$label = $JScharCode ? $this->feJScharCode($label) : $label;
 		} else {
-			if (substr($string, 0, 4) !== 'LLL:') {
+			if (strpos($string, 'LLL:') !== 0) {
 				$label = $string;
 			} else {
 				$label = $LANG->sL(trim($string));
@@ -1303,14 +1303,14 @@
 	}
 
 	public function getFullFileName($filename) {
-		if (substr($filename, 0, 4) == 'EXT:') {
+		if (strpos($filename, 'EXT:') === 0) {
 			// extension
 			list($extKey, $local) = explode('/', substr($filename, 4), 2);
 			$newFilename = '';
 			if ((string)$extKey !== '' && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey) && (string)$local !== '') {
 				$newFilename = ($this->is_FE() || $this->isFrontendEditActive() ? \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey) : $this->backPath . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extKey)) . $local;
 			}
-		} elseif (substr($filename, 0, 1) != '/') {
+		} elseif ($filename{0} != '/') {
 			$newFilename = ($this->is_FE() || $this->isFrontendEditActive() ? '' : $this->backPath . '../') . $filename;
 		} else {
 			$newFilename = ($this->is_FE() || $this->isFrontendEditActive() ? '' : $this->backPath . '../') . substr($filename, 1);
Index: typo3_src/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php	(revision )
@@ -429,11 +429,11 @@
 		if (!($this->searchRootPageIdList < 0)) {
 			$whereClause = ' AND ISEC.rl0 IN (' . $this->searchRootPageIdList . ') ';
 		}
-		if (substr($this->sections, 0, 4) == 'rl1_') {
+		if (strpos($this->sections, 'rl1_') === 0) {
 			$list = implode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', substr($this->sections, 4)));
 			$whereClause .= ' AND ISEC.rl1 IN (' . $list . ')';
 			$match = TRUE;
-		} elseif (substr($this->sections, 0, 4) == 'rl2_') {
+		} elseif (strpos($this->sections, 'rl2_') === 0) {
 			$list = implode(',', \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', substr($this->sections, 4)));
 			$whereClause .= ' AND ISEC.rl2 IN (' . $list . ')';
 			$match = TRUE;
@@ -587,7 +587,7 @@
 		// If any of the ranking sortings are selected, we must make a
 		// join with the word/rel-table again, because we need to
 		// calculate ranking based on all search-words found.
-		if (substr($this->sortOrder, 0, 5) == 'rank_') {
+		if (strpos($this->sortOrder, 'rank_') === 0) {
 			switch ($this->sortOrder) {
 				case 'rank_flag':
 					// This gives priority to word-position (max-value) so that words in title, keywords, description counts more than in content.
Index: typo3_src/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/setup/Classes/Controller/SetupModuleController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/setup/Classes/Controller/SetupModuleController.php	(revision )
@@ -448,7 +448,7 @@
 		$tabLabel = '';
 		foreach ($fieldArray as $fieldName) {
 			$more = '';
-			if (substr($fieldName, 0, 8) == '--div--;') {
+			if (strpos($fieldName, '--div--;') === 0) {
 				if ($firstTabLabel == '') {
 					// First tab
 					$tabLabel = $this->getLabel(substr($fieldName, 8), '', FALSE);
@@ -723,7 +723,7 @@
 	 * @return string HTML output.
 	 */
 	protected function getLabel($str, $key = '', $addLabelTag = TRUE, $altLabelTagId = '') {
-		if (substr($str, 0, 4) == 'LLL:') {
+		if (strpos($str, 'LLL:') === 0) {
 			$out = $GLOBALS['LANG']->sL($str);
 		} else {
 			$out = htmlspecialchars($str);
Index: typo3_src/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php	(revision )
@@ -142,7 +142,7 @@
 			return;
 		}
 		// Constraint for a group
-		if (substr($userOrGroup, 0, 3) === 'gr-') {
+		if (strpos($userOrGroup, 'gr-') === 0) {
 			$groupId = intval(substr($userOrGroup, 3));
 			$userIds = array();
 			foreach ($this->beUserList as $userId => $userData) {
@@ -156,7 +156,7 @@
 				// If there are no group members -> use -1 as constraint to not find anything
 				$queryConstraints[] = $query->in('userid', array(-1));
 			}
-		} elseif (substr($userOrGroup, 0, 3) === 'us-') {
+		} elseif (strpos($userOrGroup, 'us-') === 0) {
 			$queryConstraints[] = $query->equals('userid', intval(substr($userOrGroup, 3)));
 		} elseif ($userOrGroup === '-1') {
 			$queryConstraints[] = $query->equals('userid', intval($GLOBALS['BE_USER']->user['uid']));
Index: typo3_src/typo3/sysext/install/Classes/Service/ClearCacheService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/install/Classes/Service/ClearCacheService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/install/Classes/Service/ClearCacheService.php	(revision )
@@ -68,7 +68,7 @@
 		$tables = $database->admin_get_tables();
 		foreach ($tables as $table) {
 			$tableName = $table['Name'];
-			if (substr($tableName, 0, 3) === 'cf_') {
+			if (strpos($tableName, 'cf_') === 0) {
 				$database->exec_TRUNCATEquery($tableName);
 			}
 		}
Index: typo3_src/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Resource/ResourceCompressor.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Resource/ResourceCompressor.php	(revision )
@@ -551,7 +551,7 @@
 		// build the file path relatively to the PATH_site
 		$backPath = str_replace(TYPO3_mainDir, '', $this->backPath);
 		$file = str_replace($backPath, '', $filename);
-		if (substr($file, 0, 3) === '../') {
+		if (strpos($file, '../') === 0) {
 			$file = GeneralUtility::resolveBackPath(PATH_typo3 . $file);
 		} else {
 			$file = PATH_site . $file;
Index: typo3_src/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php	(revision )
@@ -40,7 +40,7 @@
 	public function decryptPassword(array $parameters) {
 		if ($this->isRsaAvailable()) {
 			$be_user_data = &$parameters['be_user_data'];
-			if (substr($be_user_data['password'], 0, 4) === 'rsa:' && substr($be_user_data['password2'], 0, 4) === 'rsa:') {
+			if (strpos($be_user_data['password'], 'rsa:') === 0 && strpos($be_user_data['password2'], 'rsa:') === 0) {
 				$backend = \TYPO3\CMS\Rsaauth\Backend\BackendFactory::getBackend();
 				/** @var $storage \TYPO3\CMS\Rsaauth\Storage\AbstractStorage */
 				$storage = \TYPO3\CMS\Rsaauth\Storage\StorageFactory::getStorage();
Index: typo3_src/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php	(revision )
@@ -258,7 +258,7 @@
 				$this->databaseHandle = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('PDO', $this->dataSourceName, $this->username, $this->password);
 			}
 			$this->databaseHandle->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-			if (substr($this->pdoDriver, 0, 5) === 'mysql') {
+			if (strpos($this->pdoDriver, 'mysql') === 0) {
 				$this->databaseHandle->exec('SET SESSION sql_mode=\'ANSI\';');
 			}
 		} catch (\PDOException $e) {
Index: typo3_src/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php	(revision )
@@ -257,7 +257,7 @@
 		// If the next char is a comma and this was a group, then
 		// there are more addresses, otherwise, if there are any more
 		// chars, then there is another address.
-		if ($is_group && substr($address, 0, 1) == ',') {
+		if ($is_group && $address{0} == ',') {
 			$address = trim(substr($address, 1));
 			return $address;
 		} elseif (strlen($address) > 0) {
@@ -473,7 +473,7 @@
 		}
 		foreach ($phrase_parts as $part) {
 			// If quoted string:
-			if (substr($part, 0, 1) == '"') {
+			if ($part{0} == '"') {
 				if (!$this->_validateQuotedString($part)) {
 					return FALSE;
 				}
@@ -571,7 +571,7 @@
 		}
 		$mailbox = trim($mailbox);
 		// Check for name + route-addr
-		if (substr($mailbox, -1) == '>' && substr($mailbox, 0, 1) != '<') {
+		if (substr($mailbox, -1) == '>' && $mailbox{0} != '<') {
 			$parts = explode('<', $mailbox);
 			$name = $this->_splitCheck($parts, '<');
 			$phrase = trim($name);
@@ -581,7 +581,7 @@
 			}
 		} else {
 			// First snip angle brackets if present.
-			if (substr($mailbox, 0, 1) == '<' && substr($mailbox, -1) == '>') {
+			if ($mailbox{0} == '<' && substr($mailbox, -1) == '>') {
 				$addr_spec = substr($mailbox, 1, -1);
 			} else {
 				$addr_spec = $mailbox;
Index: typo3_src/typo3/sysext/install/Classes/FolderStructure/RootNode.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/install/Classes/FolderStructure/RootNode.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/install/Classes/FolderStructure/RootNode.php	(revision )
@@ -49,7 +49,7 @@
 
 		if (!isset($structure['name'])
 			|| ($this->isWindowsOs() && substr($structure['name'], 1, 2) !== ':/')
-			|| (!$this->isWindowsOs() && substr($structure['name'], 0, 1) !== '/')
+			|| (!$this->isWindowsOs() && $structure['name']{0} !== '/')
 		) {
 			throw new \TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException(
 				'Root node expects absolute path as name',
Index: typo3_src/typo3/sysext/core/Classes/TypoScript/TemplateService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/TypoScript/TemplateService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/TypoScript/TemplateService.php	(revision )
@@ -775,7 +775,7 @@
 			}
 		}
 		// If "Include before all static templates if root-flag is set" is set:
-		if ($row['static_file_mode'] == 3 && substr($templateID, 0, 4) == 'sys_' && $row['root']) {
+		if ($row['static_file_mode'] == 3 && strpos($templateID, 'sys_') === 0 && $row['root']) {
 			$this->addExtensionStatics($idList, $templateID, $pid, $row);
 		}
 		// Static Template Files (Text files from extensions): include_static_file is a list of static files to include (from extensions)
@@ -783,7 +783,7 @@
 			$include_static_fileArr = GeneralUtility::trimExplode(',', $row['include_static_file'], TRUE);
 			// Traversing list
 			foreach ($include_static_fileArr as $ISF_file) {
-				if (substr($ISF_file, 0, 4) == 'EXT:') {
+				if (strpos($ISF_file, 'EXT:') === 0) {
 					list($ISF_extKey, $ISF_localPath) = explode('/', substr($ISF_file, 4), 2);
 					if ((string)$ISF_extKey !== '' && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($ISF_extKey) && (string)$ISF_localPath !== '') {
 						$ISF_localPath = rtrim($ISF_localPath, '/') . '/';
@@ -807,7 +807,7 @@
 		}
 		// If "Default (include before if root flag is set)" is set OR
 		// "Always include before this template record" AND root-flag are set
-		if ($row['static_file_mode'] == 1 || $row['static_file_mode'] == 0 && substr($templateID, 0, 4) == 'sys_' && $row['root']) {
+		if ($row['static_file_mode'] == 1 || $row['static_file_mode'] == 0 && strpos($templateID, 'sys_') === 0 && $row['root']) {
 			$this->addExtensionStatics($idList, $templateID, $pid, $row);
 		}
 		// Include Static Template Records after all other TypoScript has been included.
@@ -1094,7 +1094,7 @@
 	public function flattenSetup($setupArray, $prefix, $resourceFlag) {
 		if (is_array($setupArray)) {
 			foreach ($setupArray as $key => $val) {
-				if ($prefix || substr($key, 0, 16) != 'TSConstantEditor') {
+				if ($prefix || strpos($key, 'TSConstantEditor') !== 0) {
 					// We don't want 'TSConstantEditor' in the flattend setup on the first level (190201)
 					if (is_array($val)) {
 						$this->flattenSetup($val, $prefix . $key, $key == 'file.');
@@ -1243,7 +1243,7 @@
 		if (isset($this->fileCache[$hash])) {
 			return $this->fileCache[$hash];
 		}
-		if (substr($file, 0, 4) === 'EXT:') {
+		if (strpos($file, 'EXT:') === 0) {
 			$newFile = '';
 			list($extKey, $script) = explode('/', substr($file, 4), 2);
 			if ($extKey && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
Index: typo3_src/typo3/sysext/fluid/Classes/Compatibility/DocbookGeneratorService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/fluid/Classes/Compatibility/DocbookGeneratorService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/fluid/Classes/Compatibility/DocbookGeneratorService.php	(revision )
@@ -81,7 +81,7 @@
 				continue;
 			}
 			if (is_file($directory . $file)) {
-				if (substr($file, 0, 8) == 'Abstract') {
+				if (strpos($file, 'Abstract') === 0) {
 					continue;
 				}
 				$classNames[] = $namespace . substr($file, 0, -4);
Index: typo3_src/typo3/sysext/core/Classes/Database/QueryGenerator.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Database/QueryGenerator.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Database/QueryGenerator.php	(revision )
@@ -541,7 +541,7 @@
 		$c = 0;
 		$arrCount = 0;
 		foreach ($queryConfig as $key => $conf) {
-			if (substr($conf['type'], 0, 6) == 'FIELD_') {
+			if (strpos($conf['type'], 'FIELD_') === 0) {
 				$fName = substr($conf['type'], 6);
 				$fType = $this->fields[$fName]['type'];
 			} elseif ($conf['type'] == 'newlevel') {
@@ -596,7 +596,7 @@
 			$subscript = $parent . '[' . $key . ']';
 			$lineHTML = '';
 			$lineHTML .= $this->mkOperatorSelect($this->name . $subscript, $conf['operator'], $c, $conf['type'] != 'FIELD_');
-			if (substr($conf['type'], 0, 6) == 'FIELD_') {
+			if (strpos($conf['type'], 'FIELD_') === 0) {
 				$fName = substr($conf['type'], 6);
 				$this->fieldName = $fName;
 				$fType = $this->fields[$fName]['type'];
@@ -780,7 +780,7 @@
 		}
 		if ($fieldSetup['type'] == 'multiple') {
 			foreach ($fieldSetup['items'] as $key => $val) {
-				if (substr($val[0], 0, 4) == 'LLL:') {
+				if (strpos($val[0], 'LLL:') === 0) {
 					$value = $GLOBALS['LANG']->sL($val[0]);
 				} else {
 					$value = $val[0];
@@ -794,7 +794,7 @@
 		}
 		if ($fieldSetup['type'] == 'binary') {
 			foreach ($fieldSetup['items'] as $key => $val) {
-				if (substr($val[0], 0, 4) == 'LLL:') {
+				if (strpos($val[0], 'LLL:') === 0) {
 					$value = $GLOBALS['LANG']->sL($val[0]);
 				} else {
 					$value = $val[0];
@@ -809,7 +809,7 @@
 		if ($fieldSetup['type'] == 'relation') {
 			if ($fieldSetup['items']) {
 				foreach ($fieldSetup['items'] as $key => $val) {
-					if (substr($val[0], 0, 4) == 'LLL:') {
+					if (strpos($val[0], 'LLL:') === 0) {
 						$value = $GLOBALS['LANG']->sL($val[0]);
 					} else {
 						$value = $val[0];
@@ -866,7 +866,7 @@
 					$altLabelField = $GLOBALS['TCA'][$from_table]['ctrl']['label_alt'];
 					if ($GLOBALS['TCA'][$from_table]['columns'][$labelField]['config']['items']) {
 						foreach ($GLOBALS['TCA'][$from_table]['columns'][$labelField]['config']['items'] as $labelArray) {
-							if (substr($labelArray[0], 0, 4) == 'LLL:') {
+							if (strpos($labelArray[0], 'LLL:') === 0) {
 								$labelFieldSelect[$labelArray[1]] = $GLOBALS['LANG']->sL($labelArray[0]);
 							} else {
 								$labelFieldSelect[$labelArray[1]] = $labelArray[0];
@@ -876,7 +876,7 @@
 					}
 					if ($GLOBALS['TCA'][$from_table]['columns'][$altLabelField]['config']['items']) {
 						foreach ($GLOBALS['TCA'][$from_table]['columns'][$altLabelField]['config']['items'] as $altLabelArray) {
-							if (substr($altLabelArray[0], 0, 4) == 'LLL:') {
+							if (strpos($altLabelArray[0], 'LLL:') === 0) {
 								$altLabelFieldSelect[$altLabelArray[1]] = $GLOBALS['LANG']->sL($altLabelArray[0]);
 							} else {
 								$altLabelFieldSelect[$altLabelArray[1]] = $altLabelArray[0];
Index: typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php	(revision )
@@ -2243,7 +2243,7 @@
 		// First, check if cliMode is enabled:
 		if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
 			if (!$this->user['uid']) {
-				if (substr($GLOBALS['MCONF']['name'], 0, 5) == '_CLI_') {
+				if (strpos($GLOBALS['MCONF']['name'], '_CLI_') === 0) {
 					$userName = strtolower($GLOBALS['MCONF']['name']);
 					$this->setBeUserByName($userName);
 					if ($this->user['uid']) {
Index: typo3_src/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php	(revision )
@@ -1014,7 +1014,7 @@
 		$parsedUrl = @parse_url($url);
 		if ($parsedUrl !== FALSE && !isset($parsedUrl['scheme']) && !isset($parsedUrl['host'])) {
 			// If the relative URL starts with a slash, we need to check if it's within the current site path
-			return !GeneralUtility::isFirstPartOfStr($parsedUrl['path'], '/') || GeneralUtility::isFirstPartOfStr($parsedUrl['path'], GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'));
+			return $parsedUrl['path']{0} !== '/' || GeneralUtility::isFirstPartOfStr($parsedUrl['path'], GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'));
 		}
 		return FALSE;
 	}
Index: typo3_src/typo3/sysext/backend/Classes/Module/ModuleLoader.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Module/ModuleLoader.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Module/ModuleLoader.php	(revision )
@@ -282,7 +282,7 @@
 						}
 
 						// Finally, setting the icon with correct path:
-						if (substr($defaultLabels['tabs_images']['tab'], 0, 3) == '../') {
+						if (strpos($defaultLabels['tabs_images']['tab'], '../') === 0) {
 							$defaultLabels['tabs_images']['tab'] = PATH_site . substr($defaultLabels['tabs_images']['tab'], 3);
 						} else {
 							$defaultLabels['tabs_images']['tab'] = PATH_typo3 . $defaultLabels['tabs_images']['tab'];
Index: typo3_src/typo3/sysext/core/Classes/Core/ClassLoader.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Core/ClassLoader.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Core/ClassLoader.php	(revision )
@@ -226,7 +226,7 @@
 	 * @return array|null
 	 */
 	protected function buildClassLoadingInformationForClassFromCorePackage($className) {
-		if (substr($className, 0, 14) === 'TYPO3\\CMS\\Core') {
+		if (strpos($className, 'TYPO3\\CMS\\Core') === 0) {
 			$classesFolder = substr($className, 15, 5) === 'Tests' ? '' : 'Classes/';
 			$classFilePath = PATH_typo3 . 'sysext/core/' . $classesFolder . str_replace('\\', '/', substr($className, 15)) . '.php';
 			if (@file_exists($classFilePath)) {
Index: typo3_src/typo3/sysext/core/Classes/Database/PdoHelper.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Database/PdoHelper.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Database/PdoHelper.php	(revision )
@@ -50,7 +50,7 @@
 	static public function importSql(\PDO $databaseHandle, $pdoDriver, $pathAndFilename) {
 		$sql = file($pathAndFilename, FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
 		// Remove MySQL style key length delimiters (yuck!) if we are not setting up a MySQL db
-		if (substr($pdoDriver, 0, 5) !== 'mysql') {
+		if (strpos($pdoDriver, 'mysql') !== 0) {
 			$sql = preg_replace('/"\\([0-9]+\\)/', '"', $sql);
 		}
 		$statement = '';
Index: typo3_src/typo3/sysext/core/Classes/Utility/DiffUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Utility/DiffUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Utility/DiffUtility.php	(revision )
@@ -88,10 +88,10 @@
 					$c = intval($lValue);
 					$diffResArray[$c]['changeInfo'] = $lValue;
 				}
-				if (substr($lValue, 0, 1) == '<') {
+				if ($lValue{0} == '<') {
 					$differenceStr .= ($diffResArray[$c]['old'][] = substr($lValue, 2));
 				}
-				if (substr($lValue, 0, 1) == '>') {
+				if ($lValue{0} == '>') {
 					$differenceStr .= ($diffResArray[$c]['new'][] = substr($lValue, 2));
 				}
 			}
Index: typo3_src/typo3/sysext/backend/Classes/Utility/BackendUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Utility/BackendUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Utility/BackendUtility.php	(revision )
@@ -434,7 +434,7 @@
 		$loopCheck = 100;
 		$output = ($fullOutput = '/');
 		$clause = trim($clause);
-		if ($clause !== '' && substr($clause, 0, 3) !== 'AND') {
+		if ($clause !== '' && strpos($clause, 'AND') !== 0) {
 			$clause = 'AND ' . $clause;
 		}
 		$data = self::BEgetRootLine($uid, $clause);
@@ -907,7 +907,7 @@
 				$srcPointer = 'default';
 			}
 			// Get Data Source: Detect if it's a file reference and in that case read the file and parse as XML. Otherwise the value is expected to be XML.
-			if (substr($ds_array[$srcPointer], 0, 5) == 'FILE:') {
+			if (strpos($ds_array[$srcPointer], 'FILE:') === 0) {
 				$file = GeneralUtility::getFileAbsFileName(substr($ds_array[$srcPointer], 5));
 				if ($file && @is_file($file)) {
 					$dataStructArray = GeneralUtility::xml2array(GeneralUtility::getUrl($file));
Index: typo3_src/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php	(revision )
@@ -184,7 +184,7 @@
 		}
 		$addConditionCheck = GeneralUtility::_GP('qG_ins');
 		foreach ($OLD_MOD_SETTINGS as $key => $val) {
-			if (substr($key, 0, 5) == 'query' && $this->MOD_SETTINGS[$key] != $val && $key != 'queryLimit' && $key != 'use_listview') {
+			if (strpos($key, 'query') === 0 && $this->MOD_SETTINGS[$key] != $val && $key != 'queryLimit' && $key != 'use_listview') {
 				$setLimitToStart = 1;
 				if ($key == 'queryTable' && !$addConditionCheck) {
 					$this->MOD_SETTINGS['queryConfig'] = '';
Index: typo3_src/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php	(revision )
@@ -170,7 +170,7 @@
 					$data['height'] = $conf['height'];
 				}
 
-				if (substr($conf['label'], 0, 4) !== 'LLL:') {
+				if (strpos($conf['label'], 'LLL:') !== 0) {
 					$label .= $conf['label'];
 				} else {
 					$label .= $GLOBALS['LANG']->sL(trim($conf['label']));
Index: typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php	(revision )
@@ -86,7 +86,7 @@
 		// Get TSconfig for it.
 		$TSconfig = BackendUtility::getTCEFORM_TSconfig($this->table, is_array($origRow) ? $origRow : array('pid' => $this->P['pid']));
 		// Set [params][pid]
-		if (substr($this->P['params']['pid'], 0, 3) == '###' && substr($this->P['params']['pid'], -3) == '###') {
+		if (strpos($this->P['params']['pid'], '###') === 0 && substr($this->P['params']['pid'], -3) == '###') {
 			$this->pid = intval($TSconfig['_' . substr($this->P['params']['pid'], 3, -3)]);
 		} else {
 			$this->pid = intval($this->P['params']['pid']);
Index: typo3_src/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php	(revision )
@@ -178,7 +178,7 @@
 		$result = FALSE;
 		$normalizedExpression = $this->normalizeExpression($expression);
 		// First and last character must be square brackets (e.g. "[A]&&[B]":
-		if (substr($normalizedExpression, 0, 1) === '[' && substr($normalizedExpression, -1) === ']') {
+		if ($normalizedExpression{0} === '[' && substr($normalizedExpression, -1) === ']') {
 			$innerExpression = substr($normalizedExpression, 1, -1);
 			$orParts = explode(']||[', $innerExpression);
 			foreach ($orParts as $orPart) {
@@ -241,7 +241,7 @@
 				$values = GeneralUtility::trimExplode(',', $value, TRUE);
 				foreach ($values as $test) {
 					if (strcspn($test, '=<>') == 0) {
-						switch (substr($test, 0, 1)) {
+						switch ($test{0}) {
 							case '=':
 								if (doubleval(substr($test, 1)) == $browserInfo['version']) {
 									return TRUE;
Index: typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchController.php	(revision )
@@ -237,7 +237,7 @@
 			}
 		}
 		// Print a message telling which words in which sections we searched for
-		if (substr($this->searchData['sections'], 0, 2) == 'rl') {
+		if (strpos($this->searchData['sections'], 'rl') === 0) {
 			$result['searchedInSectionInfo'] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('result.inSection', 'indexed_search') . ' "' . substr($this->getPathFromPageId(substr($this->searchData['sections'], 4)), 1) . '"';
 		}
 		return $result;
@@ -278,7 +278,7 @@
 		$resultRows = $newResultRows;
 		$this->resultSections = array();
 		if ($freeIndexUid <= 0 && $this->searchData['group'] == 'sections') {
-			$rl2flag = substr($this->searchData['sections'], 0, 2) == 'rl';
+			$rl2flag = strpos($this->searchData['sections'], 'rl') === 0;
 			$sections = array();
 			foreach ($resultRows as $row) {
 				$id = $row['rl0'] . '-' . $row['rl1'] . ($rl2flag ? '-' . $row['rl2'] : '');
@@ -548,7 +548,7 @@
 			} else {
 				// Default creation / finding of icon:
 				$icon = '';
-				if ($imageType === '0' || substr($imageType, 0, 2) == '0:') {
+				if ($imageType === '0' || strpos($imageType, '0:') === 0) {
 					if (is_array($specRowConf['pageIcon.'])) {
 						$this->iconFileNameCache[$imageType] = $this->cObj->IMAGE($specRowConf['pageIcon.']);
 					} else {
Index: typo3_src/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php	(revision )
@@ -751,7 +751,7 @@
 				$tsContentsTillNextInclude = $parts[$i + 3];
 
 				// Resolve a possible relative paths if a parent file is given
-				if ($parentFilenameOrPath !== '' && GeneralUtility::isFirstPartOfStr($filename, '.')) {
+				if ($parentFilenameOrPath !== '' && $filename{0} === '.') {
 					$filename = PathUtility::getAbsolutePathOfRelativeReferencedFileOrPath($parentFilenameOrPath, $filename);
 				}
 
@@ -828,7 +828,7 @@
 	 */
 	public static function includeFile($filename, $cycle_counter = 1, $returnFiles = FALSE, &$newString = '', array &$includedFiles = array(), $optionalProperties = '', $parentFilenameOrPath = '') {
 		// Resolve a possible relative paths if a parent file is given
-		if ($parentFilenameOrPath !== '' && GeneralUtility::isFirstPartOfStr($filename, '.')) {
+		if ($parentFilenameOrPath !== '' && $filename{0} === '.') {
 			$absfilename = PathUtility::getAbsolutePathOfRelativeReferencedFileOrPath($parentFilenameOrPath, $filename);
 		} else {
 			$absfilename = $filename;
@@ -884,7 +884,7 @@
 		}
 
 		// Resolve a possible relative paths if a parent file is given
-		if ($parentFilenameOrPath !== '' && GeneralUtility::isFirstPartOfStr($dirPath, '.')) {
+		if ($parentFilenameOrPath !== '' && $dirPath{0} === '.') {
 			$absDirPath = PathUtility::getAbsolutePathOfRelativeReferencedFileOrPath($parentFilenameOrPath, $dirPath);
 		} else {
 			$absDirPath = $dirPath;
@@ -1004,7 +1004,7 @@
 					// Write the content to the file
 
 					// Resolve a possible relative paths if a parent file is given
-					if ($parentFilenameOrPath !== '' && GeneralUtility::isFirstPartOfStr($fileName, '.')) {
+					if ($parentFilenameOrPath !== '' && $fileName{0} === '.') {
 						$realFileName = PathUtility::getAbsolutePathOfRelativeReferencedFileOrPath($parentFilenameOrPath, $fileName);
 					} else {
 						$realFileName = $fileName;
Index: typo3_src/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Template/DocumentTemplate.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Template/DocumentTemplate.php	(revision )
@@ -1061,7 +1061,7 @@
 	 */
 	public function sectionHeader($label, $sH = FALSE, $addAttrib = '') {
 		$tag = $sH ? 'h2' : 'h3';
-		if ($addAttrib && substr($addAttrib, 0, 1) !== ' ') {
+		if ($addAttrib && $addAttrib{0} !== ' ') {
 			$addAttrib = ' ' . $addAttrib;
 		}
 		$str = '
@@ -1187,7 +1187,7 @@
 	 * @todo Define visibility
 	 */
 	public function addStyleSheet($key, $href, $title = '', $relation = 'stylesheet') {
-		if (strpos($href, '://') !== FALSE || substr($href, 0, 1) === '/') {
+		if (strpos($href, '://') !== FALSE || $href{0} === '/') {
 			$file = $href;
 		} else {
 			$file = $this->backPath . $href;
@@ -1259,7 +1259,7 @@
 				// Add all registered directories
 				foreach ($skinStylesheetDirs as $stylesheetDir) {
 					// for EXT:myskin/stylesheets/ syntax
-					if (substr($stylesheetDir, 0, 4) === 'EXT:') {
+					if (strpos($stylesheetDir, 'EXT:') === 0) {
 						list($extKey, $path) = explode('/', substr($stylesheetDir, 4), 2);
 						if (!empty($extKey) && ExtensionManagementUtility::isLoaded($extKey) && !empty($path)) {
 							$stylesheetDirectories[] = ExtensionManagementUtility::extRelPath($extKey) . $path;
Index: typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php	(revision )
@@ -70,7 +70,7 @@
 	 */
 	public function removeAccessibilityIcon ($content, $conf) {
 		// If the link was not rendered
-		if (substr($content, 0, 3) !== '<a ' && substr($content, 0, 5) === '<img ') {
+		if (strpos($content, '<a ') !== 0 && strpos($content, '<img ') === 0) {
 			// Let's remove the accessibility icon, if there is one
 			$matches = array();
 			if (preg_match('/^<img .*>/', $content, $matches) === 1) {
@@ -108,13 +108,13 @@
 	 * Returns the full name of a file referenced in Page TSConfig
 	 */
 	protected function getFullFileName($filename) {
-		if (substr($filename, 0, 4) == 'EXT:') {
+		if (strpos($filename, 'EXT:') === 0) {
 			list($extKey, $local) = explode('/', substr($filename, 4), 2);
 			$newFilename = '';
 			if ((string)$extKey !== '' && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey) && (string)$local !== '') {
 				$newFilename = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey) . $local;
 			}
-		} elseif (substr($filename, 0, 1) != '/') {
+		} elseif ($filename{0} != '/') {
 			$newFilename = $filename;
 		} else {
 			$newFilename = substr($filename, 1);
Index: typo3_src/typo3/sysext/extbase/Classes/Service/FlexFormService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Service/FlexFormService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Service/FlexFormService.php	(revision )
@@ -93,7 +93,7 @@
 				if (in_array($nodeKey, array('el', '_arrayContainer'))) {
 					return $this->walkFlexFormNode($nodeValue, $valuePointer);
 				}
-				if (substr($nodeKey, 0, 1) === '_') {
+				if ($nodeKey{0} === '_') {
 					continue;
 				}
 				if (strpos($nodeKey, '.')) {
Index: typo3_src/typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php	(revision )
@@ -77,7 +77,7 @@
 		$table = '';
 		$total = array();
 		foreach ($lines as $value) {
-			if (substr($value, 0, 1) == '#') {
+			if ($value{0} == '#') {
 				// Ignore comments
 				continue;
 			}
@@ -91,7 +91,7 @@
 					}
 				}
 			} else {
-				if (substr($value, 0, 1) == ')' && substr($value, -1) == ';') {
+				if ($value{0} == ')' && substr($value, -1) == ';') {
 					$ttype = array();
 					if (preg_match('/(ENGINE|TYPE)[ ]*=[ ]*([a-zA-Z]*)/', $value, $ttype)) {
 						$total[$table]['extra']['ENGINE'] = $ttype[2];
@@ -515,17 +515,18 @@
 		$statementArray = array();
 		$statementArrayPointer = 0;
 		foreach ($sqlcodeArr as $line => $lineContent) {
+			$lineContent = trim($lineContent);
 			$is_set = 0;
 			// Auto_increment fields cannot have a default value!
 			if (stristr($lineContent, 'auto_increment')) {
 				$lineContent = preg_replace('/ default \'0\'/i', '', $lineContent);
 			}
-			if (!$removeNonSQL || trim($lineContent) !== '' && substr(trim($lineContent), 0, 1) != '#' && substr(trim($lineContent), 0, 2) != '--') {
+			if (!$removeNonSQL || $lineContent !== '' && $lineContent{0} != '#' && strpos($lineContent, '--') !== 0) {
 				// '--' is seen as mysqldump comments from server version 3.23.49
 				$statementArray[$statementArrayPointer] .= $lineContent;
 				$is_set = 1;
 			}
-			if (substr(trim($lineContent), -1) == ';') {
+			if (substr($lineContent, -1) == ';') {
 				if (isset($statementArray[$statementArrayPointer])) {
 					if (!trim($statementArray[$statementArrayPointer]) || $query_regex && !preg_match(('/' . $query_regex . '/i'), trim($statementArray[$statementArrayPointer]))) {
 						unset($statementArray[$statementArrayPointer]);
Index: typo3_src/typo3/sysext/frontend/Classes/ContentObject/MediaContentObject.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/ContentObject/MediaContentObject.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/ContentObject/MediaContentObject.php	(revision )
@@ -45,7 +45,7 @@
 		$content = '';
 		// Add flex parameters to configuration
 		$flexParams = isset($conf['flexParams.']) ? $this->cObj->stdWrap($conf['flexParams'], $conf['flexParams.']) : $conf['flexParams'];
-		if (substr($flexParams, 0, 1) === '<') {
+		if ($flexParams{0} === '<') {
 			// It is a content element rather a TS object
 			$flexParams = \TYPO3\CMS\Core\Utility\GeneralUtility::xml2array($flexParams, 'T3');
 			foreach ($flexParams['data'] as $sheetData) {
@@ -138,7 +138,7 @@
 						$tmp = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(LF, $rawTS);
 						if (count($tmp)) {
 							foreach ($tmp as $tsLine) {
-								if (substr($tsLine, 0, 1) != '#' && ($pos = strpos($tsLine, '.'))) {
+								if ($tsLine{0} != '#' && ($pos = strpos($tsLine, '.'))) {
 									$parts[0] = substr($tsLine, 0, $pos);
 									$parts[1] = substr($tsLine, $pos + 1);
 									$valueParts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode('=', $parts[1], TRUE);
Index: typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php	(revision )
@@ -109,7 +109,7 @@
 		// Get TSconfig for it.
 		$TSconfig = BackendUtility::getTCEFORM_TSconfig($this->P['table'], is_array($origRow) ? $origRow : array('pid' => $this->P['pid']));
 		// Set [params][pid]
-		if (substr($this->P['params']['pid'], 0, 3) == '###' && substr($this->P['params']['pid'], -3) == '###') {
+		if (strpos($this->P['params']['pid'], '###') === 0 && substr($this->P['params']['pid'], -3) == '###') {
 			$this->pid = intval($TSconfig['_' . substr($this->P['params']['pid'], 3, -3)]);
 		} else {
 			$this->pid = intval($this->P['params']['pid']);
Index: typo3_src/typo3/sysext/frontend/Classes/ContentObject/FormContentObject.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/ContentObject/FormContentObject.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/ContentObject/FormContentObject.php	(revision )
@@ -154,7 +154,7 @@
 				// field:
 				$fParts = explode(',', $parts[1]);
 				$fParts[0] = trim($fParts[0]);
-				if (substr($fParts[0], 0, 1) == '*') {
+				if ($fParts[0]{0} == '*') {
 					$confData['required'] = 1;
 					$fParts[0] = substr($fParts[0], 1);
 				}
@@ -279,7 +279,7 @@
 						for ($a = 0; $a < $pCount; $a++) {
 							$valueParts[$a] = trim($valueParts[$a]);
 							// Finding default value
-							if (substr($valueParts[$a], 0, 1) == '*') {
+							if ($valueParts[$a]{0} == '*') {
 								$sel = 'selected';
 								$valueParts[$a] = substr($valueParts[$a], 1);
 							} else {
@@ -325,7 +325,7 @@
 						$pCount = count($valueParts);
 						for ($a = 0; $a < $pCount; $a++) {
 							$valueParts[$a] = trim($valueParts[$a]);
-							if (substr($valueParts[$a], 0, 1) == '*') {
+							if ($valueParts[$a]{0} == '*') {
 								$sel = 'checked';
 								$valueParts[$a] = substr($valueParts[$a], 1);
 							} else {
Index: typo3_src/typo3/sysext/core/Classes/DataHandling/DataHandler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/DataHandling/DataHandler.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/DataHandling/DataHandler.php	(revision )
@@ -971,7 +971,7 @@
 								$OK = 1;
 								// If a NEW... id
 								if (strstr($pid_value, 'NEW')) {
-									if (substr($pid_value, 0, 1) == '-') {
+									if ($pid_value{0} == '-') {
 										$negFlag = -1;
 										$pid_value = substr($pid_value, 1);
 									} else {
@@ -2236,7 +2236,7 @@
 						asort($actionCMDs[$key]);
 						$newValueArray = array();
 						foreach ($actionCMDs[$key] as $idx => $order) {
-							if (substr($idx, 0, 3) == 'ID-') {
+							if (strpos($idx, 'ID-') === 0) {
 								$idx = $this->newIndexMap[$idx];
 							}
 							// Just one reflection here: It is clear that when removing elements from a flexform, then we will get lost files unless we act on this delete operation by traversing and deleting files that were referred to.
@@ -2443,7 +2443,7 @@
 					break;
 				case 'double2':
 					$value = preg_replace('/[^0-9,\\.-]/', '', $value);
-					$negative = substr($value, 0, 1) == '-';
+					$negative = $value{0} == '-';
 					$value = strtr($value, array(',' => '.', '-' => ''));
 					if (strpos($value, '.') === FALSE) {
 						$value .= '.0';
@@ -2652,7 +2652,7 @@
 										$this->checkValue_flex_procInData_travDS($dataValues[$key]['el'][$ik][$theKey]['el'], is_array($dataValues_current[$key]['el'][$ik]) ? $dataValues_current[$key]['el'][$ik][$theKey]['el'] : array(), $uploadedFiles[$key]['el'][$ik][$theKey]['el'], $DSelements[$key]['el'][$theKey]['el'], $pParams, $callBackFunc, $structurePath . $key . '/el/' . $ik . '/' . $theKey . '/el/');
 										// If element is added dynamically in the flexform of TCEforms, we map the ID-string to the next numerical index we can have in that particular section of elements:
 										// The fact that the order changes is not important since order is controlled by a separately submitted index.
-										if (substr($ik, 0, 3) == 'ID-') {
+										if (strpos($ik, 'ID-') === 0) {
 											$newIndexCounter++;
 											// Set mapping index
 											$this->newIndexMap[$ik] = (is_array($dataValues_current[$key]['el']) && count($dataValues_current[$key]['el']) ? max(array_keys($dataValues_current[$key]['el'])) : 0) + $newIndexCounter;
Index: typo3_src/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php	(revision )
@@ -176,7 +176,7 @@
 	static public function configureModule($moduleSignature, $modulePath) {
 		$moduleConfiguration = $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature];
 		$iconPathAndFilename = $moduleConfiguration['icon'];
-		if (substr($iconPathAndFilename, 0, 4) === 'EXT:') {
+		if (strpos($iconPathAndFilename, 'EXT:') === 0) {
 			list($extensionKey, $relativePath) = explode('/', substr($iconPathAndFilename, 4), 2);
 			$iconPathAndFilename = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extensionKey) . $relativePath;
 		}
Index: typo3_src/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php	(revision )
@@ -55,7 +55,7 @@
 	 */
 	static public function filterHiddenFilesAndFolders($itemName, $itemIdentifier, $parentIdentifier, array $additionalInformation, \TYPO3\CMS\Core\Resource\Driver\DriverInterface $driverInstance) {
 		// Only apply the filter if you want to hide the hidden files
-		if (self::$showHiddenFilesAndFolders === FALSE && substr($itemName, 0, 1) == '.') {
+		if (self::$showHiddenFilesAndFolders === FALSE && $itemName{0} == '.') {
 			return -1;
 		} else {
 			return TRUE;
Index: typo3_src/typo3/sysext/backend/Classes/Form/FrontendFormEngine.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Form/FrontendFormEngine.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Form/FrontendFormEngine.php	(revision )
@@ -148,7 +148,7 @@
 	 * @return string
 	 */
 	private function prependBackPath($url) {
-		if (strpos($url, '://') !== FALSE || substr($url, 0, 1) === '/') {
+		if (strpos($url, '://') !== FALSE || $url{0} === '/') {
 			return $url;
 		} else {
 			return $this->backPath . $url;
Index: typo3_src/typo3/sysext/core/Classes/Database/SqlParser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Database/SqlParser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Database/SqlParser.php	(revision )
@@ -1243,7 +1243,7 @@
 		// Field type:
 		if ($result['fieldType'] = $this->nextPart($parseString, '^(int|smallint|tinyint|mediumint|bigint|double|numeric|decimal|float|varchar|char|text|tinytext|mediumtext|longtext|blob|tinyblob|mediumblob|longblob)([[:space:],]+|\\()')) {
 			// Looking for value:
-			if (substr($parseString, 0, 1) == '(') {
+			if ($parseString{0} == '(') {
 				$parseString = substr($parseString, 1);
 				if ($result['value'] = $this->nextPart($parseString, '^([^)]*)')) {
 					$parseString = ltrim(substr($parseString, 1));
@@ -1369,7 +1369,7 @@
 		} else {
 			// Just plain string value, in quotes or not:
 			// Quote?
-			$firstChar = substr($parseString, 0, 1);
+			$firstChar = $parseString{0};
 			switch ($firstChar) {
 				case '"':
 					$value = array($this->getValueInQuotes($parseString, '"'), '"');
Index: typo3_src/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php	(revision )
@@ -116,7 +116,7 @@
 		if (in_array($class, \TYPO3\CMS\Form\Utility\FormUtility::getInstance()->getFormObjects())) {
 			$this->addElement($parentElement, $class, $arguments);
 		} elseif ($this->disableContentElement === FALSE) {
-			if (substr($class, 0, 1) == '<') {
+			if ($class{0} == '<') {
 				$key = trim(substr($class, 1));
 				/** @var $typoscriptParser \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser */
 				$typoscriptParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
Index: typo3_src/typo3/sysext/extbase/Classes/Service/ImageService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Service/ImageService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Service/ImageService.php	(revision )
@@ -125,7 +125,7 @@
 	 * @return FileInterface|FileReference|\TYPO3\CMS\Core\Resource\Folder
 	 */
 	protected function getImageFromSourceString($src, $treatIdAsReference) {
-		if ($this->environmentService->isEnvironmentInBackendMode() && substr($src, 0, 3) === '../') {
+		if ($this->environmentService->isEnvironmentInBackendMode() && strpos($src, '../') === 0) {
 			$src = substr($src, 3);
 		}
 		if (MathUtility::canBeInterpretedAsInteger($src)) {
Index: typo3_src/typo3/sysext/backend/Classes/Controller/NewRecordController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/NewRecordController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/NewRecordController.php	(revision )
@@ -463,7 +463,7 @@
 							$thisTitle = '';
 							if ($nameParts[0] == 'tx' || $nameParts[0] == 'tt') {
 								// Try to extract extension name
-								if (substr($v['ctrl']['title'], 0, 8) == 'LLL:EXT:') {
+								if (strpos($v['ctrl']['title'], 'LLL:EXT:') === 0) {
 									$_EXTKEY = substr($v['ctrl']['title'], 8);
 									$_EXTKEY = substr($_EXTKEY, 0, strpos($_EXTKEY, '/'));
 									if ($_EXTKEY != '') {
Index: typo3_src/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php	(revision )
@@ -219,7 +219,7 @@
 	 * @return void
 	 */
 	public function __call($methodName, array $arguments) {
-		if (substr($methodName, 0, 3) !== 'set') {
+		if (strpos($methodName, 'set') !== 0) {
 			throw new \LogicException('Unknown method "' . $methodName . '".', 1210858451);
 		}
 		$firstLowerCaseArgumentName = $this->translateToLongArgumentName(strtolower($methodName[3]) . substr($methodName, 4));
Index: typo3_src/typo3/sysext/extbase/Classes/Persistence/Repository.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Persistence/Repository.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Persistence/Repository.php	(revision )
@@ -282,12 +282,12 @@
 	 * @api
 	 */
 	public function __call($methodName, $arguments) {
-		if (substr($methodName, 0, 6) === 'findBy' && strlen($methodName) > 7) {
+		if (strpos($methodName, 'findBy') === 0 && strlen($methodName) > 7) {
 			$propertyName = lcfirst(substr($methodName, 6));
 			$query = $this->createQuery();
 			$result = $query->matching($query->equals($propertyName, $arguments[0]))->execute();
 			return $result;
-		} elseif (substr($methodName, 0, 9) === 'findOneBy' && strlen($methodName) > 10) {
+		} elseif (strpos($methodName, 'findOneBy') === 0 && strlen($methodName) > 10) {
 			$propertyName = lcfirst(substr($methodName, 9));
 			$query = $this->createQuery();
 
@@ -298,7 +298,7 @@
 				return isset($result[0]) ? $result[0] : NULL;
 			}
 
-		} elseif (substr($methodName, 0, 7) === 'countBy' && strlen($methodName) > 8) {
+		} elseif (strpos($methodName, 'countBy') === 0 && strlen($methodName) > 8) {
 			$propertyName = lcfirst(substr($methodName, 7));
 			$query = $this->createQuery();
 			$result = $query->matching($query->equals($propertyName, $arguments[0]))->execute()->count();
Index: typo3_src/typo3/sysext/backend/Classes/View/PageLayoutView.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/View/PageLayoutView.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/View/PageLayoutView.php	(revision )
@@ -322,7 +322,7 @@
 						$theData[$field] = '&nbsp;<strong>ID:</strong>';
 						break;
 					default:
-						if (substr($field, 0, 6) == 'table_') {
+						if (strpos($field, 'table_') === 0) {
 							$f2 = substr($field, 6);
 							if ($GLOBALS['TCA'][$f2]) {
 								$theData[$field] = '&nbsp;' . IconUtility::getSpriteIconForRecord($f2, array(), array('title' => $GLOBALS['LANG']->sL($GLOBALS['TCA'][$f2]['ctrl']['title'], TRUE)));
@@ -1053,7 +1053,7 @@
 					$theData[$field] = '<span align="right">' . $row['uid'] . $eI . '</span>';
 					break;
 				default:
-					if (substr($field, 0, 6) == 'table_') {
+					if (strpos($field, 'table_') === 0) {
 						$f2 = substr($field, 6);
 						if ($GLOBALS['TCA'][$f2]) {
 							$c = $this->numberOfRecords($f2, $row['uid']);
Index: typo3_src/typo3/sysext/backend/Classes/Form/FormEngine.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Form/FormEngine.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Form/FormEngine.php	(revision )
@@ -3425,7 +3425,7 @@
 					$bit = substr($bitKey, 1);
 					if (MathUtility::canBeInterpretedAsInteger($bit)) {
 						$bit = MathUtility::forceIntegerInRange($bit, 0, 30);
-						if (substr($bitKey, 0, 1) == '-' && !($sTValue & pow(2, $bit)) || substr($bitKey, 0, 1) == '+' && $sTValue & pow(2, $bit)) {
+						if ($bitKey{0} == '-' && !($sTValue & pow(2, $bit)) || $bitKey{0} == '+' && $sTValue & pow(2, $bit)) {
 							$excludeElements = array_merge($excludeElements, GeneralUtility::trimExplode(',', $eList, TRUE));
 						}
 					}
@@ -4101,7 +4101,7 @@
 		if (is_array($wizConf) && !$this->disableWizards) {
 			$parametersOfWizards = &$specConf['wizards']['parameters'];
 			foreach ($wizConf as $wid => $wConf) {
-				if (substr($wid, 0, 1) != '_' && (!$wConf['enableByTypeConfig'] || is_array($parametersOfWizards) && in_array($wid, $parametersOfWizards)) && ($RTE || !$wConf['RTEonly'])) {
+				if ($wid{0} != '_' && (!$wConf['enableByTypeConfig'] || is_array($parametersOfWizards) && in_array($wid, $parametersOfWizards)) && ($RTE || !$wConf['RTEonly'])) {
 					// Title / icon:
 					$iTitle = htmlspecialchars($this->sL($wConf['title']));
 					if ($wConf['icon']) {
@@ -4136,7 +4136,7 @@
 								$params['md5ID'] = $md5ID;
 								$params['returnUrl'] = $this->thisReturnUrl();
 								// Resolving script filename and setting URL.
-								if (substr($wConf['script'], 0, 4) === 'EXT:') {
+								if (strpos($wConf['script'], 'EXT:') === 0) {
 									$wScript = GeneralUtility::getFileAbsFileName($wConf['script']);
 									if ($wScript) {
 										$wScript = '../' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($wScript);
@@ -4295,17 +4295,17 @@
 	 * @todo Define visibility
 	 */
 	public function getIcon($icon) {
-		if (substr($icon, 0, 4) == 'EXT:') {
+		if (strpos($icon, 'EXT:') === 0) {
 			$file = GeneralUtility::getFileAbsFileName($icon);
 			if ($file) {
 				$file = \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($file);
 				$selIconFile = $this->backPath . '../' . $file;
 				$selIconInfo = @getimagesize((PATH_site . $file));
 			}
-		} elseif (substr($icon, 0, 3) == '../') {
+		} elseif (strpos($icon, '../') === 0) {
 			$selIconFile = $this->backPath . GeneralUtility::resolveBackPath($icon);
 			$selIconInfo = @getimagesize((PATH_site . GeneralUtility::resolveBackPath(substr($icon, 3))));
-		} elseif (substr($icon, 0, 4) == 'ext/' || substr($icon, 0, 7) == 'sysext/') {
+		} elseif (strpos($icon, 'ext/') === 0 || strpos($icon, 'sysext/') === 0) {
 			$selIconFile = $this->backPath . $icon;
 			$selIconInfo = @getimagesize((PATH_typo3 . $icon));
 		} else {
@@ -4621,7 +4621,7 @@
 			$style = trim($this->fieldStyle['all']);
 		}
 		// Check class prefixed:
-		if (substr($style, 0, 6) == 'CLASS:') {
+		if (strpos($style, 'CLASS:') === 0) {
 			$out = $class ? trim(substr($style, 6)) : '';
 		} else {
 			$out = !$class ? $style : '';
@@ -6563,7 +6563,7 @@
 			return '';
 		}
 		// Check if we have a reference to another field value from the current record
-		if (substr($value, 0, 6) === '__row|') {
+		if (strpos($value, '__row|') === 0) {
 			/** @var \TYPO3\CMS\Backend\Form\FormDataTraverser $traverser */
 			$traverseFields = GeneralUtility::trimExplode('|', substr($value, 6));
 			$traverser = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Form\\FormDataTraverser', $this);
Index: typo3_src/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php	(revision )
@@ -147,11 +147,11 @@
 		if (function_exists('memcache_connect') && is_array($memcachedServers)) {
 			foreach ($memcachedServers as $testServer) {
 				$configuredServer = $testServer;
-				if (substr($testServer, 0, 7) == 'unix://') {
+				if (strpos($testServer, 'unix://') === 0) {
 					$host = $testServer;
 					$port = 0;
 				} else {
-					if (substr($testServer, 0, 6) === 'tcp://') {
+					if (strpos($testServer, 'tcp://') === 0) {
 						$testServer = substr($testServer, 6);
 					}
 					if (strstr($testServer, ':') !== FALSE) {
Index: typo3_src/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php	(revision )
@@ -916,7 +916,7 @@
 								$onClickEvent .= 'browse_links_setTarget(\'' . $v[($k2i . '.')]['target'] . '\');';
 							}
 							$v[$k2i . '.']['url'] = str_replace('###_URL###', $this->siteURL, $v[$k2i . '.']['url']);
-							if (substr($v[$k2i . '.']['url'], 0, 7) == 'http://' || substr($v[$k2i . '.']['url'], 0, 7) == 'mailto:') {
+							if (strpos($v[$k2i . '.']['url'], 'http://') === 0 || strpos($v[$k2i . '.']['url'], 'mailto:') === 0) {
 								$onClickEvent .= 'cur_href=unescape(\'' . rawurlencode($v[($k2i . '.')]['url']) . '\');link_current();';
 							} else {
 								$onClickEvent .= 'link_spec(unescape(\'' . $this->siteURL . rawurlencode($v[($k2i . '.')]['url']) . '\'));';
Index: typo3_src/typo3/sysext/core/Classes/Html/RteHtmlParser.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Html/RteHtmlParser.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Html/RteHtmlParser.php	(revision )
@@ -752,7 +752,7 @@
 				if (strstr($link_param, '@') && (!$pU['scheme'] || $pU['scheme'] == 'mailto')) {
 					// mailadr
 					$href = 'mailto:' . preg_replace('/^mailto:/i', '', $link_param);
-				} elseif (substr($link_param, 0, 1) == '#') {
+				} elseif ($link_param{0} == '#') {
 					// check if anchor
 					$href = $siteUrl . $link_param;
 				} else {
@@ -1499,8 +1499,8 @@
 			// Wrapping the line in <$dT> if not already wrapped and does not contain an hr tag
 			if (!preg_match('/<(hr)(\\s[^>\\/]*)?[[:space:]]*\\/?>/i', $parts[$k])) {
 				$testStr = strtolower(trim($parts[$k]));
-				if (substr($testStr, 0, 4) != '<div' || substr($testStr, -6) != '</div>') {
-					if (substr($testStr, 0, 2) != '<p' || substr($testStr, -4) != '</p>') {
+				if (strpos($testStr, '<div') !== 0 || substr($testStr, -6) != '</div>') {
+					if (strpos($testStr, '<p') !== 0 || substr($testStr, -4) != '</p>') {
 						// Only set p-tags if there is not already div or p tags:
 						$parts[$k] = '<' . $dT . '>' . $parts[$k] . '</' . $dT . '>';
 					}
Index: typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php	(revision )
@@ -616,7 +616,7 @@
 			$cmd = 'row_down';
 		}
 		if ($cmd && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($kk)) {
-			if (substr($cmd, 0, 4) == 'row_') {
+			if (strpos($cmd, 'row_') === 0) {
 				switch ($cmd) {
 					case 'row_remove':
 						unset($this->FORMCFG['c'][$kk]);
@@ -780,7 +780,7 @@
 				// Field:
 				$fParts = GeneralUtility::trimExplode(',', $parts[1]);
 				$fParts[0] = trim($fParts[0]);
-				if (substr($fParts[0], 0, 1) == '*') {
+				if ($fParts[0]{0} == '*') {
 					$confData['required'] = 1;
 					$fParts[0] = substr($fParts[0], 1);
 				}
Index: typo3_src/typo3/sysext/core/Classes/Utility/PathUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Utility/PathUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Utility/PathUtility.php	(revision )
@@ -205,7 +205,7 @@
 			return TRUE;
 		}
 		// Path starting with a / is always absolute, on every system
-		return substr($path, 0, 1) === '/';
+		return $path{0} === '/';
 	}
 
 	/**
Index: typo3_src/typo3/sysext/rtehtmlarea/Classes/User.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rtehtmlarea/Classes/User.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rtehtmlarea/Classes/User.php	(revision )
@@ -243,7 +243,7 @@
 										break;
 									case 'processor':
 										$script = trim($v[$k2i . '.']['submitToScript']);
-										if (substr($script, 0, 4) != 'http') {
+										if (strpos($script, 'http') !== 0) {
 											$script = $this->siteUrl . $script;
 										}
 										if ($script) {
Index: typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/PackageFactory.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/PackageFactory.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Resources/PHP/TYPO3.Flow/Classes/TYPO3/Flow/Package/PackageFactory.php	(revision )
@@ -83,7 +83,7 @@
 		if (!is_object($manifest)) {
 			throw new  \TYPO3\Flow\Package\Exception\InvalidPackageManifestException('Invalid composer manifest.', 1348146450);
 		}
-		if (isset($manifest->type) && substr($manifest->type, 0, 11) === 'typo3-flow-') {
+		if (isset($manifest->type) && strpos($manifest->type, 'typo3-flow-') === 0) {
 			$relativePackagePath = substr($packagePath, strlen($packagesBasePath));
 			$packageKey = substr($relativePackagePath, strpos($relativePackagePath, '/') + 1, -1);
 			/**
\ No newline at end of file
Index: typo3_src/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php	(revision )
@@ -145,11 +145,11 @@
 		$this->memcache = new \Memcache();
 		$defaultPort = ini_get('memcache.default_port');
 		foreach ($this->servers as $server) {
-			if (substr($server, 0, 7) == 'unix://') {
+			if (strpos($server, 'unix://') === 0) {
 				$host = $server;
 				$port = 0;
 			} else {
-				if (substr($server, 0, 6) === 'tcp://') {
+				if (strpos($server, 'tcp://') === 0) {
 					$server = substr($server, 6);
 				}
 				if (strpos($server, ':') !== FALSE) {
@@ -237,7 +237,7 @@
 	 */
 	public function get($entryIdentifier) {
 		$value = $this->memcache->get($this->identifierPrefix . $entryIdentifier);
-		if (substr($value, 0, 14) === 'TYPO3*chunked:') {
+		if (strpos($value, 'TYPO3*chunked:') === 0) {
 			list(, $chunkCount) = explode(':', $value);
 			$value = '';
 			for ($chunkNumber = 1; $chunkNumber < $chunkCount; $chunkNumber++) {
Index: typo3_src/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php	(revision )
@@ -147,7 +147,7 @@
 	 * @internal
 	 */
 	static public function getCN($key) {
-		return substr($key, 0, 5) == 'user_' ? 'user_' . str_replace('_', '', substr($key, 5)) : 'tx_' . str_replace('_', '', $key);
+		return strpos($key, 'user_') === 0 ? 'user_' . str_replace('_', '', substr($key, 5)) : 'tx_' . str_replace('_', '', $key);
 	}
 
 	/**
@@ -770,7 +770,7 @@
 	static public function configureModule($moduleSignature, $modulePath) {
 		$moduleConfiguration = $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature];
 		$iconPathAndFilename = $moduleConfiguration['icon'];
-		if (substr($iconPathAndFilename, 0, 4) === 'EXT:') {
+		if (strpos($iconPathAndFilename, 'EXT:') === 0) {
 			list($extensionKey, $relativePath) = explode('/', substr($iconPathAndFilename, 4), 2);
 			$iconPathAndFilename = self::extPath($extensionKey) . $relativePath;
 		}
Index: typo3_src/typo3/sysext/lang/Classes/LanguageService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/lang/Classes/LanguageService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/lang/Classes/LanguageService.php	(revision )
@@ -291,11 +291,11 @@
 	 */
 	public function sL($input, $hsc = FALSE) {
 			// If cached label
-		if (!isset($this->LL_labels_cache[$this->lang][$input]) && substr($input, 0, 4) === 'LLL:') {
+		if (!isset($this->LL_labels_cache[$this->lang][$input]) && strpos($input, 'LLL:') === 0) {
 			$restStr = trim(substr($input, 4));
 			$extPrfx = '';
 				// ll-file refered to is found in an extension.
-			if (substr($restStr, 0, 4) === 'EXT:') {
+			if (strpos($restStr, 'EXT:') === 0) {
 				$restStr = trim(substr($restStr, 4));
 				$extPrfx = 'EXT:';
 			}
@@ -375,7 +375,7 @@
 						if ($fieldName == '_') {
 							$fieldName = '';
 						}
-						if (substr($fieldName, 0, 1) == '_') {
+						if ($fieldName{0} == '_') {
 							$fieldName = substr($fieldName, 1);
 						}
 							// Append label
Index: typo3_src/typo3/sysext/core/Classes/Charset/CharsetConverter.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Charset/CharsetConverter.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Charset/CharsetConverter.php	(revision )
@@ -1098,7 +1098,7 @@
 	 */
 	public function utf8CharToUnumber($str, $hex = 0) {
 		// First char
-		$ord = ord(substr($str, 0, 1));
+		$ord = ord($str{0});
 		// This verifyes that it IS a multi byte string
 		if (($ord & 192) == 192) {
 			$binBuf = '';
@@ -1113,7 +1113,7 @@
 					break;
 				}
 			}
-			$binBuf = substr(('00000000' . decbin(ord(substr($str, 0, 1)))), -(6 - $b)) . $binBuf;
+			$binBuf = substr(('00000000' . decbin(ord($str{0}))), -(6 - $b)) . $binBuf;
 			$int = bindec($binBuf);
 		} else {
 			$int = $ord;
@@ -1158,7 +1158,7 @@
 					$detectedType = '';
 					foreach ($lines as $value) {
 						// Comment line or blanks are ignored.
-						if (trim($value) && substr($value, 0, 1) != '#') {
+						if (trim($value) && $value{0} != '#') {
 							// Detect type if not done yet: (Done on first real line)
 							// The "whitespaced" type is on the syntax 	"0x0A	0x000A	#LINE FEED" 	while 	"ms-token" is like 		"B9 = U+00B9 : SUPERSCRIPT ONE"
 							if (!$detectedType) {
Index: typo3_src/typo3/sysext/core/Classes/Package/Package.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Package/Package.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Package/Package.php	(revision )
@@ -63,7 +63,7 @@
 		if (substr($packagePath, -1, 1) !== '/') {
 			throw new \TYPO3\Flow\Package\Exception\InvalidPackagePathException(sprintf('The package path "%s" provided for package "%s" has no trailing forward slash.', $packagePath, $packageKey), 1166633720);
 		}
-		if (substr($classesPath, 1, 1) === '/') {
+		if ($classesPath{1} === '/') {
 			throw new \TYPO3\Flow\Package\Exception\InvalidPackagePathException(sprintf('The package classes path provided for package "%s" has a leading forward slash.', $packageKey), 1334841320);
 		}
 		if (!@file_exists($packagePath . $manifestPath . 'ext_emconf.php')) {
Index: typo3_src/typo3/sysext/impexp/Classes/ImportExport.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/impexp/Classes/ImportExport.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/impexp/Classes/ImportExport.php	(revision )
@@ -1222,7 +1222,7 @@
 		foreach ($pidsFromTree as $origPid => $newPid) {
 			if ($newPid >= 0 && $this->dontIgnorePid('pages', $origPid)) {
 				// If the page had a new id (because it was created) use that instead!
-				if (substr($this->import_newId_pids[$origPid], 0, 3) === 'NEW') {
+				if (strpos($this->import_newId_pids[$origPid], 'NEW') === 0) {
 					if ($this->import_mapId['pages'][$origPid]) {
 						$mappedPid = $this->import_mapId['pages'][$origPid];
 						$cmd_data['pages'][$mappedPid]['move'] = $newPid;
Index: typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php	(revision )
@@ -607,18 +607,18 @@
 					$AspellAnswer = shell_exec($AspellCommand);
 					$AspellResultLines = array();
 					$AspellResultLines = GeneralUtility::trimExplode(LF, $AspellAnswer, TRUE);
-					if (substr($AspellResultLines[0], 0, 6) == 'Error:') {
+					if (strpos($AspellResultLines[0], 'Error:') === 0) {
 						echo '{' . $AspellAnswer . '}';
 					}
 					GeneralUtility::unlink_tempfile($tmpFileName);
-					if (substr($AspellResultLines['1'], 0, 1) != '*') {
+					if ($AspellResultLines['1']{0} != '*') {
 						if (!in_array($word, $this->misspelled)) {
 							if (sizeof($this->misspelled) != 0) {
 								$this->suggestedWords .= ',';
 							}
 							$suggest = array();
 							$suggestions = array();
-							if (substr($AspellResultLines['1'], 0, 1) == '&') {
+							if ($AspellResultLines['1']{0} == '&') {
 								$suggestions = GeneralUtility::trimExplode(':', $AspellResultLines['1'], TRUE);
 								$suggest = GeneralUtility::trimExplode(',', $suggestions['1'], TRUE);
 							}
Index: typo3_src/typo3/sysext/frontend/Classes/Page/PageGenerator.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/Page/PageGenerator.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/Page/PageGenerator.php	(revision )
@@ -476,7 +476,7 @@
 					}
 					if ($ss) {
 						if ($GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['import']) {
-							if (!$GLOBALS['TSFE']->pSetup['includeCSS.'][($key . '.')]['external'] && substr($ss, 0, 1) != '/') {
+							if (!$GLOBALS['TSFE']->pSetup['includeCSS.'][($key . '.')]['external'] && $ss{0} != '/') {
 								// To fix MSIE 6 that cannot handle these as relative paths (according to Ben v Ende)
 								$ss = GeneralUtility::dirname(GeneralUtility::getIndpEnv('SCRIPT_NAME')) . '/' . $ss;
 							}
Index: typo3_src/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php	(revision )
@@ -641,7 +641,7 @@
 	 */
 	protected function getShortcutIconTitle($shortcutLabel, $moduleName, $parentModuleName = '') {
 		$title = '';
-		if (substr($moduleName, 0, 5) == 'xMOD_') {
+		if (strpos($moduleName, 'xMOD_') === 0) {
 			$title = substr($moduleName, 5);
 		} else {
 			$splitModuleName = explode('_', $moduleName);
Index: typo3_src/typo3/sysext/rsaauth/Classes/RsaAuthService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rsaauth/Classes/RsaAuthService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rsaauth/Classes/RsaAuthService.php	(revision )
@@ -83,7 +83,7 @@
 			// Decrypt the password
 			$password = $loginData['uident'];
 			$key = $storage->get();
-			if ($key != NULL && substr($password, 0, 4) === 'rsa:') {
+			if ($key != NULL && strpos($password, 'rsa:') === 0) {
 				// Decode password and store it in loginData
 				$decryptedPassword = $this->backend->decrypt($key, substr($password, 4));
 				if ($decryptedPassword !== NULL) {
Index: typo3_src/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php	(revision )
@@ -2071,7 +2071,7 @@
 		// ... and possibly recalculating the value
 		if (trim($cParts[1])) {
 			$cParts[1] = trim($cParts[1]);
-			if (substr($cParts[1], 0, 1) == '*') {
+			if ($cParts[1]{0} == '*') {
 				$val = doubleval(substr($cParts[1], 1));
 				$col[0] = MathUtility::forceIntegerInRange($col[0] * $val, 0, 255);
 				$col[1] = MathUtility::forceIntegerInRange($col[1] * $val, 0, 255);
Index: typo3_src/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php	(revision )
@@ -631,7 +631,7 @@
 								$onClickEvent .= 'TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser_setTarget(\'' . $v[($k2i . '.')]['target'] . '\');';
 							}
 							$v[$k2i . '.']['url'] = str_replace('###_URL###', $this->siteURL, $v[$k2i . '.']['url']);
-							if (substr($v[$k2i . '.']['url'], 0, 7) == 'http://' || substr($v[$k2i . '.']['url'], 0, 7) == 'mailto:') {
+							if (strpos($v[$k2i . '.']['url'], 'http://') === 0 || strpos($v[$k2i . '.']['url'], 'mailto:') === 0) {
 								$onClickEvent .= 'cur_href=unescape(\'' . rawurlencode($v[($k2i . '.')]['url']) . '\');link_current();';
 							} else {
 								$onClickEvent .= 'link_spec(unescape(\'' . $this->siteURL . rawurlencode($v[($k2i . '.')]['url']) . '\'));';
@@ -959,7 +959,7 @@
 	 * @return string Localized string.
 	 */
 	public function getPageConfigLabel($string, $JScharCode = 1) {
-		if (substr($string, 0, 4) !== 'LLL:') {
+		if (strpos($string, 'LLL:') !== 0) {
 			$label = $string;
 		} else {
 			$label = $GLOBALS['LANG']->sL(trim($string));
Index: typo3_src/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php	(revision )
@@ -1324,7 +1324,7 @@
 	public function enableDisableItems($menuItems) {
 		if ($this->iParts[3]) {
 			// Detect "only" mode: (only showing listed items)
-			if (substr($this->iParts[3], 0, 1) == '+') {
+			if ($this->iParts[3]{0} == '+') {
 				$this->iParts[3] = substr($this->iParts[3], 1);
 				$only = TRUE;
 			} else {
Index: typo3_src/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php	(revision )
@@ -88,7 +88,7 @@
 		// Might already contain values - empty it
 		unset($this->errorParams);
 		// Ignore FAL file references
-		if (substr($url, 0, 5) === 'file:') {
+		if (strpos($url, 'file:') === 0) {
 			// TODO: validate this resource file
 			return TRUE;
 		}
Index: typo3_src/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php	(revision )
@@ -246,10 +246,10 @@
 		}
 		foreach (get_class_methods($object) as $methodName) {
 			if (is_callable(array($object, $methodName))) {
-				if (substr($methodName, 0, 2) === 'is') {
+				if (strpos($methodName, 'is') === 0) {
 					$declaredPropertyNames[] = lcfirst(substr($methodName, 2));
 				}
-				if (substr($methodName, 0, 3) === 'get') {
+				if (strpos($methodName, 'get') === 0) {
 					$declaredPropertyNames[] = lcfirst(substr($methodName, 3));
 				}
 			}
@@ -281,7 +281,7 @@
 			$declaredPropertyNames = array_keys(get_class_vars(get_class($object)));
 		}
 		foreach (get_class_methods($object) as $methodName) {
-			if (substr($methodName, 0, 3) === 'set' && is_callable(array($object, $methodName))) {
+			if (strpos($methodName, 'set') === 0 && is_callable(array($object, $methodName))) {
 				$declaredPropertyNames[] = lcfirst(substr($methodName, 3));
 			}
 		}
Index: typo3_src/typo3/sysext/core/Classes/Utility/GeneralUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/core/Classes/Utility/GeneralUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/core/Classes/Utility/GeneralUtility.php	(revision )
@@ -1355,7 +1355,7 @@
 	 * @return string The string with the first character as lowercase
 	 */
 	static public function lcfirst($string) {
-		return self::strtolower(substr($string, 0, 1)) . substr($string, 1);
+		return self::strtolower($string{0}) . substr($string, 1);
 	}
 
 	/**
@@ -1880,7 +1880,7 @@
 		$value = array();
 		// Compared with empty string instead , 030102
 		while ($tag_tmp !== '') {
-			$firstChar = substr($tag_tmp, 0, 1);
+			$firstChar = $tag_tmp{0};
 			if ($firstChar === '"' || $firstChar === '\'') {
 				$reg = explode($firstChar, $tag_tmp, 3);
 				$value[] = $reg[1];
@@ -2239,7 +2239,7 @@
 			// Test for numeric tag, encoded on the form "nXXX":
 			$testNtag = substr($tagName, 1);
 			// Closing tag.
-			$tagName = substr($tagName, 0, 1) == 'n' && MathUtility::canBeInterpretedAsInteger($testNtag) ? (int)$testNtag : $tagName;
+			$tagName = $tagName{0} == 'n' && MathUtility::canBeInterpretedAsInteger($testNtag) ? (int)$testNtag : $tagName;
 			// Test for alternative index value:
 			if (strlen($val['attributes']['index'])) {
 				$tagName = $val['attributes']['index'];
@@ -3004,7 +3004,7 @@
 	static public function locationHeaderUrl($path) {
 		$uI = parse_url($path);
 		// relative to HOST
-		if (substr($path, 0, 1) == '/') {
+		if ($path{0} == '/') {
 			$path = self::getIndpEnv('TYPO3_REQUEST_HOST') . $path;
 		} elseif (!$uI['scheme']) {
 			// No scheme either
@@ -3599,7 +3599,7 @@
 			$relPathPrefix = PATH_site;
 		}
 		// Extension
-		if (substr($filename, 0, 4) == 'EXT:') {
+		if (strpos($filename, 'EXT:') === 0) {
 			list($extKey, $local) = explode('/', substr($filename, 4), 2);
 			$filename = '';
 			if ((string)$extKey !== '' && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey) && (string)$local !== '') {
@@ -3649,7 +3649,7 @@
 			return TRUE;
 		}
 		// Path starting with a / is always absolute, on every system
-		return substr($path, 0, 1) === '/';
+		return $path{0} === '/';
 	}
 
 	/**
@@ -3733,9 +3733,9 @@
 				}
 			} elseif (self::isAbsPath($decodedUrl) && self::isAllowedAbsPath($decodedUrl)) {
 				$sanitizedUrl = $url;
-			} elseif (strpos($testAbsoluteUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0 && substr($decodedUrl, 0, 1) === '/') {
+			} elseif (strpos($testAbsoluteUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0 && $decodedUrl{0} === '/') {
 				$sanitizedUrl = $url;
-			} elseif (strpos($testRelativeUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0 && substr($decodedUrl, 0, 1) !== '/') {
+			} elseif (strpos($testRelativeUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0 && $decodedUrl{0} !== '/') {
 				$sanitizedUrl = $url;
 			}
 		}
@@ -4072,7 +4072,7 @@
 			$funcRef = $funcName;
 		}
 		// Check for persistent object token, "&"
-		if (substr($funcRef, 0, 1) == '&') {
+		if ($funcRef{0} == '&') {
 			$funcRef = substr($funcRef, 1);
 			$storePersistentObject = TRUE;
 		} else {
@@ -4166,7 +4166,7 @@
 				$class = $classRef;
 			}
 			// Check for persistent object token, "&"
-			if (substr($class, 0, 1) == '&') {
+			if ($class{0} == '&') {
 				$class = substr($class, 1);
 				$storePersistentObject = TRUE;
 			} else {
Index: typo3_src/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php	(revision )
@@ -2620,7 +2620,7 @@
 			if ($locale) {
 				// PHP fatals with uppercase I characters in method names with turkish locale LC_CTYPE
 				// @see http://bugs.php.net/bug.php?id=35050
-				if (substr($this->config['config']['locale_all'], 0, 2) != 'tr') {
+				if (strpos($this->config['config']['locale_all'], 'tr') !== 0) {
 					setlocale(LC_CTYPE, $this->config['config']['locale_all']);
 				}
 				setlocale(LC_MONETARY, $this->config['config']['locale_all']);
@@ -4093,7 +4093,7 @@
 	 * @todo Define visibility
 	 */
 	public function checkFileInclude($incFile) {
-		return !$this->TYPO3_CONF_VARS['FE']['noPHPscriptInclude'] || substr($incFile, 0, 4 + strlen(TYPO3_mainDir)) == TYPO3_mainDir . 'ext/' || substr($incFile, 0, 7 + strlen(TYPO3_mainDir)) == TYPO3_mainDir . 'sysext/' || substr($incFile, 0, 14) == 'typo3conf/ext/';
+		return !$this->TYPO3_CONF_VARS['FE']['noPHPscriptInclude'] || substr($incFile, 0, 4 + strlen(TYPO3_mainDir)) == TYPO3_mainDir . 'ext/' || substr($incFile, 0, 7 + strlen(TYPO3_mainDir)) == TYPO3_mainDir . 'sysext/' || strpos($incFile, 'typo3conf/ext/') === 0;
 	}
 
 	/**
@@ -4627,7 +4627,7 @@
 	 * @todo Define visibility
 	 */
 	public function sL($input) {
-		if (substr($input, 0, 4) !== 'LLL:') {
+		if (strpos($input, 'LLL:') !== 0) {
 			// Not a label, return the key as this
 			return $input;
 		}
@@ -4635,7 +4635,7 @@
 		if (!isset($this->LL_labels_cache[$this->lang][$input])) {
 			$restStr = trim(substr($input, 4));
 			$extPrfx = '';
-			if (substr($restStr, 0, 4) === 'EXT:') {
+			if (strpos($restStr, 'EXT:') === 0) {
 				$restStr = trim(substr($restStr, 4));
 				$extPrfx = 'EXT:';
 			}
Index: typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php	(revision )
@@ -704,7 +704,7 @@
 			$content .= '<p' . $this->pi_classParam('noresults') . '>' . $this->pi_getLL('noResults', '', TRUE) . '</p>';
 		}
 		// Print a message telling which words we searched for, and in which sections etc.
-		$what = $this->tellUsWhatIsSeachedFor($sWArr) . (substr($this->piVars['sections'], 0, 2) == 'rl' ? ' ' . $this->pi_getLL('inSection', '', TRUE) . ' "' . substr($this->getPathFromPageId(substr($this->piVars['sections'], 4)), 1) . '"' : '');
+		$what = $this->tellUsWhatIsSeachedFor($sWArr) . (strpos($this->piVars['sections'], 'rl') === 0 ? ' ' . $this->pi_getLL('inSection', '', TRUE) . ' "' . substr($this->getPathFromPageId(substr($this->piVars['sections'], 4)), 1) . '"' : '');
 		$what = '<div' . $this->pi_classParam('whatis') . '>' . $this->cObj->stdWrap($what, $this->conf['whatis_stdWrap.']) . '</div>';
 		$content = $what . $content;
 		// Return content:
@@ -748,7 +748,7 @@
 		if ($freeIndexUid <= 0) {
 			switch ($this->piVars['group']) {
 				case 'sections':
-					$rl2flag = substr($this->piVars['sections'], 0, 2) == 'rl';
+					$rl2flag = strpos($this->piVars['sections'], 'rl') === 0;
 					$sections = array();
 					foreach ($resultRows as $row) {
 						$id = $row['rl0'] . '-' . $row['rl1'] . ($rl2flag ? '-' . $row['rl2'] : '');
@@ -980,11 +980,11 @@
 	public function sectionTableWhere() {
 		$out = $this->wholeSiteIdList < 0 ? '' : ' AND ISEC.rl0 IN (' . $this->wholeSiteIdList . ')';
 		$match = '';
-		if (substr($this->piVars['sections'], 0, 4) == 'rl1_') {
+		if (strpos($this->piVars['sections'], 'rl1_') === 0) {
 			$list = implode(',', GeneralUtility::intExplode(',', substr($this->piVars['sections'], 4)));
 			$out .= ' AND ISEC.rl1 IN (' . $list . ')';
 			$match = TRUE;
-		} elseif (substr($this->piVars['sections'], 0, 4) == 'rl2_') {
+		} elseif (strpos($this->piVars['sections'], 'rl2_') === 0) {
 			$list = implode(',', GeneralUtility::intExplode(',', substr($this->piVars['sections'], 4)));
 			$out .= ' AND ISEC.rl2 IN (' . $list . ')';
 			$match = TRUE;
@@ -1137,7 +1137,7 @@
 			$page_where = ' 1=1 ';
 		}
 		// If any of the ranking sortings are selected, we must make a join with the word/rel-table again, because we need to calculate ranking based on all search-words found.
-		if (substr($this->piVars['order'], 0, 5) == 'rank_') {
+		if (strpos($this->piVars['order'], 'rank_') === 0) {
 			switch ($this->piVars['order']) {
 				case 'rank_flag':
 					// This gives priority to word-position (max-value) so that words in title, keywords, description counts more than in content.
@@ -1827,7 +1827,7 @@
 			} else {
 				// Default creation / finding of icon:
 				$icon = '';
-				if ($it === '0' || substr($it, 0, 2) == '0:') {
+				if ($it === '0' || strpos($it, '0:') === 0) {
 					if (is_array($specRowConf['pageIcon.'])) {
 						$this->iconFileNameCache[$it] = $this->cObj->IMAGE($specRowConf['pageIcon.']);
 					} else {
Index: typo3_src/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php	(revision )
@@ -151,7 +151,7 @@
 				// Instanciate default method class
 				$this->objInstanceSaltedPW = \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance(substr($user['password'], 1));
 				// md5
-				if (substr($user['password'], 0, 1) === 'M') {
+				if ($user['password']{0} === 'M') {
 					$validPasswd = $this->objInstanceSaltedPW->checkPassword(md5($password), substr($user['password'], 1));
 				} else {
 					$validPasswd = $this->objInstanceSaltedPW->checkPassword($password, substr($user['password'], 1));
Index: typo3_src/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php	(revision )
@@ -104,7 +104,7 @@
 			$this->current++;
 		}
 		// Initial 'X' is pronounced 'Z' e.g. 'Xavier'
-		if (substr($this->original, 0, 1) == 'X') {
+		if ($this->original{0} == 'X') {
 			$this->primary .= 'S';
 			// 'Z' maps to 'S'
 			$this->secondary .= 'S';
@@ -223,7 +223,7 @@
 						break;
 					}
 					// double 'C', but not McClellan'
-					if ($this->StringAt($this->original, $this->current, 2, array('CC')) && !($this->current == 1 && substr($this->original, 0, 1) == 'M')) {
+					if ($this->StringAt($this->original, $this->current, 2, array('CC')) && !($this->current == 1 && $this->original{0} == 'M')) {
 						// 'bellocchio' but not 'bacchus'
 						if ($this->StringAt($this->original, $this->current + 2, 1, array('I', 'E', 'H')) && !$this->StringAt($this->original, ($this->current + 2), 2, array('HU'))) {
 							// 'accident', 'accede', 'succeed'
Index: typo3_src/typo3/sysext/frontend/Classes/Page/PageRepository.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/frontend/Classes/Page/PageRepository.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/frontend/Classes/Page/PageRepository.php	(revision )
@@ -618,7 +618,7 @@
 			// If relative path, prefix Site URL:
 			$uI = parse_url($redirectTo);
 			// Relative path assumed now.
-			if (!$uI['scheme'] && substr($redirectTo, 0, 1) != '/') {
+			if (!$uI['scheme'] && $redirectTo{0} != '/') {
 				$redirectTo = GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . $redirectTo;
 			}
 			return $redirectTo;
Index: typo3_src/typo3/sysext/backend/Classes/View/ThumbnailView.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/View/ThumbnailView.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/View/ThumbnailView.php	(revision )
@@ -127,7 +127,7 @@
 			// We assume the FilePath to be a relative file path (as in backwards compatibility mode)
 			$relativeFilePath = $filePathOrCombinedFileIdentifier;
 			// The incoming relative path is relative to the typo3/ directory, but we need it relative to PATH_site. This is corrected here:
-			if (substr($relativeFilePath, 0, 3) == '../') {
+			if (strpos($relativeFilePath, '../') === 0) {
 				$relativeFilePath = substr($relativeFilePath, 3);
 			} else {
 				$relativeFilePath = 'typo3/' . $relativeFilePath;
Index: typo3_src/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Controller/PageLayoutController.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Controller/PageLayoutController.php	(revision )
@@ -612,7 +612,7 @@
 		// Set the edit_record value for internal use in this function:
 		$edit_record = $this->edit_record;
 		// If a command to edit all records in a column is issue, then select all those elements, and redirect to alt_doc.php:
-		if (substr($edit_record, 0, 9) == '_EDIT_COL') {
+		if (strpos($edit_record, '_EDIT_COL') === 0) {
 			$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'tt_content', 'pid=' . intval($this->id) . ' AND colPos=' . intval(substr($edit_record, 10)) . ' AND sys_language_uid=' . intval($this->current_sys_language) . ($this->MOD_SETTINGS['tt_content_showHidden'] ? '' : BackendUtility::BEenableFields('tt_content')) . BackendUtility::deleteClause('tt_content') . BackendUtility::versioningPlaceholderClause('tt_content'), '', 'sorting');
 			$idListA = array();
 			while ($cRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
Index: typo3_src/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- typo3_src/typo3/sysext/backend/Classes/Form/Element/InlineElement.php	(revision f417d291268f6cb3e50e08b12650b4ffb97d62bf)
+++ typo3_src/typo3/sysext/backend/Classes/Form/Element/InlineElement.php	(revision )
@@ -619,7 +619,7 @@
 	public function renderForeignRecordHeaderControl($parentUid, $foreign_table, $rec, $config = array(), $isVirtualRecord = FALSE) {
 		// Initialize:
 		$cells = array();
-		$isNewItem = substr($rec['uid'], 0, 3) == 'NEW';
+		$isNewItem = strpos($rec['uid'], 'NEW') === 0;
 		$tcaTableCtrl = &$GLOBALS['TCA'][$foreign_table]['ctrl'];
 		$tcaTableCols = &$GLOBALS['TCA'][$foreign_table]['columns'];
 		$isPagesTable = $foreign_table == 'pages' ? TRUE : FALSE;
Index: fileadmin/ttts/tinyTypo3TestSuite.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- fileadmin/ttts/tinyTypo3TestSuite.php	(revision 3e6e61f784df2ce1dc13720bca8a60a91d243be3)
+++ fileadmin/ttts/tinyTypo3TestSuite.php	(revision )
@@ -122,7 +122,27 @@
 		'removeEmptyValues' => TRUE,
 		'limit' => 0,
 	),
-
+	'set9' => array (
+		'description' => 'checkTrimExplodeKeepsRemainingResultsWithEmptyItemsAfterReachingLimitWithPositiveParameter',
+		'delim' => ',',
+		'string' => ' a , b , c , , d,, ,e ',
+		'removeEmptyValues' => FALSE,
+		'limit' => 3,
+	),
+	'set10' => array (
+		'description' => 'checkTrimExplodeKeepsRemainingResultsWithoutEmptyItemsAfterReachingLimitWithPositiveParameter',
+		'delim' => ',',
+		'string' => ' a , b , c , , d,, ,e ',
+		'removeEmptyValues' => TRUE,
+		'limit' => 3,
+	),
+	'set11' => array (
+		'description' => 'checkTrimExplodeReturnsExactResultsWithoutReachingLimitWithPositiveParameter',
+		'delim' => ',',
+		'string' => ' a , b , , c , , ,',
+		'removeEmptyValues' => TRUE,
+		'limit' => 4,
+	),
 );
 
 /*****************************************************************************
@@ -132,6 +152,21 @@
  * version1 must be the baseline implementation.
  ****************************************************************************/
 
+/**
+ * Explodes a string and trims all values for whitespace in the ends.
+ * If $onlyNonEmptyValues is set, then all blank ('') values are removed.
+ *
+ * @param string $delim Delimiter string to explode with
+ * @param string $string The string to explode
+ * @param boolean $removeEmptyValues If set, all empty values will be removed in output
+ * @param integer $limit If positive, the result will contain a maximum of
+ *                $limit elements, if negative, all components except
+ *                the last -$limit are returned, if zero (default),
+ *                the result is not limited at all. Attention though
+ *                that the use of this parameter can slow down this
+ *                function.
+ * @return array Exploded values
+ */
 $descriptions['version1'] = 'Baseline trimExplode';
 function version1($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
 	$explodedValues = explode($delim, $string);
@@ -161,58 +196,77 @@
 function version2($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
 	$result = array_map('trim', explode($delim, $string));
 	if ($removeEmptyValues) {
-		foreach ($result as $key => $value) {
-			if ($value === '') {
-				unset($result[$key]);
+		$temp = array();
+		foreach ($result as $value) {
+			if ($value !== '') {
+				$temp[] = $value;
 			}
 		}
+		$result = $temp;
 	}
 	if ($limit > 0 && count($result) > $limit) {
+		$lastElements = array_slice($result, $limit - 1);
 		$result = array_slice($result, 0, $limit - 1);
-		$result[] = implode($delim, array_slice($result, $limit - 1));
+		$result[] = implode($delim, $lastElements);
 	} elseif ($limit < 0) {
 		$result = array_slice($result, 0, $limit);
 	}
 	return $result;
 }
 
-$descriptions['version3'] = 'preg_split';
+$descriptions['version3'] = 'preg_split with fallback code for limits';
 function version3($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
-	$string = trim($string);
-	if ($string === '') {
-		return array();
+		if ($limit === 0) {
+			return preg_split(
+				'/\\s*' . preg_quote($delim, '/') . '\\s*/',
+				trim($string),
+				$limit,
+				($removeEmptyValues) ? PREG_SPLIT_NO_EMPTY : NULL
+			);
-	}
+		}
-	$flags = NULL;
-	$pattern = '/\\s*'. preg_quote($delim, '/') . '\\s*/';
+		$result = array_map('trim', explode($delim, $string));
-	if ($removeEmptyValues) {
+		if ($removeEmptyValues) {
-		$flags = PREG_SPLIT_NO_EMPTY;
+			$temp = array();
+			foreach ($result as $value) {
+				if ($value !== '') {
+					$temp[] = $value;
-	}
+				}
-	return preg_split($pattern, $string, $limit, $flags);
-}
+			}
-
-$descriptions['version4'] = 'preg_split with fallback code for negative limit';
-function version4($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
-		if ($limit >= 0) {
-			$string = trim($string);
-			if ($string === '') {
-				return array();
+			$result = $temp;
-			}
+		}
-			$flags = NULL;
-			$pattern = '/\\s*'. preg_quote($delim, '/') . '\\s*/';
-			if ($removeEmptyValues) {
-				$flags = PREG_SPLIT_NO_EMPTY;
+		if ($limit > 0 && count($result) > $limit) {
+			$lastElements = array_slice($result, $limit - 1);
+			$result = array_slice($result, 0, $limit - 1);
+			$result[] = implode($delim, $lastElements);
+		} elseif ($limit < 0) {
+			$result = array_slice($result, 0, $limit);
-			}
+		}
-			return preg_split($pattern, $string, $limit, $flags);
+		return $result;
-		}
+}
+
+$descriptions['version4'] = 'explode csv';
+function version4($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
+		if ($limit === 0) {
+			return explode(',', strtr($string, array('\0' => '', '\t' => '', '\n' => '', '\r' => '', '\x0B' => '', ' ' => '')));
+		}
 		$result = array_map('trim', explode($delim, $string));
 		if ($removeEmptyValues) {
-			foreach ($result as $key => $value) {
-				if ($value === '') {
-					unset($result[$key]);
+			$temp = array();
+			foreach ($result as $value) {
+				if ($value !== '') {
+					$temp[] = $value;
 				}
 			}
+			$result = $temp;
 		}
-		return array_slice($result, 0, $limit);
+		if ($limit > 0 && count($result) > $limit) {
+			$lastElements = array_slice($result, $limit - 1);
+			$result = array_slice($result, 0, $limit - 1);
+			$result[] = implode($delim, $lastElements);
+		} elseif ($limit < 0) {
+			$result = array_slice($result, 0, $limit);
+		}
+		return $result;
 }
 
 /*****************************************************************************
\ No newline at end of file