diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 1886cdf520d..c95021e9914 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2160,11 +2160,6 @@ parameters: count: 2 path: src/Sulu/Bundle/AudienceTargetingBundle/Controller/TargetGroupController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/AudienceTargetingBundle/Controller/TargetGroupController.php - - message: "#^Parameter \\#2 \\$fieldDescriptors of method Sulu\\\\Component\\\\Rest\\\\RestHelperInterface\\:\\:initializeListBuilder\\(\\) expects array\\, array\\\\|null given\\.$#" count: 1 @@ -8205,16 +8200,6 @@ parameters: count: 1 path: src/Sulu/Bundle/ContactBundle/Controller/AccountController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/AccountController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/AccountController.php - - message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#" count: 2 @@ -8540,16 +8525,6 @@ parameters: count: 1 path: src/Sulu/Bundle/ContactBundle/Controller/ContactController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/ContactController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/ContactController.php - - message: "#^Parameter \\#1 \\$listBuilder of method Sulu\\\\Bundle\\\\ContactBundle\\\\Controller\\\\ContactController\\:\\:prepareListResponse\\(\\) expects Sulu\\\\Component\\\\Rest\\\\ListBuilder\\\\Doctrine\\\\DoctrineListBuilder, Sulu\\\\Component\\\\Rest\\\\ListBuilder\\\\ListBuilderInterface given\\.$#" count: 1 @@ -8655,16 +8630,6 @@ parameters: count: 1 path: src/Sulu/Bundle/ContactBundle/Controller/ContactTitleController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/ContactTitleController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/ContactTitleController.php - - message: "#^Parameter \\#1 \\$item of method Sulu\\\\Bundle\\\\ContactBundle\\\\Controller\\\\ContactTitleController\\:\\:addAndUpdateTitles\\(\\) expects array, mixed given\\.$#" count: 1 @@ -8705,16 +8670,6 @@ parameters: count: 1 path: src/Sulu/Bundle/ContactBundle/Controller/PositionController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/PositionController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/ContactBundle/Controller/PositionController.php - - message: "#^Parameter \\#1 \\$item of method Sulu\\\\Bundle\\\\ContactBundle\\\\Controller\\\\PositionController\\:\\:addAndUpdatePositions\\(\\) expects array, mixed given\\.$#" count: 1 @@ -14545,21 +14500,11 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Content/Types/SingleMediaSelection.php - - - message: "#^If condition is always true\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\AbstractMediaController\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\AbstractMediaController\\:\\:getUploadedFile\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\File\\\\UploadedFile but returns mixed\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Collection\\\\Manager\\\\CollectionManagerInterface\\:\\:getById\\(\\) invoked with 8 parameters, 2\\-6 required\\.$#" count: 1 @@ -14580,36 +14525,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:checkSystemCollection\\(\\) has no return type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:checkSystemCollection\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:checkSystemCollection\\(\\) has parameter \\$parent with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:deleteAction\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:getAction\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:getOffset\\(\\) has parameter \\$limit with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:getRequestParameter\\(\\) should return string but returns mixed\\.$#" count: 1 @@ -14620,21 +14535,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:putAction\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\CollectionController\\:\\:saveEntity\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - message: "#^Parameter \\#2 \\$collections of class Sulu\\\\Bundle\\\\MediaBundle\\\\Api\\\\RootCollection constructor expects array, array\\\\|Doctrine\\\\ORM\\\\Tools\\\\Pagination\\\\Paginator given\\.$#" count: 1 @@ -14645,16 +14545,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - message: "#^Parameter \\#3 \\$limit of method Sulu\\\\Bundle\\\\MediaBundle\\\\Collection\\\\Manager\\\\CollectionManagerInterface\\:\\:get\\(\\) expects int\\|null, mixed given\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - - message: "#^Parameter \\#3 \\$limit of method Sulu\\\\Bundle\\\\MediaBundle\\\\Collection\\\\Manager\\\\CollectionManagerInterface\\:\\:getTree\\(\\) expects int, mixed given\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - message: "#^Parameter \\#5 \\$depth of method Sulu\\\\Bundle\\\\MediaBundle\\\\Collection\\\\Manager\\\\CollectionManagerInterface\\:\\:getTree\\(\\) expects int, mixed given\\.$#" count: 1 @@ -14690,11 +14580,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\FormatController\\:\\:cgetAction\\(\\) has no return type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/FormatController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\FormatController\\:\\:getRequestParameter\\(\\) should return string but returns mixed\\.$#" count: 1 @@ -14720,11 +14605,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaController\\:\\:deleteVersionAction\\(\\) has no return type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaController\\:\\:getListBuilder\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#" count: 1 @@ -14735,11 +14615,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaController\\:\\:getListRepresentation\\(\\) has no return type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaController\\:\\:getRequestParameter\\(\\) should return string but returns mixed\\.$#" count: 1 @@ -14765,16 +14640,6 @@ parameters: count: 1 path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - message: "#^Parameter \\#2 \\$fieldDescriptors of method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaController\\:\\:getListBuilder\\(\\) expects array\\, array\\\\|null given\\.$#" count: 1 @@ -14820,16 +14685,6 @@ parameters: count: 2 path: src/Sulu/Bundle/MediaBundle/Controller/MediaController.php - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaFormatController\\:\\:cpatchAction\\(\\) has no return type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php - - - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaFormatController\\:\\:cpatchAction\\(\\) has parameter \\$id with no type specified\\.$#" - count: 1 - path: src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php - - message: "#^Method Sulu\\\\Bundle\\\\MediaBundle\\\\Controller\\\\MediaFormatController\\:\\:getRequestParameter\\(\\) should return string but returns mixed\\.$#" count: 1 @@ -18915,11 +18770,6 @@ parameters: count: 2 path: src/Sulu/Bundle/MediaBundle/Tests/Unit/Media/Manager/MediaManagerTest.php - - - message: "#^Parameter \\#1 \\$uploadedFile of method Sulu\\\\Bundle\\\\MediaBundle\\\\Media\\\\Manager\\\\MediaManager\\:\\:save\\(\\) expects Symfony\\\\Component\\\\HttpFoundation\\\\File\\\\UploadedFile, null given\\.$#" - count: 2 - path: src/Sulu/Bundle/MediaBundle/Tests/Unit/Media/Manager/MediaManagerTest.php - - message: "#^Property Sulu\\\\Bundle\\\\MediaBundle\\\\Media\\\\Manager\\\\MediaManagerTest\\:\\:\\$categoryManager is never read, only written\\.$#" count: 1 @@ -29080,16 +28930,6 @@ parameters: count: 1 path: src/Sulu/Bundle/SecurityBundle/Controller/UserController.php - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseDelete\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/SecurityBundle/Controller/UserController.php - - - - message: "#^Parameter \\#1 \\$id of method Sulu\\\\Component\\\\Rest\\\\AbstractRestController\\:\\:responseGetById\\(\\) expects string, int given\\.$#" - count: 1 - path: src/Sulu/Bundle/SecurityBundle/Controller/UserController.php - - message: "#^Property Sulu\\\\Bundle\\\\SecurityBundle\\\\Controller\\\\UserController\\:\\:\\$doctrineListBuilderFactory \\(Doctrine\\\\ORM\\\\EntityManagerInterface\\) does not accept Sulu\\\\Component\\\\Rest\\\\ListBuilder\\\\Doctrine\\\\DoctrineListBuilderFactoryInterface\\.$#" count: 1 diff --git a/src/Sulu/Bundle/MediaBundle/Collection/Manager/CollectionManagerInterface.php b/src/Sulu/Bundle/MediaBundle/Collection/Manager/CollectionManagerInterface.php index 04b9c78ef30..53d9373c3e5 100644 --- a/src/Sulu/Bundle/MediaBundle/Collection/Manager/CollectionManagerInterface.php +++ b/src/Sulu/Bundle/MediaBundle/Collection/Manager/CollectionManagerInterface.php @@ -83,7 +83,7 @@ public function getTreeById($id, $locale); * * @param string $locale the locale which the collection should be return * @param int $offset - * @param int $limit + * @param int|null $limit * @param string $search * @param int $depth maximum depth for query * @param array $sortBy diff --git a/src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php b/src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php index a16f7967fbd..538247a689e 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/AbstractMediaController.php @@ -41,7 +41,7 @@ protected function getData(Request $request, $fallback = true) /** * @param Request $request * - * @return string + * @return string|null */ protected function getTitleFromUpload($request) { @@ -54,15 +54,20 @@ protected function getTitleFromUpload($request) return \implode('.', \explode('.', $uploadedFile->getClientOriginalName(), -1)); } + + return null; } /** * @param string $name * - * @return UploadedFile + * @return UploadedFile|null */ protected function getUploadedFile(Request $request, $name) { - return $request->files->get($name); + /** @var UploadedFile|null $file */ + $file = $request->files->get($name); + + return $file; } } diff --git a/src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php b/src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php index 0eba898e4ef..c9c7e7fc51e 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/CollectionController.php @@ -135,7 +135,9 @@ public function __construct( /** * Shows a single collection with the given id. * - * @return \Symfony\Component\HttpFoundation\Response + * @param int $id + * + * @return Response */ public function getAction($id, Request $request) { @@ -154,11 +156,12 @@ public function getAction($id, Request $request) try { $locale = $this->getRequestParameter($request, 'locale', true); - $depth = \intval($request->get('depth', 0)); + $depth = \intval($this->getRequestParameter($request, 'depth', false, 0)); $breadcrumb = $this->getBooleanRequestParameter($request, 'breadcrumb', false, false); $children = $this->getBooleanRequestParameter($request, 'children', false, false); // filter children + /** @var int|null $limit */ $limit = $request->get('limit', null); $offset = $this->getOffset($request, $limit); $search = $this->listRestHelper->getSearchPattern(); @@ -205,7 +208,7 @@ function($id) use ($locale, $depth, $breadcrumb, $filter, $sortBy, $sortOrder, $ /** * lists all collections. * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ public function cgetAction(Request $request) { @@ -213,6 +216,7 @@ public function cgetAction(Request $request) $flat = $this->getBooleanRequestParameter($request, 'flat', false); $depth = $request->get('depth', 0); $parentId = $request->get('parentId', null); + /** @var int|null $limit */ $limit = $request->get('limit', null); $offset = $this->getOffset($request, $limit); $search = $this->listRestHelper->getSearchPattern(); @@ -281,7 +285,7 @@ public function cgetAction(Request $request) /** * Creates a new collection. * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ public function postAction(Request $request) { @@ -291,7 +295,9 @@ public function postAction(Request $request) /** * Edits the existing collection with the given id. * - * @return \Symfony\Component\HttpFoundation\Response + * @param int $id + * + * @return Response * * @throws \Sulu\Component\Rest\Exception\EntityNotFoundException */ @@ -303,10 +309,13 @@ public function putAction($id, Request $request) /** * Delete a collection with the given id. * - * @return \Symfony\Component\HttpFoundation\Response + * @param int $id + * + * @return Response */ public function deleteAction($id, Request $request) { + /** @var string|null $parent */ $parent = $request->get('parent'); $this->checkSystemCollection($id, $parent); @@ -368,7 +377,7 @@ protected function moveEntity($id, Request $request) } /** - * @return mixed[] + * @return array */ protected function getData(Request $request) { @@ -387,10 +396,13 @@ protected function getData(Request $request) } /** - * @return \Symfony\Component\HttpFoundation\Response + * @param int|null $id + * + * @return Response */ protected function saveEntity($id, Request $request) { + /** @var string|null $parent */ $parent = $request->get('parent'); $breadcrumb = $this->getBooleanRequestParameter($request, 'breadcrumb', false, false); @@ -412,6 +424,12 @@ protected function saveEntity($id, Request $request) return $this->handleView($view); } + /** + * @param string|int|null $id + * @param string|int|null $parent + * + * @return void + */ private function checkSystemCollection($id, $parent) { if ((null !== $id && $this->systemCollectionManager->isSystemCollection(\intval($id))) @@ -422,6 +440,8 @@ private function checkSystemCollection($id, $parent) } /** + * @param int|null $limit + * * @return int */ private function getOffset(Request $request, $limit) @@ -439,6 +459,9 @@ public function getSecurityContext() return MediaAdmin::SECURITY_CONTEXT; } + /** + * @return string + */ public function getSecuredClass() { return $this->collectionClass; diff --git a/src/Sulu/Bundle/MediaBundle/Controller/FormatController.php b/src/Sulu/Bundle/MediaBundle/Controller/FormatController.php index 61a38434ba8..1e4ea9c71de 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/FormatController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/FormatController.php @@ -18,6 +18,7 @@ use Sulu\Component\Rest\ListBuilder\CollectionRepresentation; use Sulu\Component\Rest\RequestParametersTrait; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; class FormatController extends AbstractRestController implements ClassResourceInterface { @@ -37,6 +38,9 @@ public function __construct( $this->formatManager = $formatManager; } + /** + * @return Response + */ public function cgetAction(Request $request) { $locale = $this->getRequestParameter($request, 'locale', true); diff --git a/src/Sulu/Bundle/MediaBundle/Controller/MediaController.php b/src/Sulu/Bundle/MediaBundle/Controller/MediaController.php index df17916aa3e..75ae445f30e 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/MediaController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/MediaController.php @@ -256,7 +256,7 @@ public function cgetAction(Request $request) /** * @deprecated */ - private function getListRepresentation(Request $request) + private function getListRepresentation(Request $request): ListRepresentation { $locale = $this->getRequestParameter($request, 'locale', true); $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors('media'); @@ -322,11 +322,10 @@ private function getListRepresentation(Request $request) * @deprecated * * @param FieldDescriptorInterface[] $fieldDescriptors - * @param array $types * * @return DoctrineListBuilder */ - private function getListBuilder(Request $request, array $fieldDescriptors, $types) + private function getListBuilder(Request $request, array $fieldDescriptors, array $types) { $listBuilder = $this->doctrineListBuilderFactory->create($this->mediaClass); $this->restHelper->initializeListBuilder($listBuilder, $fieldDescriptors); @@ -405,7 +404,7 @@ private function getListBuilder(Request $request, array $fieldDescriptors, $type /** * Creates a new media. * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response * * @throws \Sulu\Bundle\MediaBundle\Media\Exception\CollectionNotFoundException */ @@ -419,7 +418,7 @@ public function postAction(Request $request) * * @param int $id The id of the media to update * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response * * @throws \Sulu\Component\Rest\Exception\EntityNotFoundException */ @@ -433,7 +432,7 @@ public function putAction($id, Request $request) * * @param int $id * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ public function deleteAction($id) { @@ -454,6 +453,8 @@ public function deleteAction($id) * @param int $id * @param string $version * + * @return Response + * * @throws \Sulu\Component\Rest\Exception\MissingParameterException */ public function deleteVersionAction($id, $version) @@ -522,7 +523,7 @@ protected function moveEntity($id, Request $request) /** * @param int|null $id * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ protected function saveEntity($id, Request $request) { @@ -540,6 +541,9 @@ protected function saveEntity($id, Request $request) return $this->handleView($view); } + /** + * @return string + */ public function getSecurityContext() { return MediaAdmin::SECURITY_CONTEXT; diff --git a/src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php b/src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php index 61ca59168c4..fa40fddcbf8 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/MediaFormatController.php @@ -87,6 +87,11 @@ public function putAction($id, $key, Request $request) return $this->handleView($this->view($formatOptions)); } + /** + * @param int $id + * + * @return Response + */ public function cpatchAction($id, Request $request) { $formatOptions = $request->request->all(); diff --git a/src/Sulu/Bundle/MediaBundle/Controller/MediaPreviewController.php b/src/Sulu/Bundle/MediaBundle/Controller/MediaPreviewController.php index 14dbd0427d4..0e297df1d50 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/MediaPreviewController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/MediaPreviewController.php @@ -23,6 +23,7 @@ use Sulu\Bundle\MediaBundle\Media\Manager\MediaManagerInterface; use Sulu\Component\Media\SystemCollections\SystemCollectionManagerInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; /** @@ -73,7 +74,7 @@ public function __construct( * * @param int $id * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response * * @throws \Sulu\Bundle\MediaBundle\Media\Exception\CollectionNotFoundException */ @@ -130,7 +131,7 @@ public function postAction($id, Request $request) * * @param int $id * - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ public function deleteAction($id, Request $request) { diff --git a/src/Sulu/Bundle/MediaBundle/Controller/MediaStreamController.php b/src/Sulu/Bundle/MediaBundle/Controller/MediaStreamController.php index 0d5e0a63883..7447e31743a 100644 --- a/src/Sulu/Bundle/MediaBundle/Controller/MediaStreamController.php +++ b/src/Sulu/Bundle/MediaBundle/Controller/MediaStreamController.php @@ -98,7 +98,7 @@ public function __construct( } /** - * @return \Symfony\Component\HttpFoundation\Response + * @return Response */ public function getImageAction(Request $request) { diff --git a/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManager.php b/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManager.php index 7aae561fefa..517989e98f6 100644 --- a/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManager.php +++ b/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManager.php @@ -497,7 +497,7 @@ private function modifyMedia($uploadedFile, $data, $user) /** * Prepares data. * - * @param UploadedFile $uploadedFile + * @param UploadedFile|null $uploadedFile * @param array $data * @param UserInterface|null $user * diff --git a/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManagerInterface.php b/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManagerInterface.php index 4522b8c0e82..7d0fb1681b5 100644 --- a/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManagerInterface.php +++ b/src/Sulu/Bundle/MediaBundle/Media/Manager/MediaManagerInterface.php @@ -73,7 +73,7 @@ public function getByIds(array $ids, $locale/*, $permission = null */); /** * Creates a new media or overrides an existing one. * - * @param UploadedFile $uploadedFile + * @param UploadedFile|null $uploadedFile * @param array $data The data of the category to save * @param int|null $userId The id of the user, who is doing this change * diff --git a/src/Sulu/Component/Rest/RestControllerTrait.php b/src/Sulu/Component/Rest/RestControllerTrait.php index e935dc5f852..c1f94be0978 100644 --- a/src/Sulu/Component/Rest/RestControllerTrait.php +++ b/src/Sulu/Component/Rest/RestControllerTrait.php @@ -108,7 +108,7 @@ public function replaceOrAddUrlString($url, $key, $value, $add = true) * Returns the response with the entity with the given id, or a response with a status of 404, in case the entity * is not found. The find method is injected by a callback. * - * @param string $id + * @param string|int $id * @param callable $findCallback * * @return View @@ -135,7 +135,7 @@ protected function responseGetById($id, $findCallback) * Deletes the entity with the given id using the deleteCallback and return a successful response, or an error * message with a 4xx status code. * - * @param string $id + * @param string|int $id * @param callable $deleteCallback * * @return \FOS\RestBundle\View\View