Skip to content
Browse files

Jackalope Issue #14 - Renamed methods _and, _or and not in PHPCR\Quer…

…yObjectModelFactoryInterface to andConstraint, orConstraint and notConstraint + Correct version of phpcr-api tests and phpcr
  • Loading branch information...
1 parent 09bbe84 commit 9a88fc0e95416a00ea5d6b916191898781c68379 Daniel Barsotti committed Oct 28, 2011
2 lib/phpcr
@@ -1 +1 @@
-Subproject commit 48f43b2d5c0ef619afaff27b8bb5fd1b3cde223b
+Subproject commit 497eed0ac6a4e69eac8c9ce6c23df7622eba8340
View
6 src/Jackalope/Query/QOM/QueryObjectModelFactory.php
@@ -113,7 +113,7 @@ function descendantNodeJoinCondition($descendantSelectorName, $ancestorSelectorN
/**
* @api
*/
- function _and(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
+ function andConstraint(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
\PHPCR\Query\QOM\ConstraintInterface $constraint2)
{
return new AndConstraint($constraint1, $constraint2);
@@ -123,7 +123,7 @@ function _and(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
/**
* @api
*/
- function _or(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
+ function orConstraint(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
\PHPCR\Query\QOM\ConstraintInterface $constraint2)
{
return new OrConstraint($constraint1, $constraint2);
@@ -133,7 +133,7 @@ function _or(\PHPCR\Query\QOM\ConstraintInterface $constraint1,
/**
* @api
*/
- function not(\PHPCR\Query\QOM\ConstraintInterface $constraint)
+ function notConstraint(\PHPCR\Query\QOM\ConstraintInterface $constraint)
{
return new NotConstraint($constraint);
}
View
6 tests/Jackalope/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
@@ -76,7 +76,7 @@ public function testQueryWithAndConstraint()
$query = $this->factory->createQuery(
$this->factory->selector('nt:unstructured'),
- $this->factory->_and(
+ $this->factory->andConstraint(
$this->factory->comparison($this->factory->propertyValue('jcr:path'), '=', $this->factory->literal('/')),
$this->factory->comparison($this->factory->propertyValue('jcr:path'), '=', $this->factory->literal('/'))
),
@@ -94,7 +94,7 @@ public function testQueryWithOrConstraint()
$query = $this->factory->createQuery(
$this->factory->selector('nt:unstructured'),
- $this->factory->_or(
+ $this->factory->orConstraint(
$this->factory->comparison($this->factory->propertyValue('jcr:path'), '=', $this->factory->literal('/')),
$this->factory->comparison($this->factory->propertyValue('jcr:path'), '=', $this->factory->literal('/'))
),
@@ -112,7 +112,7 @@ public function testQueryWithNotConstraint()
$query = $this->factory->createQuery(
$this->factory->selector('nt:unstructured'),
- $this->factory->not(
+ $this->factory->notConstraint(
$this->factory->comparison($this->factory->propertyValue('jcr:path'), '=', $this->factory->literal('/'))
),
array(),
2 tests/phpcr-api
@@ -1 +1 @@
-Subproject commit 8f7ad21ea464c13487a0f4b02758857282347ea1
+Subproject commit ad8a426509818015825d1d4c55f098ebf8099c2a

0 comments on commit 9a88fc0

Please sign in to comment.
Something went wrong with that request. Please try again.