Update master branch

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
         strategy: [ 'highest' ]
         sf_version: ['']
         include:
@@ -43,4 +43,3 @@ jobs:
 
       - name: Run tests
         run: ./vendor/bin/simple-phpunit
-

.github/workflows/static.yml

@@ -38,35 +38,13 @@ jobs:
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: Ubuntu-20.04
-
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Cache PhpCsFixer
-        uses: actions/cache@v2
-        with:
-          path: .github/.cache/php-cs-fixer/
-          key: php-cs-fixer-${{ github.sha }}
-          restore-keys: php-cs-fixer-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-
-      - name: Download dependencies
-        uses: ramsey/composer-install@v1
-        with:
-          composer-options: --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: Download PHP CS Fixer
-        run: composer bin php-cs-fixer update --no-interaction --no-progress
-
-      - name: Execute PHP CS Fixer
-        run: vendor/bin/php-cs-fixer fix --diff-format udiff --dry-run
+    - uses: actions/checkout@v2
+    - name: PHP-CS-Fixer
+      uses: docker://oskarstark/php-cs-fixer-ga
+      with:
+        args: --diff --dry-run
 
   psalm:
     name: Psalm

.gitignore

@@ -5,4 +5,5 @@
 /phpunit.xml
 /vendor/
 .php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,21 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(__DIR__.'/vendor')
+    ->name('*.php')
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'native_function_invocation' => true,
+        'ordered_imports' => true,
+        'declare_strict_types' => false,
+        'single_import_per_statement' => false,
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+;

Catalogue/CatalogueFetcher.php

@@ -46,7 +46,7 @@ public function getCatalogues(Configuration $config, array $locales = []): array
         foreach ($locales as $locale) {
             $currentCatalogue = new MessageCatalogue($locale);
             foreach ($dirs as $path) {
-                if (\is_dir($path)) {
+                if (is_dir($path)) {
                     $this->reader->read($path, $currentCatalogue);
                 }
             }

Catalogue/CatalogueManager.php

@@ -42,7 +42,7 @@ public function load(array $catalogues): void
     public function getDomains(): array
     {
         /** @var MessageCatalogueInterface $c */
-        $c = \reset($this->catalogues);
+        $c = reset($this->catalogues);
 
         return $c->getDomains();
     }
@@ -107,7 +107,7 @@ public function findMessages(array $config = []): array
             }
         }
 
-        $messages = \array_filter($messages, static function (CatalogueMessage $m) use ($isNew, $isObsolete, $isApproved, $isEmpty) {
+        $messages = array_filter($messages, static function (CatalogueMessage $m) use ($isNew, $isObsolete, $isApproved, $isEmpty) {
             if (null !== $isNew && $m->isNew() !== $isNew) {
                 return false;
             }

Catalogue/Operation/ReplaceOperation.php

@@ -37,7 +37,7 @@ protected function processDomain($domain): void
             'new' => [],
             'obsolete' => [],
         ];
-        if (\defined(\sprintf('%s::INTL_DOMAIN_SUFFIX', MessageCatalogueInterface::class))) {
+        if (\defined(sprintf('%s::INTL_DOMAIN_SUFFIX', MessageCatalogueInterface::class))) {
             $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
         } else {
             $intlDomain = $domain;
@@ -140,12 +140,12 @@ private function doMergeMetadata(array $source, array $target): array
                         // If both arrays, do recursive call
                         $source[$key] = $this->doMergeMetadata($source[$key], $value);
                     }
-                    // Else, use value form $source
+                // Else, use value form $source
                 } else {
                     // Add new value
                     $source[$key] = $value;
                 }
-                // if sequential
+            // if sequential
             } elseif (!\in_array($value, $source, true)) {
                 $source[] = $value;
             }
@@ -160,6 +160,6 @@ public function isArrayAssociative(array $arr): bool
             return false;
         }
 
-        return \array_keys($arr) !== \range(0, \count($arr) - 1);
+        return array_keys($arr) !== range(0, \count($arr) - 1);
     }
 }

Changelog.md

