Merge branch 'hotfix/with-alias-function' into main

Author: cristoforocervino

src/SharedQueryBuilder.php

@@ -141,7 +141,7 @@ public function withAlias(string $entity, string $property): string
         }
         $property = \ltrim($property, '.');
 
-        return \sprintf('%s.%s', $entity, $property);
+        return \sprintf('%s.%s', $entityAlias, $property);
     }
 
     public function getEntityForAlias(string $alias): ?string

tests/SharedQueryBuilderAliasesTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+
+namespace Andante\Doctrine\ORM\Tests;
+
+use Andante\Doctrine\ORM\Exception\LogicException;
+use Andante\Doctrine\ORM\Tests\Model\Employee;
+use Andante\Doctrine\ORM\Tests\Model\Organization;
+use Andante\Doctrine\ORM\Tests\Model\Person;
+
+class SharedQueryBuilderAliasesTest extends TestCase
+{
+    public function testWithAlias(): void
+    {
+        $sqb = $this->createSqb();
+        $sqb
+            ->from(Organization::class, 'o')
+            ->join(Person::class, 'p');
+        self::assertSame('o.name', $sqb->withAlias(Organization::class, 'name'));
+        self::assertSame('p.name', $sqb->withAlias(Person::class, 'name'));
+
+        $this->expectException(LogicException::class);
+        $sqb->withAlias(Employee::class, 'name');
+    }
+}

tests/SharedQueryBuilderParametersTest.php

@@ -13,7 +13,6 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use PHPStan\Testing\TestCase;
 
 class SharedQueryBuilderParametersTest extends TestCase
 {
@@ -191,15 +190,6 @@ public function testInvalidParameterNameTypeThrowsException(): void
         $sqb->setParameter(new \stdClass(), 1);
     }
 
-    private function createSqb(): SharedQueryBuilder
-    {
-        return new SharedQueryBuilder(
-            new QueryBuilder(
-                $this->createStub(EntityManagerInterface::class)
-            )
-        );
-    }
-
     /**
      * @param array<string|int, mixed>              $expected
      * @param ArrayCollection<int, Query\Parameter> $parameters

tests/TestCase.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+
+namespace Andante\Doctrine\ORM\Tests;
+
+use Andante\Doctrine\ORM\SharedQueryBuilder;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+
+class TestCase extends \PHPUnit\Framework\TestCase
+{
+    protected function createSqb(): SharedQueryBuilder
+    {
+        return new SharedQueryBuilder(
+            new QueryBuilder(
+                $this->createStub(EntityManagerInterface::class)
+            )
+        );
+    }
+}