removed soft_limit setting (#2611)

src/Configuration/SystemConfiguration.php

@@ -249,7 +249,9 @@ class SystemConfiguration implements SystemBundleConfiguration
 
     public function getTimesheetActiveEntriesSoftLimit(): int
     {
-        return (int) $this->find('timesheet.active_entries.soft_limit');
+        @trigger_error('The configuration timesheet.active_entries.soft_limit is deprecated since 1.15', E_USER_DEPRECATED);
+
+        return $this->getTimesheetActiveEntriesHardLimit();
     }
 
     public function getTimesheetDefaultRoundingDays(): string

src/Constants.php

@@ -17,15 +17,15 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = '1.14.1';
+    public const VERSION = '1.15';
     /**
      * The current release: major * 10000 + minor * 100 + patch
      */
-    public const VERSION_ID = 11401;
+    public const VERSION_ID = 11500;
     /**
      * The current release status, either "stable" or "dev"
      */
-    public const STATUS = 'stable';
+    public const STATUS = 'dev';
     /**
      * The software name
      */

src/Controller/SystemConfigurationController.php

@@ -350,13 +350,6 @@ final class SystemConfigurationController extends AbstractController
                         ->setConstraints([
                             new GreaterThanOrEqual(['value' => 1])
                         ]),
-                    (new Configuration())
-                        ->setName('timesheet.active_entries.soft_limit')
-                        ->setType(IntegerType::class)
-                        ->setTranslationDomain('system-configuration')
-                        ->setConstraints([
-                            new GreaterThanOrEqual(['value' => 1])
-                        ]),
                     (new Configuration())
                         ->setName('timesheet.time_increment')
                         ->setType(MinuteIncrementType::class)

src/DependencyInjection/Configuration.php

@@ -199,6 +199,7 @@ class Configuration implements ConfigurationInterface
                     ->children()
                         ->integerNode('soft_limit')
                             ->defaultValue(1)
+                            ->setDeprecated('The node "%node%" at path "%path%" is deprecated, please use "kimai.timesheet.active_entries.hard_limit" instead.')
                             ->validate()
                                 ->ifTrue(function ($value) {
                                     return $value <= 0;

src/Twig/ConfigExtension.php

@@ -41,6 +41,8 @@ final class ConfigExtension extends AbstractExtension
      */
     public function getThemeConfig(string $name)
     {
+        @trigger_error('The twig function "theme_config" was deprecated with 1.15, replace it with the global "kimai_config" variable.', E_USER_DEPRECATED);
+
         switch ($name) {
             case 'auto_reload_datatable':
                 @trigger_error('The configuration auto_reload_datatable is deprecated and was removed with 1.4', E_USER_DEPRECATED);
@@ -48,7 +50,7 @@ final class ConfigExtension extends AbstractExtension
                 return false;
 
             case 'soft_limit':
-                return $this->configuration->getTimesheetActiveEntriesSoftLimit();
+                return $this->configuration->getTimesheetActiveEntriesHardLimit();
 
             default:
                 $name = 'theme.' . $name;