Allow Symfony 7 (#20)

* Allow Symfony 7 * Code improvements
Padam87 · Aug 28, 2024 · e498ed9 · e498ed9
1 parent 0477131
commit e498ed9
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -24,7 +24,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->dump($input);
 

diff --git a/Command/ImportCommand.php b/Command/ImportCommand.php
@@ -26,7 +26,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $path = $this->dump($input);
 

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

diff --git a/DependencyInjection/Padam87CronExtension.php b/DependencyInjection/Padam87CronExtension.php
@@ -12,7 +12,7 @@ class Padam87CronExtension extends Extension
     /**
      * {@inheritDoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

diff --git a/Tests/HelperTest.php b/Tests/HelperTest.php
@@ -25,7 +25,7 @@ private function getConfig(): array
     /**
      * @test
      */
-    public function should_register_single_job_attribute()
+    public function should_register_single_job_attribute(): void
     {
         $commands = [
             new OneAttributeCommand(),
@@ -46,7 +46,7 @@ public function should_register_single_job_attribute()
     /**
      * @test
      */
-    public function should_register_multiple_job_attributes()
+    public function should_register_multiple_job_attributes(): void
     {
         $commands = [
             new TwoAttributesCommand(),
@@ -67,7 +67,7 @@ public function should_register_multiple_job_attributes()
     /**
      * @test
      */
-    public function should_register_job_attributes_on_multiple_commands()
+    public function should_register_job_attributes_on_multiple_commands(): void
     {
         $stdClass = new \stdClass();
         $commands = [
@@ -91,7 +91,7 @@ public function should_register_job_attributes_on_multiple_commands()
     /**
      * @test
      */
-    public function should_ignore_irrelevant_attributes()
+    public function should_ignore_irrelevant_attributes(): void
     {
         $commands = [
             new IrrelevantAttributeCommand(),
@@ -112,7 +112,7 @@ public function should_ignore_irrelevant_attributes()
     /**
      * @test
      */
-    public function should_process_jobs()
+    public function should_process_jobs(): void
     {
         $commands = [new ProcessTestCommand()];
 

diff --git a/Util/Helper.php b/Util/Helper.php
@@ -44,7 +44,7 @@ public function createTab(InputInterface $input, ?array $config = null): Tab
                     continue;
                 }
 
-                $vars[strtoupper($name)] = $value;
+                $vars[strtoupper((string) $name)] = $value;
             }
         }
 
@@ -67,7 +67,7 @@ private function processJob(Job $job, InputInterface $input, array $config, Comm
         );
 
         if ($config['log_dir'] !== null && $job->logFile !== null) {
-            $logDir = rtrim($config['log_dir'], '\\/');
+            $logDir = rtrim((string) $config['log_dir'], '\\/');
             $job->logFile = $logDir.DIRECTORY_SEPARATOR.$job->logFile;
         }
 

diff --git a/Util/Tab.php b/Util/Tab.php
@@ -6,13 +6,13 @@
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-class Tab implements \ArrayAccess
+class Tab implements \ArrayAccess, \Stringable
 {
     /**
      * @var Job[]
      */
-    private $jobs = [];
-    private $vars;
+    private array $jobs = [];
+    private VariableBag $vars;
 
     public function __construct()
     {
@@ -47,7 +47,7 @@ public function offsetSet($offset, $value): void
                 sprintf(
                     'The crontab should only contain instances of "%s", "%s" given',
                     'Padam87\CronBundle\Annotation\Job',
-                    get_class($value)
+                    $value::class
                 )
             );
         }

diff --git a/Util/VariableBag.php b/Util/VariableBag.php
@@ -4,9 +4,9 @@
 
 use Padam87\CronBundle\Attribute\Job;
 
-class VariableBag implements \ArrayAccess
+class VariableBag implements \ArrayAccess, \Stringable
 {
-    private $vars = [];
+    private array $vars = [];
 
     /**
      * {@inheritdoc}

diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
     },
     "require": {
         "php": "^8.1",
-        "symfony/console": "^6.1",
-        "symfony/process": "^6.1",
-        "symfony/config": "^6.1",
-        "symfony/dependency-injection": "^6.1"
+        "symfony/console": "^6.1 || ^7.0",
+        "symfony/process": "^6.1 || ^7.0",
+        "symfony/config": "^6.1 || ^7.0",
+        "symfony/dependency-injection": "^6.1 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"