joomla/jedchecker
33
2
Fork 0
mirror of https://github.com/joomla-extensions/jedchecker.git synced 2024-11-27 15:26:36 +00:00
Code Issues Releases Activity

Merge pull request #185 from dryabov/patch-61

Browse Source 
Fix processing of strings in `JEDCheckerHelper::cleanPhpCode` method
This commit is contained in:
Denis Ryabov 2022-10-10 19:52:35 +09:00 committed by GitHub
commit 0794e09088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
administrator/components/com_jedchecker/libraries/helper.php
View File

@ -2,7 +2,7 @@
/**
* @package Joomla.JEDChecker
*
* @copyright Copyright (C) 2021 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2021-2022 Open Source Matters, Inc. All rights reserved.
*
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@ -192,7 +192,7 @@ abstract class JEDCheckerHelper
break;
case '`':
if (!preg_match("/`.*?`/As", $content, $match, 0, $pos))
if (!preg_match("/`(?>[^`\\\\]+|\\\\.)*`/As", $content, $match, 0, $pos))
{
return $cleanContent . substr($content, $pos);
}
@ -303,16 +303,16 @@ abstract class JEDCheckerHelper
{
if (!$parse)
{
return str_repeat("\n", substr_count($content, "\n"));
return self::cleanLines($content);
}
$pos = 0;
$cleanContent = '';
while (preg_match('/\n|\\|\{\$|\$\{/', $content, $match, PREG_OFFSET_CAPTURE, $pos))
while (preg_match('/\n|\\\\|\{\$|\$\{/', $content, $match, PREG_OFFSET_CAPTURE, $pos))
{
$foundPos = $match[0][1];
$cleanContent .= substr($content, $pos, $foundPos - $pos);
$cleanContent .= self::cleanLines(substr($content, $pos, $foundPos - $pos));
$pos = $foundPos;
switch ($match[0][0])
@ -384,4 +384,17 @@ abstract class JEDCheckerHelper
return $cleanContent;
}
/**
* Remove all content except of EOLs to preserve line numbers
*
* @param string $content
*
* @return string
* @since 2.4.2
*/
protected static function cleanLines($content)
{
return str_repeat("\n", substr_count($content, "\n"));
}
}