Coding standards

src/ZfcUser/Db/Adapter/MasterSlaveAdapter.php

@@ -1,8 +1,10 @@
 <?php
 namespace ZfcBase\Db\Adapter;
+
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\Adapter\Platform;
 use Zend\Db\ResultSet;
+
 class MasterSlaveAdapter extends Adapter implements MasterSlaveAdapterInterface
 {
     /**
@@ -17,10 +19,12 @@ class MasterSlaveAdapter extends Adapter implements MasterSlaveAdapterInterface
      * @param Platform\PlatformInterface $platform
      * @param ResultSet\ResultSet $queryResultPrototype
      */
-    public function __construct(Adapter $slaveAdapter, $driver,
-                                Platform\PlatformInterface $platform = null,
-                                ResultSet\ResultSetInterface $queryResultPrototype = null)
-    {
+    public function __construct(
+        Adapter $slaveAdapter,
+        $driver,
+        Platform\PlatformInterface $platform = null,
+        ResultSet\ResultSetInterface $queryResultPrototype = null
+    ) {
         $this->slaveAdapter = $slaveAdapter;
         parent::__construct($driver, $platform, $queryResultPrototype);
     }

src/ZfcUser/Db/Adapter/MasterSlaveAdapterInterface.php

@@ -1,5 +1,6 @@
 <?php
 namespace ZfcUser\Db\Adapter;
+
 interface MasterSlaveAdapterInterface
 {
     /**

src/ZfcUser/EventManager/EventProvider.php

@@ -1,5 +1,6 @@
 <?php
 namespace ZfcUser\EventManager;
+
 use Traversable;
 use Zend\EventManager\EventManagerAwareInterface;
 use Zend\EventManager\EventManagerInterface;

src/ZfcUser/Factory/Controller/RedirectCallbackFactory.php

@@ -8,7 +8,6 @@
 
 namespace ZfcUser\Factory\Controller;
 
-
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
 use Zend\Mvc\Application;

src/ZfcUser/Form/ProvidesEventsForm.php

@@ -1,9 +1,11 @@
 <?php
 namespace ZfcUser\Form;
+
 use Traversable;
 use Zend\Form\Form;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\EventManager;
+
 class ProvidesEventsForm extends Form
 {
     /**

src/ZfcUser/InputFilter/ProvidesEventsInputFilter.php

@@ -1,8 +1,10 @@
 <?php
 namespace ZfcUser\InputFilter;
+
 use Zend\InputFilter\InputFilter;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\EventManager;
+
 class ProvidesEventsInputFilter extends InputFilter
 {
     /**

src/ZfcUser/Mapper/AbstractDbMapper.php

@@ -1,5 +1,6 @@
 <?php
 namespace ZfcUser\Mapper;
+
 use Zend\Db\Adapter\Adapter;
 use Zend\Db\Adapter\Driver\ResultInterface;
 use Zend\Db\ResultSet\HydratingResultSet;
@@ -10,6 +11,7 @@
 use Zend\Hydrator\ClassMethods;
 use ZfcUser\EventManager\EventProvider;
 use ZfcUser\Db\Adapter\MasterSlaveAdapterInterface;
+
 abstract class AbstractDbMapper extends EventProvider
 {
     /**
@@ -92,8 +94,10 @@ protected function select(Select $select, $entityPrototype = null, HydratorInter
     {
         $this->initialize();
         $stmt = $this->getSlaveSql()->prepareStatementForSqlObject($select);
-        $resultSet = new HydratingResultSet($hydrator ?: $this->getHydrator(),
-            $entityPrototype ?: $this->getEntityPrototype());
+        $resultSet = new HydratingResultSet(
+            $hydrator ?: $this->getHydrator(),
+            $entityPrototype ?: $this->getEntityPrototype()
+        );
         $resultSet->initialize($stmt->execute());
         return $resultSet;
     }

src/ZfcUser/Options/ModuleOptions.php

@@ -357,7 +357,7 @@ public function getAllowedLoginStates()
      * @param Array $states
      * @return ModuleOptions
      */
-    public function setAllowedLoginStates(Array $states)
+    public function setAllowedLoginStates(array $states)
     {
         $this->allowedLoginStates = $states;
         return $this;

src/ZfcUser/Options/UserServiceOptionsInterface.php

@@ -5,8 +5,8 @@
 use ZfcUser\Options\RegistrationOptionsInterface;
 
 interface UserServiceOptionsInterface extends
- RegistrationOptionsInterface,
- AuthenticationOptionsInterface
+    RegistrationOptionsInterface,
+    AuthenticationOptionsInterface
 {
     /**
      * set user entity class name

tests/ZfcUserTest/Authentication/Adapter/AbstractAdapterTest.php

@@ -2,7 +2,6 @@
 
 namespace ZfcUserTest\Authentication\Adapter;
 
-
 use ZfcUserTest\Authentication\Adapter\TestAsset\AbstractAdapterExtension;
 
 class AbstractAdapterTest extends \PHPUnit_Framework_TestCase

tests/ZfcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php

@@ -31,7 +31,7 @@ class AdapterChainServiceFactoryTest extends \PHPUnit_Framework_TestCase
 
     protected $serviceLocatorArray;
 
-    public function helperServiceLocator ($index)
+    public function helperServiceLocator($index)
     {
         return $this->serviceLocatorArray[$index];
     }

tests/ZfcUserTest/Controller/UserControllerTest.php

@@ -235,7 +235,6 @@ public function testLoginActionValidFormRedirectFalse($isValid, $wantRedirect)
                 ->will($this->returnValue($expectedResult));
 
             $this->pluginManagerPlugins['forward']= $forwardPlugin;
-
         } else {
             $response = new Response();
 
@@ -429,7 +428,6 @@ public function testAuthenticateAction($wantRedirect, $post, $query, $prepareRes
         ));
 
         if (is_bool($prepareResult)) {
-
             $authResult = $this->getMockBuilder('Zend\Authentication\Result')
                 ->disableOriginalConstructor()
                 ->getMock();
@@ -476,7 +474,6 @@ public function testAuthenticateAction($wantRedirect, $post, $query, $prepareRes
                     ->with($controller::ROUTE_LOGIN)
                     ->will($this->returnValue('user/login'));
                 $this->pluginManagerPlugins['url'] = $url;
-
             } else {
                 $this->redirectCallback->expects($this->once())
                     ->method('__invoke');
@@ -485,7 +482,6 @@ public function testAuthenticateAction($wantRedirect, $post, $query, $prepareRes
             $this->options->expects($this->any())
                 ->method('getUseRedirectParameterIfPresent')
                 ->will($this->returnValue((bool) $wantRedirect));
-
         }
 
         $result = $controller->authenticateAction();
@@ -729,7 +725,6 @@ public function testChangepasswordAction($status, $postRedirectGetReturn, $isVal
             ->will($this->returnValue($postRedirectGetReturn));
 
         if ($postRedirectGetReturn !== false && !($postRedirectGetReturn instanceof Response)) {
-
             $form->expects($this->once())
                 ->method('setData')
                 ->with($postRedirectGetReturn);
@@ -777,7 +772,6 @@ public function testChangepasswordAction($status, $postRedirectGetReturn, $isVal
         if ($postRedirectGetReturn instanceof Response) {
             $this->assertInstanceOf('Zend\Http\Response', $result);
             $this->assertSame($postRedirectGetReturn, $result);
-
         } else {
             if ($postRedirectGetReturn === false) {
                 $exceptedReturn = array(
@@ -875,7 +869,6 @@ public function testChangeEmailAction($status, $postRedirectGetReturn, $isValid,
             ->will($this->returnValue($postRedirectGetReturn));
 
         if ($postRedirectGetReturn !== false && !($postRedirectGetReturn instanceof Response)) {
-
             $form->expects($this->once())
                 ->method('setData')
                 ->with($postRedirectGetReturn);
@@ -885,7 +878,6 @@ public function testChangeEmailAction($status, $postRedirectGetReturn, $isValid,
                 ->will($this->returnValue((bool) $isValid));
 
             if ($isValid) {
-
                 $userService->expects($this->once())
                     ->method('changeEmail')
                     ->with($postRedirectGetReturn)
@@ -920,7 +912,6 @@ public function testChangeEmailAction($status, $postRedirectGetReturn, $isValid,
         if ($postRedirectGetReturn instanceof Response) {
             $this->assertInstanceOf('Zend\Http\Response', $result);
             $this->assertSame($postRedirectGetReturn, $result);
-
         } else {
             if ($postRedirectGetReturn === false) {
                 $exceptedReturn = array(
@@ -985,15 +976,15 @@ public function testSetterGetterServices(
         $this->assertSame($servicePrototype, $result);
     }
 
-    public function providerTrueOrFalse ()
+    public function providerTrueOrFalse()
     {
         return array(
             array(true),
             array(false),
         );
     }
 
-    public function providerTrueOrFalseX2 ()
+    public function providerTrueOrFalseX2()
     {
         return array(
             array(true,true),
@@ -1003,7 +994,7 @@ public function providerTrueOrFalseX2 ()
         );
     }
 
-    public function providerTestAuthenticateAction ()
+    public function providerTestAuthenticateAction()
     {
         // $redirect, $post, $query, $prepareResult = false, $authValid = false
         return array(
@@ -1028,7 +1019,7 @@ public function providerTestAuthenticateAction ()
         );
     }
 
-    public function providerRedirectPostQueryMatrix ()
+    public function providerRedirectPostQueryMatrix()
     {
         return array(
             array(false, false, false),
@@ -1039,7 +1030,7 @@ public function providerRedirectPostQueryMatrix ()
         );
     }
 
-    public function providerTestSetterGetterServices ()
+    public function providerTestSetterGetterServices()
     {
         $that = $this;
         $loginFormCallback[] = function ($that, $controller) {
@@ -1175,7 +1166,7 @@ public function providerTestRegisterAction()
      * @param mixed $value = null
      * @return \ReflectionProperty
      */
-    public function helperMakePropertyAccessable ($objectOrClass, $property, $value = null)
+    public function helperMakePropertyAccessable($objectOrClass, $property, $value = null)
     {
         $reflectionProperty = new \ReflectionProperty($objectOrClass, $property);
         $reflectionProperty->setAccessible(true);

tests/ZfcUserTest/Form/RegisterTest.php

@@ -100,7 +100,7 @@ public function testSetCaptchaElement()
      * @param mixed $value = null
      * @return \ReflectionProperty
      */
-    public function helperMakePropertyAccessable ($objectOrClass, $property, $value = null)
+    public function helperMakePropertyAccessable($objectOrClass, $property, $value = null)
     {
         $reflectionProperty = new \ReflectionProperty($objectOrClass, $property);
         $reflectionProperty->setAccessible(true);

view/zfc-user/user/_form.phtml

@@ -1,13 +1,13 @@
 <?php echo $this->form()->openTag($form) ?>
     <dl class="zend_form">
-        <?php foreach ($form as $element): ?>
-            <?php if ($element->getLabel() != null && !$element instanceof Zend\Form\Element\Button): ?>
+        <?php foreach ($form as $element) : ?>
+            <?php if ($element->getLabel() != null && !$element instanceof Zend\Form\Element\Button) : ?>
                 <dt><?php echo $this->formLabel($element) ?></dt>
             <?php endif ?>
             <dd><?php echo $this->formElement($element) . $this->formElementErrors($element) ?></dd>
         <?php endforeach ?>
     </dl>
-<?php if ($this->redirect): ?>
+<?php if ($this->redirect) : ?>
     <input type="hidden" name="redirect" value="<?php echo $this->redirect ?>">
 <?php endif ?>
 <?php echo $this->form()->closeTag() ?>