Merge branch 'MalteGerth/master'

Module.php

@@ -10,17 +10,9 @@
 namespace LdcUserProfile;
 
 use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
-use Zend\Mvc\MvcEvent;
 
 class Module implements AutoloaderProviderInterface
 {
-    public function onBootstrap(MvcEvent $e)
-    {
-        $sm = $e->getApplication()->getServiceManager();
-        $sm->get('ldc-user-profile_service')->registerExtension(
-	        $sm->get('ldc-user-profile_extension_zfcuser')
-        );
-    }
 
     public function getAutoloaderConfig()
     {

config/ldc-user-profile.global.php.dist

@@ -22,6 +22,14 @@ $settings = array(
      */
     'validation_group_override' => array(),
 
+    /**
+     * Register extensions by adding them with their service manager key and
+     * TRUE as value. Unregister an extension by setting the value to FALSE.
+     */
+    'registered_extensions' => array(
+        'ldc-user-profile_extension_zfcuser' => true,
+    )
+
 );
 
 /**

demo/ExtensionModule/src/ExtensionModule/Extension.php

@@ -13,6 +13,8 @@
 
 class Extension extends AbstractExtension
 {
+
+    protected $session;
 
     public function getName() 
     {

src/LdcUserProfile/Controller/ProfileController.php

@@ -12,10 +12,12 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use LdcUserProfile\Options\ModuleOptions;
 use LdcUserProfile\Service\ProfileService;
-use Zend\Form\Form;
 use Zend\View\Model\ViewModel;
 use Zend\Http\Response;
 
+/**
+ * @method \ZfcUser\Controller\Plugin\ZfcUserAuthentication zfcUserAuthentication()
+ */
 class ProfileController extends AbstractActionController
 {
     protected $moduleOptions;

src/LdcUserProfile/Extensions/ZfcUser/ZfcUserForm.php

@@ -26,7 +26,7 @@ public function __construct(RegistrationOptionsInterface $registrationOptions)
      * Set Registration Options
      *
      * @param  RegistrationOptionsInterface $registrationOptions
-     * @return Register
+     * @return ZfcUserForm
      */
     public function setRegistrationOptions(RegistrationOptionsInterface $registrationOptions)
     {

src/LdcUserProfile/Extensions/ZfcUser/ZfcUserInputFilter.php

@@ -14,6 +14,13 @@
 
 class ZfcUserInputFilter extends RegisterFilter
 {
+
+    /**
+     * Constructor
+     *
+     * @param Validator\NoOtherRecordExists $emailValidator
+     * @param Validator\NoOtherRecordExists $usernameValidator
+     */
     public function __construct($emailValidator, $usernameValidator, RegistrationOptionsInterface $options)
     {
         parent::__construct($emailValidator, $usernameValidator, $options);

src/LdcUserProfile/Options/ModuleOptions.php

@@ -35,6 +35,13 @@ class ModuleOptions extends AbstractOptions
      */
     protected $validationGroupOverrides = array();
 
+    /**
+     * Registered extensions
+     *
+     * @var array
+     */
+    protected $registeredExtensions = array();
+
     public function getIsEnabled()
     {
         return $this->isEnabled;
@@ -76,4 +83,16 @@ public function setValidationGroupOverrides(array $vg)
         return $this;
     }
 
+    public function getRegisteredExtensions()
+    {
+        return $this->registeredExtensions;
+    }
+
+    public function setRegisteredExtensions(array $ext)
+    {
+        $this->registeredExtensions = $ext;
+
+        return $this;
+    }
+
 }

src/LdcUserProfile/Service/ProfileService.php

@@ -55,6 +55,16 @@ public function getExtensions()
         return $this->extensions;
     }
 
+    public function hasExtension($nameOrInstance)
+    {
+        return array_key_Exists(
+            $nameOrInstance instanceof AbstractExtension
+                ? $nameOrInstance->getName()
+                : (string) $nameOrInstance,
+            $this->extensions
+        );
+    }
+
     public function constructFormForUser(UserInterface $user)
     {
         $form = clone $this->getFormPrototype();

src/LdcUserProfile/Service/ProfileServiceFactory.php

@@ -9,6 +9,7 @@
 
 namespace LdcUserProfile\Service;
 
+use LdcUserProfile\Extensions\AbstractExtension;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -20,7 +21,24 @@ class ProfileServiceFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $service = new ProfileService();
-        $service->setModuleOptions($serviceLocator->get('ldc-user-profile_module_options'));
+
+        // Get the module options
+        /* @var \LdcUserProfile\Options\ModuleOptions $moduleOptions */
+        $moduleOptions = $serviceLocator->get('ldc-user-profile_module_options');
+        $service->setModuleOptions($moduleOptions);
+
+        // Register/Unregister the active/inactive extensions
+        foreach ($moduleOptions->getRegisteredExtensions() as $extensionName => $isActive) {
+            if (! $isActive) {
+                $service->unregisterExtension($extensionName);
+                continue;
+            }
+
+            $extension = $serviceLocator->get($extensionName);
+            if ($extension instanceof AbstractExtension) {
+                $service->registerExtension($extension);
+            }
+        }
 
         return $service;
     }

tests/LdcUserProfileTest/Options/ModuleOptionsTest.php

@@ -48,4 +48,22 @@ public function testGetSetValidationGroupOverrides()
         $this->assertEquals($data, $this->options->getValidationGroupOverrides());
     }
 
+    public function testSetValidationGroupOverridesRequiresArray()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->options->setValidationGroupOverrides('foo');
+    }
+
+    public function testGetSetRegisteredExtensions()
+    {
+        $data = array('foo', 'bar');
+        $this->options->setRegisteredExtensions($data);
+        $this->assertEquals($data, $this->options->getRegisteredExtensions());
+    }
+
+    public function testSetRegisteredExtensionsRequiresArray()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->options->setRegisteredExtensions('foo');
+    }
 }

