From 21c7e219e21c4d7f0814e29be940566c0e84dbe8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 21 May 2012 18:34:12 +0200
Subject: [PATCH] Change "else if" to "elseif"

---
 src/Composer/DependencyResolver/RuleSetGenerator.php | 2 +-
 src/Composer/DependencyResolver/Solver.php           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Composer/DependencyResolver/RuleSetGenerator.php b/src/Composer/DependencyResolver/RuleSetGenerator.php
index efed14163..67bf2fb8b 100644
--- a/src/Composer/DependencyResolver/RuleSetGenerator.php
+++ b/src/Composer/DependencyResolver/RuleSetGenerator.php
@@ -204,7 +204,7 @@ class RuleSetGenerator
 
                     if (($package instanceof AliasPackage) && $package->getAliasOf() === $provider) {
                         $this->addRule(RuleSet::TYPE_PACKAGE, $rule = $this->createRequireRule($package, array($provider), Rule::RULE_PACKAGE_ALIAS, (string) $package));
-                    } else if (!$this->obsoleteImpossibleForAlias($package, $provider)) {
+                    } elseif (!$this->obsoleteImpossibleForAlias($package, $provider)) {
                         $reason = ($package->getName() == $provider->getName()) ? Rule::RULE_PACKAGE_SAME_NAME : Rule::RULE_PACKAGE_IMPLICIT_OBSOLETES;
                         $this->addRule(RuleSet::TYPE_PACKAGE, $rule = $this->createConflictRule($package, $provider, $reason, (string) $package));
                     }
diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php
index 64e31799e..5ec682d57 100644
--- a/src/Composer/DependencyResolver/Solver.php
+++ b/src/Composer/DependencyResolver/Solver.php
@@ -381,7 +381,7 @@ class Solver
                 throw new SolverBugException(
                     "Trying to revert to invalid level ".(int) $newLevel." from level ".(int) $level."."
                 );
-            } else if (!$newRule) {
+            } elseif (!$newRule) {
                 throw new SolverBugException(
                     "No rule was learned from analyzing $rule at level $level."
                 );
@@ -451,7 +451,7 @@ class Solver
 
                 if (1 === $l) {
                     $l1num++;
-                } else if ($level === $l) {
+                } elseif ($level === $l) {
                     $num++;
                 } else {
                     // not level1 or conflict level, add to new rule
@@ -660,7 +660,7 @@ class Solver
 
             if ($foundDisabled && $rule->isEnabled()) {
                 $rule->disable();
-            } else if (!$foundDisabled && $rule->isDisabled()) {
+            } elseif (!$foundDisabled && $rule->isDisabled()) {
                 $rule->enable();
             }
         }