From 326faf2b5193cdb33c02a7afc4dd3382abbb1b2c Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 2 May 2013 17:41:55 +0200
Subject: [PATCH] Minor cleanups

---
 src/Composer/DependencyResolver/Pool.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Composer/DependencyResolver/Pool.php b/src/Composer/DependencyResolver/Pool.php
index 11c792048..992e30aee 100644
--- a/src/Composer/DependencyResolver/Pool.php
+++ b/src/Composer/DependencyResolver/Pool.php
@@ -209,9 +209,7 @@ class Pool
     */
     public function packageById($id)
     {
-        $this->ensurePackageIsLoaded($this->packages[$id - 1]);
-
-        return $this->packages[$id - 1];
+        return $this->ensurePackageIsLoaded($this->packages[$id - 1]);
     }
 
     /**
@@ -355,7 +353,8 @@ class Pool
                 $this->packageByName[$name][$data['id']] = $package;
             }
             $package->setId($data['id']);
-            $data = $package;
+
+            return $package;
         }
 
         return $data;