@@ -2,6 +2,60 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 0.12.7
+
+### Fixed
+
+* fix: check if session is available by @robbedg in https://github.com/php-translation/symfony-bundle/pull/478
+
+## 0.12.6
+
+### Fixed
+
+* fix: used finder->exclude instead of notPath for excludedDirs by @seizan8 in https://github.com/php-translation/symfony-bundle/pull/474
+
+## 0.12.5
+
+### Added
+
+* Add testing on the newest PHP 8.1 to the CI config by @bocharsky-bw in https://github.com/php-translation/symfony-bundle/pull/465
+* Allow Symfony 6 by @bocharsky-bw in https://github.com/php-translation/symfony-bundle/pull/464
+
+### Removed
+
+* refac: remove AbstractController from EditInPlaceController by @gimler in https://github.com/php-translation/symfony-bundle/pull/459
+* Stop extending AbstractController to fix some deprecations by @bocharsky-bw in https://github.com/php-translation/symfony-bundle/pull/460
+
+### Changed
+
+* Use autowiring for SymfonyProfilerController by @bocharsky-bw in https://github.com/php-translation/symfony-bundle/pull/461
+* Use a different image for PHP CS Fixer to get latest and upgrade config #471
+
+### Fixed
+
+* Fix Cannot autowire service "php_translation.data_collector" error in… by @axi in https://github.com/php-translation/symfony-bundle/pull/463
+* Fix yaml indentation to 4 spaces by @bocharsky-bw in https://github.com/php-translation/symfony-bundle/pull/462
+* Fix for deprecated session service in Symfony 6 by @robbedg in https://github.com/php-translation/symfony-bundle/pull/468
+* Fix return type and implement getCatalogues() https://github.com/php-translation/symfony-bundle/pull/470
+
+## 0.12.4
+
+### Fixed
+
+- Fix extractor parameters #438
+- Make Profiler service an optional argument for SymfonyProfilerController #440
+- Update ExtractCommand.php #435
+- Fix tests on Symfony 5.3 #443
+- Suppress getMasterRequest() deprecation message #444
+- Suppress deprecations on deprecating legacy services #445
+- Fix PHPUnit deprecations #447
+- Fix broken tests #458
+- Register visitor tag also for TranslateAnnotationVisitor and Knp visitors #451
+
+### Removed
+
+- Drop SensioLabs (Symfony) insight badge #441
+
 ## 0.12.3
 
 ### Fixed

Command/BundleTrait.php

