From 11d1bb0cdd387b2b194a105357eebc7916e10e12 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 13:32:36 -0400
Subject: [PATCH] Renamed cart service to VuFind\Cart.

---
 module/VuFind/config/module.config.php                 | 2 +-
 module/VuFind/src/VuFind/Controller/AjaxController.php | 2 +-
 module/VuFind/src/VuFind/Controller/CartController.php | 2 +-
 module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index aad0f174aca..c4ece74f728 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -315,7 +315,7 @@ $config = array(
         ),
         'invokables' => array(
             'VuFind\AuthManager' => 'VuFind\Auth\Manager',
-            'cart' => 'VuFind\Cart',
+            'VuFind\Cart' => 'VuFind\Cart',
             'cachemanager' => 'VuFind\Cache\Manager',
             'mailer' => 'VuFind\Mailer',
             'recordloader' => 'VuFind\Record\Loader',
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index a51c523aa7c..3069516272f 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -1176,7 +1176,7 @@ class AjaxController extends AbstractBase
                 self::STATUS_ERROR
             );
         }
-        $this->getServiceLocator()->get('Cart')->removeItems($ids);
+        $this->getServiceLocator()->get('VuFind\Cart')->removeItems($ids);
         return $this->output(array('delete' => true), self::STATUS_OK);
     }
 
diff --git a/module/VuFind/src/VuFind/Controller/CartController.php b/module/VuFind/src/VuFind/Controller/CartController.php
index e29392b775c..6efe3d8f96b 100644
--- a/module/VuFind/src/VuFind/Controller/CartController.php
+++ b/module/VuFind/src/VuFind/Controller/CartController.php
@@ -59,7 +59,7 @@ class CartController extends AbstractBase
      */
     protected function getCart()
     {
-        return $this->getServiceLocator()->get('Cart');
+        return $this->getServiceLocator()->get('VuFind\Cart');
     }
 
     /**
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php
index 4fb2081cd2c..29fe5e03903 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Cart.php
@@ -45,6 +45,6 @@ class Cart extends AbstractServiceLocator
      */
     public function __invoke()
     {
-        return $this->getServiceLocator()->get('Cart');
+        return $this->getServiceLocator()->get('VuFind\Cart');
     }
 }
\ No newline at end of file
-- 
GitLab