Merge branch 'MAGETWO-43435-phrase-concatenation' into MAGETWO-44154-cg-race-condition
Showing
- dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php 5 additions, 3 deletions...o/Setup/Console/Command/I18nCollectPhrasesCommandTest.php
- dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/Magento/TestModule/Phrases.php 0 additions, 7 deletions...tup/Console/Command/_files/Magento/TestModule/Phrases.php
- dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv 19 additions, 0 deletions.../Magento/Setup/Console/Command/_files/expectedPhrases.csv
- dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/phrases/TestPhrases.php 87 additions, 0 deletions...ento/Setup/Console/Command/_files/phrases/TestPhrases.php
- setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php 1 addition, 1 deletion...ule/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
- setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php 8 additions, 0 deletions.../Setup/Module/I18n/Parser/Adapter/Php/Tokenizer/Token.php
- setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php 19 additions, 0 deletions...I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
- setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php 12 additions, 0 deletions...it/Module/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
Please register or sign in to comment