@@ -20,11 +20,11 @@ trait BundleTrait
     private function configureBundleDirs(InputInterface $input, Configuration $config): void
     {
         if ($bundleName = $input->getOption('bundle')) {
-            if (0 === \strpos($bundleName, '@')) {
-                if (false === $pos = \strpos($bundleName, '/')) {
-                    $bundleName = \substr($bundleName, 1);
+            if (0 === strpos($bundleName, '@')) {
+                if (false === $pos = strpos($bundleName, '/')) {
+                    $bundleName = substr($bundleName, 1);
                 } else {
-                    $bundleName = \substr($bundleName, 1, $pos - 2);
+                    $bundleName = substr($bundleName, 1, $pos - 2);
                 }
             }
 

Command/CheckMissingCommand.php

@@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
 
         if ($newMessages > 0) {
-            $io->error(\sprintf('%d new message(s) have been found, run bin/console translation:extract', $newMessages));
+            $io->error(sprintf('%d new message(s) have been found, run bin/console translation:extract', $newMessages));
 
             return 1;
         }
@@ -100,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($emptyTranslations > 0) {
             $io->error(
-                \sprintf('%d messages have empty translations, please provide translations for them', $emptyTranslations)
+                sprintf('%d messages have empty translations, please provide translations for them', $emptyTranslations)
             );
 
             return 1;
@@ -132,7 +132,7 @@ private function countEmptyTranslations(MessageCatalogueInterface $catalogue): i
         $total = 0;
 
         foreach ($catalogue->getDomains() as $domain) {
-            $emptyTranslations = \array_filter(
+            $emptyTranslations = array_filter(
                 $catalogue->all($domain),
                 function (string $message = null): bool {
                     return null === $message || '' === $message;

Command/DeleteEmptyCommand.php

@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($input->isInteractive()) {
             $helper = $this->getHelper('question');
-            $question = new ConfirmationQuestion(\sprintf('You are about to remove %d translations. Do you wish to continue? (y/N) ', $messageCount), false);
+            $question = new ConfirmationQuestion(sprintf('You are about to remove %d translations. Do you wish to continue? (y/N) ', $messageCount), false);
             if (!$helper->ask($input, $output, $question)) {
                 return 0;
             }
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($messages as $message) {
             $storage->delete($message->getLocale(), $message->getDomain(), $message->getKey());
             if ($output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL) {
-                $output->writeln(\sprintf(
+                $output->writeln(sprintf(
                     'Deleted empty message "<info>%s</info>" from domain "<info>%s</info>" and locale "<info>%s</info>"',
                     $message->getKey(),
                     $message->getDomain(),

Command/DeleteObsoleteCommand.php

@@ -97,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($input->isInteractive()) {
             $helper = $this->getHelper('question');
-            $question = new ConfirmationQuestion(\sprintf('You are about to remove %d translations. Do you wish to continue? (y/N) ', $messageCount), false);
+            $question = new ConfirmationQuestion(sprintf('You are about to remove %d translations. Do you wish to continue? (y/N) ', $messageCount), false);
             if (!$helper->ask($input, $output, $question)) {
                 return 0;
             }
@@ -110,7 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($messages as $message) {
             $storage->delete($message->getLocale(), $message->getDomain(), $message->getKey());
             if ($output->getVerbosity() > OutputInterface::VERBOSITY_NORMAL) {
-                $output->writeln(\sprintf(
+                $output->writeln(sprintf(
                     'Deleted obsolete message "<info>%s</info>" from domain "<info>%s</info>" and locale "<info>%s</info>"',
                     $message->getKey(),
                     $message->getDomain(),

Command/DownloadCommand.php

@@ -75,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $message = 'The --cache option is deprecated as it\'s now the default behaviour of this command.';
 
             $io->note($message);
-            @\trigger_error($message, \E_USER_DEPRECATED);
+            @trigger_error($message, \E_USER_DEPRECATED);
         }
 
         $configName = $input->getArgument('configuration');
@@ -117,19 +117,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function hashDirectory(string $directory)
     {
-        if (!\is_dir($directory)) {
+        if (!is_dir($directory)) {
             return false;
         }
 
         $finder = new Finder();
         $finder->files()->in($directory)->notName('/~$/')->sortByName();
 
-        $hash = \hash_init('md5');
+        $hash = hash_init('md5');
         foreach ($finder as $file) {
-            \hash_update_file($hash, $file->getRealPath());
+            hash_update_file($hash, $file->getRealPath());
         }
 
-        return \hash_final($hash);
+        return hash_final($hash);
     }
 
     public function cleanParameters(array $raw)
@@ -138,7 +138,7 @@ public function cleanParameters(array $raw)
 
         foreach ($raw as $string) {
             // Assert $string looks like "foo:bar"
-            list($key, $value) = \explode(':', $string, 2);
+            list($key, $value) = explode(':', $string, 2);
             $config[$key][] = $value;
         }
 

Command/ExtractCommand.php

@@ -128,7 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             /** @var Error $error */
             foreach ($errors as $error) {
                 $io->error(
-                    \sprintf("%s\nLine: %s\nMessage: %s", $error->getPath(), $error->getLine(), $error->getMessage())
+                    sprintf("%s\nLine: %s\nMessage: %s", $error->getPath(), $error->getLine(), $error->getMessage())
                 );
             }
         }
@@ -143,7 +143,7 @@ private function getConfiguredFinder(Configuration $config): Finder
         $finder->in($config->getDirs());
 
         foreach ($config->getExcludedDirs() as $exclude) {
-            $finder->notPath($exclude);
+            $finder->exclude($exclude);
         }
 
         foreach ($config->getExcludedNames() as $exclude) {

Command/StatusCommand.php

@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         if ($input->getOption('json')) {
-            $output->writeln(\json_encode($stats));
+            $output->writeln(json_encode($stats));
 
             return 0;
         }

Command/StorageTrait.php

@@ -31,7 +31,7 @@ private function getStorage($configName): StorageService
         if (null === $storage = $this->storageManager->getStorage($configName)) {
             $availableStorages = $this->storageManager->getNames();
 
-            throw new \InvalidArgumentException(\sprintf('Unknown storage "%s". Available storages are "%s".', $configName, \implode('", "', $availableStorages)));
+            throw new \InvalidArgumentException(sprintf('Unknown storage "%s". Available storages are "%s".', $configName, implode('", "', $availableStorages)));
         }
 
         return $storage;