tests/LdcUserProfileTest/Service/ProfileServiceFactoryTest.php

@@ -9,13 +9,14 @@
 
 namespace LdcUserProfileTest\Service;
 
-use LdcUserProfile\Service\ProfileService;
+use LdcUserProfile\Options\ModuleOptions;
 
 class ProfileServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
     public function testCreateService()
     {
         $mockModuleOptions = \Mockery::mock('LdcUserProfile\Options\ModuleOptions');
+        $mockModuleOptions->shouldReceive('getRegisteredExtensions')->andReturn(array());
 
         $serviceManager = new \Zend\ServiceManager\ServiceManager();
         $serviceManager->setService('ldc-user-profile_module_options', $mockModuleOptions);
@@ -26,4 +27,47 @@ public function testCreateService()
         $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
         $this->assertSame($mockModuleOptions, $svc->getModuleOptions());
     }
+
+    public function testCreateServiceWithRegisteredExtension()
+    {
+        $moduleOptions = new ModuleOptions();
+        $moduleOptions->setRegisteredExtensions(array('foo' => true));
+
+        $mockExtension = \Mockery::mock('LdcUserProfile\Extensions\AbstractExtension');
+        $mockExtension->shouldReceive('getName')->andReturn('foo');
+
+        $serviceManager = new \Zend\ServiceManager\ServiceManager();
+        $serviceManager->setService('ldc-user-profile_module_options', $moduleOptions);
+        $serviceManager->setService('foo', $mockExtension);
+
+        $factory = new \LdcUserProfile\Service\ProfileServiceFactory();
+        $svc = $factory->createService($serviceManager);
+
+        $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
+        $this->assertTrue($svc->hasExtension('foo'));
+        $this->assertTrue($svc->hasExtension($mockExtension));
+
+        $extensions = $svc->getExtensions();
+        $this->assertSame($mockExtension, $extensions['foo']);
+    }
+
+    public function testCreateServiceWithUnregisterExtension()
+    {
+        $moduleOptions = new ModuleOptions();
+        $moduleOptions->setRegisteredExtensions(array('foo' => false));
+
+        $mockExtension = \Mockery::mock('LdcUserProfile\Extensions\AbstractExtension');
+        $mockExtension->shouldReceive('getName')->andReturn('foo');
+
+        $serviceManager = new \Zend\ServiceManager\ServiceManager();
+        $serviceManager->setService('ldc-user-profile_module_options', $moduleOptions);
+        //$serviceManager->setService('foo', $mockExtension);
+
+        $factory = new \LdcUserProfile\Service\ProfileServiceFactory();
+        $svc = $factory->createService($serviceManager);
+
+        $this->assertInstanceOf('LdcUserProfile\Service\ProfileService', $svc);
+        $this->assertFalse($svc->hasExtension('foo'));
+        $this->assertFalse($svc->hasExtension($mockExtension));
+    }
 }

tests/LdcUserProfileTest/Service/ProfileServiceTest.php

@@ -46,6 +46,12 @@ public function testRegisterExtensionRejectsInvalidExtension()
         $this->service->registerExtension(new \stdClass());
     }
 
+    public function testRegisterExtensionRejectsNullExtension()
+    {
+        $this->setExpectedException('PHPUnit_Framework_Error');
+        $this->service->registerExtension(null);
+    }
+
     public function testUnregisterExtensionByInstance()
     {
         $ext = $this->testRegisterExtension();
@@ -62,6 +68,20 @@ public function testUnregisterExtensionByName()
         $this->assertArrayNotHasKey('testext', $this->service->getExtensions());
     }
 
+    public function testHasExtensionByName()
+    {
+        $ext = $this->testRegisterExtension();
+
+        $this->assertTrue($this->service->hasExtension($ext->getName()));
+    }
+
+    public function testHasExtensionByInstance()
+    {
+        $ext = $this->testRegisterExtension();
+
+        $this->assertTrue($this->service->hasExtension($ext));
+    }
+
     public function testSaveCallsSaveOnEachRegsiteredExtension()
     {
         $payload = new \stdClass();