@@ -73,9 +73,7 @@ discard block |
||
73 | 73 | /** |
74 | 74 | * Initialize class. |
75 | 75 | * |
76 | - * @param string $url Base URL for REST calls |
|
77 | 76 | * @param string $driver REST Driver to be used |
78 | - * @param string $json |
|
79 | 77 | */ |
80 | 78 | public function __construct( |
81 | 79 | $driver = self::DEFAULT_DRIVER, |
@@ -89,6 +87,9 @@ discard block |
||
89 | 87 | $this->setRestDriver($this->driver); |
90 | 88 | } |
91 | 89 | |
90 | + /** |
|
91 | + * @param string $url |
|
92 | + */ |
|
92 | 93 | private function setUrl($url) |
93 | 94 | { |
94 | 95 | $this->url = $url; |
@@ -167,6 +168,8 @@ discard block |
||
167 | 168 | |
168 | 169 | /** |
169 | 170 | * @When I send a :type request to :resource (url) |
171 | + * @param string $type |
|
172 | + * @param string $resource |
|
170 | 173 | */ |
171 | 174 | public function createAndSendRequest($type, $resource) |
172 | 175 | { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
32 | - * @param mixed $resource |
|
32 | + * @param string $resource |
|
33 | 33 | * @param string $type |
34 | 34 | * |
35 | 35 | * @return RouteCollection |
@@ -87,7 +87,7 @@ |
||
87 | 87 | * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException if the user is not allowed to delete a content type group |
88 | 88 | * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If a to be deleted content type has instances |
89 | 89 | * |
90 | - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup $ContentTypeGroup |
|
90 | + * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup $contentTypeGroup |
|
91 | 91 | */ |
92 | 92 | public function deleteContentTypeGroup(ContentTypeGroup $contentTypeGroup); |
93 | 93 |
@@ -29,7 +29,8 @@ |
||
29 | 29 | use eZ\Publish\Core\REST\Common\RequestParser; |
30 | 30 | use eZ\Publish\Core\REST\Common\Input\Dispatcher; |
31 | 31 | use eZ\Publish\Core\REST\Common\Output\Visitor; |
32 | -use eZ\Publish\Core\REST\Common\Message; use eZ\Publish\Core\REST\Client\Exceptions\InvalidArgumentValue; |
|
32 | +use eZ\Publish\Core\REST\Common\Message; |
|
33 | +use eZ\Publish\Core\REST\Client\Exceptions\InvalidArgumentValue; |
|
33 | 34 | use eZ\Publish\Core\REST\Common\Exceptions\InvalidArgumentException; |
34 | 35 | use eZ\Publish\Core\REST\Common\Exceptions\ForbiddenException; |
35 | 36 | use eZ\Publish\Core\REST\Client\Exceptions\BadStateException; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | namespace eZ\Publish\Core\REST\Server\Controller; |
12 | 12 | |
13 | 13 | use eZ\Publish\API\Repository\Exceptions\LimitationValidationException; |
14 | -use eZ\Publish\API\Repository\Exceptions\NotFoundException; |
|
14 | +use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; |
|
15 | 15 | use eZ\Publish\Core\Base\Exceptions\ForbiddenException; |
16 | 16 | use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; |
17 | 17 | use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; |
@@ -25,7 +25,6 @@ discard block |
||
25 | 25 | use eZ\Publish\API\Repository\LocationService; |
26 | 26 | use eZ\Publish\API\Repository\Values\User\RoleCreateStruct; |
27 | 27 | use eZ\Publish\API\Repository\Values\User\RoleUpdateStruct; |
28 | -use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; |
|
29 | 28 | use Symfony\Component\HttpFoundation\Request; |
30 | 29 | |
31 | 30 | /** |
@@ -22,6 +22,9 @@ |
||
22 | 22 | return $treeBuilder; |
23 | 23 | } |
24 | 24 | |
25 | + /** |
|
26 | + * @param \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition $rootNode |
|
27 | + */ |
|
25 | 28 | public function addRestRootResourcesSection($rootNode) |
26 | 29 | { |
27 | 30 | $systemNode = $this->generateScopeBaseNode($rootNode); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * |
114 | 114 | * @param string $path The content path |
115 | 115 | * @param array $fields |
116 | - * @param mixed $contentType The content type identifier |
|
116 | + * @param string $contentType The content type identifier |
|
117 | 117 | * |
118 | 118 | * @return mixed location id of the created content |
119 | 119 | */ |
@@ -147,6 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | /** |
149 | 149 | * Maps the path of the content to it's name for later use. |
150 | + * @param string $path |
|
150 | 151 | */ |
151 | 152 | private function mapContentPath($path) |
152 | 153 | { |
@@ -228,6 +228,7 @@ |
||
228 | 228 | * |
229 | 229 | * @param string The field name |
230 | 230 | * @param mixed The field value |
231 | + * @param string|null $field |
|
231 | 232 | */ |
232 | 233 | private function createAndPublishContent($field, $value) |
233 | 234 | { |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | * Search User with given username, optionally at given location. |
65 | 65 | * |
66 | 66 | * @param string $username name of User to search for |
67 | - * @param string $parentGroupLocationId where to search, in User Group tree |
|
67 | + * @param string $parentGroupId where to search, in User Group tree |
|
68 | 68 | * |
69 | - * @return User found |
|
69 | + * @return null|\eZ\Publish\API\Repository\Values\User\User found |
|
70 | 70 | */ |
71 | 71 | public function searchUserByLogin($username, $parentGroupId = null) |
72 | 72 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $name name of User Group to search for |
98 | 98 | * @param string $parentLocationId (optional) parent location id to search in |
99 | 99 | * |
100 | - * @return search results |
|
100 | + * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit[] results |
|
101 | 101 | */ |
102 | 102 | public function searchUserGroups($name, $parentLocationId = null) |
103 | 103 | { |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * Create user inside given User Group; DELETES existing User if login already exists! |
122 | 122 | * |
123 | - * @param $username username of the user to create |
|
124 | - * @param $email email address of user to create |
|
125 | - * @param $password account password for user to create |
|
126 | - * @param $parentGroup pathstring wherein to create user |
|
123 | + * @param string $username username of the user to create |
|
124 | + * @param string $email email address of user to create |
|
125 | + * @param string $password account password for user to create |
|
126 | + * @param \eZ\Publish\API\Repository\Values\User\UserGroup $parentGroup pathstring wherein to create user |
|
127 | 127 | * |
128 | - * @return eZ\Publish\API\Repository\Values\User\User |
|
128 | + * @return \eZ\Publish\API\Repository\Values\User\User |
|
129 | 129 | */ |
130 | 130 | protected function createUser($username, $email, $password, $parentGroup = null, $fields = array()) |
131 | 131 | { |
@@ -319,6 +319,9 @@ discard block |
||
319 | 319 | return false; |
320 | 320 | } |
321 | 321 | |
322 | + /** |
|
323 | + * @param integer $type |
|
324 | + */ |
|
322 | 325 | public function createPasswordHash($login, $password, $type) |
323 | 326 | { |
324 | 327 | switch ($type) { |