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

Fixed some exceptions introduced earlier.

Browse source
This commit is contained in:
Jan Böhmer 2022-09-21 12:31:32 +02:00
parent 58ada496e4
commit c2c768b151
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Entity/Devices/DevicePart.php
View file

@ -78,12 +78,12 @@ class DevicePart extends AbstractDBElement
* @ORM\ManyToOne(targetEntity="Device", inversedBy="parts") * @ORM\ManyToOne(targetEntity="Device", inversedBy="parts")
* @ORM\JoinColumn(name="id_device", referencedColumnName="id") * @ORM\JoinColumn(name="id_device", referencedColumnName="id")
*/ */
protected Device $device; protected ?Device $device = null;
/** /**
* @var Part * @var Part
* @ORM\ManyToOne(targetEntity="App\Entity\Parts\Part") * @ORM\ManyToOne(targetEntity="App\Entity\Parts\Part")
* @ORM\JoinColumn(name="id_part", referencedColumnName="id") * @ORM\JoinColumn(name="id_part", referencedColumnName="id")
*/ */
protected Part $part; protected ?Part $part = null;
} }

2
src/Entity/Parts/MeasurementUnit.php
View file

@ -66,7 +66,7 @@ class MeasurementUnit extends AbstractPartsContainingDBElement
* @ORM\Column(type="string", name="unit", nullable=true) * @ORM\Column(type="string", name="unit", nullable=true)
* @Assert\Length(max=10) * @Assert\Length(max=10)
*/ */
protected string $unit; protected ?string $unit = null;
/** /**
* @var bool Determines if the amount value associated with this unit should be treated as integer. * @var bool Determines if the amount value associated with this unit should be treated as integer.

2
src/Entity/Parts/PartTraits/OrderTrait.php
View file

@ -85,7 +85,7 @@ trait OrderTrait
* *
* @ColumnSecurity(prefix="order", type="object") * @ColumnSecurity(prefix="order", type="object")
*/ */
protected Orderdetail $order_orderdetail; protected ?Orderdetail $order_orderdetail = null;
/** /**
* Get the selected order orderdetails of this part. * Get the selected order orderdetails of this part.

2
src/Entity/PriceInformations/Currency.php
View file

@ -78,7 +78,7 @@ class Currency extends AbstractStructuralDBElement
* @ORM\Column(type="string") * @ORM\Column(type="string")
* @Assert\Currency() * @Assert\Currency()
*/ */
protected string $iso_code; protected string $iso_code = "";
/** /**
* @ORM\OneToMany(targetEntity="Currency", mappedBy="parent", cascade={"persist"}) * @ORM\OneToMany(targetEntity="Currency", mappedBy="parent", cascade={"persist"})

6
src/Services/UserCacheKeyGenerator.php
View file

@ -73,13 +73,9 @@ class UserCacheKeyGenerator
$user = $this->security->getUser(); $user = $this->security->getUser();
} }
if (!$user instanceof User){
throw new \RuntimeException('UserCacheKeyGenerator::generateKey() was called without a user, but no user is logged in!');
}
//If the user is null, then treat it as anonymous user. //If the user is null, then treat it as anonymous user.
//When the anonymous user is passed as user then use this path too. //When the anonymous user is passed as user then use this path too.
if (null === $user || User::ID_ANONYMOUS === $user->getID()) { if (null === $user || !($user instanceof User) || User::ID_ANONYMOUS === $user->getID()) {
return 'user$_'.User::ID_ANONYMOUS; return 'user$_'.User::ID_ANONYMOUS;
} }