From e5f851e4a0e3aa847e692f513e15a3e35d7ff36c Mon Sep 17 00:00:00 2001
From: Michael Moravec <mail@majkl578.cz>
Date: Mon, 8 Jan 2018 01:08:42 +0100
Subject: [PATCH] Reference global functions and constants via `use`

---
 composer.json                 | 2 +-
 lib/Doctrine/ruleset.xml      | 8 ++++++--
 tests/expected_report.txt     | 6 +++---
 tests/fixed/example-class.php | 1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 15ae3e4b..063ccc14 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "php": "^7.1",
         "squizlabs/php_codesniffer": "^3.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.2",
-        "slevomat/coding-standard": "^4.2.1"
+        "slevomat/coding-standard": "^4.3.0"
     },
     "extra": {
         "branch-alias": {
diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
index 0bdcf355..ca9e6c88 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -108,10 +108,14 @@
     <!-- Forbid using absolute class name references (except global ones) -->
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
         <properties>
+            <property name="allowFallbackGlobalConstants" type="boolean" value="false"/>
+            <property name="allowFallbackGlobalFunctions" type="boolean" value="false"/>
             <property name="allowFullyQualifiedGlobalClasses" type="boolean" value="true"/>
-            <property name="allowFullyQualifiedGlobalFunctions" type="boolean" value="true"/>
-            <property name="allowFullyQualifiedGlobalConstants" type="boolean" value="true"/>
+            <property name="allowFullyQualifiedGlobalConstants" type="boolean" value="false"/>
+            <property name="allowFullyQualifiedGlobalFunctions" type="boolean" value="false"/>
             <property name="allowFullyQualifiedNameForCollidingClasses" type="boolean" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingConstants" type="boolean" value="true"/>
+            <property name="allowFullyQualifiedNameForCollidingFunctions" type="boolean" value="true"/>
         </properties>
     </rule>
     <!-- Forbid unused use statements -->
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
index 14ef2259..074f9a9b 100644
--- a/tests/expected_report.txt
+++ b/tests/expected_report.txt
@@ -4,14 +4,14 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 tests/input/concatenation_spacing.php                 24      0
-tests/input/example-class.php                         13      0
+tests/input/example-class.php                         14      0
 tests/input/not_spacing.php                           7       0
 tests/input/return_type_on_closures.php               21      0
 tests/input/return_type_on_methods.php                17      0
 ----------------------------------------------------------------------
-A TOTAL OF 82 ERRORS AND 0 WARNINGS WERE FOUND IN 5 FILES
+A TOTAL OF 83 ERRORS AND 0 WARNINGS WERE FOUND IN 5 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 72 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 73 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
index e2e02175..bba1c704 100644
--- a/tests/fixed/example-class.php
+++ b/tests/fixed/example-class.php
@@ -5,6 +5,7 @@
 namespace Example;
 
 use Doctrine\Sniffs\Spacing\ControlStructureSniff;
+use function assert;
 use function strlen;
 use function substr;