mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-27 04:08:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed coding style.

Browse source
This commit is contained in:
Jan Böhmer 2020-03-15 13:56:31 +01:00
parent 24939f2342
commit fd61c8d9e2
129 changed files with 962 additions and 1091 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Controller/AdminPages/AttachmentTypeController.php
View file

@ -68,9 +68,6 @@ 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): RedirectResponse
@ -82,9 +79,6 @@ class AttachmentTypeController extends BaseAdminController
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null): Response
@ -96,9 +90,6 @@ 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): Response
@ -109,9 +100,6 @@ 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): Response
@ -122,9 +110,6 @@ 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): Response

20
src/Controller/AdminPages/BaseAdminController.php
View file

@ -111,14 +111,12 @@ abstract class BaseAdminController extends AbstractController
$this->dataTableFactory = $dataTableFactory;
}
protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null) : Response
protected function _edit(AbstractNamedDBElement $entity, Request $request, EntityManagerInterface $em, ?string $timestamp = null): Response
{
$this->denyAccessUnlessGranted('read', $entity);
$timeTravel_timestamp = null;
if ($timestamp !== null) {
if (null !== $timestamp) {
$this->denyAccessUnlessGranted('@tools.timetravel');
$this->denyAccessUnlessGranted('show_history', $entity);
//If the timestamp only contains numbers interpret it as unix timestamp
@ -131,12 +129,12 @@ abstract class BaseAdminController extends AbstractController
$this->timeTravel->revertEntityToTimestamp($entity, $timeTravel_timestamp);
}
if ($this->isGranted('show_history', $entity) ) {
if ($this->isGranted('show_history', $entity)) {
$table = $this->dataTableFactory->createFromType(
LogDataTable::class,
[
'filter_elements' => $this->historyHelper->getAssociatedElements($entity),
'mode' => 'element_history'
'mode' => 'element_history',
],
['pageLength' => 10]
)
@ -151,7 +149,7 @@ abstract class BaseAdminController extends AbstractController
$form = $this->createForm($this->form_class, $entity, [
'attachment_class' => $this->attachment_class,
'disabled' => $timeTravel_timestamp !== null ? true : null
'disabled' => null !== $timeTravel_timestamp ? true : null,
]);
$form->handleRequest($request);
@ -202,7 +200,7 @@ abstract class BaseAdminController extends AbstractController
'attachment_helper' => $this->attachmentHelper,
'route_base' => $this->route_base,
'datatable' => $table,
'timeTravel' => $timeTravel_timestamp
'timeTravel' => $timeTravel_timestamp,
]);
}
@ -274,9 +272,7 @@ abstract class BaseAdminController extends AbstractController
'csv_separator' => $data['csv_separator'],
];
$this->commentHelper->setMessage('Import ' . $file->getClientOriginalName());
$this->commentHelper->setMessage('Import '.$file->getClientOriginalName());
$errors = $importer->fileToDBEntities($file, $this->entity_class, $options);
@ -319,7 +315,7 @@ abstract class BaseAdminController extends AbstractController
]);
}
protected function _delete(Request $request, AbstractNamedDBElement $entity, StructuralElementRecursionHelper $recursionHelper) : RedirectResponse
protected function _delete(Request $request, AbstractNamedDBElement $entity, StructuralElementRecursionHelper $recursionHelper): RedirectResponse
{
$this->denyAccessUnlessGranted('delete', $entity);

15
src/Controller/AdminPages/CategoryController.php
View file

@ -68,9 +68,6 @@ 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): RedirectResponse
@ -82,9 +79,6 @@ class CategoryController extends BaseAdminController
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null): Response
@ -96,9 +90,6 @@ 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): Response
@ -109,9 +100,6 @@ 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): Response
@ -122,9 +110,6 @@ 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): Response

15
src/Controller/AdminPages/CurrencyController.php
View file

@ -70,9 +70,6 @@ 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): RedirectResponse
@ -84,9 +81,6 @@ class CurrencyController extends BaseAdminController
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null): Response
@ -98,9 +92,6 @@ 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): Response
@ -111,9 +102,6 @@ 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): Response
@ -124,9 +112,6 @@ 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): Response

15
src/Controller/AdminPages/DeviceController.php
View file

@ -68,9 +68,6 @@ 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): RedirectResponse
@ -82,9 +79,6 @@ class DeviceController extends BaseAdminController
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null): Response
@ -96,9 +90,6 @@ 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): Response
@ -109,9 +100,6 @@ 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): Response
@ -122,9 +110,6 @@ 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): Response

17
src/Controller/AdminPages/FootprintController.php
View file

@ -67,9 +67,7 @@ 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)
@ -80,9 +78,7 @@ class FootprintController extends BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -94,9 +90,6 @@ 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): Response
@ -107,9 +100,6 @@ 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): Response
@ -120,9 +110,6 @@ 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): Response

18
src/Controller/AdminPages/ManufacturerController.php
View file

@ -66,9 +66,7 @@ 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)
@ -79,9 +77,7 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -93,9 +89,6 @@ 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): Response
@ -106,9 +99,6 @@ 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): Response
@ -119,10 +109,6 @@ class ManufacturerController extends BaseAdminController
/**
* @Route("/{id}/export", name="manufacturer_export")
*
* @param Manufacturer $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Manufacturer $entity, EntityExporter $exporter, Request $request): Response

17
src/Controller/AdminPages/MeasurementUnitController.php
View file

@ -67,9 +67,7 @@ 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)
@ -80,9 +78,7 @@ class MeasurementUnitController extends BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -94,9 +90,6 @@ 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): Response
@ -107,9 +100,6 @@ 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): Response
@ -120,9 +110,6 @@ 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): Response

18
src/Controller/AdminPages/StorelocationController.php
View file

@ -65,9 +65,7 @@ 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)
@ -78,9 +76,7 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -92,9 +88,6 @@ 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): Response
@ -105,9 +98,6 @@ 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): Response
@ -118,10 +108,6 @@ class StorelocationController extends BaseAdminController
/**
* @Route("/{id}/export", name="store_location_export")
*
* @param Storelocation $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(Storelocation $entity, EntityExporter $exporter, Request $request): Response

17
src/Controller/AdminPages/SupplierController.php
View file

@ -66,9 +66,7 @@ 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)
@ -79,9 +77,7 @@ class SupplierController extends BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -93,9 +89,6 @@ 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): Response
@ -106,9 +99,6 @@ 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): Response
@ -119,9 +109,6 @@ 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): Response

8
src/Controller/AttachmentFileController.php
View file

@ -46,7 +46,6 @@ use App\DataTables\AttachmentDataTable;
use App\Entity\Attachments\Attachment;
use App\Entity\Attachments\PartAttachment;
use App\Services\Attachments\AttachmentManager;
use Exception;
use Omines\DataTablesBundle\DataTableFactory;
use RuntimeException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -64,8 +63,6 @@ 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): BinaryFileResponse
@ -94,10 +91,7 @@ class AttachmentFileController extends AbstractController
*
* @Route("/attachment/{id}/view", name="attachment_view")
*
* @param Attachment $attachment
* @param AttachmentManager $helper
* @return BinaryFileResponse
*
*/
public function view(Attachment $attachment, AttachmentManager $helper): BinaryFileResponse
{
@ -123,8 +117,6 @@ 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)

15
src/Controller/GroupController.php
View file

@ -70,9 +70,6 @@ class GroupController extends BaseAdminController
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null): Response
@ -84,9 +81,6 @@ 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): Response
@ -97,9 +91,6 @@ 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): RedirectResponse
@ -110,9 +101,6 @@ 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): Response
@ -123,9 +111,6 @@ 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): Response

12
src/Controller/HomepageController.php
View file

