Commitd4b3bb2

committed

deal with indented heredoc/nowdoc tokens

1 parentb3c4d63 commitd4b3bb2Copy full SHA for d4b3bb2

File tree

+47

-0

lines changed

+47

-0

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,19 @@ private function getValue(\Iterator $tokenIterator)`
`178`	`178`	`}`
`179`	`179`	`break;`
`180`	`180`	`case \T_END_HEREDOC:`
	`181`	`+if ($indentation =strspn($t[1],'')) {`
	`182`	`+$docPartWithLineBreaks =$docPart;`
	`183`	`+$docPart ='';`
	`184`	`+`
	`185`	`+foreach (preg_split('~(\r\n\|\n\|\r)~',$docPartWithLineBreaks, -1,PREG_SPLIT_DELIM_CAPTURE)as$str) {`
	`186`	`+if (\in_array($str, ["\r\n","\n","\r"],true)) {`
	`187`	`+$docPart .=$str;`
	`188`	`+ }else {`
	`189`	`+$docPart .=substr($str,$indentation);`
	`190`	`+ }`
	`191`	`+ }`
	`192`	`+ }`
	`193`	`+`
`181`	`194`	`$message .= PhpStringTokenParser::parseDocString($docToken,$docPart);`
`182`	`195`	`$docToken ='';`
`183`	`196`	`$docPart ='';`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,27 @@ public function testExtraction($resource)`
`75`	`75`	`$this->assertEquals(['sources' => [$filename.':43']],$catalogue->getMetadata('other-domain-test-no-params-short-array','not_messages'));`
`76`	`76`	`}`
`77`	`77`
	`78`	`+/**`
	`79`	`+ * @requires PHP 7.3`
	`80`	`+ */`
	`81`	`+publicfunctiontestExtractionFromIndentedHeredocNowdoc()`
	`82`	`+ {`
	`83`	`+$catalogue =newMessageCatalogue('en');`
	`84`	`+`
	`85`	`+$extractor =newPhpExtractor();`
	`86`	`+$extractor->setPrefix('prefix');`
	`87`	`+$extractor->extract(__DIR__.'/../fixtures/extractor-7.3/translation.html.php',$catalogue);`
	`88`	`+`
	`89`	`+$expectedCatalogue = [`
	`90`	`+'messages' => [`
	`91`	`+"heredoc\nindented\n further" =>"prefixheredoc\nindented\n further",`
	`92`	`+"nowdoc\nindented\n further" =>"prefixnowdoc\nindented\n further",`
	`93`	`+ ],`
	`94`	`+ ];`
	`95`	`+`
	`96`	`+$this->assertEquals($expectedCatalogue,$catalogue->all());`
	`97`	`+ }`
	`98`	`+`
`78`	`99`	`publicfunctionresourcesProvider()`
`79`	`100`	`{`
`80`	`101`	`$directory =__DIR__.'/../fixtures/extractor/';`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+This template is used for translation message extraction tests`
	`2`	`+<?phpecho$view['translator']->trans(<<<EOF`
	`3`	`+ heredoc`
	`4`	`+ indented`
	`5`	`+ further`
	`6`	`+ EOF`
	`7`	`+);?>`
	`8`	`+<?phpecho$view['translator']->trans(<<<'EOF'`
	`9`	`+ nowdoc`
	`10`	`+ indented`
	`11`	`+ further`
	`12`	`+ EOF`
	`13`	`+);?>`

Comments

(0)