Merge branch 'main' into dropphp81

Author: martin-georgiev

.github/actions/release-please/manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "3.6.0"
+  ".": "3.6.1"
 }

.github/workflows/release-please.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Create new release PR
     steps:
-      - uses: googleapis/release-please-action@c2a5a2bd6a758a0937f1ddb1e8950609867ed15c # v4
+      - uses: googleapis/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config-file: .github/actions/release-please/config.json

.github/workflows/sloth.yml

@@ -34,7 +34,7 @@ jobs:
         uses: lendable/sloth@1d0ce54a04a834366b4af63362ffd0a58fc447ad # 0.2.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          interval: 10
+          interval: 15
           ignored: |
             CodeRabbit
             Scrutinizer

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.6.1](https://github.com/martin-georgiev/postgresql-for-doctrine/compare/v3.6.0...v3.6.1) (2025-11-08)
+
+
+### Bug Fixes
+
+* **#473:** Add public getter methods to `Range` value objects ([#477](https://github.com/martin-georgiev/postgresql-for-doctrine/issues/477)) ([9ba319e](https://github.com/martin-georgiev/postgresql-for-doctrine/commit/9ba319ea1d4cfeea48dfa6ab44d1820f51c689a9))
+* **#474:** Support usage of arithmetic expressions in mathematical functions ([#475](https://github.com/martin-georgiev/postgresql-for-doctrine/issues/475)) ([75b025d](https://github.com/martin-georgiev/postgresql-for-doctrine/commit/75b025d636b52621b4be47bd94ea1f163017450e))
+
 ## [3.6.0](https://github.com/martin-georgiev/postgresql-for-doctrine/compare/v3.5.1...v3.6.0) (2025-10-23)
 
 

composer.json

@@ -47,13 +47,13 @@
         "deptrac/deptrac": "^4.0",
         "doctrine/orm": "~2.14||~3.0",
         "ekino/phpstan-banned-code": "^3.0",
-        "friendsofphp/php-cs-fixer": "^3.88.2",
+        "friendsofphp/php-cs-fixer": "^3.89.2",
         "phpstan/phpstan": "^2.1.31",
         "phpstan/phpstan-deprecation-rules": "^2.0.3",
-        "phpstan/phpstan-doctrine": "^2.0.10",
+        "phpstan/phpstan-doctrine": "^2.0.11",
         "phpstan/phpstan-phpunit": "^2.0.7",
         "phpunit/phpunit": "^10.5.58",
-        "rector/rector": "^2.2.3",
+        "rector/rector": "^2.2.7",
         "symfony/cache": "^6.4||^7.0"
     },
     "suggest": {

src/MartinGeorgiev/Doctrine/DBAL/Types/ValueObject/Range.php

@@ -23,6 +23,10 @@ abstract class Range implements \Stringable
 
     protected const EMPTY_RANGE_STRING = 'empty';
 
+    /**
+     * @param R|null $lower
+     * @param R|null $upper
+     */
     public function __construct(
         protected readonly mixed $lower,
         protected readonly mixed $upper,
@@ -140,4 +144,29 @@ public static function infinite(): static
     {
         return new static(null, null, false, false);
     }
+
+    public function getLower(): \DateTimeInterface|float|int|null
+    {
+        return $this->lower;
+    }
+
+    public function getUpper(): \DateTimeInterface|float|int|null
+    {
+        return $this->upper;
+    }
+
+    public function isLowerBracketInclusive(): bool
+    {
+        return $this->isLowerBracketInclusive;
+    }
+
+    public function isUpperBracketInclusive(): bool
+    {
+        return $this->isUpperBracketInclusive;
+    }
+
+    public function isExplicitlyEmpty(): bool
+    {
+        return $this->isExplicitlyEmpty;
+    }
 }

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/BaseArithmeticFunction.php

@@ -13,7 +13,7 @@ abstract class BaseArithmeticFunction extends BaseVariadicFunction
 {
     protected function getNodeMappingPattern(): array
     {
-        return ['ArithmeticPrimary'];
+        return ['SimpleArithmeticExpression'];
     }
 
     protected function getMinArgumentCount(): int

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Gamma.php

@@ -17,6 +17,6 @@ class Gamma extends BaseFunction
     protected function customizeFunction(): void
     {
         $this->setFunctionPrototype('gamma(%s)');
-        $this->addNodeMapping('ArithmeticPrimary');
+        $this->addNodeMapping('SimpleArithmeticExpression');
     }
 }

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Lgamma.php

@@ -17,6 +17,6 @@ class Lgamma extends BaseFunction
     protected function customizeFunction(): void
     {
         $this->setFunctionPrototype('lgamma(%s)');
-        $this->addNodeMapping('ArithmeticPrimary');
+        $this->addNodeMapping('SimpleArithmeticExpression');
     }
 }

tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/CbrtTest.php

@@ -49,10 +49,20 @@ public function can_calculate_cube_root_of_negative_number(): void
     #[Test]
     public function can_calculate_cube_root_of_column_value(): void
     {
-        $dql = 'SELECT CBRT(n.decimal1) as result 
-                FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsNumerics n 
+        $dql = 'SELECT CBRT(n.decimal1) as result
+                FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsNumerics n
                 WHERE n.id = 1';
         $result = $this->executeDqlQuery($dql);
         $this->assertEqualsWithDelta(2.1897595699439445, $result[0]['result'], 0.0001);
     }
+
+    #[Test]
+    public function can_calculate_cube_root_of_arithmetic_expression(): void
+    {
+        $dql = 'SELECT CBRT(n.integer1 + n.integer2 - 3) as result
+                FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsNumerics n
+                WHERE n.id = 1';
+        $result = $this->executeDqlQuery($dql);
+        $this->assertEqualsWithDelta(3.0, $result[0]['result'], 0.0001);
+    }
 }