Support Symfony 6 (#1278)

* allow up to symfony 6 * set branch alias * prepare for symfony 6 removing deprecations * reformat annotations to workin in php7 and 8 * deprecation fix * update readme * revert branch alias * added missing return * remove extra line * sort alphabetically Co-authored-by: ychadwick <ychadwick>
phiamo · Sep 29, 2022 · d8ba5a0 · d8ba5a0
1 parent 76b7bf1
commit d8ba5a0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/Command/BaseBootstrapSymlinkCommand.php b/Command/BaseBootstrapSymlinkCommand.php
@@ -158,7 +158,7 @@ abstract protected function getTwitterBootstrapName();
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->input = $input;
         $this->output = $output;
@@ -179,7 +179,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $this->output->writeln('<error>Could not find composer and manual option not specified!</error>');
 
-            return;
+            return 0;
         }
 
         // Automatically detect if on Win XP where symlink will allways fail
@@ -205,6 +205,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $this->output->writeln(' ... <info>OK</info>');
+
+        return 0;
     }
 
     protected function getBootstrapPathsFromUser()

diff --git a/Command/BootstrapSymlinkLessCommand.php b/Command/BootstrapSymlinkLessCommand.php
@@ -11,9 +11,12 @@
 
 namespace Mopa\Bundle\BootstrapBundle\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
+
 /**
  * Command to create Bootstrap symlink to MopaBootstrapBundle.
  */
+#[AsCommand(name: 'mopa:bootstrap:symlink:less')]
 class BootstrapSymlinkLessCommand extends BaseBootstrapSymlinkCommand
 {
     public static $mopaBootstrapBundleName = 'mopa/bootstrap-bundle';

diff --git a/Command/BootstrapSymlinkSassCommand.php b/Command/BootstrapSymlinkSassCommand.php
@@ -11,9 +11,12 @@
 
 namespace Mopa\Bundle\BootstrapBundle\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
+
 /**
  * Command to create Bootstrap (SASS) symlink to MopaBootstrapBundle.
  */
+#[AsCommand(name: 'mopa:bootstrap:symlink:sass')]
 class BootstrapSymlinkSassCommand extends BaseBootstrapSymlinkCommand
 {
     public static $twitterBootstrapName = 'twbs/bootstrap-sass';

diff --git a/Command/InstallFontCommand.php b/Command/InstallFontCommand.php
@@ -13,6 +13,7 @@
 
 use Mopa\Bridge\Composer\Adapter\ComposerAdapter;
 use Mopa\Bridge\Composer\Util\ComposerPathFinder;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -23,6 +24,7 @@
 /**
  * Command to create Bootstrap symlink to MopaBootstrapBundle.
  */
+#[AsCommand(name: 'mopa:bootstrap:install:font')]
 class InstallFontCommand extends Command
 {
     public static $iconSetsPaths = [
@@ -70,7 +72,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $finder = new Finder();
         $iconWebPath = $this->kernel->getProjectDir().\DIRECTORY_SEPARATOR.'web'.\DIRECTORY_SEPARATOR.'fonts';
@@ -98,6 +100,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln('Font: '.$this->iconSet.' Installed... <info>OK</info>');
+
+        return 0;
     }
 
     public static function installFonts()

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder(self::KEY);
         $rootNode = $treeBuilder->getRootNode();

diff --git a/Form/Type/TabType.php b/Form/Type/TabType.php
@@ -51,7 +51,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'tab';
     }

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Versions and dependencies
 
 | MopaBootstrapBundle        | Bootstrap | Symfony                  | PHP            |
 | -------------------------- | --------- | ------------------------ | -------------- |
-| [**3.4**] (**master**)     | ^3.0      | ^4.4 \|\| ^5.1           | ^7.2 \|\| ^8.0 |
+| [**3.4**] (**master**)     | ^3.0      | ^4.4 \|\| ^5.1 \|\| ^6.1 | ^7.2 \|\| ^8.0 |
 | [**3.3**] (**3.3**)        | ^3.0      | ^2.3 \|\| ^3.0 \|\| ^4.0 |                |
 | [**3.2**] (*unmaintained*) | ^3.0      | ^2.3 \|\| ^3.0           |                |
 | [**3.1**] (*unmaintained*) | ^3.0      | ^2.3 \|\| ^3.0           |                |

diff --git a/composer.json b/composer.json
@@ -23,15 +23,15 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "mopa/composer-bridge": "^1.3",
-        "symfony/console": "^4.4 || ^5.1",
-        "symfony/form": "^4.4 || ^5.1",
-        "symfony/framework-bundle": "^4.4 || ^5.1",
-        "symfony/twig-bundle": "^4.4 || ^5.1",
+        "symfony/console": "^4.4 || ^5.1 || ^6.0",
+        "symfony/form": "^4.4 || ^5.1 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
+        "symfony/twig-bundle": "^4.4 || ^5.1 || ^6.0",
         "twig/twig": "^2.9 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^9.4",
-        "symfony/security-bundle": "^4.4 || ^5.1",
+        "symfony/security-bundle": "^4.4 || ^5.1 || ^6.0",
         "symfony/translation-contracts": "^2.0"
     },
     "suggest": {