Resolved merge conflict

Author: EvanDotPro

src/AdapterBroker.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Serializer
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Serializer;
+
+use Zend\ServiceManager\AbstractPluginManager;
+
+/**
+ * Plugin manager implementation for serializer adapters.
+ *
+ * Enforces that adapters retrieved are instances of
+ * Adapter\AdapterInterface. Additionally, it registers a number of default 
+ * adapters available.
+ *
+ * @category   Zend
+ * @package    Zend_Serializer
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class AdapterPluginManager extends AbstractPluginManager
+{
+    /**
+     * Default set of adapters
+     * 
+     * @var array
+     */
+    protected $invokableClasses = array(
+        'amf0'         => 'Zend\Serializer\Adapter\Amf0',
+        'amf3'         => 'Zend\Serializer\Adapter\Amf3',
+        'igbinary'     => 'Zend\Serializer\Adapter\IgBinary',
+        'json'         => 'Zend\Serializer\Adapter\Json',
+        'phpcode'      => 'Zend\Serializer\Adapter\PhpCode',
+        'phpserialize' => 'Zend\Serializer\Adapter\PhpSerialize',
+        'pythonpickle' => 'Zend\Serializer\Adapter\PythonPickle',
+        'wddx'         => 'Zend\Serializer\Adapter\Wddx',
+    );
+
+    /**
+     * Validate the plugin
+     *
+     * Checks that the adapter loaded is an instance
+     * of Adapter\AdapterInterface.
+     * 
+     * @param  mixed $plugin 
+     * @return void
+     * @throws Exception\RuntimeException if invalid
+     */
+    public function validatePlugin($plugin)
+    {
+        if ($plugin instanceof Adapter\AdapterInterface) {
+            // we're okay
+            return;
+        }
+
+        throw new Exception\RuntimeException(sprintf(
+            'Plugin of type %s is invalid; must implement %s\Adapter\AdapterInterface',
+            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+            __NAMESPACE__
+        ));
+    }
+}
+

src/AdapterLoader.php

@@ -20,8 +20,7 @@
 
 namespace Zend\Serializer;
 
-use Zend\Loader\Broker,
-    Zend\Serializer\Adapter\AdapterInterface as Adapter;
+use Zend\Serializer\Adapter\AdapterInterface as Adapter;
 
 /**
  * @category   Zend
@@ -32,11 +31,11 @@
 class Serializer
 {
     /**
-     * Broker for loading adapters
+     * Plugin manager for loading adapters
      *
-     * @var null|Zend\Loader\Broker
+     * @var null|AdapterPluginManager
      */
-    private static $_adapterBroker = null;
+    private static $_adapters = null;
 
     /**
      * The default adapter.
@@ -58,53 +57,53 @@ public static function factory($adapterName, $opts = array())
             return $adapterName; // $adapterName is already an adapter object
         }
 
-        return self::getAdapterBroker()->load($adapterName, $opts);
+        return self::getAdapterPluginManager()->get($adapterName, $opts);
     }
 
     /**
-     * Get the adapter broker
+     * Get the adapter plugin manager
      *
-     * @return Broker
+     * @return AdapterPluginManager
      */
-    public static function getAdapterBroker() 
+    public static function getAdapterPluginManager() 
     {
-        if (self::$_adapterBroker === null) {
-            self::$_adapterBroker = self::_getDefaultAdapterBroker();
+        if (self::$_adapters === null) {
+            self::$_adapters = self::_getDefaultAdapterPluginManager();
         }
-        return self::$_adapterBroker;
+        return self::$_adapters;
     }
 
     /**
-     * Change the adapter broker
+     * Change the adapter plugin manager
      *
-     * @param  Broker $broker
+     * @param  AdapterPluginManager $adapters
      * @return void
      */
-    public static function setAdapterBroker(Broker $broker) 
+    public static function setAdapterPluginManager(AdapterPluginManager $adapters) 
     {
-        self::$_adapterBroker = $broker;
+        self::$_adapters = $adapters;
     }
 
     /**
-     * Resets the internal adapter broker
+     * Resets the internal adapter plugin manager
      *
-     * @return Broker
+     * @return AdapterPluginManager
      */
-    public static function resetAdapterBroker()
+    public static function resetAdapterPluginManager()
     {
-        self::$_adapterBroker = self::_getDefaultAdapterBroker();
-        return self::$_adapterBroker;
+        self::$_adapters = self::_getDefaultAdapterPluginManager();
+        return self::$_adapters;
     }
 
     /**
-     * Returns a default adapter broker
+     * Returns a default adapter plugin manager
      *
-     * @return Broker
+     * @return AdapterPluginManager
      */
-    protected static function _getDefaultAdapterBroker()
+    protected static function _getDefaultAdapterPluginManager()
     {
-        $broker = new AdapterBroker();
-        return $broker;
+        $adapters = new AdapterPluginManager();
+        return $adapters;
     }
 
     /**

src/AdapterPluginManager.php

@@ -21,11 +21,9 @@
 
 namespace ZendTest\Serializer;
 
-use Zend\Serializer\Serializer,
-    Zend\Serializer\AdapterBroker,
-    Zend\Serializer\Adapter,
-    Zend\Loader\Broker,
-    Zend\Loader\PluginBroker;
+use Zend\Serializer\Adapter;
+use Zend\Serializer\AdapterPluginManager;
+use Zend\Serializer\Serializer;
 
 /**
  * @category   Zend
@@ -43,19 +41,19 @@ public function setUp()
 
     public function tearDown()
     {
-        Serializer::resetAdapterBroker();
+        Serializer::resetAdapterPluginManager();
     }
 
-    public function testGetDefaultAdapterBroker()
+    public function testGetDefaultAdapterPluginManager()
     {
-        $this->assertTrue(Serializer::getAdapterBroker() instanceof AdapterBroker);
+        $this->assertTrue(Serializer::getAdapterPluginManager() instanceof AdapterPluginManager);
     }
 
-    public function testChangeAdapterBroker()
+    public function testChangeAdapterPluginManager()
     {
-        $newBroker = new PluginBroker();
-        Serializer::setAdapterBroker($newBroker);
-        $this->assertTrue(Serializer::getAdapterBroker() === $newBroker);
+        $newPluginManager = new AdapterPluginManager();
+        Serializer::setAdapterPluginManager($newPluginManager);
+        $this->assertTrue(Serializer::getAdapterPluginManager() === $newPluginManager);
     }
 
     public function testDefaultAdapter()
@@ -72,16 +70,16 @@ public function testFactoryValidCall()
 
     public function testFactoryUnknownAdapter()
     {
-        $this->setExpectedException('Zend\Loader\Exception\RuntimeException', 'locate class');
+        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
         Serializer::factory('unknown');
     }
 
     public function testFactoryOnADummyClassAdapter()
     {
-        $this->setExpectedException('Zend\\Serializer\\Exception\\RuntimeException','must implement Zend\\Serializer\\Adapter\\AdapterInterface');
-        $broker = new AdapterBroker();
-        $broker->getClassLoader()->registerPlugin('dummy', 'ZendTest\Serializer\TestAsset\Dummy');
-        Serializer::setAdapterBroker($broker);
+        $adapters = new AdapterPluginManager();
+        $adapters->setInvokableClass('dummy', 'ZendTest\Serializer\TestAsset\Dummy');
+        Serializer::setAdapterPluginManager($adapters);
+        $this->setExpectedException('Zend\\Serializer\\Exception\\RuntimeException', 'AdapterInterface');
         Serializer::factory('dummy');
     }