Merge pull request #70 from jamessampford/master

wapmorgan · web-flow · commit 88d8f47f9a41 · 2023-03-10T11:47:39.000+03:00
Adds PHP 8.1 and Junit Support
diff --git a/README.md b/README.md
@@ -77,7 +77,8 @@ Options:
   -s, --max-size[=MAX-SIZE]                Sets max size of php file. If file is larger, it will be skipped. [default: "1mb"]
       --file-extensions[=FILE-EXTENSIONS]  Sets file extensions to be parsed. [default: "php, php5, phtml"]
       --skip-checks[=SKIP-CHECKS]          Skip all checks containing any of the given values. Pass a comma-separated list for multiple values.
-      --output-json[=OUTPUT-JSON]          Path to store json-file with analyze results. If '-' passed, json will be printed on stdout.
+      --output[=OUTPUT]                    The output type required. Options: stdout, json, junit. Defaults to stdout.
+      --output-file[=OUTPUT-FILE]          File path to store results where output is not stdout.
   -h, --help                               Display help for the given command. When no command is given display help for the scan command
   -q, --quiet                              Do not output any message
   -V, --version                            Display this application version
@@ -91,7 +92,7 @@ Options:
 - By providing `--exclude` option you can exclude specific folders or files from analyze. For example, `--exclude vendor` will prevent checking third-party libraries.
 - By providing `--skip-checks` option you can exclude specific checks from analyze.
 - If your files has unusual extension, you can specify all exts by `--file-extensions` option. By default, it uses `php`, `phtml` and `php5`.
-- If you need to generate machine-readable analyze result, use `--output-json` option to specify path to store json or `--output-json=-` to print json to stdout.
+- If you need to generate machine-readable analyze result, use the `--output-file` option to specify path to store the output file as specified on `--output` (json or junit).
 
 ### Example of usage
 ```
@@ -122,7 +123,10 @@ Folder /media/wapmorgan/Локальный диск/Документы/PhpDeprec
 ```
 
 ## Json report format
-Also, you can store analyze result in json format for automatic check. Pass `--output-json=FILENAME` to write result to **FILENAME** file or `--output-json=-` to output to *stdout*.
+Also, you can store analyze result in json format for automatic check. Pass `--output-file=FILENAME` to write result to **FILENAME** file or do not set to output to *stdout*.
+
+## Junit report format
+Also, you can store analyze result in junit format for automatic check. Pass `--output-file=FILENAME` to write result to **FILENAME** file or do not set to output to *stdout*.
 
 **Format of json** - dictionary with items:
 - InfoMessage[] **info_messages** - list of information messages about analyzing process.
@@ -139,6 +143,7 @@ Items description:
   - string **file** - relative path to file in which issue found (*like src/ProblemClass.php*)
   - string **path** - absolute path to file in which issue found (*like /var/www/html/project/src/ProblemClass.php*)
   - int **line** - line in file in which issue found
+  - int **column** - column in line in which issue found
   - string **category** - issue category - any of (changed | removed | violation)
   - string **type** - concrete issue type (*like "constant" or "identifier"*)
   - string **checker** - concrete issue object which may cause problem (*like `magic_quotes_runtime` or `preg_replace() (@preg_replace_e_modifier)`*)
