Merge pull request #272 from PHPCSStandards/universal/constructordest…

…ructorreturn-allow-for-namespaced-classes

CodeAnalysis/ConstructorDestructorReturn: correctly ignore PHP-4-style constructors in namespaced classes

Universal/Sniffs/CodeAnalysis/ConstructorDestructorReturnSniff.php

@@ -18,6 +18,7 @@
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\FunctionDeclarations;
 use PHPCSUtils\Utils\GetTokensAsString;
+use PHPCSUtils\Utils\Namespaces;
 use PHPCSUtils\Utils\NamingConventions;
 use PHPCSUtils\Utils\ObjectDeclarations;
 use PHPCSUtils\Utils\Scopes;
@@ -105,6 +106,17 @@ public function process(File $phpcsFile, $stackPtr)
                 return;
             }
 
+            if (Namespaces::determineNamespace($phpcsFile, $stackPtr) !== '') {
+                /*
+                 * Namespaced methods with the same name as the class are treated as
+                 * regular methods, so we can bow out if we're in a namespace.
+                 *
+                 * Note: the exception to this is PHP 5.3.0-5.3.2. This is currently
+                 * not dealt with.
+                 */
+                return;
+            }
+
             $functionType = 'A PHP 4-style constructor';
         }
 

Universal/Tests/CodeAnalysis/ConstructorDestructorReturnUnitTest.5.inc

@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * The PHP4-style constructors are not constructors in namespaced files.
+ * No errors should be thrown for it, nor any auto-fixes made.
+ */
+namespace Some\Name;
+
+class ReturnsAValue {
+    function returnsAValue(): string
+    {
+        return 'php4style';
+    }
+}