Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qom always has a selector name #68

Merged
merged 1 commit into from Jul 26, 2013
Merged

qom always has a selector name #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 24 additions & 23 deletions src/PHPCR/Query/QOM/QueryObjectModelFactoryInterface.php
View file
Open in desktop
Expand Up @@ -83,8 +83,8 @@ public function createQuery(SourceInterface $source,
* available in the repository, the query is valid but the selector selects
* no nodes.
*
* @param string $selectorName the selector name
* @param string $nodeTypeName the name of the required node type
* @param string $selectorName the selector name; non-null
*
* @return SelectorInterface the selector
*
Expand All @@ -96,7 +96,7 @@ public function createQuery(SourceInterface $source,
*
* @api
*/
public function selector($nodeTypeName, $selectorName = null);
public function selector($selectorName, $nodeTypeName);

/**
* Performs a join between two node-tuple sources.
Expand Down Expand Up @@ -324,8 +324,8 @@ public function comparison(DynamicOperandInterface $operand1, $operator,
* - $propertyName is not a syntactically valid JCR name
* - $selectorName is not the name of a selector in the query
*
* @param string $selectorName the selector name
* @param string $propertyName the property name
* @param string $selectorName the selector name; non-null
*
* @return PropertyExistenceInterface the constraint
*
Expand All @@ -337,7 +337,7 @@ public function comparison(DynamicOperandInterface $operand1, $operator,
*
* @api
*/
public function propertyExistence($propertyName, $selectorName = null);
public function propertyExistence($selectorName, $propertyName);

/**
* Performs a full-text search against the specified or default selector.
Expand All @@ -353,11 +353,11 @@ public function propertyExistence($propertyName, $selectorName = null);
* does not have a property named $propertyName, the query is valid but the
* constraint is not satisfied.
*
* @param string $selectorName the selector name
* @param string|null $propertyName the property name, or null to search all
* full-text indexed properties of the node (or node subgraph, in some
* implementations);
* @param string $fullTextSearchExpression the full-text search expression
* @param string $selectorName the selector name; non-null
*
* @return FullTextSearchInterface the constraint
*
Expand All @@ -369,7 +369,7 @@ public function propertyExistence($propertyName, $selectorName = null);
*
* @api
*/
public function fullTextSearch($propertyName, $fullTextSearchExpression, $selectorName = null);
public function fullTextSearch($selectorName, $propertyName, $fullTextSearchExpression);

/**
* Tests whether a node in the specified or default selector is reachable
Expand All @@ -385,8 +385,8 @@ public function fullTextSearch($propertyName, $fullTextSearchExpression, $select
* because of access control constraints), the query is valid but the
* constraint is not satisfied.
*
* @param string $selectorName the selector name
* @param string $path an absolute path
* @param string $selectorName the selector name; non-null
*
* @return \PHPCR\Query\QOM\SameNodeInterface the constraint
*
Expand All @@ -395,7 +395,7 @@ public function fullTextSearch($propertyName, $fullTextSearchExpression, $select
*
* @api
*/
public function sameNode($path, $selectorName = null);
public function sameNode($selectorName, $path);

/**
* Tests whether a node in the specified or default selector is a child of
Expand All @@ -411,8 +411,8 @@ public function sameNode($path, $selectorName = null);
* because of access control constraints), the query is valid but the
* constraint is not satisfied.
*
* @param string $selectorName the selector name
* @param string $path an absolute path
* @param string $selectorName the selector name; non-null
*
* @return \PHPCR\Query\QOM\ChildNodeInterface the constraint
*
Expand All @@ -424,7 +424,7 @@ public function sameNode($path, $selectorName = null);
*
* @api
*/
public function childNode($path, $selectorName = null);
public function childNode($selectorName, $path);

/**
* Tests whether a node in the specified or default selector is a
Expand All @@ -440,8 +440,8 @@ public function childNode($path, $selectorName = null);
* because of access control constraints), the query is valid but the
* constraint is not satisfied.
*
* @param string $selectorName the selector name
* @param string $path an absolute path
* @param string $selectorName the selector name; non-null
*
* @return DescendantNodeInterface the constraint
*
Expand All @@ -453,7 +453,7 @@ public function childNode($path, $selectorName = null);
*
* @api
*/
public function descendantNode($path, $selectorName = null);
public function descendantNode($selectorName, $path);

/**
* Evaluates to the value (or values, if multi-valued) of a property in the
Expand All @@ -463,8 +463,8 @@ public function descendantNode($path, $selectorName = null);
* - $selectorName is not the name of a selector in the query
* - $propertyName is not a syntactically valid JCR name
*
* @param string $selectorName the selector name
* @param string $propertyName the property name
* @param string $selectorName the selector name; non-null
*
* @return PropertyValueInterface the operand
*
Expand All @@ -473,7 +473,7 @@ public function descendantNode($path, $selectorName = null);
*
* @api
*/
public function propertyValue($propertyName, $selectorName = null);
public function propertyValue($selectorName, $propertyName);

/**
* Evaluates to the length (or lengths, if multi-valued) of a property.
Expand All @@ -500,7 +500,7 @@ public function length(PropertyValueInterface $propertyValue);
* The query is invalid if $selectorName is not the name of a selector in
* the query.
*
* @param string $selectorName the selector name; non-null
* @param string $selectorName the selector name
*
* @return NodeNameInterface the operand
*
Expand All @@ -512,7 +512,7 @@ public function length(PropertyValueInterface $propertyValue);
*
* @api
*/
public function nodeName($selectorName = null);
public function nodeName($selectorName);

/**
* Evaluates to a NAME value equal to the local (unprefixed) name of a node
Expand All @@ -521,7 +521,7 @@ public function nodeName($selectorName = null);
* The query is invalid if $selectorName is not the name of a selector in
* the query.
*
* @param string $selectorName the selector name; non-null
* @param string $selectorName the selector name
*
* @return NodeLocalNameInterface the operand
*
Expand All @@ -530,7 +530,7 @@ public function nodeName($selectorName = null);
*
* @api
*/
public function nodeLocalName($selectorName = null);
public function nodeLocalName($selectorName);

/**
* Evaluates to a DOUBLE value equal to the full-text search score of a
Expand All @@ -539,7 +539,7 @@ public function nodeLocalName($selectorName = null);
* The query is invalid if $selectorName is not the name of a selector in
* the query.
*
* @param string $selectorName the selector name; non-null
* @param string $selectorName the selector name
*
* @return FullTextSearchScoreInterface the operand
*
Expand All @@ -551,7 +551,7 @@ public function nodeLocalName($selectorName = null);
*
* @api
*/
public function fullTextSearchScore($selectorName = null);
public function fullTextSearchScore($selectorName);

/**
* Evaluates to the lower-case string value (or values, if multi-valued) of
Expand Down Expand Up @@ -682,12 +682,13 @@ public function descending(DynamicOperandInterface $operand);
* does not have a property named $propertyName, the query is valid and the
* column has null value.
*
* @param string $selectorName the selector name
* @param string|null $propertyName the property name, or null to include a
* column for each single-value non-residual property of the
* selector's node type
* @param string|null $columnName the column name; must be null if
* propertyName is null
* @param string $selectorName the selector name; non-null
* propertyName is null, otherwise must be the the column name for
* this property.
*
* @return ColumnInterface the column
*
Expand All @@ -697,5 +698,5 @@ public function descending(DynamicOperandInterface $operand);
*
* @api
*/
public function column($propertyName, $columnName = null, $selectorName = null);
public function column($selectorName, $propertyName = null, $columnName = null);
}