Skip to content
Snippets Groups Projects
Commit 3b4ec49a authored by Demian Katz's avatar Demian Katz
Browse files

Style fixes.

parent e822a738
No related merge requests found
......@@ -61,7 +61,7 @@ class BackendManager
*
* @return void
*/
public function __construct (ServiceLocatorInterface $registry)
public function __construct(ServiceLocatorInterface $registry)
{
$this->registry = $registry;
}
......@@ -71,7 +71,7 @@ class BackendManager
*
* @return ServiceLocatorInterface
*/
public function getBackendRegistry ()
public function getBackendRegistry()
{
return $this->registry;
}
......@@ -84,16 +84,27 @@ class BackendManager
* @return BackendInterface
*
* @throws UnexpectedValueException Retrieved backend is not an object
* @throws UnexpectedValueException Retrieved backend does not implement BackendInterface
* @throws UnexpectedValueException Retrieved backend does not implement
* BackendInterface
*/
public function get ($name)
public function get($name)
{
$backend = $this->registry->get($name, false);
if (!is_object($backend)) {
throw new UnexpectedValueException(sprintf('Expected backend registry to return object, got %s', gettype($backend)));
throw new UnexpectedValueException(
sprintf(
'Expected backend registry to return object, got %s',
gettype($backend)
)
);
}
if (!$backend instanceOf BackendInterface) {
throw new UnexpectedValueException(sprintf('Object of class %s does not implement the expected interface', get_class($backend)));
throw new UnexpectedValueException(
sprintf(
'Object of class %s does not implement the expected interface',
get_class($backend)
)
);
}
$backend->setIdentifier($name);
return $backend;
......@@ -106,7 +117,7 @@ class BackendManager
*
* @return boolean
*/
public function has ($name)
public function has($name)
{
return $this->registry->has($name);
}
......@@ -114,11 +125,11 @@ class BackendManager
/**
* Listener for search system event `resolve`.
*
* @param EventInterface $e
* @param EventInterface $e Event object
*
* @return BackendInterface|null
*/
public function onResolve (EventInterface $e)
public function onResolve(EventInterface $e)
{
$name = $e->getParam('backend');
if ($name && $this->has($name)) {
......
......@@ -62,12 +62,16 @@ abstract class QueryAdapter
return new Query($search['l'], $handler);
} elseif (isset($search['g'])) {
$operator = $search['g'][0]['b'];
return new QueryGroup($operator, array_map(array('self', 'deminify'), $search['g']));
return new QueryGroup(
$operator, array_map(array('self', 'deminify'), $search['g'])
);
} else {
// Special case: The outer-most group-of-groups.
if (isset($search[0]['j'])) {
$operator = $search[0]['j'];
return new QueryGroup($operator, array_map(array('self', 'deminify'), $search));
return new QueryGroup(
$operator, array_map(array('self', 'deminify'), $search)
);
} else {
// Simple query
return new Query($search[0]['l'], $search[0]['i']);
......@@ -140,15 +144,14 @@ abstract class QueryAdapter
}
// Base 'advanced' query
$output = '('
. join(') ' . call_user_func($translate, $query->getOperator())
. ' (', $groups) . ')';
$operator = call_user_func($translate, $query->getOperator());
$output = '(' . join(') ' . $operator . ' (', $groups) . ')';
// Concatenate exclusion after that
if (count($excludes) > 0) {
$output .= ' ' . call_user_func($translate, 'NOT') . ' (('
. join(') ' . call_user_func($translate, 'OR')
. ' (', $excludes) . '))';
. join(') ' . call_user_func($translate, 'OR') . ' (', $excludes)
. '))';
}
return $output;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment