Fixed inspection issues.

This commit is contained in:
Jan Böhmer 2020-02-02 14:05:36 +01:00
parent 16497b76c5
commit 96d7e4c9f4
45 changed files with 448 additions and 89 deletions

View file

@ -50,9 +50,12 @@ class AttachmentTypeController extends BaseAdminController
/**
* @Route("/{id}", name="attachment_type_delete", methods={"DELETE"})
*
* @param Request $request
* @param AttachmentType $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return RedirectResponse
*/
public function delete(Request $request, AttachmentType $entity, StructuralElementRecursionHelper $recursionHelper)
public function delete(Request $request, AttachmentType $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
return $this->_delete($request, $entity, $recursionHelper);
}
@ -61,9 +64,12 @@ class AttachmentTypeController extends BaseAdminController
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="attachment_type_edit")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param AttachmentType $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(AttachmentType $entity, Request $request, EntityManagerInterface $em)
public function edit(AttachmentType $entity, Request $request, EntityManagerInterface $em): Response
{
return $this->_edit($entity, $request, $em);
}
@ -72,9 +78,12 @@ class AttachmentTypeController extends BaseAdminController
* @Route("/new", name="attachment_type_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -82,9 +91,12 @@ class AttachmentTypeController extends BaseAdminController
/**
* @Route("/export", name="attachment_type_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -92,9 +104,12 @@ class AttachmentTypeController extends BaseAdminController
/**
* @Route("/{id}/export", name="attachment_type_export")
*
* @param AttachmentType $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -40,7 +40,9 @@ use InvalidArgumentException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Contracts\Translation\TranslatorInterface;
@ -75,7 +77,8 @@ abstract class BaseAdminController extends AbstractController
$this->attachmentSubmitHandler = $attachmentSubmitHandler;
}
protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em)
protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em) : Response
{
$this->denyAccessUnlessGranted('read', $entity);
@ -234,7 +237,7 @@ abstract class BaseAdminController extends AbstractController
]);
}
protected function _delete(Request $request, AbstractNamedDBElement $entity, StructuralElementRecursionHelper $recursionHelper)
protected function _delete(Request $request, AbstractNamedDBElement $entity, StructuralElementRecursionHelper $recursionHelper) : RedirectResponse
{
$this->denyAccessUnlessGranted('delete', $entity);
@ -270,7 +273,7 @@ abstract class BaseAdminController extends AbstractController
return $this->redirectToRoute($this->route_base.'_new');
}
protected function _exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
protected function _exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
$entity = new $this->entity_class();
@ -281,7 +284,7 @@ abstract class BaseAdminController extends AbstractController
return $exporter->exportEntityFromRequest($entities, $request);
}
protected function _exportEntity(AbstractNamedDBElement $entity, EntityExporter $exporter, Request $request)
protected function _exportEntity(AbstractNamedDBElement $entity, EntityExporter $exporter, Request $request): \Symfony\Component\HttpFoundation\Response
{
$this->denyAccessUnlessGranted('read', $entity);

View file

@ -50,9 +50,12 @@ class CategoryController extends BaseAdminController
/**
* @Route("/{id}", name="category_delete", methods={"DELETE"})
*
* @param Request $request
* @param Category $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return RedirectResponse
*/
public function delete(Request $request, Category $entity, StructuralElementRecursionHelper $recursionHelper)
public function delete(Request $request, Category $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
return $this->_delete($request, $entity, $recursionHelper);
}
@ -61,9 +64,12 @@ class CategoryController extends BaseAdminController
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="category_edit")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param Category $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Category $entity, Request $request, EntityManagerInterface $em)
public function edit(Category $entity, Request $request, EntityManagerInterface $em): Response
{
return $this->_edit($entity, $request, $em);
}
@ -72,9 +78,12 @@ class CategoryController extends BaseAdminController
* @Route("/new", name="category_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -82,9 +91,12 @@ class CategoryController extends BaseAdminController
/**
* @Route("/export", name="category_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -92,9 +104,12 @@ class CategoryController extends BaseAdminController
/**
* @Route("/{id}/export", name="category_export")
*
* @param Category $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Category $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Category $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -52,9 +52,12 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/{id}", name="currency_delete", methods={"DELETE"})
*
* @param Request $request
* @param Currency $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return RedirectResponse
*/
public function delete(Request $request, Currency $entity, StructuralElementRecursionHelper $recursionHelper)
public function delete(Request $request, Currency $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
return $this->_delete($request, $entity, $recursionHelper);
}
@ -63,9 +66,12 @@ class CurrencyController extends BaseAdminController
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="currency_edit")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param Currency $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Currency $entity, Request $request, EntityManagerInterface $em)
public function edit(Currency $entity, Request $request, EntityManagerInterface $em): Response
{
return $this->_edit($entity, $request, $em);
}
@ -74,9 +80,12 @@ class CurrencyController extends BaseAdminController
* @Route("/new", name="currency_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -84,9 +93,12 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/export", name="currency_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -94,9 +106,12 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/{id}/export", name="currency_export")
*
* @param Currency $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Currency $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Currency $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -50,9 +50,12 @@ class DeviceController extends BaseAdminController
/**
* @Route("/{id}", name="device_delete", methods={"DELETE"})
*
* @param Request $request
* @param Device $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return RedirectResponse
*/
public function delete(Request $request, Device $entity, StructuralElementRecursionHelper $recursionHelper)
public function delete(Request $request, Device $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
return $this->_delete($request, $entity, $recursionHelper);
}
@ -61,9 +64,12 @@ class DeviceController extends BaseAdminController
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="device_edit")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param Device $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Device $entity, Request $request, EntityManagerInterface $em)
public function edit(Device $entity, Request $request, EntityManagerInterface $em): Response
{
return $this->_edit($entity, $request, $em);
}
@ -72,9 +78,12 @@ class DeviceController extends BaseAdminController
* @Route("/new", name="device_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -82,9 +91,12 @@ class DeviceController extends BaseAdminController
/**
* @Route("/export", name="device_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -92,9 +104,12 @@ class DeviceController extends BaseAdminController
/**
* @Route("/{id}/export", name="device_export")
*
* @param Device $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Device $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Device $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -49,6 +49,10 @@ class FootprintController extends BaseAdminController
/**
* @Route("/{id}", name="footprint_delete", methods={"DELETE"})
* @param Request $request
* @param Footprint $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Footprint $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -58,6 +62,10 @@ class FootprintController extends BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="footprint_edit")
* @Route("/{id}", requirements={"id"="\d+"})
* @param Footprint $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Footprint $entity, Request $request, EntityManagerInterface $em)
{
@ -68,9 +76,12 @@ class FootprintController extends BaseAdminController
* @Route("/new", name="footprint_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -78,9 +89,12 @@ class FootprintController extends BaseAdminController
/**
* @Route("/export", name="footprint_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -88,9 +102,12 @@ class FootprintController extends BaseAdminController
/**
* @Route("/{id}/export", name="footprint_export")
*
* @param AttachmentType $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -26,7 +26,6 @@ namespace App\Controller\AdminPages;
use App\Entity\Attachments\ManufacturerAttachment;
use App\Entity\Parts\Manufacturer;
use App\Entity\Parts\Supplier;
use App\Form\AdminPages\CompanyForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -49,6 +48,10 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/{id}", name="manufacturer_delete", methods={"DELETE"})
* @param Request $request
* @param Manufacturer $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Manufacturer $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -58,6 +61,10 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="manufacturer_edit")
* @Route("/{id}", requirements={"id"="\d+"})
* @param Manufacturer $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Manufacturer $entity, Request $request, EntityManagerInterface $em)
{
@ -68,9 +75,12 @@ class ManufacturerController extends BaseAdminController
* @Route("/new", name="manufacturer_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -78,9 +88,12 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/export", name="manufacturer_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -88,11 +101,13 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/{id}/export", name="manufacturer_export")
*
* @param Manufacturer $entity
* @param Manufacturer $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Manufacturer $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Manufacturer $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -49,6 +49,10 @@ class MeasurementUnitController extends BaseAdminController
/**
* @Route("/{id}", name="measurement_unit_delete", methods={"DELETE"})
* @param Request $request
* @param MeasurementUnit $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, MeasurementUnit $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -58,6 +62,10 @@ class MeasurementUnitController extends BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="measurement_unit_edit")
* @Route("/{id}", requirements={"id"="\d+"})
* @param MeasurementUnit $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(MeasurementUnit $entity, Request $request, EntityManagerInterface $em)
{
@ -68,9 +76,12 @@ class MeasurementUnitController extends BaseAdminController
* @Route("/new", name="measurement_unit_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -78,9 +89,12 @@ class MeasurementUnitController extends BaseAdminController
/**
* @Route("/export", name="measurement_unit_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -88,9 +102,12 @@ class MeasurementUnitController extends BaseAdminController
/**
* @Route("/{id}/export", name="measurement_unit_export")
*
* @param AttachmentType $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Storelocation;
use App\Form\AdminPages\StorelocationAdminForm;
use App\Services\EntityExporter;
@ -48,6 +47,10 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/{id}", name="store_location_delete", methods={"DELETE"})
* @param Request $request
* @param Storelocation $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Storelocation $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -57,6 +60,10 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="store_location_edit")
* @Route("/{id}", requirements={"id"="\d+"})
* @param Storelocation $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Storelocation $entity, Request $request, EntityManagerInterface $em)
{
@ -67,9 +74,12 @@ class StorelocationController extends BaseAdminController
* @Route("/new", name="store_location_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -77,9 +87,12 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/export", name="store_location_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -87,11 +100,13 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/{id}/export", name="store_location_export")
*
* @param Storelocation $entity
* @param Storelocation $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Storelocation $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Storelocation $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -48,6 +48,10 @@ class SupplierController extends BaseAdminController
/**
* @Route("/{id}", name="supplier_delete", methods={"DELETE"})
* @param Request $request
* @param Supplier $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Supplier $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -57,6 +61,10 @@ class SupplierController extends BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="supplier_edit")
* @Route("/{id}", requirements={"id"="\d+"})
* @param Supplier $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Supplier $entity, Request $request, EntityManagerInterface $em)
{
@ -67,9 +75,12 @@ class SupplierController extends BaseAdminController
* @Route("/new", name="supplier_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -77,9 +88,12 @@ class SupplierController extends BaseAdminController
/**
* @Route("/export", name="supplier_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -87,9 +101,12 @@ class SupplierController extends BaseAdminController
/**
* @Route("/{id}/export", name="supplier_export")
*
* @param Supplier $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Supplier $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Supplier $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -46,9 +46,11 @@ class AttachmentFileController extends AbstractController
*
* @Route("/attachment/{id}/download", name="attachment_download")
*
* @param Attachment $attachment
* @param AttachmentManager $helper
* @return BinaryFileResponse
*/
public function download(Attachment $attachment, AttachmentManager $helper)
public function download(Attachment $attachment, AttachmentManager $helper): BinaryFileResponse
{
$this->denyAccessUnlessGranted('read', $attachment);
@ -74,11 +76,12 @@ class AttachmentFileController extends AbstractController
*
* @Route("/attachment/{id}/view", name="attachment_view")
*
* @param Attachment $attachment
* @param AttachmentManager $helper
* @return BinaryFileResponse
*
* @throws Exception
*/
public function view(Attachment $attachment, AttachmentManager $helper)
public function view(Attachment $attachment, AttachmentManager $helper): BinaryFileResponse
{
$this->denyAccessUnlessGranted('read', $attachment);
@ -102,6 +105,8 @@ class AttachmentFileController extends AbstractController
/**
* @Route("/attachment/list", name="attachment_list")
*
* @param DataTableFactory $dataTable
* @param Request $request
* @return JsonResponse|Response
*/
public function attachmentsTable(DataTableFactory $dataTable, Request $request)

View file

@ -52,9 +52,12 @@ class GroupController extends BaseAdminController
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="group_edit")
* @Route("/{id}/", requirements={"id"="\d+"})
*
* @param Group $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
*/
public function edit(Group $entity, Request $request, EntityManagerInterface $em)
public function edit(Group $entity, Request $request, EntityManagerInterface $em): Response
{
return $this->_edit($entity, $request, $em);
}
@ -63,9 +66,12 @@ class GroupController extends BaseAdminController
* @Route("/new", name="group_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
@ -73,9 +79,12 @@ class GroupController extends BaseAdminController
/**
* @Route("/{id}", name="group_delete", methods={"DELETE"})
*
* @param Request $request
* @param Group $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return RedirectResponse
*/
public function delete(Request $request, Group $entity, StructuralElementRecursionHelper $recursionHelper)
public function delete(Request $request, Group $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
return $this->_delete($request, $entity, $recursionHelper);
}
@ -83,9 +92,12 @@ class GroupController extends BaseAdminController
/**
* @Route("/export", name="group_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -93,9 +105,12 @@ class GroupController extends BaseAdminController
/**
* @Route("/{id}/export", name="group_export")
*
* @param Group $entity
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Group $entity, EntityExporter $exporter, Request $request)
public function exportEntity(Group $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}

View file

@ -57,8 +57,10 @@ class HomepageController extends AbstractController
/**
* @Route("/", name="homepage")
* @param GitVersionInfo $versionInfo
* @return \Symfony\Component\HttpFoundation\Response
*/
public function homepage(GitVersionInfo $versionInfo)
public function homepage(GitVersionInfo $versionInfo): \Symfony\Component\HttpFoundation\Response
{
return $this->render('homepage.html.twig', [
'banner' => $this->getBanner(),

View file

@ -40,6 +40,8 @@ class LogController extends AbstractController
/**
* @Route("/", name="log_view")
*
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showLogs(Request $request, DataTableFactory $dataTable)

View file

@ -50,9 +50,13 @@ class PartController extends AbstractController
* @Route("/{id}/info", name="part_info")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param Part $part
* @param AttachmentManager $attachmentHelper
* @param PricedetailHelper $pricedetailHelper
* @param PartPreviewGenerator $previewGenerator
* @return Response
*/
public function show(Part $part, AttachmentManager $attachmentHelper, PricedetailHelper $pricedetailHelper, PartPreviewGenerator $previewGenerator)
public function show(Part $part, AttachmentManager $attachmentHelper, PricedetailHelper $pricedetailHelper, PartPreviewGenerator $previewGenerator): Response
{
$this->denyAccessUnlessGranted('read', $part);
@ -70,10 +74,16 @@ class PartController extends AbstractController
/**
* @Route("/{id}/edit", name="part_edit")
*
* @param Part $part
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @param AttachmentManager $attachmentHelper
* @param AttachmentSubmitHandler $attachmentSubmitHandler
* @return Response
*/
public function edit(Part $part, Request $request, EntityManagerInterface $em, TranslatorInterface $translator,
AttachmentManager $attachmentHelper, AttachmentSubmitHandler $attachmentSubmitHandler)
AttachmentManager $attachmentHelper, AttachmentSubmitHandler $attachmentSubmitHandler): Response
{
$this->denyAccessUnlessGranted('edit', $part);
@ -120,9 +130,11 @@ class PartController extends AbstractController
/**
* @Route("/{id}/delete", name="part_delete", methods={"DELETE"})
*
* @param Request $request
* @param Part $part
* @return RedirectResponse
*/
public function delete(Request $request, Part $part)
public function delete(Request $request, Part $part): RedirectResponse
{
$this->denyAccessUnlessGranted('delete', $part);
@ -144,10 +156,15 @@ class PartController extends AbstractController
/**
* @Route("/new", name="part_new")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @param AttachmentManager $attachmentHelper
* @param AttachmentSubmitHandler $attachmentSubmitHandler
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, TranslatorInterface $translator,
AttachmentManager $attachmentHelper, AttachmentSubmitHandler $attachmentSubmitHandler)
AttachmentManager $attachmentHelper, AttachmentSubmitHandler $attachmentSubmitHandler): Response
{
$new_part = new Part();
@ -206,6 +223,10 @@ class PartController extends AbstractController
/**
* @Route("/{id}/clone", name="part_clone")
*
* @param Part $part
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @return RedirectResponse|Response
*/
public function clone(Part $part, Request $request, EntityManagerInterface $em, TranslatorInterface $translator)

View file

@ -42,6 +42,9 @@ class PartListsController extends AbstractController
/**
* @Route("/category/{id}/parts", name="part_list_category")
*
* @param Category $category
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showCategory(Category $category, Request $request, DataTableFactory $dataTable)
@ -62,6 +65,9 @@ class PartListsController extends AbstractController
/**
* @Route("/footprint/{id}/parts", name="part_list_footprint")
*
* @param Footprint $footprint
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showFootprint(Footprint $footprint, Request $request, DataTableFactory $dataTable)
@ -82,6 +88,9 @@ class PartListsController extends AbstractController
/**
* @Route("/manufacturer/{id}/parts", name="part_list_manufacturer")
*
* @param Manufacturer $manufacturer
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showManufacturer(Manufacturer $manufacturer, Request $request, DataTableFactory $dataTable)
@ -102,6 +111,9 @@ class PartListsController extends AbstractController
/**
* @Route("/store_location/{id}/parts", name="part_list_store_location")
*
* @param Storelocation $storelocation
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showStorelocation(Storelocation $storelocation, Request $request, DataTableFactory $dataTable)
@ -122,6 +134,9 @@ class PartListsController extends AbstractController
/**
* @Route("/supplier/{id}/parts", name="part_list_supplier")
*
* @param Supplier $supplier
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showSupplier(Supplier $supplier, Request $request, DataTableFactory $dataTable)
@ -142,6 +157,9 @@ class PartListsController extends AbstractController
/**
* @Route("/parts/by_tag/{tag}", name="part_list_tags")
*
* @param string $tag
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showTag(string $tag, Request $request, DataTableFactory $dataTable)
@ -161,6 +179,9 @@ class PartListsController extends AbstractController
/**
* @Route("/parts/search", name="parts_search")
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showSearch(Request $request, DataTableFactory $dataTable)
{
@ -182,6 +203,8 @@ class PartListsController extends AbstractController
/**
* @Route("/parts", name="parts_show_all")
*
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showAll(Request $request, DataTableFactory $dataTable)

View file

@ -52,9 +52,10 @@ class RedirectController extends AbstractController
* This function is called whenever a route was not matching the localized routes.
* The purpose is to redirect the user to the localized version of the page.
*
* @param Request $request
* @return RedirectResponse
*/
public function addLocalePart(Request $request)
public function addLocalePart(Request $request): RedirectResponse
{
//By default we use the global default locale
$locale = $this->default_locale;
@ -85,7 +86,7 @@ class RedirectController extends AbstractController
*
* @return bool
*/
public function checkIfModRewriteAvailable()
public function checkIfModRewriteAvailable(): bool
{
if (! function_exists('apache_get_modules')) {
//If we can not check for apache modules, we just hope for the best and assume url rewriting is available

View file

@ -53,8 +53,10 @@ class SecurityController extends AbstractController
/**
* @Route("/login", name="login", methods={"GET", "POST"})
* @param AuthenticationUtils $authenticationUtils
* @return \Symfony\Component\HttpFoundation\Response
*/
public function login(AuthenticationUtils $authenticationUtils)
public function login(AuthenticationUtils $authenticationUtils): \Symfony\Component\HttpFoundation\Response
{
// get the login error if there is one
$error = $authenticationUtils->getLastAuthenticationError();
@ -70,6 +72,9 @@ class SecurityController extends AbstractController
/**
* @Route("/pw_reset/request", name="pw_reset_request")
* @param PasswordResetManager $passwordReset
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function requestPwReset(PasswordResetManager $passwordReset, Request $request)
{
@ -112,6 +117,11 @@ class SecurityController extends AbstractController
/**
* @Route("/pw_reset/new_pw/{user}/{token}", name="pw_reset_new_pw")
* @param PasswordResetManager $passwordReset
* @param Request $request
* @param string|null $user
* @param string|null $token
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function pwResetNewPw(PasswordResetManager $passwordReset, Request $request, ?string $user = null, ?string $token = null)
{

View file

@ -52,8 +52,10 @@ class TreeController extends AbstractController
/**
* @Route("/tools", name="tree_tools")
* @param ToolsTreeBuilder $builder
* @return JsonResponse
*/
public function tools(ToolsTreeBuilder $builder)
public function tools(ToolsTreeBuilder $builder): JsonResponse
{
$tree = $builder->getTree();
@ -63,8 +65,10 @@ class TreeController extends AbstractController
/**
* @Route("/category/{id}", name="tree_category")
* @Route("/categories")
* @param Category|null $category
* @return JsonResponse
*/
public function categoryTree(?Category $category = null)
public function categoryTree(?Category $category = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Category::class, $category);
@ -74,8 +78,10 @@ class TreeController extends AbstractController
/**
* @Route("/footprint/{id}", name="tree_footprint")
* @Route("/footprints")
* @param Footprint|null $footprint
* @return JsonResponse
*/
public function footprintTree(?Footprint $footprint = null)
public function footprintTree(?Footprint $footprint = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Footprint::class, $footprint);
@ -85,8 +91,10 @@ class TreeController extends AbstractController
/**
* @Route("/location/{id}", name="tree_location")
* @Route("/locations")
* @param Storelocation|null $location
* @return JsonResponse
*/
public function locationTree(?Storelocation $location = null)
public function locationTree(?Storelocation $location = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Storelocation::class, $location);
@ -96,8 +104,10 @@ class TreeController extends AbstractController
/**
* @Route("/manufacturer/{id}", name="tree_manufacturer")
* @Route("/manufacturers")
* @param Manufacturer|null $manufacturer
* @return JsonResponse
*/
public function manufacturerTree(?Manufacturer $manufacturer = null)
public function manufacturerTree(?Manufacturer $manufacturer = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Manufacturer::class, $manufacturer);
@ -107,8 +117,10 @@ class TreeController extends AbstractController
/**
* @Route("/supplier/{id}", name="tree_supplier")
* @Route("/suppliers")
* @param Supplier|null $supplier
* @return JsonResponse
*/
public function supplierTree(?Supplier $supplier = null)
public function supplierTree(?Supplier $supplier = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Supplier::class, $supplier);
@ -118,8 +130,10 @@ class TreeController extends AbstractController
/**
* @Route("/device/{id}", name="tree_device")
* @Route("/devices")
* @param Device|null $device
* @return JsonResponse
*/
public function deviceTree(?Device $device = null)
public function deviceTree(?Device $device = null): JsonResponse
{
$tree = $this->treeGenerator->getTreeView(Device::class, $device, '');

View file

@ -43,6 +43,10 @@ class TypeaheadController extends AbstractController
{
/**
* @Route("/builtInResources/search/{query}", name="typeahead_builtInRessources", requirements={"query"= ".+"})
* @param Request $request
* @param string $query
* @param BuiltinAttachmentsFinder $finder
* @return JsonResponse
*/
public function builtInResources(Request $request, string $query, BuiltinAttachmentsFinder $finder)
{
@ -62,6 +66,9 @@ class TypeaheadController extends AbstractController
/**
* @Route("/tags/search/{query}", name="typeahead_tags", requirements={"query"= ".+"})
* @param string $query
* @param TagFinder $finder
* @return JsonResponse
*/
public function tags(string $query, TagFinder $finder)
{

View file

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace App\Controller;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Attachments\UserAttachment;
use App\Entity\UserSystem\User;
use App\Form\Permissions\PermissionsType;
@ -54,6 +53,11 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="user_edit")
* @Route("/{id}/", requirements={"id"="\d+"})
* @param User $entity
* @param Request $request
* @param EntityManagerInterface $em
* @return Response
* @throws \Exception
*/
public function edit(User $entity, Request $request, EntityManagerInterface $em)
{
@ -87,15 +91,22 @@ class UserController extends AdminPages\BaseAdminController
* @Route("/new", name="user_new")
* @Route("/")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer): Response
{
return $this->_new($request, $em, $importer);
}
/**
* @Route("/{id}", name="user_delete", methods={"DELETE"}, requirements={"id"="\d+"})
* @param Request $request
* @param User $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, User $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -109,9 +120,12 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/export", name="user_export_all")
*
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request): Response
{
return $this->_exportAll($em, $exporter, $request);
}
@ -119,11 +133,13 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/{id}/export", name="user_export")
*
* @param User $entity
* @param User $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(User $entity, EntityExporter $exporter, Request $request)
public function exportEntity(User $entity, EntityExporter $exporter, Request $request): Response
{
return $this->_exportEntity($entity, $exporter, $request);
}
@ -131,12 +147,19 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/info", name="user_info_self")
* @Route("/{id}/info", name="user_info")
* @param User|null $user
* @param Packages $packages
* @return Response
*/
public function userInfo(?User $user, Packages $packages)
public function userInfo(?User $user, Packages $packages): Response
{
//If no user id was passed, then we show info about the current user
if (null === $user) {
$user = $this->getUser();
$tmp = $this->getUser();
if(!$tmp instanceof User) {
throw new InvalidArgumentException('Userinfo only works for database users!');
}
$user = $tmp;
} else {
//Else we must check, if the current user is allowed to access $user
$this->denyAccessUnlessGranted('read', $user);
@ -176,7 +199,7 @@ class UserController extends AdminPages\BaseAdminController
* @return string containing either just a URL or a complete image tag
* @source https://gravatar.com/site/implement/images/php/
*/
public function getGravatar(?string $email, int $s = 80, string $d = 'mm', string $r = 'g', bool $img = false, array $atts = [])
public function getGravatar(?string $email, int $s = 80, string $d = 'mm', string $r = 'g', bool $img = false, array $atts = []): string
{
if (null === $email) {
return '';

View file

@ -84,9 +84,12 @@ class UserSettingsController extends AbstractController
/**
* @Route("/u2f_delete", name="u2f_delete", methods={"DELETE"})
*
* @param Request $request
* @param EntityManagerInterface $entityManager
* @param BackupCodeManager $backupCodeManager
* @return RedirectResponse
*/
public function removeU2FToken(Request $request, EntityManagerInterface $entityManager, BackupCodeManager $backupCodeManager)
public function removeU2FToken(Request $request, EntityManagerInterface $entityManager, BackupCodeManager $backupCodeManager): RedirectResponse
{
if ($this->demo_mode) {
throw new RuntimeException('You can not do 2FA things in demo mode');
@ -134,6 +137,9 @@ class UserSettingsController extends AbstractController
/**
* @Route("/invalidate_trustedDevices", name="tfa_trustedDevices_invalidate", methods={"DELETE"})
* @param Request $request
* @param EntityManagerInterface $entityManager
* @return RuntimeException|RedirectResponse
*/
public function resetTrustedDevices(Request $request, EntityManagerInterface $entityManager)
{
@ -163,6 +169,12 @@ class UserSettingsController extends AbstractController
/**
* @Route("/settings", name="user_settings")
* @param Request $request
* @param EntityManagerInterface $em
* @param UserPasswordEncoderInterface $passwordEncoder
* @param GoogleAuthenticator $googleAuthenticator
* @param BackupCodeManager $backupCodeManager
* @return RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function userSettings(Request $request, EntityManagerInterface $em, UserPasswordEncoderInterface $passwordEncoder, GoogleAuthenticator $googleAuthenticator, BackupCodeManager $backupCodeManager)
{
@ -186,7 +198,7 @@ class UserSettingsController extends AbstractController
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid() && ! $this->demo_mode) {
if (! $this->demo_mode && $form->isSubmitted() && $form->isValid()) {
//Check if user theme setting has changed
if ($user->getTheme() !== $em->getUnitOfWork()->getOriginalEntityData($user)['theme']) {
$page_need_reload = true;
@ -246,7 +258,7 @@ class UserSettingsController extends AbstractController
$pw_form->handleRequest($request);
//Check if password if everything was correct, then save it to User and DB
if ($pw_form->isSubmitted() && $pw_form->isValid() && ! $this->demo_mode) {
if (! $this->demo_mode && $pw_form->isSubmitted() && $pw_form->isValid()) {
$password = $passwordEncoder->encodePassword($user, $pw_form['new_password']->getData());
$user->setPassword($password);
@ -261,13 +273,13 @@ class UserSettingsController extends AbstractController
//Handle 2FA things
$google_form = $this->createForm(TFAGoogleSettingsType::class, $user);
$google_enabled = $user->isGoogleAuthenticatorEnabled();
if (! $form->isSubmitted() && ! $google_enabled) {
if (! $google_enabled && ! $form->isSubmitted()) {
$user->setGoogleAuthenticatorSecret($googleAuthenticator->generateSecret());
$google_form->get('googleAuthenticatorSecret')->setData($user->getGoogleAuthenticatorSecret());
}
$google_form->handleRequest($request);
if ($google_form->isSubmitted() && $google_form->isValid() && ! $this->demo_mode) {
if ( ! $this->demo_mode && $google_form->isSubmitted() && $google_form->isValid()) {
if (! $google_enabled) {
//Save 2FA settings (save secrets)
$user->setGoogleAuthenticatorSecret($google_form->get('googleAuthenticatorSecret')->getData());
@ -296,7 +308,7 @@ class UserSettingsController extends AbstractController
])->getForm();
$backup_form->handleRequest($request);
if ($backup_form->isSubmitted() && $backup_form->isValid() && ! $this->demo_mode) {
if (! $this->demo_mode && $backup_form->isSubmitted() && $backup_form->isValid()) {
$backupCodeManager->regenerateBackupCodes($user);
$em->flush();
$this->addFlash('success', 'user.settings.2fa.backup_codes.regenerated');