public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Rename watches array to watchChains to make clearer what they are

pull/715/head
Nils Adermann 2012-05-21 12:39:04 +02:00
parent e817a2e2d7
commit 265533d390
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Composer/DependencyResolver/RuleWatchGraph.php
View File

@ -17,7 +17,7 @@ namespace Composer\DependencyResolver;
*/ */
class RuleWatchGraph class RuleWatchGraph
{ {
protected $watches = array(); protected $watchChains = array();
/** /**
* Alters watch chains for a rule. * Alters watch chains for a rule.
@ -30,28 +30,30 @@ class RuleWatchGraph
} }
foreach (array($node->watch1, $node->watch2) as $literal) { foreach (array($node->watch1, $node->watch2) as $literal) {
if (!isset($this->watches[$literal])) { if (!isset($this->watchChains[$literal])) {
$this->watches[$literal] = new RuleWatchChain; $this->watchChains[$literal] = new RuleWatchChain;
} }
$this->watches[$literal]->unshift($node); $this->watchChains[$literal]->unshift($node);
} }
} }
public function contains($literal) public function contains($literal)
{ {
return isset($this->watches[$literal]); return isset($this->watchChains[$literal]);
} }
public function propagateLiteral($literal, $level, $skipCallback, $conflictCallback, $decideCallback) public function propagateLiteral($literal, $level, $skipCallback, $conflictCallback, $decideCallback)
{ {
if (!isset($this->watches[$literal])) { if (!isset($this->watchChains[$literal])) {
return null; return null;
} }
$this->watches[$literal]->rewind(); $chain = $this->watchChains[$literal];
while ($this->watches[$literal]->valid()) {
$node = $this->watches[$literal]->current(); $chain->rewind();
while ($chain->valid()) {
$node = $chain->current();
$otherWatch = $node->getOtherWatch($literal); $otherWatch = $node->getOtherWatch($literal);
if (!$node->getRule()->isDisabled() && !call_user_func($skipCallback, $otherWatch)) { if (!$node->getRule()->isDisabled() && !call_user_func($skipCallback, $otherWatch)) {
@ -76,7 +78,7 @@ class RuleWatchGraph
call_user_func($decideCallback, $otherWatch, $level, $node->getRule()); call_user_func($decideCallback, $otherWatch, $level, $node->getRule());
} }
$this->watches[$literal]->next(); $chain->next();
} }
return null; return null;
@ -84,12 +86,12 @@ class RuleWatchGraph
protected function moveWatch($fromLiteral, $toLiteral, $node) protected function moveWatch($fromLiteral, $toLiteral, $node)
{ {
if (!isset($this->watches[$toLiteral])) { if (!isset($this->watchChains[$toLiteral])) {
$this->watches[$toLiteral] = new RuleWatchChain; $this->watchChains[$toLiteral] = new RuleWatchChain;
} }
$node->moveWatch($fromLiteral, $toLiteral); $node->moveWatch($fromLiteral, $toLiteral);
$this->watches[$fromLiteral]->remove(); $this->watchChains[$fromLiteral]->remove();
$this->watches[$toLiteral]->unshift($node); $this->watchChains[$toLiteral]->unshift($node);
} }
} }