chg: update symfony to 5.4; small config bug

Author: philipp-riddle

composer.json

@@ -10,10 +10,10 @@
  }
  ],
  "require": {
- "php": "^7.4|^8.0",
- "symfony/framework-bundle": "^5.3",
- "symfony/translation": "^5.3",
- "symfony/cache": "^5.3"
+ "php": "^7.4|^8.0|^8.1",
+ "symfony/framework-bundle": "^5.4",
+ "symfony/translation": "^5.4",
+ "symfony/cache": "^5.4"
  },
  "autoload": {
  "psr-4": {
@@ -26,7 +26,7 @@
  }
  },
  "require-dev": {
- "symfony/phpunit-bridge": "^5.3",
+ "symfony/phpunit-bridge": "^5.4",
  "friendsofphp/php-cs-fixer": "^2.16"
  }
 }

src/Command/TranslationReloadCommand.php

@@ -30,7 +30,7 @@ protected function configure()
  $this
  ->setDescription('Reloads all the translations from your chosen GoogleSheet.')
  ->setHelp('Usage: ... phiil:translation:reload --exclude=de,en')
- ;
+  ;
  }
 
  protected function execute(InputInterface $input, OutputInterface $output)
@@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
  return 1;
  }
 
- $setupLog = $this->_setupTranslationDirectory($locales);
+ $setupLog = $this->setupTranslationDirectory($locales);
 
  if (!empty($setupLog)) {
  foreach ($setupLog as $logItem) {
@@ -73,21 +73,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
  /**
  * Create the ./translations directory if it doesn't exist and touch files to prepare the translation loader
  */
- private function _setupTranslationDirectory(array $locales) :array
+ private function setupTranslationDirectory(array $locales) :array
  {
  $filesystem = new Filesystem();
  $log = [];
 
- $this->_createTranslationsDirectory($filesystem, $log);
- $this->_touchStandardFiles($filesystem, $locales, $log);
+ $this->createTranslationsDirectory($filesystem, $log);
+ $this->touchStandardFiles($filesystem, $locales, $log);
 
  return $log;
  }
 
  /**
  * Make sure that the translations directory exists
  */
- private function _createTranslationsDirectory(Filesystem $filesystem, array &$log, string $directoryName = 'translations')
+ private function createTranslationsDirectory(Filesystem $filesystem, array &$log, string $directoryName = 'translations')
  {
  if (!$filesystem->exists('./' . $directoryName)) {
  $filesystem->mkdir('./' . $directoryName);
@@ -98,7 +98,7 @@ private function _createTranslationsDirectory(Filesystem $filesystem, array &$lo
  /**
  * If these files don't exist the translation loader doesn't work
  */
- private function _touchStandardFiles(FileSystem $filesystem, array $locales, array &$log)
+ private function touchStandardFiles(FileSystem $filesystem, array $locales, array &$log)
  {
  foreach ($locales as $index => $locale) {
  $fileName = './translations/messages.' . $locale . '.gs_trans';

src/Resources/config/services.xml

@@ -23,11 +23,9 @@
 
  <service id="phil_googlesheets_translations_bundle.translation_service" class="Phiil\GoogleSheetsTranslationBundle\Service\TranslationService" public="true">
  <argument type="service" id="Phiil\GoogleSheetsTranslationBundle\Service\GoogleSheetsService"/>
- </service>
- <service id="Phiil\GoogleSheetsTranslationBundle\Service\TranslationService" alias="phil_googlesheets_translations_bundle.translation_service" public="true">
- <argument type="service" id="Phiil\GoogleSheetsTranslationBundle\Service\GoogleSheetsService"/>
  <argument type="service" id="Symfony\Component\HttpKernel\KernelInterface"/>
  </service>
+ <service id="Phiil\GoogleSheetsTranslationBundle\Service\TranslationService" alias="phil_googlesheets_translations_bundle.translation_service" public="true" />
 
  <service id="phil_googlesheets_translations_bundle.translation_loader" class="Phiil\GoogleSheetsTranslationBundle\Translation\TranslationLoader" public="true">
  <argument type="service" id="Phiil\GoogleSheetsTranslationBundle\Service\GoogleSheetsService"/>