diff --git a/data/8.1.php b/data/8.1.php
@@ -0,0 +1,61 @@
+<?php
+return [
+    /**
+     * @see https://github.com/php/php-src/blob/PHP-8.1.6/UPGRADING
+     */
+    'functions' => [
+        // @see CORE
+        '__serialize' =>'deprecate, if you order php support both implement https://wiki.php.net/rfc/phase_out_serializable',
+        '__unserialize' => 'deprecate, if you order php support both implement https://wiki.php.net/rfc/phase_out_serializable',
+
+        // @seeDate
+        'date_sunrise' => 'deprecate it will remove in php 9.0',
+        'date_sunset' => 'deprecate it will remove in php 9.0',
+        'strftime' => 'date/DateTime::format() or IntlDateFormatter::format()',
+        'gmstrftime' => 'date/DateTime::format() or IntlDateFormatter::format()',
+
+        // @see Hash
+        'mhash' => 'Use the hash_*() APIs instead',
+        'mhash_keygen_s2k' => 'Use the hash_*() APIs instead',
+        'mhash_count' => 'Use the hash_*() APIs instead',
+        'mhash_get_block_size' => 'Use the hash_*() APIs instead',
+
+        // @see Intl
+        'roll' => 'Calling IntlCalendar::roll() with bool argument is deprecated. Pass 1 and -1 instead of true and false respectively.',
+
+        // @see Standard
+        'key' => 'use with objects is deprecated',
+        'current' => 'use with objects is deprecated',
+        'next' => 'use with objects is deprecated',
+        'prev' => 'use with objects is deprecated',
+        'reset' => 'use with objects is deprecated',
+        'end' => 'use with objects is deprecated',
+        'strptime' => 'Deprecated. Use date_parse_from_format() or IntlDateFormatter::parse',
+
+        // @see MySQLi
+        'MYSQLI_REFRESH_REPLICA' => 'Use MYSQLI_REFRESH_SLAVE. The old constant is still available for backwards-compatibility reasons, 
+        but may be deprecated/removed in the future.'
+    ],
+    'constants' => [
+        /**
+         * @see https://github.com/php/php-src/blob/PHP-8.1.6/UPGRADING
+         */
+        'MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH',
+        'MYSQLI_STORE_RESULT_COPY_DATA',
+        'FILTER_SANITIZE_STRING' => 'Deprecated',
+        'FILTER_SANITIZE_STRIPPED' => 'Deprecated',
+        'NIL' => 'Deprecated, Use 0 instead',
+        'FILE_BINARY' => 'deprecated. They already had no effect previously.',
+        'FILE_TEXT' => 'deprecated. They already had no effect previously.',
+    ],
+    'ini_settings' => [
+        'mysqlnd.fetch_data_copy',
+        'filter.default' => 'Deprecated',
+        'oci8.old_oci_close_semantics' => 'Deprecated',
+        'auto_detect_line_endings' => 'Deprecated',
+        'log_errors_max_len', //removed
+    ],
+    'identifiers' => [
+        'enum'
+    ]
+];
diff --git a/src/PhpCodeFixer.php b/src/PhpCodeFixer.php
@@ -11,7 +11,7 @@ class PhpCodeFixer {
     /**
      * @var array
      */
-    static public $availableTargets = ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'];
+    static public $availableTargets = ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'];
 
     /**
      * @var array Extensions of file to process.
@@ -53,6 +53,11 @@ class PhpCodeFixer {
      */
     protected $fileExtensions;
 
+    /**
+     * @var array
+     */
+    public $scannedFiles = [];
+
     /**
      * PhpCodeFixer constructor.
      */
@@ -190,6 +195,8 @@ protected function checkDirInternal($dir, Report $report) {
      * @return Report|bool
      */
     public function checkFile($file, Report $report = null) {
+        $this->scannedFiles[] = realpath($file);
+        
         if ($report === null) {
             $report = new Report('File ' . basename($file), dirname(realpath($file)));
             $previous_error_handler = set_error_handler([$this, 'handleError']);
@@ -203,6 +210,18 @@ public function checkFile($file, Report $report = null) {
         try {
             $tokens = token_get_all(file_get_contents($file));
 
+            $line = 1;
+            $col  = 1;
+            foreach ($tokens as $k => $token) {
+                if (is_array($token)) {
+                    list ($token, $text) = $token;
+                    $tokens[$k][3] = $col;
+                } else if (is_string($token)) {
+                    $text = $token;
+                }
+                $this->updateLineColumnPositions($text, $line, $col);
+            }
+
             // cut off heredoc, comments
             while (in_array_column($tokens, T_START_HEREDOC, 0)) {
                 $start = array_search_column($tokens, T_START_HEREDOC, 0);
@@ -371,6 +390,7 @@ protected function analyzeMethodsNaming($currentFile, Report $report, array &$to
                             $method_name = $tokens[$i + 2][1];
                             $methods[$method_name] = [
                                 'line' => $tokens[$i][2],
+                                'column' => $tokens[$i][3],
                                 'attributes' => $method_attributes
                             ];
                         }
@@ -384,7 +404,7 @@ protected function analyzeMethodsNaming($currentFile, Report $report, array &$to
                             $result = $checker($class_name, $method_name, $method_data['attributes'], $methods, $namespace);
                             if ($result !== false) {
                                 $report->addIssue($methods_naming_checker[1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FEATURE,
-                                    $method_name . ':' . $class_name . ' (' . $methods_naming_checker[0] . ')', $result, $currentFile, $method_data['line']);
+                                    $method_name . ':' . $class_name . ' (' . $methods_naming_checker[0] . ')', $result, $currentFile, $method_data['line'], $method_data['column']);
                             }
                         }
                     }
@@ -429,7 +449,7 @@ protected function analyzeIdentifiers($currentFile, Report $report, array &$toke
                         if (isset($identifiers[$used_identifier_word])) {
                             $identifier = $identifiers[$used_identifier_word];
                             $report->addIssue($identifier[1], ReportIssue::VIOLATION, ReportIssue::RESERVED_IDENTIFIER,
-                                $used_identifier[1], null, $currentFile, $used_identifier[2]);
+                                $used_identifier[1], null, $currentFile, $used_identifier[2], $used_identifier[3]);
                         }
                     }
                 }
@@ -451,7 +471,7 @@ protected function analyzeVariables($currentFile, Report $report, array $tokens)
             if (isset($deprecated_varibales[$used_variable[1]])) {
                 $variable = $deprecated_varibales[$used_variable[1]];
                 $report->addIssue($variable[1], ReportIssue::REMOVED, ReportIssue::REMOVED_VARIABLE,
-                    $used_variable[1], ($variable[0] != $used_variable[1] ? $variable[0] : null), $currentFile, $used_variable[2]);
+                    $used_variable[1], ($variable[0] != $used_variable[1] ? $variable[0] : null), $currentFile, $used_variable[2], $used_variable[3]);
             }
         }
     }
@@ -545,7 +565,7 @@ protected function analyzeFunctionsUsage($currentFile, Report $report, array &$t
 
                 if ($result) {
                     $report->addIssue($deprecated_functions_usage[$token[1]][1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FUNCTION_USAGE,
-                        $token[1] . '() (' . $deprecated_functions_usage[$token[1]][0] . ')', is_string($result) ? $result : null, $currentFile, $token[2]);
+                        $token[1] . '() (' . $deprecated_functions_usage[$token[1]][0] . ')', is_string($result) ? $result : null, $currentFile, $token[2], $token[3]);
                 }
             }
 
@@ -557,7 +577,7 @@ protected function analyzeFunctionsUsage($currentFile, Report $report, array &$t
                         $functionTokens);
                     if ($result) {
                         $report->addIssue($global_function_usage_checker[1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FUNCTION_USAGE,
-                            $token[1] . '() (' . $global_function_usage_checker[0] . ')', is_string($result) ? $result : null, $currentFile, $token[2]);
+                            $token[1] . '() (' . $global_function_usage_checker[0] . ')', is_string($result) ? $result : null, $currentFile, $token[2], $token[3]);
                     }
                 }
             }
