joomla/jedchecker
33
2
Fork 0
mirror of https://github.com/joomla-extensions/jedchecker.git synced 2024-12-31 21:51:46 +00:00
Code Issues Releases Activity

Merge pull request #186 from dryabov/patch-62

Browse Source 
Fix displaying unmodified file content in error message(s)
This commit is contained in:
Denis Ryabov 2022-10-10 19:53:02 +09:00 committed by GitHub
commit bcc8f69bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
administrator/components/com_jedchecker/libraries/rules/encoding.php
View File

@ -2,7 +2,7 @@
/** /**
* @package Joomla.JEDChecker * @package Joomla.JEDChecker
* *
* @copyright Copyright (C) 2017 - 2019 Open Source Matters, Inc. All rights reserved. * @copyright Copyright (C) 2017 - 2022 Open Source Matters, Inc. All rights reserved.
* Copyright (C) 2008 - 2016 compojoom.com . All rights reserved. * Copyright (C) 2008 - 2016 compojoom.com . All rights reserved.
* @author Daniel Dimitrov <daniel@compojoom.com> * @author Daniel Dimitrov <daniel@compojoom.com>
* 02.06.12 * 02.06.12
@ -105,6 +105,7 @@ class JedcheckerRulesEncoding extends JEDcheckerRule
protected function find($file) protected function find($file)
{ {
$content = file_get_contents($file); $content = file_get_contents($file);
$origContent = JEDCheckerHelper::splitLines($content);
// Exclude comments // Exclude comments
$content = JEDCheckerHelper::cleanPhpCode( $content = JEDCheckerHelper::cleanPhpCode(
@ -120,7 +121,7 @@ class JedcheckerRulesEncoding extends JEDcheckerRule
if (preg_match($this->encodingsRegex, $line)) if (preg_match($this->encodingsRegex, $line))
{ {
$found = true; $found = true;
$this->report->addWarning($file, JText::_('COM_JEDCHECKER_ERROR_ENCODING'), $i + 1, $line); $this->report->addWarning($file, JText::_('COM_JEDCHECKER_ERROR_ENCODING'), $i + 1, $origContent[$i]);
} }
} }

5
administrator/components/com_jedchecker/libraries/rules/errorreporting.php
View File

@ -2,7 +2,7 @@
/** /**
* @package Joomla.JEDChecker * @package Joomla.JEDChecker
* *
* @copyright Copyright (C) 2017 - 2019 Open Source Matters, Inc. All rights reserved. * @copyright Copyright (C) 2017 - 2022 Open Source Matters, Inc. All rights reserved.
* Copyright (C) 2008 - 2016 mijosoft.com . All rights reserved. * Copyright (C) 2008 - 2016 mijosoft.com . All rights reserved.
* @author Denis Dulici <denis@mijosoft.com> * @author Denis Dulici <denis@mijosoft.com>
* *
@ -106,6 +106,7 @@ class JedcheckerRulesErrorreporting extends JEDcheckerRule
protected function find($file) protected function find($file)
{ {
$content = file_get_contents($file); $content = file_get_contents($file);
$origContent = JEDCheckerHelper::splitLines($content);
// Exclude non-code content // Exclude non-code content
$content = JEDCheckerHelper::cleanPhpCode( $content = JEDCheckerHelper::cleanPhpCode(
@ -121,7 +122,7 @@ class JedcheckerRulesErrorreporting extends JEDcheckerRule
if (preg_match($this->errorreportingRegex, $line)) if (preg_match($this->errorreportingRegex, $line))
{ {
$found = true; $found = true;
$this->report->addWarning($file, JText::_('COM_JEDCHECKER_ERROR_ERRORREPORTING'), $i + 1, $line); $this->report->addWarning($file, JText::_('COM_JEDCHECKER_ERROR_ERRORREPORTING'), $i + 1, $origContent[$i]);
} }
} }

5
administrator/components/com_jedchecker/libraries/rules/jamss.php
View File

@ -2,7 +2,7 @@
/** /**
* @package Joomla.JEDChecker * @package Joomla.JEDChecker
* *
* @copyright Copyright (C) 2017 - 2021 Open Source Matters, Inc. All rights reserved. * @copyright Copyright (C) 2017 - 2022 Open Source Matters, Inc. All rights reserved.
* Copyright (C) 2008 - 2016 fasterjoomla.com. All rights reserved. * Copyright (C) 2008 - 2016 fasterjoomla.com. All rights reserved.
* @author Riccardo Zorn <support@fasterjoomla.com> * @author Riccardo Zorn <support@fasterjoomla.com>
* Bernard Toplak <bernard@orion-web.hr> * Bernard Toplak <bernard@orion-web.hr>
@ -340,6 +340,7 @@ class JedcheckerRulesJamss extends JEDcheckerRule
} }
else else
{ {
$origContent = JEDCheckerHelper::splitLines($content);
$scopes = array( $scopes = array(
'full' => $content, 'full' => $content,
'clean' => JEDCheckerHelper::cleanPhpCode($content, JEDCheckerHelper::CLEAN_COMMENTS), 'clean' => JEDCheckerHelper::cleanPhpCode($content, JEDCheckerHelper::CLEAN_COMMENTS),
@ -403,8 +404,8 @@ class JedcheckerRulesJamss extends JEDcheckerRule
$end = strlen($scoped_content); $end = strlen($scoped_content);
} }
$first_code = substr($scoped_content, $start, min($end - $start, 200));
$first_line = $this->calculate_line_number($offset, $scoped_content); $first_line = $this->calculate_line_number($offset, $scoped_content);
$first_code = $origContent[$first_line - 1];
break; break;
} }