symfony · mleczakm · Apr 7, 2023 · Apr 7, 2023 · Apr 7, 2023 · Apr 7, 2023
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -146,6 +146,13 @@ public function getString(string $key, string $default = ''): string
        return (string) $value;
    }

+    public function getStringOrNull(string $key): ?string
+    {
+        return $this->has($key)
+            ? $this->getString($key)
+            : null;
+    }
+
    /**
     * Returns the parameter value converted to integer.
     */
@@ -155,6 +162,13 @@ public function getInt(string $key, int $default = 0): int
        return $this->filter($key, $default, \FILTER_VALIDATE_INT, ['flags' => \FILTER_REQUIRE_SCALAR]) ?: 0;
    }

+    public function getIntOrNull(string $key): ?int
+    {
+        return $this->has($key)
+            ? $this->getInt($key)
+            : null;
+    }
+
    /**
     * Returns the parameter value converted to boolean.
     */
@@ -163,6 +177,13 @@ public function getBoolean(string $key, bool $default = false): bool
        return $this->filter($key, $default, \FILTER_VALIDATE_BOOL, ['flags' => \FILTER_REQUIRE_SCALAR]);
    }

+    public function getBooleanOrNull(string $key): ?bool
+    {
+        return $this->has($key)
+            ? $this->getBoolean($key)
+            : null;
+    }
+
    /**
     * Returns the parameter value converted to an enum.
     *

diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -378,6 +378,30 @@ public function testGetEnumThrowsExceptionWithInvalidValueType()

        $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
    }
+
+    public function testGetStringOrNull(): void
+    {
+        $bag = new ParameterBag(['valid-value' => 'foo']);
+
+        $this->assertSame('foo', $bag->getStringOrNull('valid-value'));
+        $this->assertNull($bag->getStringOrNull('missing-key'));
+    }
+
+    public function testGetIntOrNull(): void
+    {
+        $bag = new ParameterBag(['valid-value' => 1]);
+
+        $this->assertSame(1, $bag->getIntOrNull('valid-value'));
+        $this->assertNull($bag->getIntOrNull('missing-key'));
+    }
+
+    public function testGetBooleanOrNull(): void
+    {
+        $bag = new ParameterBag(['valid-value' => true]);
+
+        $this->assertTrue($bag->getBooleanOrNull('valid-value'));
+        $this->assertNull($bag->getBooleanOrNull('missing-key'));
+    }
 }

 class InputStringable
-Original file line number
+Diff line change
@@ -146,6 +146,13 @@ public function getString(string $key, string $default = ''): string
             return (string) $value;
         }
+        public function getStringOrNull(string $key): ?string
+        {
+            return $this->has($key)
+                ? $this->getString($key)
+                : null;
+        }
         /**
          * Returns the parameter value converted to integer.
          */
@@ -155,6 +162,13 @@ public function getInt(string $key, int $default = 0): int
             return $this->filter($key, $default, \FILTER_VALIDATE_INT, ['flags' => \FILTER_REQUIRE_SCALAR]) ?: 0;
         }
+        public function getIntOrNull(string $key): ?int
+        {
+            return $this->has($key)
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            GromNaN
  

      

      

      


        Apr 7, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Checking if the value is set is not necessary:

filter_var(null, \FILTER_VALIDATE_INT, \FILTER_NULL_ON_FAILURE) returns null.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            mleczakm
  

      

      

      


        Apr 10, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I've changed it to use getInt implementation instead.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+                ? $this->getInt($key)
+                : null;
+        }
         /**
          * Returns the parameter value converted to boolean.
          */
@@ -163,6 +177,13 @@ public function getBoolean(string $key, bool $default = false): bool
             return $this->filter($key, $default, \FILTER_VALIDATE_BOOL, ['flags' => \FILTER_REQUIRE_SCALAR]);
         }
+        public function getBooleanOrNull(string $key): ?bool
+        {
+            return $this->has($key)
+                ? $this->getBoolean($key)
+                : null;
+        }
         /**
          * Returns the parameter value converted to an enum.
          *
-          Expand Down