@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return ClientsController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\ClientsTable |
|
38 | + * @return ClientsTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -39,11 +39,11 @@ |
||
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
42 | - $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | - $resultSetPrototype = new ResultSet(); |
|
42 | + $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | + $resultSetPrototype = new ResultSet(); |
|
44 | 44 | $resultSetPrototype->setArrayObjectPrototype(new Clients()); |
45 | - $tableGateway = new TableGateway('clients', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new ClientsTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('clients', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new ClientsTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return SettingsController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\SettingsTable |
|
38 | + * @return SettingsTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -39,11 +39,11 @@ |
||
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
42 | - $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | - $resultSetPrototype = new ResultSet(); |
|
42 | + $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | + $resultSetPrototype = new ResultSet(); |
|
44 | 44 | $resultSetPrototype->setArrayObjectPrototype(new Settings()); |
45 | - $tableGateway = new TableGateway('settings', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new SettingsTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('settings', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new SettingsTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\UserProfileTable |
|
38 | + * @return UserProfileTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -39,11 +39,11 @@ |
||
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
42 | - $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | - $resultSetPrototype = new ResultSet(); |
|
42 | + $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | + $resultSetPrototype = new ResultSet(); |
|
44 | 44 | $resultSetPrototype->setArrayObjectPrototype(new UserProfile()); |
45 | - $tableGateway = new TableGateway('userprofile', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new UserProfileTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('userprofile', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new UserProfileTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return UsersController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\UserTable |
|
38 | + * @return UserTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -39,11 +39,11 @@ |
||
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
42 | - $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | - $resultSetPrototype = new ResultSet(); |
|
42 | + $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
43 | + $resultSetPrototype = new ResultSet(); |
|
44 | 44 | $resultSetPrototype->setArrayObjectPrototype(new User()); |
45 | - $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new UserTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new UserTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -24,9 +24,8 @@ discard block |
||
24 | 24 | /** |
25 | 25 | * Create service |
26 | 26 | * |
27 | - * @param ServiceLocatorInterface $serviceLocator |
|
28 | 27 | * |
29 | - * @return mixed |
|
28 | + * @return ZfcuserController |
|
30 | 29 | * / |
31 | 30 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 31 | { |
@@ -38,7 +37,7 @@ discard block |
||
38 | 37 | * Create service |
39 | 38 | * |
40 | 39 | * @param ServiceLocatorInterface $controllerManager |
41 | - * @return mixed |
|
40 | + * @return ZfcuserController |
|
42 | 41 | */ |
43 | 42 | public function createService(ServiceLocatorInterface $controllerManager) |
44 | 43 | { |
@@ -102,7 +102,7 @@ |
||
102 | 102 | * Set Authentication-related Options |
103 | 103 | * |
104 | 104 | * @param AuthenticationOptionsInterface $authOptions |
105 | - * @return Login |
|
105 | + * @return RequestPasswordResetForm |
|
106 | 106 | */ |
107 | 107 | public function setAuthenticationOptions(AuthenticationOptionsInterface $authOptions) |
108 | 108 | { |
@@ -42,7 +42,7 @@ |
||
42 | 42 | $label = $emailElement->getLabel('label'); |
43 | 43 | // @TODO: make translation-friendly |
44 | 44 | foreach ($this->getAuthenticationOptions()->getAuthIdentityFields() as $mode) { |
45 | - $label = (!empty($label) ? $label . ' or ' : '') . ucfirst($mode); |
|
45 | + $label = (!empty($label) ? $label.' or ' : '').ucfirst($mode); |
|
46 | 46 | } |
47 | 47 | $emailElement->setLabel($label); |
48 | 48 |