From e26ae255f175c92019a4fd0c99701546c1b11fc7 Mon Sep 17 00:00:00 2001
From: Giulio De Donato <liuggio@gmail.com>
Date: Sat, 1 Jun 2013 14:28:43 +0200
Subject: [PATCH] moved error into the controller

---
 .../BadgeBundle/Controller/BadgeController.php   | 16 +++++++++++-----
 src/PUGX/BadgeBundle/Service/ImageCreator.php    |  4 ----
 src/PUGX/BadgeBundle/Service/PackageManager.php  |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/PUGX/BadgeBundle/Controller/BadgeController.php b/src/PUGX/BadgeBundle/Controller/BadgeController.php
index daf24bf0..ca968b91 100644
--- a/src/PUGX/BadgeBundle/Controller/BadgeController.php
+++ b/src/PUGX/BadgeBundle/Controller/BadgeController.php
@@ -22,6 +22,10 @@
 
 class BadgeController extends ContainerAware
 {
+    CONST ERROR_TEXT_GENERIC = 'ERR 1 ';
+    CONST ERROR_TEXT_NOT_A_NUMBER = 'ERR 2 ';
+    CONST ERROR_TEXT_CLIENT_EXCEPTION = 'ERR 3 ';
+
     /**
      * @Route("/{repository}/downloads.png",
      *     name         = "pugx_badge",
@@ -53,9 +57,9 @@ public function downloadsAction($repository, $type = 'total')
             $text = $this->container->get('package_manager')->getPackageDownloads($package, $type);
             $status = 200;
         } catch (UnexpectedValueException $e) {
-            $text = ImageCreator::ERROR_TEXT_GENERIC;
+            $text = self::ERROR_TEXT_CLIENT_EXCEPTION;
         } catch (\Exception $e){
-            $text = ImageCreator::ERROR_TEXT_CLIENT_EXCEPTION;
+            $text = self::ERROR_TEXT_GENERIC;
         }
 
         $image = $imageCreator->createDownloadsImage($text);
@@ -87,7 +91,7 @@ public function versionAction($repository, $latest = 'stable')
     {
         $image = null;
         $outputFilename = sprintf('%s.png', $latest);
-        $error = 'Err';
+        $error = self::ERROR_TEXT_GENERIC;
         $status = 500;
 
         try {
@@ -101,8 +105,10 @@ public function versionAction($repository, $latest = 'stable')
             }
 
             $status = 200;
-        } catch (\Exception $e) {
-            $error = 'Err 01';
+        } catch (UnexpectedValueException $e) {
+            $error = self::ERROR_TEXT_CLIENT_EXCEPTION;
+        } catch (\Exception $e){
+            $error = self::ERROR_TEXT_GENERIC;
         }
 
         if (null == $image) {
diff --git a/src/PUGX/BadgeBundle/Service/ImageCreator.php b/src/PUGX/BadgeBundle/Service/ImageCreator.php
index 5cefff40..7b6f5bef 100644
--- a/src/PUGX/BadgeBundle/Service/ImageCreator.php
+++ b/src/PUGX/BadgeBundle/Service/ImageCreator.php
@@ -17,10 +17,6 @@
 
 class ImageCreator implements ImageCreatorInterface
 {
-    CONST ERROR_TEXT_GENERIC = 'ERR 1 ';
-    CONST ERROR_TEXT_NOT_A_NUMBER = 'ERR 2 ';
-    CONST ERROR_TEXT_CLIENT_EXCEPTION = 'ERR 3 ';
-
     private $logger;
     protected $dispatcher;
     protected $imageNames = array('empty' => 'empty.png', 'downloads' => 'downloads.png', 'stable' => 'stable.png', 'unstable' => 'unstable.png');
diff --git a/src/PUGX/BadgeBundle/Service/PackageManager.php b/src/PUGX/BadgeBundle/Service/PackageManager.php
index a68e3286..47d7b2fe 100644
--- a/src/PUGX/BadgeBundle/Service/PackageManager.php
+++ b/src/PUGX/BadgeBundle/Service/PackageManager.php
@@ -41,7 +41,7 @@ public static function instantiatePackage()
     }
 
     /**
-     * Create a new Package decorated from the Api Package.
+     * Create a new Package decorated with the Api Package.
      *
      * @param ApiPackage $apiPackage
      *
@@ -56,7 +56,7 @@ public function instantiateAndDecoratePackage(ApiPackage $apiPackage)
     }
 
     /**
-     * Returns package if found.
+     * Returns package if founded.
      *
      * @param string $repository
      *