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

Fixed some inspection issues.

Browse source
This commit is contained in:
Jan Böhmer 2019-08-20 18:39:57 +02:00
parent 8e23629dc0
commit 1629f31fed
31 changed files with 187 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,11 +53,15 @@ class AttachmentTypeController extends BaseAdminController
protected $entity_class = AttachmentType::class;
protected $twig_template = 'AdminPages/AttachmentTypeAdmin.html.twig';
protected $form_class = BaseEntityAdminForm::class;
protected $route_base = "attachment_type";
protected $route_base = 'attachment_type';
/**
* @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)
{
@ -68,7 +72,10 @@ class AttachmentTypeController extends BaseAdminController
* @Route("/new", name="attachment_type_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -77,6 +84,10 @@ class AttachmentTypeController extends BaseAdminController
/**
* @Route("/{id}", name="attachment_type_delete", methods={"DELETE"})
* @param Request $request
* @param AttachmentType $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, AttachmentType $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -86,7 +97,6 @@ class AttachmentTypeController extends BaseAdminController
/**
* @Route("/export", name="attachment_type_export_all")
* @param Request $request
* @param SerializerInterface $serializer
* @param EntityManagerInterface $em
* @return Response
*/
@ -99,6 +109,7 @@ class AttachmentTypeController extends BaseAdminController
* @Route("/{id}/export", name="attachment_type_export")
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
{

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

@ -33,7 +33,6 @@ namespace App\Controller\AdminPages;
use App\Entity\Base\NamedDBElement;
use App\Entity\Base\StructuralDBElement;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\ImportType;
use App\Form\AdminPages\MassCreationForm;
use App\Services\EntityExporter;
@ -48,14 +47,14 @@ use Symfony\Component\Validator\ConstraintViolationList;
abstract class BaseAdminController extends AbstractController
{
protected $entity_class = "";
protected $form_class = "";
protected $twig_template = "";
protected $route_base = "";
protected $entity_class = '';
protected $form_class = '';
protected $twig_template = '';
protected $route_base = '';
public function __construct()
{
if ($this->entity_class === "" || $this->form_class === "" || $this->twig_template === "" || $this->route_base === "") {
if ($this->entity_class === '' || $this->form_class === '' || $this->twig_template === '' || $this->route_base === '') {
throw new \InvalidArgumentException('You have to override the $entity_class, $form_class, $route_base and $twig_template value in your subclasss!');
}
}
@ -115,7 +114,7 @@ abstract class BaseAdminController extends AbstractController
foreach ($errors as $name => $error) {
/** @var $error ConstraintViolationList */
$this->addFlash('error', $name . ":" . $error);
$this->addFlash('error', $name . ':' . $error);
}
}
@ -134,7 +133,7 @@ abstract class BaseAdminController extends AbstractController
//Show errors to user:
foreach ($errors as $name => $error) {
/** @var $error ConstraintViolationList */
$this->addFlash('error', $name . ":" . $error);
$this->addFlash('error', $name . ':' . $error);
}
}

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

@ -34,7 +34,6 @@ namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Category;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\CategoryAdminForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -55,11 +54,15 @@ class CategoryController extends BaseAdminController
protected $entity_class = Category::class;
protected $twig_template = 'AdminPages/CategoryAdmin.html.twig';
protected $form_class = CategoryAdminForm::class;
protected $route_base = "category";
protected $route_base = 'category';
/**
* @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)
{
@ -70,7 +73,10 @@ class CategoryController extends BaseAdminController
* @Route("/new", name="category_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -79,6 +85,10 @@ class CategoryController extends BaseAdminController
/**
* @Route("/{id}", name="category_delete", methods={"DELETE"})
* @param Request $request
* @param Category $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Category $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -87,9 +97,9 @@ class CategoryController extends BaseAdminController
/**
* @Route("/export", name="category_export_all")
* @param Request $request
* @param SerializerInterface $serializer
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
@ -99,8 +109,10 @@ class CategoryController extends BaseAdminController
/**
* @Route("/{id}/export", name="category_export")
* @param Category $entity
* @param EntityExporter $exporter
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(Category $entity, EntityExporter $exporter, Request $request)
{

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

@ -33,10 +33,7 @@ namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Category;
use App\Entity\PriceInformations\Currency;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\CategoryAdminForm;
use App\Form\AdminPages\CurrencyAdminForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -58,11 +55,15 @@ class CurrencyController extends BaseAdminController
protected $entity_class = Currency::class;
protected $twig_template = 'AdminPages/CurrencyAdmin.html.twig';
protected $form_class = CurrencyAdminForm::class;
protected $route_base = "currency";
protected $route_base = 'currency';
/**
* @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)
{
@ -73,7 +74,10 @@ class CurrencyController extends BaseAdminController
* @Route("/new", name="currency_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -82,6 +86,10 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/{id}", name="currency_delete", methods={"DELETE"})
* @param Request $request
* @param Currency $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Currency $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -90,9 +98,9 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/export", name="currency_export_all")
* @param Request $request
* @param SerializerInterface $serializer
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
@ -102,8 +110,10 @@ class CurrencyController extends BaseAdminController
/**
* @Route("/{id}/export", name="currency_export")
* @param Currency $entity
* @param EntityExporter $exporter
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(Currency $entity, EntityExporter $exporter, Request $request)
{

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

@ -55,11 +55,15 @@ class DeviceController extends BaseAdminController
protected $entity_class = Device::class;
protected $twig_template = 'AdminPages/DeviceAdmin.html.twig';
protected $form_class = BaseEntityAdminForm::class;
protected $route_base = "device";
protected $route_base = 'device';
/**
* @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)
{
@ -70,7 +74,10 @@ class DeviceController extends BaseAdminController
* @Route("/new", name="device_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @param Request $request
* @param EntityManagerInterface $em
* @param EntityImporter $importer
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -79,6 +86,10 @@ class DeviceController extends BaseAdminController
/**
* @Route("/{id}", name="device_delete", methods={"DELETE"})
* @param Request $request
* @param Device $entity
* @param StructuralElementRecursionHelper $recursionHelper
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function delete(Request $request, Device $entity, StructuralElementRecursionHelper $recursionHelper)
{
@ -87,9 +98,9 @@ class DeviceController extends BaseAdminController
/**
* @Route("/export", name="device_export_all")
* @param Request $request
* @param SerializerInterface $serializer
* @param EntityManagerInterface $em
* @param EntityExporter $exporter
* @param Request $request
* @return Response
*/
public function exportAll(EntityManagerInterface $em, EntityExporter $exporter, Request $request)
@ -99,8 +110,10 @@ class DeviceController extends BaseAdminController
/**
* @Route("/{id}/export", name="device_export")
* @param Device $entity
* @param EntityExporter $exporter
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(Device $entity, EntityExporter $exporter, Request $request)
{

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

@ -55,7 +55,7 @@ class FootprintController extends BaseAdminController
protected $entity_class = Footprint::class;
protected $twig_template = 'AdminPages/FootprintAdmin.html.twig';
protected $form_class = BaseEntityAdminForm::class;
protected $route_base = "footprint";
protected $route_base = 'footprint';
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="footprint_edit")
@ -70,7 +70,7 @@ class FootprintController extends BaseAdminController
* @Route("/new", name="footprint_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -101,6 +101,7 @@ class FootprintController extends BaseAdminController
* @Route("/{id}/export", name="footprint_export")
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
{

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

@ -32,11 +32,8 @@
namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Manufacturer;
use App\Entity\Parts\Supplier;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\CompanyForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -72,7 +69,7 @@ class ManufacturerController extends BaseAdminController
* @Route("/new", name="manufacturer_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -103,6 +100,7 @@ class ManufacturerController extends BaseAdminController
* @Route("/{id}/export", name="manufacturer_export")
* @param Request $request
* @param Supplier $entity
* @return Response
*/
public function exportEntity(Manufacturer $entity, EntityExporter $exporter, Request $request)
{

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

@ -34,7 +34,6 @@ namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\MeasurementUnit;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\MeasurementUnitAdminForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -55,7 +54,7 @@ class MeasurementUnitController extends BaseAdminController
protected $entity_class = MeasurementUnit::class;
protected $twig_template = 'AdminPages/MeasurementUnitAdmin.html.twig';
protected $form_class = MeasurementUnitAdminForm::class;
protected $route_base = "measurement_unit";
protected $route_base = 'measurement_unit';
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="measurement_unit_edit")
@ -70,7 +69,7 @@ class MeasurementUnitController extends BaseAdminController
* @Route("/new", name="measurement_unit_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -101,6 +100,7 @@ class MeasurementUnitController extends BaseAdminController
* @Route("/{id}/export", name="measurement_unit_export")
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(AttachmentType $entity, EntityExporter $exporter, Request $request)
{

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

@ -34,7 +34,6 @@ namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Storelocation;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\StorelocationAdminForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -42,7 +41,6 @@ use App\Services\StructuralElementRecursionHelper;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpCache\Store;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\SerializerInterface;
@ -56,7 +54,7 @@ class StorelocationController extends BaseAdminController
protected $entity_class = Storelocation::class;
protected $twig_template = 'AdminPages/StorelocationAdmin.html.twig';
protected $form_class = StorelocationAdminForm::class;
protected $route_base = "store_location";
protected $route_base = 'store_location';
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="store_location_edit")
@ -71,7 +69,7 @@ class StorelocationController extends BaseAdminController
* @Route("/new", name="store_location_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -102,6 +100,7 @@ class StorelocationController extends BaseAdminController
* @Route("/{id}/export", name="store_location_export")
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(Storelocation $entity, EntityExporter $exporter, Request $request)
{

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

@ -32,11 +32,7 @@
namespace App\Controller\AdminPages;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Supplier;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\AdminPages\CompanyForm;
use App\Form\AdminPages\SupplierForm;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
@ -57,7 +53,7 @@ class SupplierController extends BaseAdminController
protected $entity_class = Supplier::class;
protected $twig_template = 'AdminPages/SupplierAdmin.html.twig';
protected $form_class = SupplierForm::class;
protected $route_base = "supplier";
protected $route_base = 'supplier';
/**
* @Route("/{id}/edit", requirements={"id"="\d+"}, name="supplier_edit")
@ -72,7 +68,7 @@ class SupplierController extends BaseAdminController
* @Route("/new", name="supplier_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -103,6 +99,7 @@ class SupplierController extends BaseAdminController
* @Route("/{id}/export", name="supplier_export")
* @param Request $request
* @param Supplier $entity
* @return Response
*/
public function exportEntity(Supplier $entity, EntityExporter $exporter, Request $request)
{

18
src/Controller/AttachmentFileController.php
View file

@ -47,17 +47,20 @@ class AttachmentFileController extends AbstractController
*
* @Route("/attachment/{id}/download", name="attachment_download")
* @param Attachment $attachment
* @param AttachmentHelper $helper
* @return BinaryFileResponse
* @throws \Exception
*/
public function download(Attachment $attachment, AttachmentHelper $helper)
{
$this->denyAccessUnlessGranted("read", $attachment);
$this->denyAccessUnlessGranted('read', $attachment);
if ($attachment->isExternal()) {
throw new \Exception("You can not download external attachments!");
throw new \RuntimeException('You can not download external attachments!');
}
if (!$helper->isFileExisting($attachment)) {
throw new \Exception("The file associated with the attachment is not existing!");
throw new \RuntimeException('The file associated with the attachment is not existing!');
}
@ -75,17 +78,20 @@ class AttachmentFileController extends AbstractController
*
* @Route("/attachment/{id}/view", name="attachment_view")
* @param Attachment $attachment
* @param AttachmentHelper $helper
* @return BinaryFileResponse
* @throws \Exception
*/
public function view(Attachment $attachment, AttachmentHelper $helper)
{
$this->denyAccessUnlessGranted("read", $attachment);
$this->denyAccessUnlessGranted('read', $attachment);
if ($attachment->isExternal()) {
throw new \Exception("You can not download external attachments!");
throw new \RuntimeException('You can not download external attachments!');
}
if (!$helper->isFileExisting($attachment)) {
throw new \Exception("The file associated with the attachment is not existing!");
throw new \RuntimeException('The file associated with the attachment is not existing!');
}

16
src/Controller/PartController.php
View file

@ -33,7 +33,6 @@ namespace App\Controller;
use App\Entity\Parts\Category;
use App\Entity\Parts\Part;
use App\Form\Part\PartBaseType;
use App\Services\AttachmentFilenameService;
use App\Services\AttachmentHelper;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -46,6 +45,9 @@ class PartController extends AbstractController
/**
* @Route("/part/{id}/info", name="part_info")
* @Route("/part/{id}", requirements={"id"="\d+"})
* @param Part $part
* @param AttachmentHelper $attachmentHelper
* @return \Symfony\Component\HttpFoundation\Response
*/
public function show(Part $part, AttachmentHelper $attachmentHelper)
{
@ -64,6 +66,8 @@ class PartController extends AbstractController
*
* @param Part $part
*
* @param Request $request
* @param EntityManagerInterface $em
* @return \Symfony\Component\HttpFoundation\Response
*/
public function edit(Part $part, Request $request, EntityManagerInterface $em)
@ -89,6 +93,9 @@ class PartController extends AbstractController
/**
* @Route("/part/new", name="part_new")
*
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @return \Symfony\Component\HttpFoundation\Response
*/
public function new(Request $request, EntityManagerInterface $em, TranslatorInterface $translator)
@ -123,6 +130,11 @@ class PartController extends AbstractController
/**
* @Route("/part/{id}/clone", name="part_clone")
* @param Part $part
* @param Request $request
* @param EntityManagerInterface $em
* @param TranslatorInterface $translator
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function clone(Part $part, Request $request, EntityManagerInterface $em, TranslatorInterface $translator)
{
@ -143,7 +155,7 @@ class PartController extends AbstractController
return $this->redirectToRoute('part_edit', ['id' => $new_part->getID()]);
}
return $this->render('Parts/new_part.html.twig',
return $this->render('Parts/edit/new_part.html.twig',
[
'part' => $new_part,
'form' => $form->createView(),

2
src/Controller/SecurityController.php
View file

@ -57,6 +57,6 @@ class SecurityController extends AbstractController
*/
public function logout()
{
throw new \Exception('Will be intercepted before getting here');
throw new \RuntimeException('Will be intercepted before getting here');
}
}

14
src/Controller/TreeController.php
View file

@ -35,11 +35,9 @@ use App\Entity\Parts\Footprint;
use App\Entity\Parts\Manufacturer;
use App\Entity\Parts\Storelocation;
use App\Entity\Parts\Supplier;
use App\Helpers\TreeViewNode;
use App\Services\ToolsTreeBuilder;
use App\Services\TreeBuilder;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\LocaleType;
use Symfony\Component\Routing\Annotation\Route;
/**
@ -66,7 +64,7 @@ class TreeController extends AbstractController
*/
public function categoryTree(TreeBuilder $builder, Category $category = null)
{
if ($category != null) {
if ($category !== null) {
$tree[] = $builder->elementToTreeNode($category);
} else {
$tree = $builder->typeToTree(Category::class);
@ -82,7 +80,7 @@ class TreeController extends AbstractController
*/
public function footprintTree(TreeBuilder $builder, Footprint $footprint = null)
{
if ($footprint != null) {
if ($footprint !== null) {
$tree[] = $builder->elementToTreeNode($footprint);
} else {
$tree = $builder->typeToTree(Footprint::class, null);
@ -98,7 +96,7 @@ class TreeController extends AbstractController
*/
public function locationTree(TreeBuilder $builder, Storelocation $location = null)
{
if ($location != null) {
if ($location !== null) {
$tree[] = $builder->elementToTreeNode($location);
} else {
$tree = $builder->typeToTree(Storelocation::class, null);
@ -114,7 +112,7 @@ class TreeController extends AbstractController
*/
public function manufacturerTree(TreeBuilder $builder, Manufacturer $manufacturer = null)
{
if ($manufacturer != null) {
if ($manufacturer !== null) {
$tree[] = $builder->elementToTreeNode($manufacturer);
} else {
$tree = $builder->typeToTree(Manufacturer::class, null);
@ -130,7 +128,7 @@ class TreeController extends AbstractController
*/
public function supplierTree(TreeBuilder $builder, Supplier $supplier = null)
{
if ($supplier != null) {
if ($supplier !== null) {
$tree[] = $builder->elementToTreeNode($supplier);
} else {
$tree = $builder->typeToTree(Supplier::class, null);
@ -146,7 +144,7 @@ class TreeController extends AbstractController
*/
public function deviceTree(TreeBuilder $builder, Device $device = null)
{
if ($device != null) {
if ($device !== null) {
$tree[] = $builder->elementToTreeNode($device);
} else {
$tree = $builder->typeToTree(Device::class, null);

8
src/Controller/UserController.php
View file

@ -30,16 +30,13 @@
namespace App\Controller;
use App\Entity\Attachments\AttachmentType;
use App\Entity\Parts\Footprint;
use App\Entity\UserSystem\User;
use App\Form\AdminPages\BaseEntityAdminForm;
use App\Form\UserAdminForm;
use App\Form\UserSettingsType;
use App\Services\EntityExporter;
use App\Services\EntityImporter;
use App\Services\StructuralElementRecursionHelper;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Asset\Packages;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
@ -63,7 +60,7 @@ class UserController extends AdminPages\BaseAdminController
protected $entity_class = User::class;
protected $twig_template = 'AdminPages/UserAdmin.html.twig';
protected $form_class = UserAdminForm::class;
protected $route_base = "user";
protected $route_base = 'user';
/**
@ -79,7 +76,7 @@ class UserController extends AdminPages\BaseAdminController
* @Route("/new", name="user_new")
* @Route("/")
*
* @return \Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function new(Request $request, EntityManagerInterface $em, EntityImporter $importer)
{
@ -110,6 +107,7 @@ class UserController extends AdminPages\BaseAdminController
* @Route("/{id}/export", name="user_export")
* @param Request $request
* @param AttachmentType $entity
* @return Response
*/
public function exportEntity(User $entity, EntityExporter $exporter, Request $request)
{