@ -44,11 +44,11 @@ namespace App\Controller;
use App\DataTables\LogDataTable;
use App\Services\GitVersionInfo;
use const DIRECTORY_SEPARATOR;
use Omines\DataTablesBundle\DataTableFactory;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use const DIRECTORY_SEPARATOR;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Cache\CacheInterface;
@ -81,16 +81,16 @@ class HomepageController extends AbstractController
/**
* @Route("/", name="homepage")
* @param GitVersionInfo $versionInfo
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function homepage(Request $request, GitVersionInfo $versionInfo): Response
{
if ($this->isGranted("@tools.lastActivity")) {
if ($this->isGranted('@tools.lastActivity')) {
$table = $this->dataTable->createFromType(
LogDataTable::class,
[
'mode' => 'last_activity'
'mode' => 'last_activity',
],
['pageLength' => 10]
)
@ -107,7 +107,7 @@ class HomepageController extends AbstractController
'banner' => $this->getBanner(),
'git_branch' => $versionInfo->getGitBranchName(),
'git_commit' => $versionInfo->getGitCommitHash(),
'datatable' => $table
'datatable' => $table,
]);
}
}

23
src/Controller/LogController.php
View file

@ -56,7 +56,6 @@ use Omines\DataTablesBundle\DataTableFactory;
use phpDocumentor\Reflection\Element;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
@ -70,7 +69,6 @@ class LogController extends AbstractController
protected $timeTravel;
protected $dbRepository;
public function __construct(EntityManagerInterface $entityManager, TimeTravel $timeTravel)
{
$this->entityManager = $entityManager;
@ -81,8 +79,6 @@ class LogController extends AbstractController
/**
* @Route("/", name="log_view")
*
* @param Request $request
* @param DataTableFactory $dataTable
* @return JsonResponse|Response
*/
public function showLogs(Request $request, DataTableFactory $dataTable)
@ -103,7 +99,6 @@ class LogController extends AbstractController
/**
* @Route("/undo", name="log_undo", methods={"POST"})
* @param Request $request
*/
public function undoRevertLog(Request $request, EventUndoHelper $eventUndoHelper)
{
@ -111,13 +106,13 @@ class LogController extends AbstractController
$id = $request->request->get('undo');
//If no undo value was set check if a revert was set
if ($id === null) {
if (null === $id) {
$id = $request->get('revert');
$mode = EventUndoHelper::MODE_REVERT;
}
$log_element = $this->entityManager->find(AbstractLogEntry::class, $id);
if ($log_element === null) {
if (null === $log_element) {
throw new \InvalidArgumentException('No log entry with the given ID is existing!');
}
@ -126,15 +121,16 @@ class LogController extends AbstractController
$eventUndoHelper->setMode($mode);
$eventUndoHelper->setUndoneEvent($log_element);
if ($mode === EventUndoHelper::MODE_UNDO) {
if (EventUndoHelper::MODE_UNDO === $mode) {
$this->undoLog($log_element);
} elseif ($mode === EventUndoHelper::MODE_REVERT) {
} elseif (EventUndoHelper::MODE_REVERT === $mode) {
$this->revertLog($log_element);
}
$eventUndoHelper->clearUndoneEvent();
$redirect = $request->request->get('redirect_back');
return $this->redirect($redirect);
}
@ -143,15 +139,16 @@ class LogController extends AbstractController
$timestamp = $logEntry->getTimestamp();
$element = $this->entityManager->find($logEntry->getTargetClass(), $logEntry->getTargetID());
//If the element is not available in DB try to undelete it
if ($element === null) {
if (null === $element) {
$element = $this->timeTravel->undeleteEntity($logEntry->getTargetClass(), $logEntry->getTargetID());
$this->entityManager->persist($element);
$this->entityManager->flush();
$this->dbRepository->changeID($element, $logEntry->getTargetID());
}
if (!$element instanceof AbstractDBElement) {
if (! $element instanceof AbstractDBElement) {
$this->addFlash('error', 'log.undo.target_not_found');
return;
}
@ -172,7 +169,7 @@ class LogController extends AbstractController
}
//Check if the element we want to undelete already exits
if ($this->entityManager->find($element_class, $element_id) == null) {
if (null === $this->entityManager->find($element_class, $element_id)) {
$undeleted_element = $this->timeTravel->undeleteEntity($element_class, $element_id);
$this->entityManager->persist($undeleted_element);
$this->entityManager->flush();
@ -183,7 +180,7 @@ class LogController extends AbstractController
}
} elseif ($log_element instanceof ElementCreatedLogEntry) {
$element = $this->entityManager->find($log_element->getTargetClass(), $log_element->getTargetID());
if ($element !== null) {
if (null !== $element) {
$this->entityManager->remove($element);
$this->entityManager->flush();
$this->addFlash('success', 'log.undo.element_delete_success');

26
src/Controller/PartController.php
View file

@ -87,8 +87,8 @@ class PartController extends AbstractController
* @Route("/{id}/info/{timestamp}", name="part_info")
* @Route("/{id}", requirements={"id"="\d+"})
*
* @param Part $part
* @return Response
*
* @throws \Exception
*/
public function show(Part $part, Request $request, TimeTravel $timeTravel, HistoryHelper $historyHelper,
@ -97,7 +97,7 @@ class PartController extends AbstractController
$this->denyAccessUnlessGranted('read', $part);
$timeTravel_timestamp = null;
if ($timestamp !== null) {
if (null !== $timestamp) {
$this->denyAccessUnlessGranted('@tools.timetravel');
$this->denyAccessUnlessGranted('show_history', $part);
//If the timestamp only contains numbers interpret it as unix timestamp
@ -110,10 +110,10 @@ class PartController extends AbstractController
$timeTravel->revertEntityToTimestamp($part, $timeTravel_timestamp);
}
if ($this->isGranted('show_history', $part) ) {
if ($this->isGranted('show_history', $part)) {
$table = $dataTable->createFromType(LogDataTable::class, [
'filter_elements' => $historyHelper->getAssociatedElements($part),
'mode' => 'element_history'
'mode' => 'element_history',
], ['pageLength' => 10])
->handleRequest($request);
@ -132,7 +132,7 @@ class PartController extends AbstractController
'attachment_helper' => $this->attachmentManager,
'pricedetail_helper' => $this->pricedetailHelper,
'pictures' => $this->partPreviewGenerator->getPreviewAttachments($part),
'timeTravel' => $timeTravel_timestamp
'timeTravel' => $timeTravel_timestamp,
]
);
}
@ -140,11 +140,6 @@ class PartController extends AbstractController
/**
* @Route("/{id}/edit", name="part_edit")
*
* @param Part $part
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @param AttachmentSubmitHandler $attachmentSubmitHandler
* @return Response
*/
public function edit(Part $part, Request $request, EntityManagerInterface $em, TranslatorInterface $translator,
@ -197,8 +192,6 @@ 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): RedirectResponse
@ -226,17 +219,12 @@ class PartController extends AbstractController
* @Route("/new", name="part_new")
* @Route("/{id}/clone", name="part_clone")
*
* @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, ?Part $part = null): Response
{
if($part === null) {
if (null === $part) {
$new_part = new Part();
} else {
$new_part = clone $part;
@ -247,7 +235,7 @@ class PartController extends AbstractController
$cid = $request->get('cid', 1);
$category = $em->find(Category::class, $cid);
if (null !== $category && $new_part->getCategory() === null) {
if (null !== $category && null === $new_part->getCategory()) {
$new_part->setCategory($category);
}

26
src/Controller/PartListsController.php
View file

@ -60,9 +60,6 @@ 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)
@ -83,9 +80,6 @@ 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)
@ -106,9 +100,6 @@ 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)
@ -129,9 +120,6 @@ 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)
@ -152,9 +140,6 @@ 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)
@ -175,9 +160,6 @@ 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)
@ -197,8 +179,7 @@ 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)
@ -218,9 +199,8 @@ class PartListsController extends AbstractController
'regex' => $request->query->getBoolean('regex'),
];
$table = $dataTable->createFromType(PartsDataTable::class, [
'search' => $search, 'search_options' => $search_options
'search' => $search, 'search_options' => $search_options,
])
->handleRequest($request);
@ -237,8 +217,6 @@ 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)

1
src/Controller/RedirectController.php
View file

@ -70,7 +70,6 @@ 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): RedirectResponse

10
src/Controller/SecurityController.php
View file

@ -71,7 +71,7 @@ class SecurityController extends AbstractController
/**
* @Route("/login", name="login", methods={"GET", "POST"})
* @param AuthenticationUtils $authenticationUtils
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function login(AuthenticationUtils $authenticationUtils): \Symfony\Component\HttpFoundation\Response
@ -90,8 +90,7 @@ 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)
@ -135,10 +134,7 @@ 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)

7
src/Controller/StatisticsController.php
View file

@ -1,4 +1,7 @@
<?php
declare(strict_types=1);
/**
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
*
@ -20,7 +23,6 @@
namespace App\Controller;
use App\Services\StatisticsHelper;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
@ -30,6 +32,7 @@ class StatisticsController extends AbstractController
{
/**
* @Route("/statistics", name="statistics_view")
*
* @return Response
*/
public function showStatistics(StatisticsHelper $helper): Response
@ -40,4 +43,4 @@ class StatisticsController extends AbstractController
'helper' => $helper,
]);
}
}
}

