Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DX: re-apply concat_space #52317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2023
Merged

DX: re-apply concat_space #52317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public function testFormatCatalogue()

$dumper = new CsvFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/valid.csv', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/valid.csv', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function testFormatCatalogue()

$dumper = new IcuResFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resourcebundle/res/en.res', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resourcebundle/res/en.res', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function testFormatCatalogue()

$dumper = new IniFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.ini', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.ini', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function testFormatCatalogue()

$dumper = new JsonFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.json', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.json', $dumper->formatCatalogue($catalogue, 'messages'));
}

public function testDumpWithCustomEncoding()
Expand All @@ -34,6 +34,6 @@ public function testDumpWithCustomEncoding()

$dumper = new JsonFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.dump.json', $dumper->formatCatalogue($catalogue, 'messages', ['json_encoding' => \JSON_HEX_QUOT]));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.dump.json', $dumper->formatCatalogue($catalogue, 'messages', ['json_encoding' => \JSON_HEX_QUOT]));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function testFormatCatalogue()

$dumper = new MoFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.mo', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.mo', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ public function testFormatCatalogue()

$dumper = new PhpFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.php', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.php', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function testFormatCatalogue()

$dumper = new PoFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.po', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.po', $dumper->formatCatalogue($catalogue, 'messages'));
}

public function testDumpPlurals()
Expand All @@ -56,6 +56,6 @@ public function testDumpPlurals()

$dumper = new PoFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/plurals.po', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/plurals.po', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ public function testFormatCatalogue()

$dumper = new QtFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/resources.ts', $dumper->formatCatalogue($catalogue, 'resources'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/resources.ts', $dumper->formatCatalogue($catalogue, 'resources'));
}
}
14 changes: 7 additions & 7 deletions src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testFormatCatalogue()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-clean.xlf',
__DIR__.'/../Fixtures/resources-clean.xlf',
$dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR'])
);
}
Expand All @@ -50,7 +50,7 @@ public function testFormatCatalogueXliff2()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-2.0-clean.xlf',
__DIR__.'/../Fixtures/resources-2.0-clean.xlf',
$dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR', 'xliff_version' => '2.0'])
);
}
Expand All @@ -65,7 +65,7 @@ public function testFormatIcuCatalogueXliff2()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-2.0+intl-icu.xlf',
__DIR__.'/../Fixtures/resources-2.0+intl-icu.xlf',
$dumper->formatCatalogue($catalogue, 'messages'.MessageCatalogue::INTL_DOMAIN_SUFFIX, ['default_locale' => 'fr_FR', 'xliff_version' => '2.0'])
);
}
Expand All @@ -83,7 +83,7 @@ public function testFormatCatalogueWithCustomToolInfo()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-tool-info.xlf',
__DIR__.'/../Fixtures/resources-tool-info.xlf',
$dumper->formatCatalogue($catalogue, 'messages', $options)
);
}
Expand All @@ -99,7 +99,7 @@ public function testFormatCatalogueWithTargetAttributesMetadata()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-target-attributes.xlf',
__DIR__.'/../Fixtures/resources-target-attributes.xlf',
$dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR'])
);
}
Expand All @@ -124,7 +124,7 @@ public function testFormatCatalogueWithNotesMetadata()
$dumper = new XliffFileDumper();

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-notes-meta.xlf',
__DIR__.'/../Fixtures/resources-notes-meta.xlf',
$dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR', 'xliff_version' => '2.0'])
);
}
Expand All @@ -143,7 +143,7 @@ public function testDumpCatalogueWithXliffExtension()
$dumper = new XliffFileDumper('xliff');

$this->assertStringEqualsFile(
__DIR__ . '/../Fixtures/resources-clean.xliff',
__DIR__.'/../Fixtures/resources-clean.xliff',
$dumper->formatCatalogue($catalogue, 'messages', ['default_locale' => 'fr_FR'])
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function testTreeFormatCatalogue()

$dumper = new YamlFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/messages.yml', $dumper->formatCatalogue($catalogue, 'messages', ['as_tree' => true, 'inline' => 999]));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/messages.yml', $dumper->formatCatalogue($catalogue, 'messages', ['as_tree' => true, 'inline' => 999]));
}

public function testLinearFormatCatalogue()
Expand All @@ -40,6 +40,6 @@ public function testLinearFormatCatalogue()

$dumper = new YamlFileDumper();

