Skip to content
Permalink
Browse files

Enable further clickability in IDE.

  • Loading branch information...
dereuromark committed Dec 19, 2016
1 parent b0eb42d commit 8ba737192c6ae48b252f3e349f9f37e2046e519c
Showing with 9 additions and 3 deletions.
  1. +2 −0 src/ORM/Behavior/TreeBehavior.php
  2. +5 −1 src/ORM/ResultSet.php
  3. +2 −2 src/ORM/Table.php
@@ -719,6 +719,7 @@ protected function _moveDown($node, $number)
->select([$left, $right])
->where(["$parent IS" => $nodeParent])
->where(function ($exp) use ($config, $nodeRight) {
/* @var \Cake\Database\Expression\QueryExpression $exp */
return $exp->gt($config['leftField'], $nodeRight);
})
->orderAsc($config['leftField'])
@@ -731,6 +732,7 @@ protected function _moveDown($node, $number)
->select([$left, $right])
->where(["$parent IS" => $nodeParent])
->where(function ($exp) use ($config, $nodeRight) {
/* @var \Cake\Database\Expression\QueryExpression $exp */
return $exp->gt($config['leftField'], $nodeRight);
})
->orderDesc($config['leftField'])
@@ -497,7 +497,10 @@ protected function _groupResult($row)
array_intersect_key($row, $keys)
);
if ($this->_hydrate) {
$options['source'] = $matching['instance']->registryAlias();
/** @var \Cake\ORM\Table $table */
$table = $matching['instance'];
$options['source'] = $table->registryAlias();
/** @var \Cake\Datasource\EntityInterface $entity */
$entity = new $matching['entityClass']($results['_matchingData'][$alias], $options);
$entity->clean();
$results['_matchingData'][$alias] = $entity;
@@ -518,6 +521,7 @@ protected function _groupResult($row)
continue;
}
/** @var \Cake\ORM\Association $instance */
$instance = $assoc['instance'];
if (!$assoc['canBeJoined'] && !isset($row[$alias])) {
@@ -2669,8 +2669,8 @@ public function loadInto($entities, array $contain)
public function __debugInfo()
{
$conn = $this->connection();
$associations = $this->_associations ?: false;
$behaviors = $this->_behaviors ?: false;
$associations = $this->_associations;
$behaviors = $this->_behaviors;
return [
'registryAlias' => $this->registryAlias(),

0 comments on commit 8ba7371

Please sign in to comment.
You can’t perform that action at this time.