14
src/Controller/TreeController.php
View file

@ -70,7 +70,7 @@ class TreeController extends AbstractController
/**
* @Route("/tools", name="tree_tools")
* @param ToolsTreeBuilder $builder
*
* @return JsonResponse
*/
public function tools(ToolsTreeBuilder $builder): JsonResponse
@ -83,7 +83,7 @@ class TreeController extends AbstractController
/**
* @Route("/category/{id}", name="tree_category")
* @Route("/categories")
* @param Category|null $category
*
* @return JsonResponse
*/
public function categoryTree(?Category $category = null): JsonResponse
@ -96,7 +96,7 @@ class TreeController extends AbstractController
/**
* @Route("/footprint/{id}", name="tree_footprint")
* @Route("/footprints")
* @param Footprint|null $footprint
*
* @return JsonResponse
*/
public function footprintTree(?Footprint $footprint = null): JsonResponse
@ -109,7 +109,7 @@ class TreeController extends AbstractController
/**
* @Route("/location/{id}", name="tree_location")
* @Route("/locations")
* @param Storelocation|null $location
*
* @return JsonResponse
*/
public function locationTree(?Storelocation $location = null): JsonResponse
@ -122,7 +122,7 @@ class TreeController extends AbstractController
/**
* @Route("/manufacturer/{id}", name="tree_manufacturer")
* @Route("/manufacturers")
* @param Manufacturer|null $manufacturer
*
* @return JsonResponse
*/
public function manufacturerTree(?Manufacturer $manufacturer = null): JsonResponse
@ -135,7 +135,7 @@ class TreeController extends AbstractController
/**
* @Route("/supplier/{id}", name="tree_supplier")
* @Route("/suppliers")
* @param Supplier|null $supplier
*
* @return JsonResponse
*/
public function supplierTree(?Supplier $supplier = null): JsonResponse
@ -148,7 +148,7 @@ class TreeController extends AbstractController
/**
* @Route("/device/{id}", name="tree_device")
* @Route("/devices")
* @param Device|null $device
*
* @return JsonResponse
*/
public function deviceTree(?Device $device = null): JsonResponse

