[UPDATE] Rename to

symfony · Neirda24 · Jul 28, 2023 · Jul 30, 2023 · Sep 7, 2023 · Sep 7, 2023
commit ad36be4d41e1344781cf50a55c2536bc316858a8
diff --git a/src/Symfony/Bundle/FeatureToggleBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FeatureToggleBundle/DependencyInjection/Configuration.php
@@ -67,7 +67,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->always()
                             ->then(static function (array $strategy): array {
                                 $defaultWith = match ($strategy['type']) {
-                                    'date' => ['from' => null, 'until' => null, 'includeFrom' => false, 'includeUntil' => false],
+                                    'date' => ['since' => null, 'until' => null, 'includeSince' => false, 'includeUntil' => false],
                                     'not' => ['strategy' => null],
                                     'env', 'request_header', 'request_query', 'request_attribute' => ['name' => null],
                                     'priority', 'affirmative', 'unanimous' => ['strategies' => null],
@@ -86,8 +86,8 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 /** @var ConfigurationStrategy $strategy */
                                 $validator = match ($strategy['type']) {
                                     'date' => static function (array $with): void {
-                                        if ('' === trim((string) $with['from'].(string) $with['until'])) {
-                                            throw new \InvalidArgumentException('Either "from" or "until" must be provided.');
+                                        if ('' === trim((string) $with['since'].(string) $with['until'])) {
+                                            throw new \InvalidArgumentException('Either "since" or "until" must be provided.');
                                         }
                                     },
                                     'not' => static function (array $with): void {

diff --git a/src/Symfony/Bundle/FeatureToggleBundle/DependencyInjection/FeatureToggleExtension.php b/src/Symfony/Bundle/FeatureToggleBundle/DependencyInjection/FeatureToggleExtension.php
@@ -106,9 +106,9 @@ private function generateStrategy(string $type, array $with): Definition
 
         return match ($type) {
             'date' => $definition->setArguments([
-                '$from' => new Definition(\DateTimeImmutable::class, [$with['from']]),
+                '$since' => new Definition(\DateTimeImmutable::class, [$with['since']]),
                 '$until' => new Definition(\DateTimeImmutable::class, [$with['until']]),
-                '$includeFrom' => $with['includeFrom'],
+                '$includeSince' => $with['includeSince'],
                 '$includeUntil' => $with['includeUntil'],
             ]),
             'env' => $definition->setArguments(['$envName' => $with['name']]),

diff --git a/src/Symfony/Bundle/FeatureToggleBundle/Resources/config/strategies.php b/src/Symfony/Bundle/FeatureToggleBundle/Resources/config/strategies.php
@@ -25,9 +25,9 @@
         '$envName' => abstract_arg('Defined in FeatureToggleExtension'),
     ]);
     $services->set($prefix.'date', DateStrategy::class)->abstract()->args([
-        '$from' => abstract_arg('Defined in FeatureToggleExtension'),
+        '$since' => abstract_arg('Defined in FeatureToggleExtension'),
         '$until' => abstract_arg('Defined in FeatureToggleExtension'),
-        '$includeFrom' => abstract_arg('Defined in FeatureToggleExtension'),
+        '$includeSince' => abstract_arg('Defined in FeatureToggleExtension'),
         '$includeUntil' => abstract_arg('Defined in FeatureToggleExtension'),
         '$clock' => service('clock')->nullOnInvalid(),
     ]);

diff --git a/...mfony/Bundle/FeatureToggleBundle/Tests/DependencyInjection/FeatureToggleExtensionTest.php b/...mfony/Bundle/FeatureToggleBundle/Tests/DependencyInjection/FeatureToggleExtensionTest.php
@@ -39,7 +39,7 @@ public function getConfig(): array
                     [
                         'name' => 'date.feature-strategy',
                         'type' => 'date',
-                        'with' => ['from' => '-2 days'],
+                        'with' => ['since' => '-2 days'],
                     ],
                     [
                         'name' => 'env.feature-strategy',

diff --git a/src/Symfony/Component/FeatureToggle/Strategy/DateStrategy.php b/src/Symfony/Component/FeatureToggle/Strategy/DateStrategy.php
@@ -18,12 +18,12 @@ final class DateStrategy implements StrategyInterface
 {
     public function __construct(
         private readonly ClockInterface $clock,
-        private readonly \DateTimeImmutable|null $from = null,
+        private readonly \DateTimeImmutable|null $since = null,
         private readonly \DateTimeImmutable|null $until = null,
-        private readonly bool $includeFrom = true,
+        private readonly bool $includeSince = true,
         private readonly bool $includeUntil = true,
     ) {
-        if (null === $this->from && null === $this->until) {
+        if (null === $this->since && null === $this->until) {
             throw new \InvalidArgumentException('Either from or until must be provided.');
         }
     }
@@ -32,12 +32,12 @@ public function compute(): StrategyResult
     {
         $now = $this->clock->now();
 
-        if (null !== $this->from) {
-            if ($this->includeFrom && $this->from > $now) {
+        if (null !== $this->since) {
+            if ($this->includeSince && $this->since > $now) {
                 return StrategyResult::Deny;
             }
 
-            if (!$this->includeFrom && $this->from >= $now) {
+            if (!$this->includeSince && $this->since >= $now) {
                 return StrategyResult::Deny;
             }
         }