Merge 3ecd048 into 94af5b5

sonata-project · Jul 6, 2020 · 3e6dfdc · 3e6dfdc
2 parents 94af5b5 + 3ecd048
commit 3e6dfdc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Filter/AbstractDateFilter.php b/src/Filter/AbstractDateFilter.php
@@ -124,7 +124,7 @@ public function getRenderSettings()
      * @param string    $field
      * @param \DateTime $datetime
      */
-    protected function applyType(ProxyQueryInterface $queryBuilder, $operation, $field, \DateTime $datetime = null)
+    protected function applyType(ProxyQueryInterface $queryBuilder, $operation, $field, ?\DateTime $datetime = null)
     {
         $queryBuilder->field($field)->$operation($datetime);
         $this->active = true;

diff --git a/src/Util/ObjectAclManipulator.php b/src/Util/ObjectAclManipulator.php
@@ -27,7 +27,7 @@ class ObjectAclManipulator extends BaseObjectAclManipulator
     /**
      * {@inheritdoc}
      */
-    public function batchConfigureAcls(OutputInterface $output, AdminInterface $admin, UserSecurityIdentity $securityIdentity = null)
+    public function batchConfigureAcls(OutputInterface $output, AdminInterface $admin, ?UserSecurityIdentity $securityIdentity = null)
     {
         $securityHandler = $admin->getSecurityHandler();
         if (!$securityHandler instanceof AclSecurityHandlerInterface) {

diff --git a/tests/Filter/FilterWithQueryBuilderTest.php b/tests/Filter/FilterWithQueryBuilderTest.php
@@ -22,7 +22,7 @@ abstract class FilterWithQueryBuilderTest extends TestCase
     private $queryBuilder;
     private $expr;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->queryBuilder = $this->createMock(Builder::class);
         $this->queryBuilder

diff --git a/tests/Guesser/FilterTypeGuesserTest.php b/tests/Guesser/FilterTypeGuesserTest.php
@@ -109,7 +109,7 @@ public function testGuessTypeWithAssociation(): void
     /**
      * @dataProvider noAssociationData
      */
-    public function testGuessTypeNoAssociation(string $type, string $resultType, int $confidence, string $fieldType = null): void
+    public function testGuessTypeNoAssociation(string $type, string $resultType, int $confidence, ?string $fieldType = null): void
     {
         $classMetadata = $this->prophesize(ClassMetadata::class);