7
src/Controller/TypeaheadController.php
View file

@ -61,9 +61,7 @@ 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)
@ -84,8 +82,7 @@ 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)

24
src/Controller/UserController.php
View file

@ -71,10 +71,9 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/{id}/edit/{timestamp}", 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, ?string $timestamp = null)
@ -109,9 +108,6 @@ 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): Response
@ -121,9 +117,7 @@ class UserController extends AdminPages\BaseAdminController
/**
* @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)
@ -138,9 +132,6 @@ 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): Response
@ -151,10 +142,6 @@ class UserController extends AdminPages\BaseAdminController
/**
* @Route("/{id}/export", name="user_export")
*
* @param User $entity
*
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportEntity(User $entity, EntityExporter $exporter, Request $request): Response
@ -165,8 +152,7 @@ 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): Response
@ -174,7 +160,7 @@ class UserController extends AdminPages\BaseAdminController
//If no user id was passed, then we show info about the current user
if (null === $user) {
$tmp = $this->getUser();
if(!$tmp instanceof User) {
if (! $tmp instanceof User) {
throw new InvalidArgumentException('Userinfo only works for database users!');
}
$user = $tmp;

20
src/Controller/UserSettingsController.php
View file

@ -102,9 +102,6 @@ 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): RedirectResponse
@ -155,8 +152,7 @@ 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)
@ -187,11 +183,7 @@ 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)
@ -266,9 +258,9 @@ class UserSettingsController extends AbstractController
],
],
'constraints' => [new Length([
'min' => 6,
'max' => 128,
])],
'min' => 6,
'max' => 128,
])],
])
->add('submit', SubmitType::class, ['label' => 'save'])
->getForm();
@ -297,7 +289,7 @@ class UserSettingsController extends AbstractController
}
$google_form->handleRequest($request);
if ( ! $this->demo_mode && $google_form->isSubmitted() && $google_form->isValid()) {
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());