@@ -589,7 +609,7 @@ protected function analyzeIniSettings($currentFile, Report $report, array $token
                     if (isset($deprecated_ini_settings[$ini_setting[1]])) {
                         $deprecated_setting = $deprecated_ini_settings[$ini_setting[1]];
                         $report->addIssue($deprecated_setting[1], ReportIssue::REMOVED, ReportIssue::REMOVED_INI_SETTING,
-                            $ini_setting[1], ($deprecated_setting[0] != $ini_setting[1] ? $deprecated_setting[0] : null), $currentFile, $ini_setting[2]);
+                            $ini_setting[1], ($deprecated_setting[0] != $ini_setting[1] ? $deprecated_setting[0] : null), $currentFile, $ini_setting[2], $ini_setting[3]);
                     }
                 }
             }
@@ -610,7 +630,7 @@ protected function analyzeConstants($currentFile, Report $report, array $tokens)
             if (isset($deprecated_constants[$used_constant[1]])) {
                 $constant = $deprecated_constants[$used_constant[1]];
                 $report->addIssue($constant[1], ReportIssue::REMOVED, ReportIssue::REMOVED_CONSTANT,
-                    $used_constant[1], ($constant[0] != $used_constant[1] ? $constant[0] : null), $currentFile, $used_constant[2]);
+                    $used_constant[1], ($constant[0] != $used_constant[1] ? $constant[0] : null), $currentFile, $used_constant[2], $used_constant[3]);
             }
         }
     }
@@ -648,7 +668,7 @@ protected function analyzeFunctions($currentFile, Report $report, array &$tokens
 
                 $function = $deprecated_functions[$used_function[1]];
                 $report->addIssue($function[1], ReportIssue::REMOVED, ReportIssue::REMOVED_FUNCTION,
-                    $used_function[1], ($function[0] != $used_function[1] ? $function[0] : null), $currentFile, $used_function[2]);
+                    $used_function[1], ($function[0] != $used_function[1] ? $function[0] : null), $currentFile, $used_function[2], $used_function[3]);
             }
         }
     }
