diff --git a/Classes/Service/ConvertService.php b/Classes/Service/ConvertService.php index 41c5aa5..dbf2838 100644 --- a/Classes/Service/ConvertService.php +++ b/Classes/Service/ConvertService.php @@ -9,14 +9,10 @@ class ConvertService { - public function __construct( protected readonly XlfFileService $xlfFileService, protected readonly CsvReader $csvReader - ) - { - - } + ) {} public function convert(string $csvFilePath, string $out, bool $forceRebuild): array { @@ -57,5 +53,4 @@ protected function addExistingLabels(array $labels, string $language, string $pa return array_merge($existingLabels, $labels); } - } diff --git a/Classes/Service/CsvReader.php b/Classes/Service/CsvReader.php index e5a906d..6d57a37 100644 --- a/Classes/Service/CsvReader.php +++ b/Classes/Service/CsvReader.php @@ -9,7 +9,6 @@ class CsvReader { - public function getFromFile(string $filePath): array { $csvReader = Reader::createFromPath($filePath, 'r'); @@ -41,5 +40,4 @@ public function getFromFile(string $filePath): array return $labels; } - } diff --git a/Classes/Service/XlfFileService.php b/Classes/Service/XlfFileService.php index bc263cb..42f883a 100644 --- a/Classes/Service/XlfFileService.php +++ b/Classes/Service/XlfFileService.php @@ -9,13 +9,6 @@ class XlfFileService { - - - /** - * @param string $path - * @param string $language - * @return array - */ public function getLabels(string $path, string $language): array { $xmlContent = file_get_contents($path); @@ -29,17 +22,17 @@ public function getLabels(string $path, string $language): array $rootXmlNode = simplexml_load_string($xmlContent, \SimpleXMLElement::class, LIBXML_NOWARNING); foreach ($rootXmlNode->file->body->children() as $translationElement) { if ($translationElement->getName() === 'trans-unit' && !isset($translationElement['restype'])) { - $approved = (string)($translationElement['approved'] ?? ''); - $parsedData[(string)$translationElement['id']][0] = [ - 'source' => (string)$translationElement->source, - 'target' => (string)$translationElement->target, + $approved = (string) ($translationElement['approved'] ?? ''); + $parsedData[(string) $translationElement['id']][0] = [ + 'source' => (string) $translationElement->source, + 'target' => (string) $translationElement->target, ]; - $id = (string)$translationElement['id']; + $id = (string) $translationElement['id']; $newLabels[$id] = new Label( $id, $language, - (string)$translationElement->source, - (string)$translationElement->target, + (string) $translationElement->source, + (string) $translationElement->target, $approved ); } @@ -47,7 +40,6 @@ public function getLabels(string $path, string $language): array return $newLabels; } - /** * @param Label[] $labels * @return string|bool diff --git a/Tests/Unit/Service/CsvReaderTest.php b/Tests/Unit/Service/CsvReaderTest.php index 6e36950..898ec59 100644 --- a/Tests/Unit/Service/CsvReaderTest.php +++ b/Tests/Unit/Service/CsvReaderTest.php @@ -9,7 +9,6 @@ class CsvReaderTest extends UnitTestCase { - protected CsvReader $subject; public function setUp(): void @@ -33,11 +32,11 @@ public function testForEnAs2ndHeaderField(): void /** * @throws \JsonException */ - public function testCsvReading():void + public function testCsvReading(): void { - $labels = $this->subject->getFromFile(__DIR__ . '/Fixtures/reader/valid.csv'); - $json = json_encode($labels, JSON_THROW_ON_ERROR|JSON_UNESCAPED_UNICODE); + $labels = $this->subject->getFromFile(__DIR__ . '/Fixtures/reader/valid.csv'); + $json = json_encode($labels, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE); - $this->assertJsonStringEqualsJsonFile(__DIR__ . '/Fixtures/reader/valid.json', $json); + self::assertJsonStringEqualsJsonFile(__DIR__ . '/Fixtures/reader/valid.json', $json); } }