tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix i18nTextCollector produces corrupt output / namespaces when runni…
This commit is contained in:
Guy Sartorelli 2022-09-29 14:42:39 +13:00 committed by GitHub
commit 0b80643210
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/i18n/TextCollection/i18nTextCollector.php
View File

@ -571,20 +571,13 @@ class i18nTextCollector
if (is_array($token)) { if (is_array($token)) {
list($id, $text) = $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 // Check class
if ($id === T_NAMESPACE) { if ($id === T_NAMESPACE) {
$inNamespace = true; $inNamespace = true;
$currentClass = []; $currentClass = [];
continue; continue;
} }
if ($inNamespace && $id === T_STRING) { if ($inNamespace && ($id === T_STRING || (defined('T_NAME_QUALIFIED') && $id === T_NAME_QUALIFIED))) {
$currentClass[] = $text; $currentClass[] = $text;
continue; continue;
} }

8
tests/php/i18n/i18nTextCollectorTest.php
View File

@ -300,9 +300,14 @@ PHP;
<?php <?php
namespace SilverStripe\Framework\Core; namespace SilverStripe\Framework\Core;
use SilverStripe\ORM\DataObject;
class MyClass extends Base implements SomeService { class MyClass extends Base implements SomeService {
public function getNewLines(\$class) { 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 null;
} }
return _t( return _t(
@ -331,6 +336,7 @@ class MyClass extends Base implements SomeService {
} }
} }
PHP; PHP;
$this->assertEquals( $this->assertEquals(
[ [
'SilverStripe\\Framework\\Core\\MyClass.NEWLINES' => "New Lines", 'SilverStripe\\Framework\\Core\\MyClass.NEWLINES' => "New Lines",