@@ -666,4 +686,26 @@ public function handleError($errorNumber, $errorMessage, $errorFile,
     {
         throw new ParsingException($errorMessage.' in file '.$errorFile.':'.$errorLine, $errorNumber);
     }
+
+    /**
+     * @param $text
+     * @param $line
+     * @param $col
+     */
+
+    private function updateLineColumnPositions($text, &$line, &$col)
+    {
+        $numNewLines = substr_count($text, "\n");
+        if (1 <= $numNewLines) {
+            $line += $numNewLines;
+            $col  =  1;
+
+            $text = substr($text, strrpos($text, "\n") + 1);
+            if ($text === false) {
+                $text = '';
+            }
+        }
+        $col += strlen($text);
+    }
+
 }
diff --git a/src/Report.php b/src/Report.php
@@ -40,13 +40,14 @@ public function __construct($reportTitle, $removablePath = null)
      * @param string|null $replacement Possible replacement
      * @param string $file File in which issue present
      * @param integer $line Line of file
+     * @param integer $column Column of file
      * @return void
      */
-    public function addIssue($version, $category, $type, $text, $replacement, $file, $line) {
+    public function addIssue($version, $category, $type, $text, $replacement, $file, $line, $column) {
         if ($this->removablePath !== null && strncasecmp($file, $this->removablePath, strlen($this->removablePath)) === 0)
             $file = substr($file, strlen($this->removablePath));
 //        $this->records[$version][] = [$type, $text, $replacement, $file, $line];
-        $issue = new ReportIssue($version, $category, $type, $text, $file, $line);
+        $issue = new ReportIssue($version, $category, $type, $text, realpath($this->removablePath.$file), $file, $line, $column);
         if (!empty($replacement))
             $issue->setReplacement($replacement);
         $this->records[$version][] = $issue;
diff --git a/src/ReportIssue.php b/src/ReportIssue.php
@@ -18,20 +18,24 @@ class ReportIssue
     const REMOVED_VARIABLE = 'variable';
     public $version;
 
+    public $path;
     public $file;
     public $line;
+    public $column;
 
     public $category;
     public $type;
 
     public $text;
     public $replacement;
 
-    public function __construct($version, $category, $type, $text, $file, $line)
+    public function __construct($version, $category, $type, $text, $path, $file, $line, $column)
     {
         $this->version = $version;
+        $this->path = $path;
         $this->file = $file;
         $this->line = $line;
+        $this->column = $column;
         $this->type = $type;
         $this->category = $category;
         $this->text = $text;
@@ -42,4 +46,4 @@ public function setReplacement($replacement)
         $this->replacement = $replacement;
         return $this;
     }
-}
+}
diff --git a/src/ScanCommand.php b/src/ScanCommand.php

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class PhpCodeFixer {`
`11`	`11`	`/**`
`12`	`12`	`* @var array`
`13`	`13`	`*/`
`14`		`- static public $availableTargets = ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'];`
	`14`	`+ static public $availableTargets = ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'];`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @var array Extensions of file to process.`
`@@ -53,6 +53,11 @@ class PhpCodeFixer {`
`53`	`53`	`*/`
`54`	`54`	`protected $fileExtensions;`
`55`	`55`
	`56`	`+ /**`
	`57`	`+ * @var array`
	`58`	`+ */`
	`59`	`+ public $scannedFiles = [];`
	`60`	`+`
`56`	`61`	`/**`
`57`	`62`	`* PhpCodeFixer constructor.`
`58`	`63`	`*/`
`@@ -190,6 +195,8 @@ protected function checkDirInternal($dir, Report $report) {`
`190`	`195`	`* @return Report\|bool`
`191`	`196`	`*/`
`192`	`197`	`public function checkFile($file, Report $report = null) {`
	`198`	`+ $this->scannedFiles[] = realpath($file);`
	`199`	`+`
`193`	`200`	`if ($report === null) {`
`194`	`201`	`$report = new Report('File ' . basename($file), dirname(realpath($file)));`
`195`	`202`	`$previous_error_handler = set_error_handler([$this, 'handleError']);`
`@@ -203,6 +210,18 @@ public function checkFile($file, Report $report = null) {`
`203`	`210`	`try {`
`204`	`211`	`$tokens = token_get_all(file_get_contents($file));`
`205`	`212`
	`213`	`+ $line = 1;`
	`214`	`+ $col = 1;`
	`215`	`+ foreach ($tokens as $k => $token) {`
	`216`	`+ if (is_array($token)) {`
	`217`	`+ list ($token, $text) = $token;`
	`218`	`+ $tokens[$k][3] = $col;`
	`219`	`+ } else if (is_string($token)) {`
	`220`	`+ $text = $token;`
	`221`	`+ }`
	`222`	`+ $this->updateLineColumnPositions($text, $line, $col);`
	`223`	`+ }`
	`224`	`+`
`206`	`225`	`// cut off heredoc, comments`
`207`	`226`	`while (in_array_column($tokens, T_START_HEREDOC, 0)) {`
`208`	`227`	`$start = array_search_column($tokens, T_START_HEREDOC, 0);`
`@@ -371,6 +390,7 @@ protected function analyzeMethodsNaming($currentFile, Report $report, array &$to`
`371`	`390`	`$method_name = $tokens[$i + 2][1];`
`372`	`391`	`$methods[$method_name] = [`
`373`	`392`	`'line' => $tokens[$i][2],`
	`393`	`+ 'column' => $tokens[$i][3],`
`374`	`394`	`'attributes' => $method_attributes`
`375`	`395`	`];`
`376`	`396`	`}`
`@@ -384,7 +404,7 @@ protected function analyzeMethodsNaming($currentFile, Report $report, array &$to`
`384`	`404`	`$result = $checker($class_name, $method_name, $method_data['attributes'], $methods, $namespace);`
`385`	`405`	`if ($result !== false) {`
`386`	`406`	`$report->addIssue($methods_naming_checker[1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FEATURE,`
`387`		`- $method_name . ':' . $class_name . ' (' . $methods_naming_checker[0] . ')', $result, $currentFile, $method_data['line']);`
	`407`	`+ $method_name . ':' . $class_name . ' (' . $methods_naming_checker[0] . ')', $result, $currentFile, $method_data['line'], $method_data['column']);`
`388`	`408`	`}`
`389`	`409`	`}`
`390`	`410`	`}`
`@@ -429,7 +449,7 @@ protected function analyzeIdentifiers($currentFile, Report $report, array &$toke`
`429`	`449`	`if (isset($identifiers[$used_identifier_word])) {`
`430`	`450`	`$identifier = $identifiers[$used_identifier_word];`
`431`	`451`	`$report->addIssue($identifier[1], ReportIssue::VIOLATION, ReportIssue::RESERVED_IDENTIFIER,`
`432`		`- $used_identifier[1], null, $currentFile, $used_identifier[2]);`
	`452`	`+ $used_identifier[1], null, $currentFile, $used_identifier[2], $used_identifier[3]);`
`433`	`453`	`}`
`434`	`454`	`}`
`435`	`455`	`}`
`@@ -451,7 +471,7 @@ protected function analyzeVariables($currentFile, Report $report, array $tokens)`
`451`	`471`	`if (isset($deprecated_varibales[$used_variable[1]])) {`
`452`	`472`	`$variable = $deprecated_varibales[$used_variable[1]];`
`453`	`473`	`$report->addIssue($variable[1], ReportIssue::REMOVED, ReportIssue::REMOVED_VARIABLE,`
`454`		`- $used_variable[1], ($variable[0] != $used_variable[1] ? $variable[0] : null), $currentFile, $used_variable[2]);`
	`474`	`+ $used_variable[1], ($variable[0] != $used_variable[1] ? $variable[0] : null), $currentFile, $used_variable[2], $used_variable[3]);`
`455`	`475`	`}`
`456`	`476`	`}`
`457`	`477`	`}`
`@@ -545,7 +565,7 @@ protected function analyzeFunctionsUsage($currentFile, Report $report, array &$t`
`545`	`565`
`546`	`566`	`if ($result) {`
`547`	`567`	`$report->addIssue($deprecated_functions_usage[$token[1]][1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FUNCTION_USAGE,`
`548`		`- $token[1] . '() (' . $deprecated_functions_usage[$token[1]][0] . ')', is_string($result) ? $result : null, $currentFile, $token[2]);`
	`568`	`+ $token[1] . '() (' . $deprecated_functions_usage[$token[1]][0] . ')', is_string($result) ? $result : null, $currentFile, $token[2], $token[3]);`
`549`	`569`	`}`
`550`	`570`	`}`
`551`	`571`
`@@ -557,7 +577,7 @@ protected function analyzeFunctionsUsage($currentFile, Report $report, array &$t`
`557`	`577`	`$functionTokens);`
`558`	`578`	`if ($result) {`
`559`	`579`	`$report->addIssue($global_function_usage_checker[1], ReportIssue::CHANGED, ReportIssue::DEPRECATED_FUNCTION_USAGE,`
`560`		`- $token[1] . '() (' . $global_function_usage_checker[0] . ')', is_string($result) ? $result : null, $currentFile, $token[2]);`
	`580`	`+ $token[1] . '() (' . $global_function_usage_checker[0] . ')', is_string($result) ? $result : null, $currentFile, $token[2], $token[3]);`
`561`	`581`	`}`
`562`	`582`	`}`
`563`	`583`	`}`
`@@ -589,7 +609,7 @@ protected function analyzeIniSettings($currentFile, Report $report, array $token`
`589`	`609`	`if (isset($deprecated_ini_settings[$ini_setting[1]])) {`
`590`	`610`	`$deprecated_setting = $deprecated_ini_settings[$ini_setting[1]];`
`591`	`611`	`$report->addIssue($deprecated_setting[1], ReportIssue::REMOVED, ReportIssue::REMOVED_INI_SETTING,`
`592`		`- $ini_setting[1], ($deprecated_setting[0] != $ini_setting[1] ? $deprecated_setting[0] : null), $currentFile, $ini_setting[2]);`
	`612`	`+ $ini_setting[1], ($deprecated_setting[0] != $ini_setting[1] ? $deprecated_setting[0] : null), $currentFile, $ini_setting[2], $ini_setting[3]);`
`593`	`613`	`}`
`594`	`614`	`}`
`595`	`615`	`}`
`@@ -610,7 +630,7 @@ protected function analyzeConstants($currentFile, Report $report, array $tokens)`
`610`	`630`	`if (isset($deprecated_constants[$used_constant[1]])) {`
`611`	`631`	`$constant = $deprecated_constants[$used_constant[1]];`
`612`	`632`	`$report->addIssue($constant[1], ReportIssue::REMOVED, ReportIssue::REMOVED_CONSTANT,`
`613`		`- $used_constant[1], ($constant[0] != $used_constant[1] ? $constant[0] : null), $currentFile, $used_constant[2]);`
	`633`	`+ $used_constant[1], ($constant[0] != $used_constant[1] ? $constant[0] : null), $currentFile, $used_constant[2], $used_constant[3]);`
`614`	`634`	`}`
`615`	`635`	`}`
`616`	`636`	`}`
`@@ -648,7 +668,7 @@ protected function analyzeFunctions($currentFile, Report $report, array &$tokens`
`648`	`668`
`649`	`669`	`$function = $deprecated_functions[$used_function[1]];`
`650`	`670`	`$report->addIssue($function[1], ReportIssue::REMOVED, ReportIssue::REMOVED_FUNCTION,`
`651`		`- $used_function[1], ($function[0] != $used_function[1] ? $function[0] : null), $currentFile, $used_function[2]);`
	`671`	`+ $used_function[1], ($function[0] != $used_function[1] ? $function[0] : null), $currentFile, $used_function[2], $used_function[3]);`
`652`	`672`	`}`
`653`	`673`	`}`
`654`	`674`	`}`
`@@ -666,4 +686,26 @@ public function handleError($errorNumber, $errorMessage, $errorFile,`
`666`	`686`	`{`
`667`	`687`	`throw new ParsingException($errorMessage.' in file '.$errorFile.':'.$errorLine, $errorNumber);`
`668`	`688`	`}`
	`689`	`+`
	`690`	`+ /**`
	`691`	`+ * @param $text`
	`692`	`+ * @param $line`
	`693`	`+ * @param $col`
	`694`	`+ */`
	`695`	`+`
	`696`	`+ private function updateLineColumnPositions($text, &$line, &$col)`
	`697`	`+ {`
	`698`	`+ $numNewLines = substr_count($text, "\n");`
	`699`	`+ if (1 <= $numNewLines) {`
	`700`	`+ $line += $numNewLines;`
	`701`	`+ $col = 1;`
	`702`	`+`
	`703`	`+ $text = substr($text, strrpos($text, "\n") + 1);`
	`704`	`+ if ($text === false) {`
	`705`	`+ $text = '';`
	`706`	`+ }`
	`707`	`+ }`
	`708`	`+ $col += strlen($text);`
	`709`	`+ }`
	`710`	`+`
`669`	`711`	`}`