|
5 | 5 | require_once 'Sql2TestQueries.php';
|
6 | 6 |
|
7 | 7 | use Jackalope\Query\QOM; // TODO get rid of jackalope dependency
|
| 8 | +use PHPCR\Query\QOM\ConstraintInterface; |
| 9 | +use PHPCR\Query\QOM\QueryObjectModelFactoryInterface; |
| 10 | +use PHPCR\Query\QOM\SourceInterface; |
| 11 | +use PHPCR\Test\BaseCase; |
8 | 12 | use PHPCR\Util\QOM\QomToSql2QueryConverter;
|
9 | 13 | use PHPCR\Util\QOM\Sql2Generator;
|
10 | 14 | use PHPCR\Query\QOM\QueryObjectModelConstantsInterface as Constants;
|
|
13 | 17 | /**
|
14 | 18 | * Test for PHPCR\Util\QOM\QomToSql2QueryConverter
|
15 | 19 | */
|
16 |
| -class QomToSql2ConverterTest extends \PHPCR\Test\BaseCase |
| 20 | +class QomToSql2ConverterTest extends BaseCase |
17 | 21 | {
|
18 | 22 | /**
|
19 |
| - * @var \PHPCR\Util\QOM\QomToSql2QueryConverter |
| 23 | + * @var QomToSql2QueryConverter |
20 | 24 | */
|
21 | 25 | protected $parser;
|
22 | 26 |
|
23 | 27 | /**
|
24 |
| - * @var \PHPCR\Query\QOM\QueryObjectModelFactoryInterface |
| 28 | + * @var QueryObjectModelFactoryInterface |
25 | 29 | */
|
26 | 30 | protected $factory;
|
27 | 31 |
|
@@ -382,11 +386,11 @@ public function testColumns()
|
382 | 386 | * Assert that a QOM query specified by its source, columns, constraint and orderings
|
383 | 387 | * will be converted in the expected SQL2 query.
|
384 | 388 | *
|
385 |
| - * @param string $expectedSql2 The expected SQL2 query |
386 |
| - * @param \PHPCR\Query\QOM\SourceInterface $source The source of the QOM query |
387 |
| - * @param array $columns The columns of the QOM query |
388 |
| - * @param \PHPCR\Query\QOM\ContraintInterface $constraint The contraint of the QOM query |
389 |
| - * @param array $ordering The orderings of the QOM query |
| 389 | + * @param string $expectedSql2 The expected SQL2 query |
| 390 | + * @param SourceInterface $source The source of the QOM query |
| 391 | + * @param array $columns The columns of the QOM query |
| 392 | + * @param ConstraintInterface $constraint The contraint of the QOM query |
| 393 | + * @param array $ordering The orderings of the QOM query |
390 | 394 | */
|
391 | 395 | protected function assertQuery($expectedSql2, $source, $columns = array(), $constraint = null, $ordering = array())
|
392 | 396 | {
|
|
0 commit comments