Fix certain non empty options having a default null value

Author: HypeMC

README.md

@@ -60,7 +60,7 @@ Symfony bundle which provides a way to version your application using various ve
             handler:              git
 
             # The message to use for the VCS commit.
-            commit_message:       null
+            commit_message:       'Update application version to %s'
 
             # The mode for applying tags to version commits:
             # - 'always': automatically add a tag without prompting
@@ -69,7 +69,7 @@ Symfony bundle which provides a way to version your application using various ve
             tagging_mode:         ask # One of "always"; "never"; "ask"
 
             # The message to use for the VCS tag.
-            tag_message:          null
+            tag_message:          'Update application version to %s'
 
             # The name used for the VCS commit information,
             # set to null to use the default VCS configuration.

src/DependencyInjection/Configuration.php

@@ -5,6 +5,7 @@
 namespace Bizkit\VersioningBundle\DependencyInjection;
 
 use Bizkit\VersioningBundle\Command\IncrementCommand;
+use Bizkit\VersioningBundle\VCS\VCSHandlerInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -67,7 +68,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->scalarNode('commit_message')
                             ->info('The message to use for the VCS commit.')
                             ->cannotBeEmpty()
-                            ->defaultNull()
+                            ->defaultValue(VCSHandlerInterface::DEFAULT_MESSAGE)
                         ->end()
                         ->enumNode('tagging_mode')
                             ->values(IncrementCommand::TAGGING_MODES)
@@ -78,23 +79,20 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->scalarNode('tag_message')
                             ->info('The message to use for the VCS tag.')
                             ->cannotBeEmpty()
-                            ->defaultNull()
+                            ->defaultValue(VCSHandlerInterface::DEFAULT_MESSAGE)
                         ->end()
 
                         ->scalarNode('name')
                             ->info("The name used for the VCS commit information,\nset to null to use the default VCS configuration.")
-                            ->cannotBeEmpty()
                             ->defaultNull()
                         ->end()
                         ->scalarNode('email')
                             ->info("The email used for the VCS commit information,\nset to null to use the default VCS configuration.")
-                            ->cannotBeEmpty()
                             ->defaultNull()
                         ->end()
 
                         ->scalarNode('path_to_executable')
                             ->info("The path to the VCS executable,\nset to null for autodiscovery.")
-                            ->cannotBeEmpty()
                             ->defaultNull()
                         ->end()
                     ->end()

src/VCS/GitHandler.php

@@ -13,8 +13,6 @@
 
 final class GitHandler implements VCSHandlerInterface
 {
-    private const DEFAULT_MESSAGE = 'Update application version to %s';
-
     /**
      * @var string
      */

src/VCS/VCSHandlerInterface.php

@@ -9,6 +9,8 @@
 
 interface VCSHandlerInterface
 {
+    public const DEFAULT_MESSAGE = 'Update application version to %s';
+
     public function commit(StyleInterface $io, Version $version): void;
 
     public function tag(StyleInterface $io, Version $version): void;

tests/DependencyInjection/BizkitVersioningExtensionTest.php

@@ -269,10 +269,10 @@ public function testParametersAreRegistered(): void
         self::assertSame(__DIR__.'/version.yaml', $container->getParameter('bizkit_versioning.file'));
 
         self::assertTrue($container->hasParameter('bizkit_versioning.vcs_commit_message'));
-        self::assertNull($container->getParameter('bizkit_versioning.vcs_commit_message'));
+        self::assertSame(VCSHandlerInterface::DEFAULT_MESSAGE, $container->getParameter('bizkit_versioning.vcs_commit_message'));
 
         self::assertTrue($container->hasParameter('bizkit_versioning.vcs_tag_message'));
-        self::assertNull($container->getParameter('bizkit_versioning.vcs_tag_message'));
+        self::assertSame(VCSHandlerInterface::DEFAULT_MESSAGE, $container->getParameter('bizkit_versioning.vcs_tag_message'));
 
         self::assertTrue($container->hasParameter('bizkit_versioning.vcs_name'));
         self::assertNull($container->getParameter('bizkit_versioning.vcs_name'));

tests/DependencyInjection/ConfigurationTest.php

@@ -25,9 +25,9 @@ public function testDefaultConfig(): void
             'format' => 'yaml',
             'vcs' => [
                 'handler' => 'git',
-                'commit_message' => null,
+                'commit_message' => 'Update application version to %s',
                 'tagging_mode' => 'ask',
-                'tag_message' => null,
+                'tag_message' => 'Update application version to %s',
                 'name' => null,
                 'email' => null,
                 'path_to_executable' => null,
@@ -44,9 +44,9 @@ public function testConfigWhenVCSIsTrue(): void
         self::assertArrayHasKey('vcs', $config);
         self::assertSame([
             'handler' => 'git',
-            'commit_message' => null,
+            'commit_message' => 'Update application version to %s',
             'tagging_mode' => 'ask',
-            'tag_message' => null,
+            'tag_message' => 'Update application version to %s',
             'name' => null,
             'email' => null,
             'path_to_executable' => null,
@@ -62,9 +62,9 @@ public function testConfigWhenVCSIsFalse(): void
         self::assertArrayHasKey('vcs', $config);
         self::assertSame([
             'handler' => null,
-            'commit_message' => null,
+            'commit_message' => 'Update application version to %s',
             'tagging_mode' => 'ask',
-            'tag_message' => null,
+            'tag_message' => 'Update application version to %s',
             'name' => null,
             'email' => null,
             'path_to_executable' => null,