Merge pull request #10522 from creative-commoners/pulls/4.11/backport…

…-textcollector-fix Fix i18nTextCollector produces corrupt output / namespaces when runni…
silverstripe · Sep 29, 2022 · 0b80643 · 0b80643
2 parents b36c987 + e24fb3f
commit 0b80643
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/i18n/TextCollection/i18nTextCollector.php b/src/i18n/TextCollection/i18nTextCollector.php
@@ -571,20 +571,13 @@ public function collectFromCode($content, $fileName, Module $module)
             if (is_array($token)) {
                 list($id, $text) = $token;
 
-                // PHP 8 namespace tokens
-                if (\defined('T_NAME_QUALIFIED') && in_array($id, [T_NAME_FULLY_QUALIFIED, T_NAME_QUALIFIED])) {
-                    $inNamespace = true;
-                    $currentClass[] = $text;
-                    continue;
-                }
-
                 // Check class
                 if ($id === T_NAMESPACE) {
                     $inNamespace = true;
                     $currentClass = [];
                     continue;
                 }
-                if ($inNamespace && $id === T_STRING) {
+                if ($inNamespace && ($id === T_STRING || (defined('T_NAME_QUALIFIED') && $id === T_NAME_QUALIFIED))) {
                     $currentClass[] = $text;
                     continue;
                 }

diff --git a/tests/php/i18n/i18nTextCollectorTest.php b/tests/php/i18n/i18nTextCollectorTest.php
@@ -300,9 +300,14 @@ public function testCollectFromCodeNamespace()
 <?php
 namespace SilverStripe\Framework\Core;
 
+use SilverStripe\ORM\DataObject;
+
 class MyClass extends Base implements SomeService {
     public function getNewLines(\$class) {
-        if (!is_subclass_of(\$class, DataObject::class) || !Object::has_extension(\$class, Versioned::class)) {
+        if (
+            !is_subclass_of(\$class, DataObject::class)
+            || !Object::has_extension(\$class, \SilverStripe\Versioned\Versioned::class)
+        ) {
             return null;
         }
         return _t(
@@ -331,6 +336,7 @@ public function getMagicConstantStringFromSelf()
     }
 }
 PHP;
+
         $this->assertEquals(
             [
                 'SilverStripe\\Framework\\Core\\MyClass.NEWLINES' => "New Lines",