Force use statements for global function, constants and classes if they are not colliding (#432)

Author: Simon Mönch

phpcs.xml.dist

@@ -15,8 +15,20 @@
 
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
     <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFallbackGlobalName"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.NamespaceSpacing"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
+        <properties>
+            <property name="allowFallbackGlobalConstants" value="false"/>
+            <property name="allowFallbackGlobalFunctions" value="false"/>
+            <property name="allowFullyQualifiedGlobalClasses" value="false"/>
+            <property name="allowFullyQualifiedGlobalConstants" value="false"/>
+            <property name="allowFullyQualifiedGlobalFunctions" value="false"/>
+            <property name="allowFullyQualifiedNameForCollidingClasses" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingConstants" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingFunctions" value="true"/>
+            <property name="searchAnnotations" value="true"/>
+        </properties>
         <exclude-pattern>src/bootstrap\.php</exclude-pattern>
         <exclude-pattern>src/functions\.php</exclude-pattern>
     </rule>

src/Autoload/ScoperAutoloadGenerator.php

@@ -14,13 +14,13 @@
 
 namespace Humbug\PhpScoper\Autoload;
 
+use Humbug\PhpScoper\Whitelist;
+use PhpParser\Node\Name\FullyQualified;
 use function array_map;
 use function array_unshift;
 use function chr;
 use function explode;
-use Humbug\PhpScoper\Whitelist;
 use function implode;
-use PhpParser\Node\Name\FullyQualified;
 use function sprintf;
 use function str_repeat;
 use function str_replace;

src/Configuration.php

@@ -14,27 +14,40 @@
 
 namespace Humbug\PhpScoper;
 
+use Humbug\PhpScoper\Patcher\SymfonyPatcher;
+use InvalidArgumentException;
+use Iterator;
+use RuntimeException;
+use SplFileInfo;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
+use function array_filter;
 use function array_key_exists;
+use function array_keys;
+use function array_map;
+use function array_merge;
+use function array_reduce;
+use function array_unique;
 use function array_unshift;
-use const DIRECTORY_SEPARATOR;
 use function dirname;
 use function file_exists;
+use function file_get_contents;
 use function gettype;
-use Humbug\PhpScoper\Patcher\SymfonyPatcher;
-use InvalidArgumentException;
+use function in_array;
 use function is_array;
 use function is_bool;
+use function is_callable;
+use function is_dir;
 use function is_file;
 use function is_link;
+use function is_readable;
 use function is_string;
-use Iterator;
+use function iterator_to_array;
 use function readlink;
 use function realpath;
-use RuntimeException;
-use SplFileInfo;
 use function sprintf;
-use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Finder\Finder;
+use function trim;
+use const DIRECTORY_SEPARATOR;
 
 final class Configuration
 {

src/Console/Application.php

@@ -15,8 +15,10 @@
 namespace Humbug\PhpScoper\Console;
 
 use Humbug\PhpScoper\Container;
-use function Humbug\PhpScoper\get_php_scoper_version;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use function Humbug\PhpScoper\get_php_scoper_version;
+use function sprintf;
+use function strpos;
 use function trim;
 
 final class Application extends SymfonyApplication

src/Console/Command/AddPrefixCommand.php

@@ -14,11 +14,9 @@
 
 namespace Humbug\PhpScoper\Console\Command;
 
-use function count;
 use Humbug\PhpScoper\Autoload\ScoperAutoloadGenerator;
 use Humbug\PhpScoper\Configuration;
 use Humbug\PhpScoper\Console\ScoperLogger;
-use function Humbug\PhpScoper\get_common_path;
 use Humbug\PhpScoper\Scoper;
 use Humbug\PhpScoper\Scoper\ConfigurableScoper;
 use Humbug\PhpScoper\Throwable\Exception\ParsingException;
@@ -33,6 +31,23 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
 use Throwable;
+use function array_keys;
+use function array_map;
+use function bin2hex;
+use function count;
+use function file_exists;
+use function file_get_contents;
+use function getcwd;
+use function Humbug\PhpScoper\get_common_path;
+use function is_dir;
+use function is_writable;
+use function preg_match;
+use function random_bytes;
+use function sprintf;
+use function str_replace;
+use function strlen;
+use function usort;
+use const DIRECTORY_SEPARATOR;
 
 final class AddPrefixCommand extends BaseCommand
 {

src/Console/Command/BaseCommand.php

@@ -19,6 +19,10 @@
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use function chdir;
+use function file_exists;
+use function getcwd;
+use function sprintf;
 
 abstract class BaseCommand extends Command
 {

src/Console/Command/InitCommand.php

@@ -21,6 +21,10 @@
 use Symfony\Component\Console\Style\OutputStyle;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
+use function file_exists;
+use function getcwd;
+use function sprintf;
+use const DIRECTORY_SEPARATOR;
 
 final class InitCommand extends BaseCommand
 {

src/Console/ScoperLogger.php

@@ -20,6 +20,12 @@
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function count;
+use function memory_get_peak_usage;
+use function memory_get_usage;
+use function microtime;
+use function round;
+use function sprintf;
 
 /**
  * @private

src/Patcher/SymfonyPatcher.php

@@ -15,6 +15,7 @@
 namespace Humbug\PhpScoper\Patcher;
 
 use function preg_replace;
+use function sprintf;
 use function strpos;
 
 final class SymfonyPatcher

src/PhpParser/NodeTraverser.php

@@ -14,9 +14,6 @@
 
 namespace Humbug\PhpScoper\PhpParser;
 
-use function array_slice;
-use function array_values;
-use function count;
 use Humbug\PhpScoper\PhpParser\Node\NameFactory;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
@@ -27,6 +24,12 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\Stmt\UseUse;
 use PhpParser\NodeTraverser as PhpParserNodeTraverser;
+use function array_map;
+use function array_slice;
+use function array_splice;
+use function array_values;
+use function count;
+use function current;
 
 /**
  * @private