Skip to content

Commit ca43978

Browse files
committed
minor symfony#52659 [CssSelector][Serializer][Translation] [Command] Clean unused code (alamirault)
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [CssSelector][Serializer][Translation] [Command] Clean unused code | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT Remove unused code Commits ------- 3ea601d [CssSelector][Serializer][Translation] [Command] Clean unused code
2 parents de19d00 + 3ea601d commit ca43978

File tree

7 files changed

+4
-32
lines changed

7 files changed

+4
-32
lines changed

src/Symfony/Component/Console/Command/Command.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,6 @@ public function run(InputInterface $input, OutputInterface $output): int
277277
$statusCode = ($this->code)($input, $output);
278278
} else {
279279
$statusCode = $this->execute($input, $output);
280-
281-
if (!\is_int($statusCode)) {
282-
throw new \TypeError(sprintf('Return value of "%s::execute()" must be of the type int, "%s" returned.', static::class, get_debug_type($statusCode)));
283-
}
284280
}
285281

286282
return is_numeric($statusCode) ? (int) $statusCode : 0;

src/Symfony/Component/CssSelector/XPath/XPathExpr.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function join(string $combiner, self $expr): static
104104
public function __toString(): string
105105
{
106106
$path = $this->path.$this->element;
107-
$condition = null === $this->condition || '' === $this->condition ? '' : '['.$this->condition.']';
107+
$condition = '' === $this->condition ? '' : '['.$this->condition.']';
108108

109109
return $path.$condition;
110110
}

src/Symfony/Component/Serializer/Encoder/XmlEncoder.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,9 @@ final protected function appendCData(\DOMNode $node, string $val): bool
196196

197197
final protected function appendDocumentFragment(\DOMNode $node, \DOMDocumentFragment $fragment): bool
198198
{
199-
if ($fragment instanceof \DOMDocumentFragment) {
200-
$node->appendChild($fragment);
199+
$node->appendChild($fragment);
201200

202-
return true;
203-
}
204-
205-
return false;
201+
return true;
206202
}
207203

208204
final protected function appendComment(\DOMNode $node, string $data): bool

src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,6 @@ public function delete(TranslatorBagInterface $translatorBag): void
176176

177177
$defaultCatalogue = $translatorBag->getCatalogue($this->defaultLocale);
178178

179-
if (!$defaultCatalogue) {
180-
$defaultCatalogue = $translatorBag->getCatalogues()[0];
181-
}
182-
183179
foreach ($defaultCatalogue->all() as $domain => $messages) {
184180
$fileId = $this->getFileIdByDomain($fileList, $domain);
185181

src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ public function write(TranslatorBagInterface $translatorBag): void
5757
{
5858
$catalogue = $translatorBag->getCatalogue($this->defaultLocale);
5959

60-
if (!$catalogue) {
61-
$catalogue = $translatorBag->getCatalogues()[0];
62-
}
63-
6460
foreach ($catalogue->all() as $domain => $messages) {
6561
$createdIds = $this->createAssets(array_keys($messages), $domain);
6662
if ($createdIds) {
@@ -175,10 +171,6 @@ public function delete(TranslatorBagInterface $translatorBag): void
175171
{
176172
$catalogue = $translatorBag->getCatalogue($this->defaultLocale);
177173

178-
if (!$catalogue) {
179-
$catalogue = $translatorBag->getCatalogues()[0];
180-
}
181-
182174
$responses = [];
183175

184176
foreach (array_keys($catalogue->all()) as $domain) {

src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ public function write(TranslatorBagInterface $translatorBag): void
6161
{
6262
$defaultCatalogue = $translatorBag->getCatalogue($this->defaultLocale);
6363

64-
if (!$defaultCatalogue) {
65-
$defaultCatalogue = $translatorBag->getCatalogues()[0];
66-
}
67-
6864
$this->ensureAllLocalesAreCreated($translatorBag);
6965
$existingKeysByDomain = [];
7066

@@ -111,10 +107,6 @@ public function delete(TranslatorBagInterface $translatorBag): void
111107
{
112108
$catalogue = $translatorBag->getCatalogue($this->defaultLocale);
113109

114-
if (!$catalogue) {
115-
$catalogue = $translatorBag->getCatalogues()[0];
116-
}
117-
118110
$keysIds = [];
119111

120112
foreach ($catalogue->getDomains() as $domain) {

src/Symfony/Component/Translation/Command/TranslationPushCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
6060
if ($input->mustSuggestOptionValuesFor('domains')) {
6161
$provider = $this->providers->get($input->getArgument('provider'));
6262

63-
if ($provider && method_exists($provider, 'getDomains')) {
63+
if (method_exists($provider, 'getDomains')) {
6464
$domains = $provider->getDomains();
6565
$suggestions->suggestValues($domains);
6666
}

0 commit comments

Comments
 (0)