$this->assertStringEqualsFile(__DIR__ . '/../Fixtures/messages_linear.yml', $dumper->formatCatalogue($catalogue, 'messages'));
$this->assertStringEqualsFile(__DIR__.'/../Fixtures/messages_linear.yml', $dumper->formatCatalogue($catalogue, 'messages'));
}
}
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Tests/Extractor/PhpAstExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public function testExtractionFromIndentedHeredocNowdoc()
], new TranslatableMessageVisitor()),
]);
$extractor->setPrefix('prefix');
$extractor->extract(__DIR__ . '/../Fixtures/extractor-7.3/translation.html.php', $catalogue);
$extractor->extract(__DIR__.'/../Fixtures/extractor-7.3/translation.html.php', $catalogue);

$expectedCatalogue = [
'messages' => [
Expand All @@ -189,7 +189,7 @@ public function testExtractionFromIndentedHeredocNowdoc()

public static function resourcesProvider(): array
{
$directory = __DIR__ . '/../Fixtures/extractor-ast/';
$directory = __DIR__.'/../Fixtures/extractor-ast/';
$phpFiles = [];
$splFiles = [];
foreach (new \DirectoryIterator($directory) as $fileInfo) {
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function testExtractionFromIndentedHeredocNowdoc()

$extractor = new PhpExtractor();
$extractor->setPrefix('prefix');
$extractor->extract(__DIR__ . '/../Fixtures/extractor-7.3/translation.html.php', $catalogue);
$extractor->extract(__DIR__.'/../Fixtures/extractor-7.3/translation.html.php', $catalogue);

$expectedCatalogue = [
'messages' => [
Expand All @@ -153,7 +153,7 @@ public function testExtractionFromIndentedHeredocNowdoc()

public static function resourcesProvider()
{
$directory = __DIR__ . '/../Fixtures/extractor/';
$directory = __DIR__.'/../Fixtures/extractor/';
$phpFiles = [];
$splFiles = [];
foreach (new \DirectoryIterator($directory) as $fileInfo) {
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CsvFileLoaderTest extends TestCase
public function testLoad()
{
$loader = new CsvFileLoader();
$resource = __DIR__ . '/../Fixtures/resources.csv';
$resource = __DIR__.'/../Fixtures/resources.csv';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
Expand All @@ -33,7 +33,7 @@ public function testLoad()
public function testLoadDoesNothingIfEmpty()
{
$loader = new CsvFileLoader();
$resource = __DIR__ . '/../Fixtures/empty.csv';
$resource = __DIR__.'/../Fixtures/empty.csv';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals([], $catalogue->all('domain1'));
Expand All @@ -45,7 +45,7 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new CsvFileLoader();
$resource = __DIR__ . '/../Fixtures/not-exists.csv';
$resource = __DIR__.'/../Fixtures/not-exists.csv';
$loader->load($resource, 'en', 'domain1');
}

Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function testLoadInvalidResource()
{
$this->expectException(InvalidResourceException::class);
$loader = new IcuDatFileLoader();
$loader->load(__DIR__ . '/../Fixtures/resourcebundle/corrupted/resources', 'es', 'domain2');
$loader->load(__DIR__.'/../Fixtures/resourcebundle/corrupted/resources', 'es', 'domain2');
}

public function testDatEnglishLoad()
Expand All @@ -34,7 +34,7 @@ public function testDatEnglishLoad()
// you must specify an temporary build directory which is not the same as current directory and
// MUST reside on the same partition. pkgdata -p resources -T /srv -d.packagelist.txt
$loader = new IcuDatFileLoader();
$resource = __DIR__ . '/../Fixtures/resourcebundle/dat/resources';
$resource = __DIR__.'/../Fixtures/resourcebundle/dat/resources';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['symfony' => 'Symfony 2 is great'], $catalogue->all('domain1'));
Expand All @@ -45,7 +45,7 @@ public function testDatEnglishLoad()
public function testDatFrenchLoad()
{
$loader = new IcuDatFileLoader();
$resource = __DIR__ . '/../Fixtures/resourcebundle/dat/resources';
$resource = __DIR__.'/../Fixtures/resourcebundle/dat/resources';
$catalogue = $loader->load($resource, 'fr', 'domain1');

$this->assertEquals(['symfony' => 'Symfony 2 est génial'], $catalogue->all('domain1'));
Expand All @@ -57,6 +57,6 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new IcuDatFileLoader();
$loader->load(__DIR__ . '/../Fixtures/non-existing.txt', 'en', 'domain1');
$loader->load(__DIR__.'/../Fixtures/non-existing.txt', 'en', 'domain1');
}
}
6 changes: 3 additions & 3 deletions src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function testLoad()
{
// resource is build using genrb command
$loader = new IcuResFileLoader();
$resource = __DIR__ . '/../Fixtures/resourcebundle/res';
$resource = __DIR__.'/../Fixtures/resourcebundle/res';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
Expand All @@ -37,13 +37,13 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new IcuResFileLoader();
$loader->load(__DIR__ . '/../Fixtures/non-existing.txt', 'en', 'domain1');
$loader->load(__DIR__.'/../Fixtures/non-existing.txt', 'en', 'domain1');
}

public function testLoadInvalidResource()
{
$this->expectException(InvalidResourceException::class);
$loader = new IcuResFileLoader();
$loader->load(__DIR__ . '/../Fixtures/resourcebundle/corrupted', 'en', 'domain1');
$loader->load(__DIR__.'/../Fixtures/resourcebundle/corrupted', 'en', 'domain1');
}
}
6 changes: 3 additions & 3 deletions src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class IniFileLoaderTest extends TestCase
public function testLoad()
{
$loader = new IniFileLoader();
$resource = __DIR__ . '/../Fixtures/resources.ini';
$resource = __DIR__.'/../Fixtures/resources.ini';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
Expand All @@ -32,7 +32,7 @@ public function testLoad()
public function testLoadDoesNothingIfEmpty()
{
$loader = new IniFileLoader();
$resource = __DIR__ . '/../Fixtures/empty.ini';
$resource = __DIR__.'/../Fixtures/empty.ini';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals([], $catalogue->all('domain1'));
Expand All @@ -44,7 +44,7 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new IniFileLoader();
$resource = __DIR__ . '/../Fixtures/non-existing.ini';
$resource = __DIR__.'/../Fixtures/non-existing.ini';
$loader->load($resource, 'en', 'domain1');
}
}
8 changes: 4 additions & 4 deletions src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class JsonFileLoaderTest extends TestCase
public function testLoad()
{
$loader = new JsonFileLoader();
$resource = __DIR__ . '/../Fixtures/resources.json';
$resource = __DIR__.'/../Fixtures/resources.json';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
Expand All @@ -33,7 +33,7 @@ public function testLoad()
public function testLoadDoesNothingIfEmpty()
{
$loader = new JsonFileLoader();
$resource = __DIR__ . '/../Fixtures/empty.json';
$resource = __DIR__.'/../Fixtures/empty.json';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals([], $catalogue->all('domain1'));
Expand All @@ -45,7 +45,7 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new JsonFileLoader();
$resource = __DIR__ . '/../Fixtures/non-existing.json';
$resource = __DIR__.'/../Fixtures/non-existing.json';
$loader->load($resource, 'en', 'domain1');
}

Expand All @@ -54,7 +54,7 @@ public function testParseException()
$this->expectException(InvalidResourceException::class);
$this->expectExceptionMessage('Error parsing JSON: Syntax error, malformed JSON');
$loader = new JsonFileLoader();
$resource = __DIR__ . '/../Fixtures/malformed.json';
$resource = __DIR__.'/../Fixtures/malformed.json';
$loader->load($resource, 'en', 'domain1');
}
}
10 changes: 5 additions & 5 deletions src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MoFileLoaderTest extends TestCase
public function testLoad()
{
$loader = new MoFileLoader();
$resource = __DIR__ . '/../Fixtures/resources.mo';
$resource = __DIR__.'/../Fixtures/resources.mo';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals(['foo' => 'bar'], $catalogue->all('domain1'));
Expand All @@ -33,7 +33,7 @@ public function testLoad()
public function testLoadPlurals()
{
$loader = new MoFileLoader();
$resource = __DIR__ . '/../Fixtures/plurals.mo';
$resource = __DIR__.'/../Fixtures/plurals.mo';
$catalogue = $loader->load($resource, 'en', 'domain1');

$this->assertEquals([
Expand All @@ -48,22 +48,22 @@ public function testLoadNonExistingResource()
{
$this->expectException(NotFoundResourceException::class);
$loader = new MoFileLoader();
$resource = __DIR__ . '/../Fixtures/non-existing.mo';
$resource = __DIR__.'/../Fixtures/non-existing.mo';
$loader->load($resource, 'en', 'domain1');
}

public function testLoadInvalidResource()
{
$this->expectException(InvalidResourceException::class);
$loader = new MoFileLoader();
$resource = __DIR__ . '/../Fixtures/empty.mo';
$resource = __DIR__.'/../Fixtures/empty.mo';
$loader->load($resource, 'en', 'domain1');
}

public function testLoadEmptyTranslation()
{
$loader = new MoFileLoader();
$resource = __DIR__ . '/../Fixtures/empty-translation.mo';
$resource = __DIR__.'/../Fixtures/empty-translation.mo';
$catalogue = $loader->load($resource, 'en', 'message');

$this->assertEquals([], $catalogue->all('message'));
Expand Down
Loading