Remove deprecated function calls (#698)

theofidry · web-flow · commit 96ea56045d2a · 2022-10-13T09:28:03.000Z
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -37,9 +37,7 @@ parameters:
           path: 'tests/Configuration/ConfigurationKeysTest.php'
         - message: '#Property .* does not accept#'
           path: 'src/PhpParser/NodeVisitor/UseStmt/UseStmtCollection.php'
-        - message: '#Return type \(void\) of method#'
-          path: 'tests/PhpParser/FakeParser.php'
-        - message: '#concat\(\) should return .+Name but returns .+\|null#'
+        - message: '#::concat\(\) should return .+Name but returns .+\|null#'
           path: 'src/PhpParser/Node/NameFactory.php'
         - message: '#concat\(\) should return .+FullyQualified but returns .+\|null#'
           path: 'src/PhpParser/Node/FullyQualifiedFactory.php'
diff --git a/src/Autoload/ScoperAutoloadGenerator.php b/src/Autoload/ScoperAutoloadGenerator.php
@@ -22,7 +22,7 @@
 use function count;
 use function explode;
 use function implode;
-use function Safe\sprintf;
+use function sprintf;
 use function str_repeat;
 use function str_replace;
 
diff --git a/src/Configuration/Configuration.php b/src/Configuration/Configuration.php
@@ -17,7 +17,7 @@
 use Humbug\PhpScoper\Patcher\Patcher;
 use InvalidArgumentException;
 use function Safe\preg_match;
-use function Safe\sprintf;
+use function sprintf;
 
 final class Configuration
 {
diff --git a/src/Configuration/ConfigurationFactory.php b/src/Configuration/ConfigurationFactory.php
@@ -47,7 +47,7 @@
 use function readlink as native_readlink;
 use function realpath;
 use function Safe\file_get_contents;
-use function Safe\sprintf;
+use function sprintf;
 use function trim;
 use const DIRECTORY_SEPARATOR;
 use const SORT_STRING;
diff --git a/src/Configuration/RegexChecker.php b/src/Configuration/RegexChecker.php
@@ -21,7 +21,7 @@
 use function preg_last_error;
 use function preg_last_error_msg;
 use function preg_match as native_preg_match;
-use function Safe\sprintf;
+use function sprintf;
 use function str_split;
 use function strlen;
 
diff --git a/src/Configuration/SymbolsConfigurationFactory.php b/src/Configuration/SymbolsConfigurationFactory.php
@@ -32,11 +32,11 @@
 use function is_string;
 use function ltrim;
 use function Safe\preg_match as native_preg_match;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
 use function str_contains;
 use function str_replace;
 use function strtolower;
+use function substr;
 use function trim;
 
 final class SymbolsConfigurationFactory
diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -21,7 +21,7 @@
 use Humbug\PhpScoper\Container;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use function Humbug\PhpScoper\get_php_scoper_version;
-use function Safe\sprintf;
+use function sprintf;
 use function str_contains;
 use function trim;
 
diff --git a/src/Console/Command/AddPrefixCommand.php b/src/Console/Command/AddPrefixCommand.php
@@ -36,7 +36,7 @@
 use function is_dir;
 use function is_writable;
 use function Safe\getcwd;
-use function Safe\sprintf;
+use function sprintf;
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/src/Console/Command/ChangeableDirectory.php b/src/Console/Command/ChangeableDirectory.php
@@ -21,7 +21,7 @@
 use function chdir as native_chdir;
 use function file_exists;
 use function Safe\getcwd;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @private
diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 use function file_exists;
 use function Safe\getcwd;
-use function Safe\sprintf;
+use function sprintf;
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/src/Console/Command/InspectSymbolCommand.php b/src/Console/Command/InspectSymbolCommand.php
@@ -35,7 +35,7 @@
 use function file_exists;
 use function implode;
 use function Safe\getcwd;
-use function Safe\sprintf;
+use function sprintf;
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/src/Console/ConfigLoader.php b/src/Console/ConfigLoader.php
@@ -26,7 +26,7 @@
 use function assert;
 use function count;
 use function file_exists;
-use function Safe\sprintf;
+use function sprintf;
 use function trim;
 use const DIRECTORY_SEPARATOR;
 
diff --git a/src/Console/ConsoleScoper.php b/src/Console/ConsoleScoper.php
@@ -31,10 +31,10 @@
 use function Humbug\PhpScoper\get_common_path;
 use function preg_match as native_preg_match;
 use function Safe\file_get_contents;
-use function Safe\sprintf;
-use function Safe\usort;
+use function sprintf;
 use function str_replace;
 use function strlen;
+use function usort;
 use const DIRECTORY_SEPARATOR;
 
 /**
@@ -196,10 +196,10 @@ private static function findVendorDir(array $outputFilePaths): ?string
 
         usort(
             $vendorDirs,
-            static fn ($a, $b) => strlen($a) <=> strlen($b),
+            static fn ($a, $b) => strlen((string) $a) <=> strlen((string) $b),
         );
 
-        return (0 === count($vendorDirs)) ? null : $vendorDirs[0];
+        return (0 === count($vendorDirs)) ? null : (string) $vendorDirs[0];
     }
 
     private function scopeFile(
diff --git a/src/Console/ScoperLogger.php b/src/Console/ScoperLogger.php
@@ -25,7 +25,7 @@
 use function memory_get_usage;
 use function microtime;
 use function round;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @private
diff --git a/src/Patcher/SymfonyPatcher.php b/src/Patcher/SymfonyPatcher.php
@@ -15,7 +15,7 @@
 namespace Humbug\PhpScoper\Patcher;
 
 use function Safe\preg_replace;
-use function Safe\sprintf;
+use function sprintf;
 use function str_contains;
 
 final class SymfonyPatcher implements Patcher
diff --git a/src/PhpParser/NodeVisitor/NewdocPrefixer.php b/src/PhpParser/NodeVisitor/NewdocPrefixer.php
@@ -19,8 +19,8 @@
 use PhpParser\Node\Scalar\String_;
 use PhpParser\NodeVisitorAbstract;
 use function ltrim;
-use function Safe\substr;
 use function str_starts_with;
+use function substr;
 
 final class NewdocPrefixer extends NodeVisitorAbstract
 {
diff --git a/src/PhpParser/StringNodePrefixer.php b/src/PhpParser/StringNodePrefixer.php
@@ -17,7 +17,7 @@
 use Humbug\PhpScoper\Scoper\PhpScoper;
 use PhpParser\Error as PhpParserError;
 use PhpParser\Node\Scalar\String_;
-use function Safe\substr;
+use function substr;
 
 /**
  * @private
diff --git a/src/PhpParser/UseStmtName.php b/src/PhpParser/UseStmtName.php
@@ -19,7 +19,7 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\Stmt\UseUse;
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
 final class UseStmtName
 {
diff --git a/src/Scoper/Composer/AutoloadPrefixer.php b/src/Scoper/Composer/AutoloadPrefixer.php
@@ -21,10 +21,10 @@
 use function is_array;
 use function is_string;
 use function rtrim;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
 use function str_contains;
 use function str_replace;
+use function substr;
 
 /**
  * @private
diff --git a/src/Scoper/Composer/InstalledPackagesScoper.php b/src/Scoper/Composer/InstalledPackagesScoper.php
@@ -23,7 +23,7 @@
 use function preg_match as native_preg_match;
 use function Safe\json_decode;
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 use const JSON_PRETTY_PRINT;
 use const JSON_THROW_ON_ERROR;
 
diff --git a/src/Scoper/Composer/JsonFileScoper.php b/src/Scoper/Composer/JsonFileScoper.php
@@ -21,7 +21,7 @@
 use function preg_match as native_preg_match;
 use function Safe\json_decode;
 use function Safe\json_encode;
-use function Safe\sprintf;
+use function sprintf;
 use const JSON_PRETTY_PRINT;
 use const JSON_THROW_ON_ERROR;
 
diff --git a/src/Scoper/FileWhitelistScoper.php b/src/Scoper/FileWhitelistScoper.php
@@ -14,9 +14,9 @@
 
 namespace Humbug\PhpScoper\Scoper;
 
+use function array_flip;
 use function array_key_exists;
 use function func_get_args;
-use function Safe\array_flip;
 
 final class FileWhitelistScoper implements Scoper
 {
diff --git a/src/Scoper/Symfony/XmlScoper.php b/src/Scoper/Symfony/XmlScoper.php
@@ -22,11 +22,11 @@
 use function func_get_args;
 use function preg_match as native_preg_match;
 use function preg_match_all as native_preg_match_all;
-use function Safe\substr;
 use function str_contains;
 use function str_replace;
 use function strlen;
 use function strpos;
+use function substr;
 
 /**
  * Scopes the Symfony XML configuration files.
diff --git a/src/Scoper/Symfony/YamlScoper.php b/src/Scoper/Symfony/YamlScoper.php
@@ -22,11 +22,11 @@
 use function func_get_args;
 use function preg_match as native_preg_match;
 use function preg_match_all as native_preg_match_all;
-use function Safe\substr;
 use function str_contains;
 use function str_replace;
 use function strlen;
 use function strpos;
+use function substr;
 
 /**
  * Scopes the Symfony YAML configuration files.
diff --git a/src/Symbol/SymbolRegistry.php b/src/Symbol/SymbolRegistry.php
@@ -15,6 +15,7 @@
 namespace Humbug\PhpScoper\Symbol;
 
 use InvalidArgumentException;
+use function array_flip;
 use function array_key_exists;
 use function array_keys;
 use function array_map;
@@ -23,7 +24,6 @@
 use function explode;
 use function implode;
 use function ltrim;
-use function Safe\array_flip;
 use function Safe\preg_match;
 use function strtolower;
 use function trim;
diff --git a/src/functions.php b/src/functions.php
@@ -18,10 +18,10 @@
 use PackageVersions\Versions;
 use function array_pop;
 use function count;
-use function Safe\substr;
 use function str_split;
 use function str_starts_with;
 use function strrpos;
+use function substr;
 
 function get_php_scoper_version(): string
 {
diff --git a/tests/Console/Command/AddPrefixCommandIntegrationTest.php b/tests/Console/Command/AddPrefixCommandIntegrationTest.php
@@ -28,7 +28,7 @@
 use function Safe\file_put_contents;
 use function Safe\preg_replace;
 use function Safe\realpath;
-use function Safe\sprintf;
+use function sprintf;
 use function str_replace;
 use const DIRECTORY_SEPARATOR;
 
@@ -306,8 +306,11 @@ private function createDisplayNormalizer(): callable
 
     private function getNormalizeDisplay(string $display): string
     {
-        $display = str_replace(realpath(self::FIXTURE_PATH), '/path/to', $display);
-        $display = str_replace($this->tmp, '/path/to', $display);
+        $display = str_replace(
+            [realpath(self::FIXTURE_PATH), $this->tmp],
+            '/path/to',
+            $display,
+        );
 
         return preg_replace(
             '/\/\/ Memory usage: \d+\.\d{2}MB \(peak: \d+\.\d{2}MB\), time: \d+\.\d{2}s/',
diff --git a/tests/Console/Command/AddPrefixCommandTest.php b/tests/Console/Command/AddPrefixCommandTest.php
@@ -42,7 +42,7 @@
 use function Safe\chdir;
 use function Safe\file_get_contents;
 use function Safe\realpath;
-use function Safe\sprintf;
+use function sprintf;
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/tests/Console/DisplayNormalizer.php b/tests/Console/DisplayNormalizer.php
@@ -15,9 +15,9 @@
 namespace Humbug\PhpScoper\Console;
 
 use function Safe\preg_match_all;
-use function Safe\usort;
 use function str_replace;
 use function strlen;
+use function usort;
 use const DIRECTORY_SEPARATOR;
 
 final class DisplayNormalizer
diff --git a/tests/Patcher/DummyPatcher.php b/tests/Patcher/DummyPatcher.php
@@ -14,7 +14,7 @@
 
 namespace Humbug\PhpScoper\Patcher;
 
-use function Safe\sprintf;
+use function sprintf;
 
 final class DummyPatcher implements Patcher
 {
diff --git a/tests/Patcher/PatcherChainTest.php b/tests/Patcher/PatcherChainTest.php
@@ -17,7 +17,7 @@
 use PHPUnit\Framework\TestCase;
 use function func_get_args;
 use function implode;
-use function Safe\sprintf;
+use function sprintf;
 use function str_replace;
 
 /**
diff --git a/tests/PhpParser/FakeParser.php b/tests/PhpParser/FakeParser.php
@@ -20,7 +20,7 @@
 
 final class FakeParser implements Parser
 {
-    public function parse(string $code, ?ErrorHandler $errorHandler = null): void
+    public function parse(string $code, ?ErrorHandler $errorHandler = null): mixed
     {
         throw new LogicException();
     }
diff --git a/tests/PhpParser/UseStmtNameTest.php b/tests/PhpParser/UseStmtNameTest.php
@@ -25,7 +25,7 @@
 use PhpParser\NodeTraverser as PhpParserNodeTraverser;
 use PHPUnit\Framework\TestCase;
 use function Humbug\PhpScoper\create_parser;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @covers \Humbug\PhpScoper\PhpParser\UseStmtName
diff --git a/tests/Scoper/PhpScoperSpecTest.php b/tests/Scoper/PhpScoperSpecTest.php
@@ -50,11 +50,11 @@
 use function is_string;
 use function min;
 use function Safe\preg_split;
-use function Safe\sprintf;
-use function Safe\usort;
+use function sprintf;
 use function str_repeat;
 use function str_starts_with;
 use function strlen;
+use function usort;
 use const PHP_EOL;
 use const PHP_VERSION_ID;
 
diff --git a/tests/Scoper/ScoperStub.php b/tests/Scoper/ScoperStub.php
@@ -15,7 +15,7 @@
 namespace Humbug\PhpScoper\Scoper;
 
 use UnexpectedValueException;
-use function Safe\sprintf;
+use function sprintf;
 
 final class ScoperStub implements Scoper
 {
diff --git a/tests/functions.php b/tests/functions.php
@@ -19,10 +19,10 @@
 use Symfony\Component\Filesystem\Filesystem;
 use function mkdir as native_mkdir;
 use function Safe\realpath;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
 use function str_replace;
 use function strrpos;
+use function substr;
 use function sys_get_temp_dir;
 use const DIRECTORY_SEPARATOR;
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use Humbug\PhpScoper\Patcher\Patcher;`
`18`	`18`	`use InvalidArgumentException;`
`19`	`19`	`use function Safe\preg_match;`
`20`		`-use function Safe\sprintf;`
	`20`	`+use function sprintf;`
`21`	`21`
`22`	`22`	`final class Configuration`
`23`	`23`	`{`