+
+
+
+HTML;
+ }
+}
diff --git a/src/EventSubscriber/UserSystem/PartUniqueIpnSubscriber.php b/src/EventSubscriber/UserSystem/PartUniqueIpnSubscriber.php
index ecc25b4f..690448a5 100644
--- a/src/EventSubscriber/UserSystem/PartUniqueIpnSubscriber.php
+++ b/src/EventSubscriber/UserSystem/PartUniqueIpnSubscriber.php
@@ -1,5 +1,7 @@
.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Exceptions;
+
+use App\Services\InfoProviderSystem\Providers\InfoProviderInterface;
+
+/**
+ * An exception denoting that a required info provider is not active. This can be used to display a user-friendly error message,
+ * when a user tries to use an info provider that is not active.
+ */
+class InfoProviderNotActiveException extends \RuntimeException
+{
+ public function __construct(public readonly string $providerKey, public readonly string $friendlyName)
+ {
+ parent::__construct(sprintf('The info provider "%s" (%s) is not active.', $this->friendlyName, $this->providerKey));
+ }
+
+ /**
+ * Creates an instance of this exception from an info provider instance
+ * @param InfoProviderInterface $provider
+ * @return self
+ */
+ public static function fromProvider(InfoProviderInterface $provider): self
+ {
+ return new self($provider->getProviderKey(), $provider->getProviderInfo()['name'] ?? '???');
+ }
+}
diff --git a/assets/controllers/turbo/locale_menu_controller.js b/src/Exceptions/ProviderIDNotSupportedException.php
similarity index 67%
rename from assets/controllers/turbo/locale_menu_controller.js
rename to src/Exceptions/ProviderIDNotSupportedException.php
index d55ff8da..429f43ea 100644
--- a/assets/controllers/turbo/locale_menu_controller.js
+++ b/src/Exceptions/ProviderIDNotSupportedException.php
@@ -1,7 +1,8 @@
+.
*/
-import { Controller } from '@hotwired/stimulus';
+declare(strict_types=1);
-export default class extends Controller {
- connect() {
- const menu = document.getElementById('locale-select-menu');
- menu.innerHTML = this.element.innerHTML;
+
+namespace App\Exceptions;
+
+class ProviderIDNotSupportedException extends \RuntimeException
+{
+ public function fromProvider(string $providerKey, string $id): self
+ {
+ return new self(sprintf('The given ID %s is not supported by the provider %s.', $id, $providerKey,));
}
-}
\ No newline at end of file
+}
diff --git a/src/Exceptions/TwigModeException.php b/src/Exceptions/TwigModeException.php
index b76d14d3..ea84667a 100644
--- a/src/Exceptions/TwigModeException.php
+++ b/src/Exceptions/TwigModeException.php
@@ -42,15 +42,14 @@ declare(strict_types=1);
namespace App\Exceptions;
use RuntimeException;
-use Twig\Error\Error;
class TwigModeException extends RuntimeException
{
private const PROJECT_PATH = __DIR__ . '/../../';
- public function __construct(?Error $previous = null)
+ public function __construct(?\Throwable $previous = null)
{
- parent::__construct($previous->getMessage(), 0, $previous);
+ parent::__construct($previous?->getMessage() ?? "Unknown message", 0, $previous);
}
/**
diff --git a/src/Form/AdminPages/AttachmentTypeAdminForm.php b/src/Form/AdminPages/AttachmentTypeAdminForm.php
index d777d4d4..7f9e7646 100644
--- a/src/Form/AdminPages/AttachmentTypeAdminForm.php
+++ b/src/Form/AdminPages/AttachmentTypeAdminForm.php
@@ -22,17 +22,23 @@ declare(strict_types=1);
namespace App\Form\AdminPages;
+use App\Entity\Attachments\Attachment;
+use App\Entity\Attachments\PartAttachment;
+use App\Entity\Attachments\ProjectAttachment;
+use App\Services\ElementTypeNameGenerator;
use Symfony\Bundle\SecurityBundle\Security;
use App\Entity\Base\AbstractNamedDBElement;
use App\Services\Attachments\FileTypeFilterTools;
use App\Services\LogSystem\EventCommentNeededHelper;
use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\StaticMessage;
class AttachmentTypeAdminForm extends BaseEntityAdminForm
{
- public function __construct(Security $security, protected FileTypeFilterTools $filterTools, EventCommentNeededHelper $eventCommentNeededHelper)
+ public function __construct(Security $security, protected FileTypeFilterTools $filterTools, EventCommentNeededHelper $eventCommentNeededHelper, private readonly ElementTypeNameGenerator $elementTypeNameGenerator)
{
parent::__construct($security, $eventCommentNeededHelper);
}
@@ -41,6 +47,25 @@ class AttachmentTypeAdminForm extends BaseEntityAdminForm
{
$is_new = null === $entity->getID();
+
+ $choiceLabel = function (string $class) {
+ if (!is_a($class, Attachment::class, true)) {
+ return $class;
+ }
+ return new StaticMessage($this->elementTypeNameGenerator->typeLabelPlural($class::ALLOWED_ELEMENT_CLASS));
+ };
+
+
+ $builder->add('allowed_targets', ChoiceType::class, [
+ 'required' => false,
+ 'choices' => array_values(Attachment::ORM_DISCRIMINATOR_MAP),
+ 'choice_label' => $choiceLabel,
+ 'preferred_choices' => [PartAttachment::class, ProjectAttachment::class],
+ 'label' => 'attachment_type.edit.allowed_targets',
+ 'help' => 'attachment_type.edit.allowed_targets.help',
+ 'multiple' => true,
+ ]);
+
$builder->add('filetype_filter', TextType::class, [
'required' => false,
'label' => 'attachment_type.edit.filetype_filter',
diff --git a/src/Form/AdminPages/BaseEntityAdminForm.php b/src/Form/AdminPages/BaseEntityAdminForm.php
index 5a4ef5bc..f4bf37f8 100644
--- a/src/Form/AdminPages/BaseEntityAdminForm.php
+++ b/src/Form/AdminPages/BaseEntityAdminForm.php
@@ -71,6 +71,7 @@ class BaseEntityAdminForm extends AbstractType
'label' => 'name.label',
'attr' => [
'placeholder' => 'part.name.placeholder',
+ 'autofocus' => $is_new,
],
'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
]);
diff --git a/src/Form/AttachmentFormType.php b/src/Form/AttachmentFormType.php
index eb484a58..d9fe2cd2 100644
--- a/src/Form/AttachmentFormType.php
+++ b/src/Form/AttachmentFormType.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Form;
+use App\Form\Type\AttachmentTypeType;
use App\Settings\SystemSettings\AttachmentsSettings;
use Symfony\Bundle\SecurityBundle\Security;
use App\Entity\Attachments\Attachment;
@@ -67,10 +68,10 @@ class AttachmentFormType extends AbstractType
'required' => false,
'empty_data' => '',
])
- ->add('attachment_type', StructuralEntityType::class, [
+ ->add('attachment_type', AttachmentTypeType::class, [
'label' => 'attachment.edit.attachment_type',
- 'class' => AttachmentType::class,
'disable_not_selectable' => true,
+ 'attachment_filter_class' => $options['data_class'] ?? null,
'allow_add' => $this->security->isGranted('@attachment_types.create'),
]);
@@ -121,9 +122,7 @@ class AttachmentFormType extends AbstractType
],
'constraints' => [
//new AllowedFileExtension(),
- new File([
- 'maxSize' => $options['max_file_size'],
- ]),
+ new File(maxSize: $options['max_file_size']),
],
]);
diff --git a/src/Form/Filters/PartFilterType.php b/src/Form/Filters/PartFilterType.php
index e101c635..25fe70b2 100644
--- a/src/Form/Filters/PartFilterType.php
+++ b/src/Form/Filters/PartFilterType.php
@@ -135,6 +135,10 @@ class PartFilterType extends AbstractType
'min' => 0,
]);
+ $builder->add('gtin', TextConstraintType::class, [
+ 'label' => 'part.gtin',
+ ]);
+
$builder->add('measurementUnit', StructuralEntityConstraintType::class, [
'label' => 'part.edit.partUnit',
'entity_class' => MeasurementUnit::class
diff --git a/src/Form/InfoProviderSystem/FieldToProviderMappingType.php b/src/Form/InfoProviderSystem/FieldToProviderMappingType.php
index 13e9581e..7df8985e 100644
--- a/src/Form/InfoProviderSystem/FieldToProviderMappingType.php
+++ b/src/Form/InfoProviderSystem/FieldToProviderMappingType.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Form\InfoProviderSystem;
+use Symfony\Component\Validator\Constraints\Range;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -61,7 +62,7 @@ class FieldToProviderMappingType extends AbstractType
'style' => 'width: 80px;'
],
'constraints' => [
- new \Symfony\Component\Validator\Constraints\Range(['min' => 1, 'max' => 10]),
+ new Range(min: 1, max: 10),
],
]);
}
diff --git a/src/Form/LabelSystem/ScanDialogType.php b/src/Form/LabelSystem/ScanDialogType.php
index 13ff8e6f..cd1440c6 100644
--- a/src/Form/LabelSystem/ScanDialogType.php
+++ b/src/Form/LabelSystem/ScanDialogType.php
@@ -72,10 +72,7 @@ class ScanDialogType extends AbstractType
'placeholder' => 'scan_dialog.mode.auto',
'choice_label' => fn (?BarcodeSourceType $enum) => match($enum) {
null => 'scan_dialog.mode.auto',
- BarcodeSourceType::INTERNAL => 'scan_dialog.mode.internal',
- BarcodeSourceType::IPN => 'scan_dialog.mode.ipn',
- BarcodeSourceType::USER_DEFINED => 'scan_dialog.mode.user',
- BarcodeSourceType::EIGP114 => 'scan_dialog.mode.eigp'
+ default => 'scan_dialog.mode.' . $enum->value,
},
]);
diff --git a/src/Form/Part/OrderdetailType.php b/src/Form/Part/OrderdetailType.php
index 53240821..ca295c7e 100644
--- a/src/Form/Part/OrderdetailType.php
+++ b/src/Form/Part/OrderdetailType.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Form\Part;
+use App\Form\Type\TriStateCheckboxType;
use Symfony\Bundle\SecurityBundle\Security;
use App\Entity\Parts\MeasurementUnit;
use App\Entity\Parts\Supplier;
@@ -73,6 +74,11 @@ class OrderdetailType extends AbstractType
'label' => 'orderdetails.edit.obsolete',
]);
+ $builder->add('pricesIncludesVAT', TriStateCheckboxType::class, [
+ 'required' => false,
+ 'label' => 'orderdetails.edit.prices_includes_vat',
+ ]);
+
//Add pricedetails after we know the data, so we can set the default currency
$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options): void {
/** @var Orderdetail $orderdetail */
diff --git a/src/Form/Part/PartBaseType.php b/src/Form/Part/PartBaseType.php
index b8276589..6b929486 100644
--- a/src/Form/Part/PartBaseType.php
+++ b/src/Form/Part/PartBaseType.php
@@ -43,6 +43,7 @@ use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
use App\Services\LogSystem\EventCommentNeededHelper;
use App\Services\LogSystem\EventCommentType;
use App\Settings\MiscSettings\IpnSuggestSettings;
+use App\Settings\SystemSettings\LocalizationSettings;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -63,6 +64,7 @@ class PartBaseType extends AbstractType
protected UrlGeneratorInterface $urlGenerator,
protected EventCommentNeededHelper $event_comment_needed_helper,
protected IpnSuggestSettings $ipnSuggestSettings,
+ private readonly LocalizationSettings $localizationSettings,
) {
}
@@ -115,6 +117,7 @@ class PartBaseType extends AbstractType
'label' => 'part.edit.name',
'attr' => [
'placeholder' => 'part.edit.name.placeholder',
+ 'autofocus' => $new_part,
],
])
->add('description', RichTextEditorType::class, [
@@ -216,7 +219,13 @@ class PartBaseType extends AbstractType
'disable_not_selectable' => true,
'label' => 'part.edit.partCustomState',
])
- ->add('ipn', TextType::class, $ipnOptions);
+ ->add('ipn', TextType::class, $ipnOptions)
+ ->add('gtin', TextType::class, [
+ 'required' => false,
+ 'empty_data' => null,
+ 'label' => 'part.gtin',
+ ])
+ ;
//Comment section
$builder->add('comment', RichTextEditorType::class, [
@@ -261,6 +270,9 @@ class PartBaseType extends AbstractType
'entity' => $part,
]);
+ $orderdetailPrototype = new Orderdetail();
+ $orderdetailPrototype->setPricesIncludesVAT($this->localizationSettings->pricesIncludeTaxByDefault);
+
//Orderdetails section
$builder->add('orderdetails', CollectionType::class, [
'entry_type' => OrderdetailType::class,
@@ -269,7 +281,7 @@ class PartBaseType extends AbstractType
'allow_delete' => true,
'label' => false,
'by_reference' => false,
- 'prototype_data' => new Orderdetail(),
+ 'prototype_data' => $orderdetailPrototype,
'entry_options' => [
'measurement_unit' => $part->getPartUnit(),
],
diff --git a/src/Form/Part/PartLotType.php b/src/Form/Part/PartLotType.php
index 7d545340..fc330bb1 100644
--- a/src/Form/Part/PartLotType.php
+++ b/src/Form/Part/PartLotType.php
@@ -31,6 +31,7 @@ use App\Form\Type\StructuralEntityType;
use App\Form\Type\UserSelectType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
@@ -110,6 +111,13 @@ class PartLotType extends AbstractType
//Do not remove whitespace chars on the beginning and end of the string
'trim' => false,
]);
+
+ $builder->add('last_stocktake_at', DateTimeType::class, [
+ 'label' => 'part_lot.edit.last_stocktake_at',
+ 'widget' => 'single_text',
+ 'disabled' => !$this->security->isGranted('@parts_stock.stocktake'),
+ 'required' => false,
+ ]);
}
public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/Form/Type/AttachmentTypeType.php b/src/Form/Type/AttachmentTypeType.php
new file mode 100644
index 00000000..099ed282
--- /dev/null
+++ b/src/Form/Type/AttachmentTypeType.php
@@ -0,0 +1,56 @@
+.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Form\Type;
+
+use App\Entity\Attachments\AttachmentType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Form type to select the AttachmentType to use in an attachment form. This is used to filter the available attachment types based on the target class.
+ */
+class AttachmentTypeType extends AbstractType
+{
+ public function getParent(): ?string
+ {
+ return StructuralEntityType::class;
+ }
+
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->define('attachment_filter_class')->allowedTypes('null', 'string')->default(null);
+
+ $resolver->setDefault('class', AttachmentType::class);
+
+ $resolver->setDefault('choice_filter', function (Options $options) {
+ if (is_a($options['class'], AttachmentType::class, true) && $options['attachment_filter_class'] !== null) {
+ return static function (?AttachmentType $choice) use ($options) {
+ return $choice?->isAllowedForTarget($options['attachment_filter_class']);
+ };
+ }
+ return null;
+ });
+ }
+}
diff --git a/src/Form/UserAdminForm.php b/src/Form/UserAdminForm.php
index 69be181f..457a6e0b 100644
--- a/src/Form/UserAdminForm.php
+++ b/src/Form/UserAdminForm.php
@@ -177,10 +177,7 @@ class UserAdminForm extends AbstractType
'required' => false,
'mapped' => false,
'disabled' => !$this->security->isGranted('set_password', $entity) || $entity->isSamlUser(),
- 'constraints' => [new Length([
- 'min' => 6,
- 'max' => 128,
- ])],
+ 'constraints' => [new Length(min: 6, max: 128)],
])
->add('need_pw_change', CheckboxType::class, [
diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingsType.php
index 0c7cb169..968d8063 100644
--- a/src/Form/UserSettingsType.php
+++ b/src/Form/UserSettingsType.php
@@ -92,9 +92,7 @@ class UserSettingsType extends AbstractType
'accept' => 'image/*',
],
'constraints' => [
- new File([
- 'maxSize' => '5M',
- ]),
+ new File(maxSize: '5M'),
],
])
->add('aboutMe', RichTextEditorType::class, [
diff --git a/src/Repository/PartRepository.php b/src/Repository/PartRepository.php
index 9d5fee5e..d5ccd3a6 100644
--- a/src/Repository/PartRepository.php
+++ b/src/Repository/PartRepository.php
@@ -389,4 +389,93 @@ class PartRepository extends NamedDBElementRepository
return $baseIpn . '_' . ($maxSuffix + 1);
}
+ /**
+ * Finds a part based on the provided info provider key and ID, with an option for case sensitivity.
+ * If no part is found with the given provider key and ID, null is returned.
+ * @param string $providerID
+ * @param string|null $providerKey If null, the provider key will not be included in the search criteria, and only the provider ID will be used for matching.
+ * @param bool $caseInsensitive If true, the provider ID comparison will be case-insensitive. Default is true.
+ * @return Part|null
+ */
+ public function getPartByProviderInfo(string $providerID, ?string $providerKey = null, bool $caseInsensitive = true): ?Part
+ {
+ $qb = $this->createQueryBuilder('part');
+ $qb->select('part');
+
+ if ($providerKey) {
+ $qb->where("part.providerReference.provider_key = :providerKey");
+ $qb->setParameter('providerKey', $providerKey);
+ }
+
+
+ if ($caseInsensitive) {
+ $qb->andWhere("LOWER(part.providerReference.provider_id) = LOWER(:providerID)");
+ } else {
+ $qb->andWhere("part.providerReference.provider_id = :providerID");
+ }
+
+ $qb->setParameter('providerID', $providerID);
+
+ return $qb->getQuery()->getOneOrNullResult();
+ }
+
+ /**
+ * Finds a part based on the provided MPN (Manufacturer Part Number), with an option for case sensitivity.
+ * If no part is found with the given MPN, null is returned.
+ * @param string $mpn
+ * @param string|null $manufacturerName If provided, the search will also include a match for the manufacturer's name. If null, the manufacturer name will not be included in the search criteria.
+ * @param bool $caseInsensitive If true, the MPN comparison will be case-insensitive. Default is true (case-insensitive).
+ * @return Part|null
+ */
+ public function getPartByMPN(string $mpn, ?string $manufacturerName = null, bool $caseInsensitive = true): ?Part
+ {
+ $qb = $this->createQueryBuilder('part');
+ $qb->select('part');
+
+ if ($caseInsensitive) {
+ $qb->where("LOWER(part.manufacturer_product_number) = LOWER(:mpn)");
+ } else {
+ $qb->where("part.manufacturer_product_number = :mpn");
+ }
+
+ if ($manufacturerName !== null) {
+ $qb->leftJoin('part.manufacturer', 'manufacturer');
+
+ if ($caseInsensitive) {
+ $qb->andWhere("LOWER(manufacturer.name) = LOWER(:manufacturerName)");
+ } else {
+ $qb->andWhere("manufacturer.name = :manufacturerName");
+ }
+ $qb->setParameter('manufacturerName', $manufacturerName);
+ }
+
+ $qb->setParameter('mpn', $mpn);
+
+ return $qb->getQuery()->getOneOrNullResult();
+ }
+
+ /**
+ * Finds a part based on the provided SPN (Supplier Part Number), with an option for case sensitivity.
+ * If no part is found with the given SPN, null is returned.
+ * @param string $spn
+ * @param bool $caseInsensitive
+ * @return Part|null
+ */
+ public function getPartBySPN(string $spn, bool $caseInsensitive = true): ?Part
+ {
+ $qb = $this->createQueryBuilder('part');
+ $qb->select('part');
+
+ $qb->leftJoin('part.orderdetails', 'o');
+
+ if ($caseInsensitive) {
+ $qb->where("LOWER(o.supplierpartnr) = LOWER(:spn)");
+ } else {
+ $qb->where("o.supplierpartnr = :spn");
+ }
+
+ $qb->setParameter('spn', $spn);
+
+ return $qb->getQuery()->getOneOrNullResult();
+ }
}
diff --git a/src/Security/Voter/PartLotVoter.php b/src/Security/Voter/PartLotVoter.php
index 87c3d135..5748f4af 100644
--- a/src/Security/Voter/PartLotVoter.php
+++ b/src/Security/Voter/PartLotVoter.php
@@ -58,13 +58,13 @@ final class PartLotVoter extends Voter
{
}
- protected const ALLOWED_PERMS = ['read', 'edit', 'create', 'delete', 'show_history', 'revert_element', 'withdraw', 'add', 'move'];
+ protected const ALLOWED_PERMS = ['read', 'edit', 'create', 'delete', 'show_history', 'revert_element', 'withdraw', 'add', 'move', 'stocktake'];
protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token, ?Vote $vote = null): bool
{
$user = $this->helper->resolveUser($token);
- if (in_array($attribute, ['withdraw', 'add', 'move'], true))
+ if (in_array($attribute, ['withdraw', 'add', 'move', 'stocktake'], true))
{
$base_permission = $this->helper->isGranted($token, 'parts_stock', $attribute, $vote);
diff --git a/src/Services/Attachments/AttachmentSubmitHandler.php b/src/Services/Attachments/AttachmentSubmitHandler.php
index c7e69257..81a83f0c 100644
--- a/src/Services/Attachments/AttachmentSubmitHandler.php
+++ b/src/Services/Attachments/AttachmentSubmitHandler.php
@@ -137,7 +137,10 @@ class AttachmentSubmitHandler
$attachment->getName()
);
- return $safeName.'-'.uniqid('', false).'.'.$extension;
+ // Generate a 12-character URL-safe random string, which should avoid collisions and prevent from guessing file paths.
+ $random = str_replace(['+', '/', '='], ['0', '1', '2'], base64_encode(random_bytes(9)));
+
+ return $safeName.'-'.$random.'.'.$extension;
}
/**
diff --git a/src/Services/Attachments/AttachmentURLGenerator.php b/src/Services/Attachments/AttachmentURLGenerator.php
index e505408f..89856650 100644
--- a/src/Services/Attachments/AttachmentURLGenerator.php
+++ b/src/Services/Attachments/AttachmentURLGenerator.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Services\Attachments;
+use App\Settings\SystemSettings\AttachmentsSettings;
use Imagine\Exception\RuntimeException;
use App\Entity\Attachments\Attachment;
use InvalidArgumentException;
@@ -40,7 +41,7 @@ class AttachmentURLGenerator
public function __construct(protected Packages $assets, protected AttachmentPathResolver $pathResolver,
protected UrlGeneratorInterface $urlGenerator, protected AttachmentManager $attachmentHelper,
- protected CacheManager $thumbnailManager, protected LoggerInterface $logger)
+ protected CacheManager $thumbnailManager, protected LoggerInterface $logger, private readonly AttachmentsSettings $attachmentsSettings)
{
//Determine a normalized path to the public folder (assets are relative to this folder)
$this->public_path = $this->pathResolver->parameterToAbsolutePath('public');
@@ -99,6 +100,10 @@ class AttachmentURLGenerator
return null;
}
+ if ($this->attachmentsSettings->showHTMLAttachments && $attachment->isLocalHTMLFile()) {
+ return $this->urlGenerator->generate('attachment_html_sandbox', ['id' => $attachment->getID()]);
+ }
+
$asset_path = $this->absolutePathToAssetPath($absolute_path);
//If path is not relative to public path or marked as secure, serve it via controller
if (null === $asset_path || $attachment->isSecure()) {
diff --git a/src/Services/EntityMergers/Mergers/PartMerger.php b/src/Services/EntityMergers/Mergers/PartMerger.php
index d1f5c137..8397257e 100644
--- a/src/Services/EntityMergers/Mergers/PartMerger.php
+++ b/src/Services/EntityMergers/Mergers/PartMerger.php
@@ -59,6 +59,7 @@ class PartMerger implements EntityMergerInterface
$this->useOtherValueIfNotEmtpy($target, $other, 'manufacturer_product_number');
$this->useOtherValueIfNotEmtpy($target, $other, 'mass');
$this->useOtherValueIfNotEmtpy($target, $other, 'ipn');
+ $this->useOtherValueIfNotEmtpy($target, $other, 'gtin');
//Merge relations to other entities
$this->useOtherValueIfNotNull($target, $other, 'manufacturer');
@@ -184,4 +185,4 @@ class PartMerger implements EntityMergerInterface
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Services/ImportExportSystem/BOMImporter.php b/src/Services/ImportExportSystem/BOMImporter.php
index 33a402cb..abf72d74 100644
--- a/src/Services/ImportExportSystem/BOMImporter.php
+++ b/src/Services/ImportExportSystem/BOMImporter.php
@@ -22,6 +22,8 @@ declare(strict_types=1);
*/
namespace App\Services\ImportExportSystem;
+use App\Entity\Parts\Supplier;
+use App\Entity\PriceInformations\Orderdetail;
use App\Entity\Parts\Part;
use App\Entity\ProjectSystem\Project;
use App\Entity\ProjectSystem\ProjectBOMEntry;
@@ -275,10 +277,13 @@ class BOMImporter
$mapped_entries = []; // Collect all mapped entries for validation
// Fetch suppliers once for efficiency
- $suppliers = $this->entityManager->getRepository(\App\Entity\Parts\Supplier::class)->findAll();
+ $suppliers = $this->entityManager->getRepository(Supplier::class)->findAll();
$supplierSPNKeys = [];
+ $suppliersByName = []; // Map supplier names to supplier objects
foreach ($suppliers as $supplier) {
- $supplierSPNKeys[] = $supplier->getName() . ' SPN';
+ $supplierName = $supplier->getName();
+ $supplierSPNKeys[] = $supplierName . ' SPN';
+ $suppliersByName[$supplierName] = $supplier;
}
foreach ($csv->getRecords() as $offset => $entry) {
@@ -356,6 +361,41 @@ class BOMImporter
}
}
+ // Try to link existing part based on supplier part number if no Part-DB ID is given
+ if ($part === null) {
+ // Check all available supplier SPN fields
+ foreach ($suppliersByName as $supplierName => $supplier) {
+ $supplier_spn = null;
+
+ if (isset($mapped_entry[$supplierName . ' SPN']) && !empty(trim($mapped_entry[$supplierName . ' SPN']))) {
+ $supplier_spn = trim($mapped_entry[$supplierName . ' SPN']);
+ }
+
+ if ($supplier_spn !== null) {
+ // Query for orderdetails with matching supplier and SPN
+ $orderdetail = $this->entityManager->getRepository(Orderdetail::class)
+ ->findOneBy([
+ 'supplier' => $supplier,
+ 'supplierpartnr' => $supplier_spn,
+ ]);
+
+ if ($orderdetail !== null && $orderdetail->getPart() !== null) {
+ $part = $orderdetail->getPart();
+ $name = $part->getName(); // Update name with actual part name
+
+ $this->logger->info('Linked BOM entry to existing part via supplier SPN', [
+ 'supplier' => $supplierName,
+ 'supplier_spn' => $supplier_spn,
+ 'part_id' => $part->getID(),
+ 'part_name' => $part->getName(),
+ ]);
+
+ break; // Stop searching once a match is found
+ }
+ }
+ }
+ }
+
// Create unique key for this entry (name + part ID)
$entry_key = $name . '|' . ($part ? $part->getID() : 'null');
@@ -497,7 +537,7 @@ class BOMImporter
];
// Add dynamic supplier fields based on available suppliers in the database
- $suppliers = $this->entityManager->getRepository(\App\Entity\Parts\Supplier::class)->findAll();
+ $suppliers = $this->entityManager->getRepository(Supplier::class)->findAll();
foreach ($suppliers as $supplier) {
$supplierName = $supplier->getName();
$targets[$supplierName . ' SPN'] = [
@@ -532,7 +572,7 @@ class BOMImporter
];
// Add supplier-specific patterns
- $suppliers = $this->entityManager->getRepository(\App\Entity\Parts\Supplier::class)->findAll();
+ $suppliers = $this->entityManager->getRepository(Supplier::class)->findAll();
foreach ($suppliers as $supplier) {
$supplierName = $supplier->getName();
$supplierLower = strtolower($supplierName);
diff --git a/src/Services/ImportExportSystem/EntityExporter.php b/src/Services/ImportExportSystem/EntityExporter.php
index 70feb8e6..ab87a905 100644
--- a/src/Services/ImportExportSystem/EntityExporter.php
+++ b/src/Services/ImportExportSystem/EntityExporter.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Services\ImportExportSystem;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use App\Entity\Base\AbstractNamedDBElement;
use App\Entity\Base\AbstractStructuralDBElement;
use App\Helpers\FilenameSanatizer;
@@ -177,7 +178,7 @@ class EntityExporter
$colIndex = 1;
foreach ($columns as $column) {
- $cellCoordinate = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($colIndex) . $rowIndex;
+ $cellCoordinate = Coordinate::stringFromColumnIndex($colIndex) . $rowIndex;
$worksheet->setCellValue($cellCoordinate, $column);
$colIndex++;
}
@@ -265,11 +266,14 @@ class EntityExporter
//Sanitize the filename
$filename = FilenameSanatizer::sanitizeFilename($filename);
+ //Remove percent for fallback
+ $fallback = str_replace("%", "_", $filename);
+
// Create the disposition of the file
$disposition = $response->headers->makeDisposition(
ResponseHeaderBag::DISPOSITION_ATTACHMENT,
$filename,
- u($filename)->ascii()->toString(),
+ $fallback,
);
// Set the content disposition
$response->headers->set('Content-Disposition', $disposition);
diff --git a/src/Services/ImportExportSystem/EntityImporter.php b/src/Services/ImportExportSystem/EntityImporter.php
index a89be9dc..7b928d6c 100644
--- a/src/Services/ImportExportSystem/EntityImporter.php
+++ b/src/Services/ImportExportSystem/EntityImporter.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Services\ImportExportSystem;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use App\Entity\Base\AbstractNamedDBElement;
use App\Entity\Base\AbstractStructuralDBElement;
use App\Entity\Parts\Category;
@@ -419,14 +420,14 @@ class EntityImporter
'worksheet_title' => $worksheet->getTitle()
]);
- $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+ $highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
for ($row = 1; $row <= $highestRow; $row++) {
$rowData = [];
// Read all columns using numeric index
for ($colIndex = 1; $colIndex <= $highestColumnIndex; $colIndex++) {
- $col = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($colIndex);
+ $col = Coordinate::stringFromColumnIndex($colIndex);
try {
$cellValue = $worksheet->getCell("{$col}{$row}")->getCalculatedValue();
$rowData[] = $cellValue ?? '';
diff --git a/src/Services/InfoProviderSystem/DTOs/BulkSearchResponseDTO.php b/src/Services/InfoProviderSystem/DTOs/BulkSearchResponseDTO.php
index 58e9e240..3db09de3 100644
--- a/src/Services/InfoProviderSystem/DTOs/BulkSearchResponseDTO.php
+++ b/src/Services/InfoProviderSystem/DTOs/BulkSearchResponseDTO.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Services\InfoProviderSystem\DTOs;
+use Doctrine\ORM\Exception\ORMException;
use App\Entity\Parts\Part;
use Doctrine\ORM\EntityManagerInterface;
use Traversable;
@@ -176,7 +177,7 @@ readonly class BulkSearchResponseDTO implements \ArrayAccess, \IteratorAggregate
* @param array $data
* @param EntityManagerInterface $entityManager
* @return BulkSearchResponseDTO
- * @throws \Doctrine\ORM\Exception\ORMException
+ * @throws ORMException
*/
public static function fromSerializableRepresentation(array $data, EntityManagerInterface $entityManager): BulkSearchResponseDTO
{
diff --git a/src/Services/InfoProviderSystem/DTOs/PartDetailDTO.php b/src/Services/InfoProviderSystem/DTOs/PartDetailDTO.php
index 41d50510..9700ae57 100644
--- a/src/Services/InfoProviderSystem/DTOs/PartDetailDTO.php
+++ b/src/Services/InfoProviderSystem/DTOs/PartDetailDTO.php
@@ -42,6 +42,7 @@ class PartDetailDTO extends SearchResultDTO
?ManufacturingStatus $manufacturing_status = null,
?string $provider_url = null,
?string $footprint = null,
+ ?string $gtin = null,
public readonly ?string $notes = null,
/** @var FileDTO[]|null */
public readonly ?array $datasheets = null,
@@ -68,6 +69,7 @@ class PartDetailDTO extends SearchResultDTO
manufacturing_status: $manufacturing_status,
provider_url: $provider_url,
footprint: $footprint,
+ gtin: $gtin
);
}
}
diff --git a/src/Services/InfoProviderSystem/DTOs/PriceDTO.php b/src/Services/InfoProviderSystem/DTOs/PriceDTO.php
index 2acf3e57..cf1f577d 100644
--- a/src/Services/InfoProviderSystem/DTOs/PriceDTO.php
+++ b/src/Services/InfoProviderSystem/DTOs/PriceDTO.php
@@ -39,7 +39,9 @@ readonly class PriceDTO
public string $price,
/** @var string The currency of the used ISO code of this price detail */
public ?string $currency_iso_code,
- /** @var bool If the price includes tax */
+ /** @var bool If the price includes tax
+ * @deprecated Use the prices_include_vat property of the PurchaseInfoDTO instead, as this property is not reliable if there are multiple prices with different values for includes_tax
+ */
public ?bool $includes_tax = true,
/** @var float the price related quantity */
public ?float $price_related_quantity = 1.0,
diff --git a/src/Services/InfoProviderSystem/DTOs/PurchaseInfoDTO.php b/src/Services/InfoProviderSystem/DTOs/PurchaseInfoDTO.php
index 9ac142ff..446d04dc 100644
--- a/src/Services/InfoProviderSystem/DTOs/PurchaseInfoDTO.php
+++ b/src/Services/InfoProviderSystem/DTOs/PurchaseInfoDTO.php
@@ -29,6 +29,9 @@ namespace App\Services\InfoProviderSystem\DTOs;
*/
readonly class PurchaseInfoDTO
{
+ /** @var bool|null If the prices contain VAT or not. Null if state is unknown. */
+ public ?bool $prices_include_vat;
+
public function __construct(
public string $distributor_name,
public string $order_number,
@@ -36,6 +39,7 @@ readonly class PurchaseInfoDTO
public array $prices,
/** @var string|null An url to the product page of the vendor */
public ?string $product_url = null,
+ ?bool $prices_include_vat = null,
)
{
//Ensure that the prices are PriceDTO instances
@@ -44,5 +48,17 @@ readonly class PurchaseInfoDTO
throw new \InvalidArgumentException('The prices array must only contain PriceDTO instances');
}
}
+
+ //If no prices_include_vat information is given, try to deduct it from the prices
+ if ($prices_include_vat === null) {
+ $vatValues = array_unique(array_map(fn(PriceDTO $price) => $price->includes_tax, $this->prices));
+ if (count($vatValues) === 1) {
+ $this->prices_include_vat = $vatValues[0]; //Use the value of the prices if they are all the same
+ } else {
+ $this->prices_include_vat = null; //If there are different values for the prices, we cannot determine if the prices include VAT or not
+ }
+ } else {
+ $this->prices_include_vat = $prices_include_vat;
+ }
}
}
diff --git a/src/Services/InfoProviderSystem/DTOs/SearchResultDTO.php b/src/Services/InfoProviderSystem/DTOs/SearchResultDTO.php
index a70b2486..085ae17e 100644
--- a/src/Services/InfoProviderSystem/DTOs/SearchResultDTO.php
+++ b/src/Services/InfoProviderSystem/DTOs/SearchResultDTO.php
@@ -59,6 +59,8 @@ class SearchResultDTO
public readonly ?string $provider_url = null,
/** @var string|null A footprint representation of the providers page */
public readonly ?string $footprint = null,
+ /** @var string|null The GTIN / EAN of the part */
+ public readonly ?string $gtin = null,
)
{
if ($preview_image_url !== null) {
@@ -90,6 +92,7 @@ class SearchResultDTO
'manufacturing_status' => $this->manufacturing_status?->value,
'provider_url' => $this->provider_url,
'footprint' => $this->footprint,
+ 'gtin' => $this->gtin,
];
}
@@ -112,6 +115,7 @@ class SearchResultDTO
manufacturing_status: isset($data['manufacturing_status']) ? ManufacturingStatus::tryFrom($data['manufacturing_status']) : null,
provider_url: $data['provider_url'] ?? null,
footprint: $data['footprint'] ?? null,
+ gtin: $data['gtin'] ?? null,
);
}
}
diff --git a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
index a655a0df..c7c15673 100644
--- a/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
+++ b/src/Services/InfoProviderSystem/DTOtoEntityConverter.php
@@ -94,7 +94,6 @@ final class DTOtoEntityConverter
$entity->setPrice($dto->getPriceAsBigDecimal());
$entity->setPriceRelatedQuantity($dto->price_related_quantity);
- //Currency TODO
if ($dto->currency_iso_code !== null) {
$entity->setCurrency($this->getCurrency($dto->currency_iso_code));
} else {
@@ -117,6 +116,8 @@ final class DTOtoEntityConverter
$entity->addPricedetail($this->convertPrice($price));
}
+ $entity->setPricesIncludesVAT($dto->prices_include_vat);
+
return $entity;
}
@@ -175,6 +176,8 @@ final class DTOtoEntityConverter
$entity->setManufacturingStatus($dto->manufacturing_status ?? ManufacturingStatus::NOT_SET);
$entity->setManufacturerProductURL($dto->manufacturer_product_url ?? '');
+ $entity->setGtin($dto->gtin);
+
//Set the provider reference on the part
$entity->setProviderReference(InfoProviderReference::fromPartDTO($dto));
diff --git a/src/Services/InfoProviderSystem/PartInfoRetriever.php b/src/Services/InfoProviderSystem/PartInfoRetriever.php
index 0eb74642..db1895e7 100644
--- a/src/Services/InfoProviderSystem/PartInfoRetriever.php
+++ b/src/Services/InfoProviderSystem/PartInfoRetriever.php
@@ -24,10 +24,15 @@ declare(strict_types=1);
namespace App\Services\InfoProviderSystem;
use App\Entity\Parts\Part;
+use App\Exceptions\InfoProviderNotActiveException;
+use App\Exceptions\OAuthReconnectRequiredException;
use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
use App\Services\InfoProviderSystem\DTOs\SearchResultDTO;
use App\Services\InfoProviderSystem\Providers\InfoProviderInterface;
+use Psr\Http\Client\ClientExceptionInterface;
use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpClient\Exception\ClientException;
+use Symfony\Component\HttpClient\Exception\TransportException;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
@@ -49,6 +54,11 @@ final class PartInfoRetriever
* @param string[]|InfoProviderInterface[] $providers A list of providers to search in, either as provider keys or as provider instances
* @param string $keyword The keyword to search for
* @return SearchResultDTO[] The search results
+ * @throws InfoProviderNotActiveException if any of the given providers is not active
+ * @throws ClientException if any of the providers throws an exception during the search
+ * @throws \InvalidArgumentException if any of the given providers is not a valid provider key or instance
+ * @throws TransportException if any of the providers throws an exception during the search
+ * @throws OAuthReconnectRequiredException if any of the providers throws an exception during the search that indicates that the OAuth token needs to be refreshed
*/
public function searchByKeyword(string $keyword, array $providers): array
{
@@ -61,7 +71,7 @@ final class PartInfoRetriever
//Ensure that the provider is active
if (!$provider->isActive()) {
- throw new \RuntimeException("The provider with key {$provider->getProviderKey()} is not active!");
+ throw InfoProviderNotActiveException::fromProvider($provider);
}
if (!$provider instanceof InfoProviderInterface) {
@@ -82,10 +92,10 @@ final class PartInfoRetriever
protected function searchInProvider(InfoProviderInterface $provider, string $keyword): array
{
//Generate key and escape reserved characters from the provider id
- $escaped_keyword = urlencode($keyword);
+ $escaped_keyword = hash('xxh3', $keyword);
return $this->partInfoCache->get("search_{$provider->getProviderKey()}_{$escaped_keyword}", function (ItemInterface $item) use ($provider, $keyword) {
//Set the expiration time
- $item->expiresAfter(!$this->debugMode ? self::CACHE_RESULT_EXPIRATION : 1);
+ $item->expiresAfter(!$this->debugMode ? self::CACHE_RESULT_EXPIRATION : 10);
return $provider->searchByKeyword($keyword);
});
@@ -97,6 +107,7 @@ final class PartInfoRetriever
* @param string $provider_key
* @param string $part_id
* @return PartDetailDTO
+ * @throws InfoProviderNotActiveException if the the given providers is not active
*/
public function getDetails(string $provider_key, string $part_id): PartDetailDTO
{
@@ -104,14 +115,14 @@ final class PartInfoRetriever
//Ensure that the provider is active
if (!$provider->isActive()) {
- throw new \RuntimeException("The provider with key $provider_key is not active!");
+ throw InfoProviderNotActiveException::fromProvider($provider);
}
//Generate key and escape reserved characters from the provider id
- $escaped_part_id = urlencode($part_id);
+ $escaped_part_id = hash('xxh3', $part_id);
return $this->partInfoCache->get("details_{$provider_key}_{$escaped_part_id}", function (ItemInterface $item) use ($provider, $part_id) {
//Set the expiration time
- $item->expiresAfter(!$this->debugMode ? self::CACHE_DETAIL_EXPIRATION : 1);
+ $item->expiresAfter(!$this->debugMode ? self::CACHE_DETAIL_EXPIRATION : 10);
return $provider->getDetails($part_id);
});
@@ -145,4 +156,4 @@ final class PartInfoRetriever
return $this->dto_to_entity_converter->convertPart($details);
}
-}
\ No newline at end of file
+}
diff --git a/src/Services/InfoProviderSystem/ProviderRegistry.php b/src/Services/InfoProviderSystem/ProviderRegistry.php
index f6c398d2..18b8a37a 100644
--- a/src/Services/InfoProviderSystem/ProviderRegistry.php
+++ b/src/Services/InfoProviderSystem/ProviderRegistry.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace App\Services\InfoProviderSystem;
use App\Services\InfoProviderSystem\Providers\InfoProviderInterface;
+use App\Services\InfoProviderSystem\Providers\URLHandlerInfoProviderInterface;
/**
* This class keeps track of all registered info providers and allows to find them by their key
@@ -47,6 +48,8 @@ final class ProviderRegistry
*/
private array $providers_disabled = [];
+ private array $providers_by_domain = [];
+
/**
* @var bool Whether the registry has been initialized
*/
@@ -78,6 +81,14 @@ final class ProviderRegistry
$this->providers_by_name[$key] = $provider;
if ($provider->isActive()) {
$this->providers_active[$key] = $provider;
+ if ($provider instanceof URLHandlerInfoProviderInterface) {
+ foreach ($provider->getHandledDomains() as $domain) {
+ if (isset($this->providers_by_domain[$domain])) {
+ throw new \LogicException("Domain $domain is already handled by another provider");
+ }
+ $this->providers_by_domain[$domain] = $provider;
+ }
+ }
} else {
$this->providers_disabled[$key] = $provider;
}
@@ -139,4 +150,29 @@ final class ProviderRegistry
return $this->providers_disabled;
}
-}
\ No newline at end of file
+
+ public function getProviderHandlingDomain(string $domain): (InfoProviderInterface&URLHandlerInfoProviderInterface)|null
+ {
+ if (!$this->initialized) {
+ $this->initStructures();
+ }
+
+ //Check if the domain is directly existing:
+ if (isset($this->providers_by_domain[$domain])) {
+ return $this->providers_by_domain[$domain];
+ }
+
+ //Otherwise check for subdomains:
+ $parts = explode('.', $domain);
+ while (count($parts) > 2) {
+ array_shift($parts);
+ $check_domain = implode('.', $parts);
+ if (isset($this->providers_by_domain[$check_domain])) {
+ return $this->providers_by_domain[$check_domain];
+ }
+ }
+
+ //If we found nothing, return null
+ return null;
+ }
+}
diff --git a/src/Services/InfoProviderSystem/Providers/BuerklinProvider.php b/src/Services/InfoProviderSystem/Providers/BuerklinProvider.php
index 07125c73..c2291107 100644
--- a/src/Services/InfoProviderSystem/Providers/BuerklinProvider.php
+++ b/src/Services/InfoProviderSystem/Providers/BuerklinProvider.php
@@ -34,7 +34,7 @@ use App\Settings\InfoProviderSystem\BuerklinSettings;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
-class BuerklinProvider implements BatchInfoProviderInterface
+class BuerklinProvider implements BatchInfoProviderInterface, URLHandlerInfoProviderInterface
{
private const ENDPOINT_URL = 'https://www.buerklin.com/buerklinws/v2/buerklin';
@@ -365,7 +365,7 @@ class BuerklinProvider implements BatchInfoProviderInterface
* - prefers 'zoom' format, then 'product' format, then all others
*
* @param array|null $images
- * @return \App\Services\InfoProviderSystem\DTOs\FileDTO[]
+ * @return FileDTO[]
*/
private function getProductImages(?array $images): array
{
@@ -636,4 +636,35 @@ class BuerklinProvider implements BatchInfoProviderInterface
);
}
+ public function getHandledDomains(): array
+ {
+ return ['buerklin.com'];
+ }
+
+ public function getIDFromURL(string $url): ?string
+ {
+ //Inputs:
+ //https://www.buerklin.com/de/p/bkl-electronic/niedervoltsteckverbinder/072341-l/40F1332/
+ //https://www.buerklin.com/de/p/40F1332/
+ //https://www.buerklin.com/en/p/bkl-electronic/dc-connectors/072341-l/40F1332/
+ //https://www.buerklin.com/en/p/40F1332/
+ //The ID is the last part after the manufacturer/category/mpn segment and before the final slash
+ //https://www.buerklin.com/de/p/bkl-electronic/niedervoltsteckverbinder/072341-l/40F1332/#download should also work
+
+ $path = parse_url($url, PHP_URL_PATH);
+
+ if (!$path) {
+ return null;
+ }
+
+ // Ensure it's actually a product URL
+ if (strpos($path, '/p/') === false) {
+ return null;
+ }
+
+ $id = basename(rtrim($path, '/'));
+
+ return $id !== '' && $id !== 'p' ? $id : null;
+ }
+
}
diff --git a/src/Services/InfoProviderSystem/Providers/CanopyProvider.php b/src/Services/InfoProviderSystem/Providers/CanopyProvider.php
new file mode 100644
index 00000000..18864a49
--- /dev/null
+++ b/src/Services/InfoProviderSystem/Providers/CanopyProvider.php
@@ -0,0 +1,231 @@
+.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Services\InfoProviderSystem\Providers;
+
+use App\Services\InfoProviderSystem\DTOs\FileDTO;
+use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
+use App\Services\InfoProviderSystem\DTOs\PriceDTO;
+use App\Services\InfoProviderSystem\DTOs\PurchaseInfoDTO;
+use App\Services\InfoProviderSystem\DTOs\SearchResultDTO;
+use App\Settings\InfoProviderSystem\BuerklinSettings;
+use App\Settings\InfoProviderSystem\CanopySettings;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\DependencyInjection\Attribute\When;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * Use canopy API to retrieve infos from amazon
+ */
+class CanopyProvider implements InfoProviderInterface
+{
+
+ public const BASE_URL = "https://rest.canopyapi.co/api";
+ public const SEARCH_API_URL = self::BASE_URL . "/amazon/search";
+ public const DETAIL_API_URL = self::BASE_URL . "/amazon/product";
+
+ public const DISTRIBUTOR_NAME = 'Amazon';
+
+ public function __construct(private readonly CanopySettings $settings,
+ private readonly HttpClientInterface $httpClient, private readonly CacheItemPoolInterface $partInfoCache)
+ {
+
+ }
+
+ public function getProviderInfo(): array
+ {
+ return [
+ 'name' => 'Amazon (Canopy)',
+ 'description' => 'Retrieves part infos from Amazon using the Canopy API',
+ 'url' => 'https://canopyapi.co',
+ 'disabled_help' => 'Set Canopy API key in the provider configuration to enable this provider',
+ 'settings_class' => CanopySettings::class
+ ];
+ }
+
+ public function getProviderKey(): string
+ {
+ return 'canopy';
+ }
+
+ public function isActive(): bool
+ {
+ return $this->settings->apiKey !== null;
+ }
+
+ private function productPageFromASIN(string $asin): string
+ {
+ return "https://www.{$this->settings->getRealDomain()}/dp/{$asin}";
+ }
+
+ /**
+ * Saves the given part to the cache.
+ * Everytime this function is called, the cache is overwritten.
+ * @param PartDetailDTO $part
+ * @return void
+ */
+ private function saveToCache(PartDetailDTO $part): void
+ {
+ $key = 'canopy_part_'.$part->provider_id;
+
+ $item = $this->partInfoCache->getItem($key);
+ $item->set($part);
+ $item->expiresAfter(3600 * 24); //Cache for 1 day
+ $this->partInfoCache->save($item);
+ }
+
+ /**
+ * Retrieves a from the cache, or null if it was not cached yet.
+ * @param string $id
+ * @return PartDetailDTO|null
+ */
+ private function getFromCache(string $id): ?PartDetailDTO
+ {
+ $key = 'canopy_part_'.$id;
+
+ $item = $this->partInfoCache->getItem($key);
+ if ($item->isHit()) {
+ return $item->get();
+ }
+
+ return null;
+ }
+
+ public function searchByKeyword(string $keyword): array
+ {
+ $response = $this->httpClient->request('GET', self::SEARCH_API_URL, [
+ 'query' => [
+ 'domain' => $this->settings->domain,
+ 'searchTerm' => $keyword,
+ ],
+ 'headers' => [
+ 'API-KEY' => $this->settings->apiKey,
+ ]
+ ]);
+
+ $data = $response->toArray();
+ $results = $data['data']['amazonProductSearchResults']['productResults']['results'] ?? [];
+
+ $out = [];
+ foreach ($results as $result) {
+
+
+ $dto = new PartDetailDTO(
+ provider_key: $this->getProviderKey(),
+ provider_id: $result['asin'],
+ name: $result["title"],
+ description: "",
+ preview_image_url: $result["mainImageUrl"] ?? null,
+ provider_url: $this->productPageFromASIN($result['asin']),
+ vendor_infos: [$this->priceToPurchaseInfo($result['price'], $result['asin'])]
+ );
+
+ $out[] = $dto;
+ $this->saveToCache($dto);
+ }
+
+ return $out;
+ }
+
+ private function categoriesToCategory(array $categories): ?string
+ {
+ if (count($categories) === 0) {
+ return null;
+ }
+
+ return implode(" -> ", array_map(static fn($cat) => $cat['name'], $categories));
+ }
+
+ private function feauturesBulletsToNotes(array $featureBullets): string
+ {
+ $notes = "
+ ⚙️
+
+ Part-DB is under maintenance
+We're making things better. This should only take a moment.
+ +
+ {$reason}
+
+
+
+
+
+ Maintenance mode active since {$startDateStr}
+
+ Started {$durationText} ago
+ This page will automatically refresh every 15 seconds.
+
- ";
+ foreach ($featureBullets as $bullet) {
+ $notes .= "
- " . $bullet . " "; + } + $notes .= "
- {% for label, messages in app.flashes() %}
- {% for message in messages %}
- {{ include('_toast.html.twig', {
- 'label': label,
- 'message': message
- }) }}
- {% endfor %}
- {% endfor %}
-
+{% block flashes %}
+ {# Insert flashes #}
+
+ {% for label, messages in app.flashes() %}
+ {% for message in messages %}
+ {{ include('_toast.html.twig', {
+ 'label': label,
+ 'message': message
+ }) }}
+ {% endfor %}
+ {% endfor %}
+
+
+
- {% set locales = settings_instance('localization').languageMenuEntries %}
- {% if locales is empty %}
- {% set locales = locale_menu %}
- {% endif %}
- {% for locale in locales %}
-
- {{ locale|language_name }} ({{ locale|upper }})
- {% endfor %}
-
diff --git a/templates/admin/attachment_type_admin.html.twig b/templates/admin/attachment_type_admin.html.twig
index 87a053af..9aeba934 100644
--- a/templates/admin/attachment_type_admin.html.twig
+++ b/templates/admin/attachment_type_admin.html.twig
@@ -6,6 +6,7 @@
{% block additional_controls %}
{{ form_row(form.filetype_filter) }}
+ {{ form_row(form.allowed_targets) }}
{{ form_row(form.alternative_names) }}
{% endblock %}
diff --git a/templates/admin/update_manager/index.html.twig b/templates/admin/update_manager/index.html.twig
new file mode 100644
index 00000000..44b9f8c0
--- /dev/null
+++ b/templates/admin/update_manager/index.html.twig
@@ -0,0 +1,423 @@
+{% extends "main_card.html.twig" %}
+
+{% block title %}Part-DB {% trans %}update_manager.title{% endtrans %}{% endblock %}
+
+{% block card_title %}
+ Part-DB {% trans %}update_manager.title{% endtrans %}
+{% endblock %}
+
+{% block card_content %}
+
+
+ {# Maintenance Mode Warning #}
+ {% if is_maintenance %}
+
+{% endblock %}
diff --git a/templates/admin/update_manager/log_viewer.html.twig b/templates/admin/update_manager/log_viewer.html.twig
new file mode 100644
index 00000000..64412123
--- /dev/null
+++ b/templates/admin/update_manager/log_viewer.html.twig
@@ -0,0 +1,40 @@
+{% extends "main_card.html.twig" %}
+
+{% block title %}{{ filename }} - {% trans %}update_manager.log_viewer{% endtrans %}{% endblock %}
+
+{% block card_title %}
+ {{ filename }}
+{% endblock %}
+
+{% block card_content %}
+
+
+
+
+ {% trans %}update_manager.maintenance_mode_active{% endtrans %}
+ {% if maintenance_info.reason is defined %}
+ - {{ maintenance_info.reason }}
+ {% endif %}
+
+ {% endif %}
+
+ {# Lock Warning #}
+ {% if is_locked %}
+
+
+ {% trans %}update_manager.update_in_progress{% endtrans %}
+ {% if lock_info.started_at is defined %}
+ ({% trans %}update_manager.started_at{% endtrans %}: {{ lock_info.started_at }})
+ {% endif %}
+
+ {% trans %}update_manager.view_progress{% endtrans %}
+
+
+ {% endif %}
+
+ {# Web Updates Disabled Warning #}
+ {% if web_updates_disabled %}
+
+
+ {% trans %}update_manager.web_updates_disabled{% endtrans %}
+
+ {% endif %}
+
+ {# Backup Restore Disabled Warning #}
+ {% if backup_restore_disabled %}
+ {% trans %}update_manager.web_updates_disabled_hint{% endtrans %}
+
+
+ {% trans %}update_manager.backup_restore_disabled{% endtrans %}
+
+ {% endif %}
+
+
+ {# Current Version Card #}
+
+
+ {# Validation Issues #}
+ {% if not validation.valid %}
+
+
+
+ {# Latest Version / Update Card #}
+
+
+
+ {% trans %}update_manager.current_installation{% endtrans %}
+
+
+
+
+
+
+
+ | {% trans %}update_manager.version{% endtrans %} | ++ {{ status.current_version }} + | +
|---|---|
| {% trans %}update_manager.installation_type{% endtrans %} | ++ {{ status.installation.type_name }} + | +
| {% trans %}update_manager.git_branch{% endtrans %} | +{{ status.git.branch ?? 'N/A' }} |
+
| {% trans %}update_manager.git_commit{% endtrans %} | +{{ status.git.commit ?? 'N/A' }} |
+
| {% trans %}update_manager.local_changes{% endtrans %} | ++ {% if status.git.has_local_changes %} + + {% trans %}Yes{% endtrans %} + + {% else %} + + {% trans %}No{% endtrans %} + + {% endif %} + | +
| {% trans %}update_manager.auto_update_supported{% endtrans %} | ++ {% if status.can_auto_update %} + + {% trans %}Yes{% endtrans %} + + {% else %} + + {% trans %}No{% endtrans %} + + {% endif %} + | +
+
+
+
+
+ {% if status.update_available %}
+ {% trans %}update_manager.new_version_available.title{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.latest_release{% endtrans %}
+ {% endif %}
+
+
+ {% if status.latest_version %}
+
+ {% if status.latest_tag %}
+
+ {% endif %}
+
+
+ {{ status.latest_tag }}
+
+ {% if not status.update_available %}
+
+
+ {% if status.update_available and status.can_auto_update and validation.valid and not web_updates_disabled %}
+
+ {% endif %}
+
+ {% if status.published_at %}
+ + + {% trans %}update_manager.already_up_to_date{% endtrans %} +
+ {% endif %} ++ + {% trans %}update_manager.released{% endtrans %}: {{ status.published_at|date('Y-m-d') }} +
+ {% endif %} + {% else %} +
+
+
+ {% endif %}
+ {% trans %}update_manager.could_not_fetch_releases{% endtrans %}
+
+
+ {% endif %}
+
+ {# Non-auto-update installations info #}
+ {% if not status.can_auto_update %}
+ + {% trans %}update_manager.validation_issues{% endtrans %} +
+-
+ {% for error in validation.errors %}
+
- {{ error }} + {% endfor %} +
+
+ {% endif %}
+
+ + {% trans%}update_manager.cant_auto_update{% endtrans%}: {{ status.installation.type_name }} +
+{{ status.installation.update_instructions }}
+
+ {# Available Versions #}
+
+
+
+
+ {# Update History & Backups #}
+
+
+
+ {% trans %}update_manager.available_versions{% endtrans %}
+
+
+
+
+
+
+
+
+ | {% trans %}update_manager.version{% endtrans %} | +{% trans %}update_manager.released{% endtrans %} | ++ |
+ {{ release.tag }}
+ {% if release.prerelease %}
+ pre
+ {% endif %}
+ {% if release.version == status.current_version %}
+ {% trans %}update_manager.current{% endtrans %}
+ {% endif %}
+ |
+ + {{ release.published_at|date('Y-m-d') }} + | +
+
+
+
+
+ {% if release.version != status.current_version and status.can_auto_update and validation.valid and not web_updates_disabled %}
+
+ {% endif %}
+
+ |
+
+ {% else %}
+
|---|---|---|
| + {% trans %}update_manager.no_releases_found{% endtrans %} + | +||
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | {% trans %}update_manager.date{% endtrans %} | +{% trans %}update_manager.log_file{% endtrans %} | ++ |
|---|---|---|
| + {{ log.date|date('Y-m-d H:i') }} + | +{{ log.file }} |
+ + + + + | +
| + {% trans %}update_manager.no_logs_found{% endtrans %} + | +||
+
+
+
+
+
+
+ | {% trans %}update_manager.date{% endtrans %} | +{% trans %}update_manager.file{% endtrans %} | +{% trans %}update_manager.size{% endtrans %} | ++ |
|---|---|---|---|
| + {{ backup.date|date('Y-m-d H:i') }} + | +{{ backup.file }} |
+ + {{ (backup.size / 1024 / 1024)|number_format(1) }} MB + | ++ {% if status.can_auto_update and validation.valid and not backup_restore_disabled %} + + {% endif %} + | +
| + {% trans %}update_manager.no_backups_found{% endtrans %} + | +|||
+
+
+
+{% endblock %}
diff --git a/templates/admin/update_manager/progress.html.twig b/templates/admin/update_manager/progress.html.twig
new file mode 100644
index 00000000..54ac6595
--- /dev/null
+++ b/templates/admin/update_manager/progress.html.twig
@@ -0,0 +1,196 @@
+{% extends "main_card.html.twig" %}
+
+{% block title %}
+ {% if is_downgrade|default(false) %}
+ {% trans %}update_manager.progress.downgrade_title{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.progress.title{% endtrans %}
+ {% endif %}
+{% endblock %}
+
+{% block card_title %}
+ {% if progress and progress.status == 'running' %}
+
+ {% elseif progress and progress.status == 'completed' %}
+
+ {% elseif progress and progress.status == 'failed' %}
+
+ {% else %}
+
+ {% endif %}
+ {% if is_downgrade|default(false) %}
+ {% trans %}update_manager.progress.downgrade_title{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.progress.title{% endtrans %}
+ {% endif %}
+{% endblock %}
+
+{% block head %}
+ {{ parent() }}
+ {# Auto-refresh while update is running - also refresh when 'starting' status #}
+ {% if not progress or progress.status == 'running' or progress.status == 'starting' %}
+
+ {% endif %}
+{% endblock %}
+
+{% block card_content %}
+
+
+ {% trans %}update_manager.update_log{% endtrans %}
+
+ {{ content|length }} {% trans %}update_manager.bytes{% endtrans %}
+
+
+
+{{ content }}
+
+ {# Progress Header #}
+
+{% endblock %}
diff --git a/templates/admin/update_manager/release_notes.html.twig b/templates/admin/update_manager/release_notes.html.twig
new file mode 100644
index 00000000..9bcd9e04
--- /dev/null
+++ b/templates/admin/update_manager/release_notes.html.twig
@@ -0,0 +1,110 @@
+{% extends "main_card.html.twig" %}
+
+{% block title %}{{ release.name }} - {% trans %}update_manager.release_notes{% endtrans %}{% endblock %}
+
+{% block card_title %}
+ {{ release.name }}
+{% endblock %}
+
+{% block card_content %}
+
+
+
+
+
+ {# Progress Bar #}
+ {% set percent = progress ? ((progress.current_step|default(0) / progress.total_steps|default(12)) * 100)|round : 0 %}
+ {% if progress and progress.status == 'completed' %}
+ {% set percent = 100 %}
+ {% endif %}
+
+ {% if progress and progress.status == 'completed' %}
+
+ {% elseif progress and progress.status == 'failed' %}
+
+ {% else %}
+
+ {% endif %}
+
+ + {% if progress and progress.status == 'running' %} + {% if is_downgrade|default(false) %} + {% trans %}update_manager.progress.downgrading{% endtrans %} + {% else %} + {% trans %}update_manager.progress.updating{% endtrans %} + {% endif %} + {% elseif progress and progress.status == 'completed' %} + {% if is_downgrade|default(false) %} + {% trans %}update_manager.progress.downgrade_completed{% endtrans %} + {% else %} + {% trans %}update_manager.progress.completed{% endtrans %} + {% endif %} + {% elseif progress and progress.status == 'failed' %} + {% if is_downgrade|default(false) %} + {% trans %}update_manager.progress.downgrade_failed{% endtrans %} + {% else %} + {% trans %}update_manager.progress.failed{% endtrans %} + {% endif %} + {% else %} + {% trans %}update_manager.progress.initializing{% endtrans %} + {% endif %} +
++ {% if progress %} + {% if is_downgrade|default(false) %} + {% trans with {'%version%': progress.target_version|default('unknown')} %}update_manager.progress.downgrading_to{% endtrans %} + {% else %} + {% trans with {'%version%': progress.target_version|default('unknown')} %}update_manager.progress.updating_to{% endtrans %} + {% endif %} + {% endif %} +
+
+
+
+
+ {# Current Step - shows what's currently being worked on #}
+ {% if progress and (progress.status == 'running' or progress.status == 'starting') %}
+
+ {{ progress.step_name|default('initializing')|replace({'_': ' '})|capitalize }}:
+ {{ progress.step_message|default('Processing...') }}
+
+ {% endif %}
+
+ {# Error Message #}
+ {% if progress and progress.status == 'failed' %}
+
+ {% trans %}update_manager.progress.error{% endtrans %}:
+ {{ progress.error|default('An unknown error occurred') }}
+
+ {% endif %}
+
+ {# Success Message #}
+ {% if progress and progress.status == 'completed' %}
+
+
+ {% if is_downgrade|default(false) %}
+ {% trans %}update_manager.progress.downgrade_success_message{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.progress.success_message{% endtrans %}
+ {% endif %}
+
+ {% endif %}
+
+ {# Steps Timeline #}
+
+
+
+ {# Actions #}
+
+
+ {% if is_downgrade|default(false) %}
+ {% trans %}update_manager.progress.downgrade_steps{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.progress.steps{% endtrans %}
+ {% endif %}
+
+
+
+ -
+ {% if progress and progress.steps %}
+ {% for step in progress.steps %}
+
-
+ {% if step.success %}
+
+ {% else %}
+
+ {% endif %}
+ + {{ step.step|replace({'_': ' '})|capitalize }} ++ {{ step.timestamp|date('H:i:s') }} +
{{ step.message }} +
+ {% endfor %}
+ {% else %}
+ - + {% trans %}update_manager.progress.waiting{% endtrans %} + + {% endif %} +
+ {% if progress and (progress.status == 'completed' or progress.status == 'failed') %}
+
+ {% trans %}update_manager.progress.back{% endtrans %}
+
+
+ {% trans %}update_manager.progress.refresh_page{% endtrans %}
+
+ {% endif %}
+
+
+ {# Warning Notice #}
+ {% if not progress or progress.status == 'running' or progress.status == 'starting' %}
+
+
+ {% trans %}update_manager.progress.warning{% endtrans %}:
+ {% if is_downgrade|default(false) %}
+ {% trans %}update_manager.progress.downgrade_do_not_close{% endtrans %}
+ {% else %}
+ {% trans %}update_manager.progress.do_not_close{% endtrans %}
+ {% endif %}
+
+
+ {# JavaScript refresh - more reliable than meta refresh #}
+
+ {% endif %}
+
+
+
+{% if release.assets is not empty %}
+
+
+
+
+ | {% trans %}update_manager.version{% endtrans %} | ++ {{ release.version }} + {% if release.prerelease %} + {% trans %}update_manager.prerelease{% endtrans %} + {% endif %} + | +
|---|---|
| {% trans %}update_manager.tag{% endtrans %} | +{{ release.tag }} |
+
| {% trans %}update_manager.released{% endtrans %} | +{{ release.published_at|date('Y-m-d H:i') }} | +
| {% trans %}update_manager.status{% endtrans %} | ++ {% if release.version == current_version %} + {% trans %}update_manager.current{% endtrans %} + {% elseif release.version > current_version %} + {% trans %}update_manager.newer{% endtrans %} + {% else %} + {% trans %}update_manager.older{% endtrans %} + {% endif %} + | +
+
+ {% trans %}update_manager.view_on_github{% endtrans %}
+
+ {% if release.zipball_url %}
+
+ ZIP
+
+ {% endif %}
+
+
+
+{% endif %}
+
+
+ {% trans %}update_manager.download_assets{% endtrans %}
+
+
+
+ -
+ {% for asset in release.assets %}
+
- + + {{ asset.name }} + + ({{ (asset.size / 1024 / 1024)|number_format(1) }} MB) + + {% endfor %} +
+
+
+{% if release.version > current_version %}
+
+ {% trans %}update_manager.changelog{% endtrans %}
+
+
+ {% if release.body %}
+
+
+ {{ release.body|markdown_to_html }}
+
+ {% else %}
+ {% trans %}update_manager.no_release_notes{% endtrans %}
+ {% endif %} +
+
+{% endif %}
+{% endblock %}
diff --git a/templates/attachments/html_sandbox.html.twig b/templates/attachments/html_sandbox.html.twig
new file mode 100644
index 00000000..389ebc2e
--- /dev/null
+++ b/templates/attachments/html_sandbox.html.twig
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+ {# The content block is already escaped. so we must not escape it again. #}
+
+ {% trans %}update_manager.update_to_this_version{% endtrans %}
+
+
+
+ {% trans %}update_manager.run_command_to_update{% endtrans %}
+
+
+ php bin/console partdb:update {{ release.tag }}
+
+
+
+
+ ⚠️ {% trans%}attachment.sandbox.warning{% endtrans %}
+
+
+ + {% trans%}[Attachment]{% endtrans%}: {{ attachment.name }} / {{ attachment.filename ?? "" }} ({% trans%}id.label{% endtrans %}: {{ attachment.id }}) + {% trans%}attachment.sandbox.as_plain_text{% endtrans %} + {% trans%}attachment.sandbox.back_to_partdb{% endtrans %} + +
+
+
+
+
+
+
+
+{% endblock %}
+
+
+
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 2db726ee..8dc87239 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -26,6 +26,11 @@
+ {# Allow pages to request a fully reload of everything #}
+ {% if global_reload_needed is defined and global_reload_needed %}
+
+ {% endif %}
+
diff --git a/templates/form/extended_bootstrap_layout.html.twig b/templates/form/extended_bootstrap_layout.html.twig
index 75e44a15..1227750c 100644
--- a/templates/form/extended_bootstrap_layout.html.twig
+++ b/templates/form/extended_bootstrap_layout.html.twig
@@ -100,6 +100,17 @@
{%- endif -%}
{%- endblock tristate_widget %}
+{% block tristate_row -%}
+ + + {% trans%}[Attachment]{% endtrans%}: {{ attachment.name }} / {{ attachment.filename ?? "" }} ({% trans%}id.label{% endtrans %}: {{ attachment.id }}) + {% trans%}attachment.sandbox.as_plain_text{% endtrans %} + {% trans%}attachment.sandbox.back_to_partdb{% endtrans %} + +
+ {{- form_widget(form) -}}
+ {{- form_help(form) -}}
+ {{- form_errors(form) -}}
+
{#--#}
+
+{%- endblock tristate_row %}
+
{%- block choice_widget_collapsed -%}
{# Only add the BS5 form-select class if we dont use bootstrap-selectpicker #}
{# {% if attr["data-controller"] is defined and attr["data-controller"] not in ["elements--selectpicker"] %}
@@ -144,3 +155,8 @@
{{- parent() -}}
{% endif %}
{% endblock %}
+
+{% block boolean_constraint_widget %}
+ {{ form_widget(form.value) }}
+ {{ form_errors(form.value) }}
+{% endblock %}
diff --git a/templates/helper.twig b/templates/helper.twig
index 66268a96..9e68d56c 100644
--- a/templates/helper.twig
+++ b/templates/helper.twig
@@ -192,7 +192,7 @@
{% set preview_attach = part_preview_generator.tablePreviewAttachment(part) %}
{% if preview_attach %}
{% trans %}info_providers.from_url.help{% endtrans %}
+ + {{ form_start(form) }} + {{ form_row(form.url) }} + {{ form_row(form.submit) }} + {{ form_end(form) }} +{% endblock %} diff --git a/templates/info_providers/search/part_search.html.twig b/templates/info_providers/search/part_search.html.twig index 3d741c34..a5602618 100644 --- a/templates/info_providers/search/part_search.html.twig +++ b/templates/info_providers/search/part_search.html.twig @@ -94,7 +94,13 @@ {{ dto.footprint }} {% endif %} -+ {{ dto.gtin }} + {% endif %} +
- {% if info_provider_info.url %}
+ {% if info_provider_info.url is defined %}
{{ info_provider_info.name }}
{% else %}
{{ info_provider_info.name }}
diff --git a/templates/label_system/scanner/_info_mode.html.twig b/templates/label_system/scanner/_info_mode.html.twig
new file mode 100644
index 00000000..23deb6d3
--- /dev/null
+++ b/templates/label_system/scanner/_info_mode.html.twig
@@ -0,0 +1,154 @@
+{% import "helper.twig" as helper %}
+
+{% if decoded is not empty %}
+
+
+ {% if part %} {# Show detailed info when it is a part #}
+
+
+ {% trans %}label_scanner.db_part_found{% endtrans %}
+ {% if openUrl %}
+
+
+
+
+
+ {% endif %}
+
+
+
+
+  ?? asset('img/part_placeholder.svg') }})
+
+
+
+
+ {{ part.name }}
+ {{ part.description | format_markdown(true) }}
+
+
+ {% trans %}category.label{% endtrans %}
+
+
+
+ {{ helper.structural_entity_link(part.category) }}
+
+
+
+
+
+ {% trans %}footprint.label{% endtrans %}
+
+
+
+ {{ helper.structural_entity_link(part.footprint) }}
+
+
+
+ {# Show part lots / locations #}
+ {% if part.partLots is not empty %}
+
+
+
+ {% trans %}part_lots.storage_location{% endtrans %}
+
+ {% trans %}part_lots.amount{% endtrans %}
+
+
+
+
+ {% for lot in part.partLots %}
+
+
+ {% if lot.storageLocation %}
+ {{ helper.structural_entity_link(lot.storageLocation) }}
+ {% else %}
+ —
+ {% endif %}
+
+
+ {% if lot.instockUnknown %}
+ ?
+ {% else %}
+ {{ lot.amount | format_amount(part.partUnit, {'decimals': 5}) }}
+ {% endif %}
+
+
+ {% endfor %}
+
+
+ {% else %}
+ {% trans %}label_scanner.no_locations{% endtrans %}
+ {% endif %}
+
+
+
+
+
+ {% elseif entity %} {# If we have an entity but that is not an part #}
+
+
+
+ {% trans %}label_scanner.target_found{% endtrans %}: {{ type_label(entity) }}
+ {% if openUrl %}
+
+
+
+
+
+ {% endif %}
+
+
+
+
+  ?? asset('img/part_placeholder.svg') }})
+
+
+
+
+ {{ entity.name }}
+ {% trans %}id.label{% endtrans %}: {{ entity.id }} ({{ type_label(entity) }})
+
+ {% if entity.fullPath is defined %}
+ {{ helper.breadcrumb_entity_link(entity)}}
+ {% endif %}
+
+
+
+
+ {% endif %}
+
+
+ {% if createUrl %}
+
+ {% trans %}label_scanner.part_can_be_created{% endtrans %}
+ {% trans %}label_scanner.part_can_be_created.help{% endtrans %}
+
+ {% trans %}label_scanner.part_create_btn{% endtrans %}
+
+ {% endif %}
+
+
+ {% trans %}label_scanner.scan_result.title{% endtrans %}
+
+
+ {# Decoded barcode fields #}
+
+ {% trans %}label_scanner.db_part_found{% endtrans %}
+ {% if openUrl %}
+
+
+
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% else %}
+
+ {{ part.name }}
+{{ part.description | format_markdown(true) }}
+
+
+ {% trans %}category.label{% endtrans %}
+
+
+
+ {{ helper.structural_entity_link(part.category) }}
+
+
+
+
+
+ {% trans %}footprint.label{% endtrans %}
+
+
+
+ {{ helper.structural_entity_link(part.footprint) }}
+
+
+
+ {# Show part lots / locations #}
+ {% if part.partLots is not empty %}
+ | {% trans %}part_lots.storage_location{% endtrans %} | ++ {% trans %}part_lots.amount{% endtrans %} + | +
|---|---|
| + {% if lot.storageLocation %} + {{ helper.structural_entity_link(lot.storageLocation) }} + {% else %} + — + {% endif %} + | ++ {% if lot.instockUnknown %} + ? + {% else %} + {{ lot.amount | format_amount(part.partUnit, {'decimals': 5}) }} + {% endif %} + | +
{% trans %}label_scanner.no_locations{% endtrans %}
+ {% endif %}
+
+
+ {% trans %}label_scanner.target_found{% endtrans %}: {{ type_label(entity) }}
+ {% if openUrl %}
+
+
+
+
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ entity.name }}
+{% trans %}id.label{% endtrans %}: {{ entity.id }} ({{ type_label(entity) }})
+ + {% if entity.fullPath is defined %} + {{ helper.breadcrumb_entity_link(entity)}} + {% endif %} +{% trans %}label_scanner.part_can_be_created{% endtrans %}
+{% trans %}label_scanner.part_can_be_created.help{% endtrans %}
++ {% trans %}label_scanner.part_create_btn{% endtrans %} +
| {{ key }} | +{{ value }} |
+
|---|
+ +{% endif %} diff --git a/templates/label_system/scanner/scanner.html.twig b/templates/label_system/scanner/scanner.html.twig index 1f978a9b..f9b51388 100644 --- a/templates/label_system/scanner/scanner.html.twig +++ b/templates/label_system/scanner/scanner.html.twig @@ -10,35 +10,28 @@
-
+ {% include "label_system/scanner/_info_mode.html.twig" %}
+
+
+ {{ form_start(form, {'attr': {'id': 'scan_dialog_form'}}) }}
+
+ {{ form_end(form) }}
-
{% trans %}label_scanner.decoded_info.title{% endtrans %}
- -| {{ key }} | -{{ value }} |
-
+ {% include "label_system/scanner/_info_mode.html.twig" %}
+
+
+
-
+{{ form_row(form.eda_info.visibility) }}
- {{ form_row(form.eda_info.visibility) }}
-
-
@@ -21,4 +17,4 @@
@@ -109,6 +110,7 @@
{{ form_row(form.comment) }}
{{ form_row(form.owner) }}
{{ form_row(form.user_barcode) }}
+ {{ form_row(form.last_stocktake_at) }}
| {% trans %}part.order.minamount{% endtrans %} | {% trans %}part.order.price{% endtrans %} | @@ -36,32 +36,35 @@ {% endif %}|
|---|---|---|
| - {{ detail.MinDiscountQuantity | format_amount(part.partUnit) }} - | -- {{ detail.price | format_money(detail.currency) }} / {{ detail.PriceRelatedQuantity | format_amount(part.partUnit) }} - {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.price, detail.currency) %} - {% if detail.currency != (app.user.currency ?? null) and tmp is not null and tmp.GreaterThan(0) %} - ({{ pricedetail_helper.convertMoneyToCurrency(detail.price, detail.currency, app.user.currency ?? null) | format_money(app.user.currency ?? null) }}) - {% endif %} - | -- {{ detail.PricePerUnit | format_money(detail.currency) }} - {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.PricePerUnit, detail.currency) %} - {% if detail.currency != (app.user.currency ?? null) and tmp is not null and tmp.GreaterThan(0) %} - ({{ pricedetail_helper.convertMoneyToCurrency(detail.PricePerUnit, detail.currency, app.user.currency ?? null) | format_money(app.user.currency ?? null) }}) - {% endif %} - | -
| {{ lot.description }} | {% if lot.storageLocation %} {{ helper.structural_entity_link(lot.storageLocation) }} {% else %} - + {% trans %}part_lots.location_unknown{% endtrans %} {% endif %} | {% if lot.instockUnknown %} - + {% trans %}part_lots.instock_unknown{% endtrans %} {% else %} {{ lot.amount | format_amount(part.partUnit, {'decimals': 5}) }} {% endif %} | -
-
+
{% if lot.owner %}
-
+
{{ helper.user_icon_link(lot.owner) }}
-
+ {% endif %} {% if lot.expirationDate %} - + {{ lot.expirationDate | format_date() }} {% endif %} {% if lot.expired %} - - + {% trans %}part_lots.is_expired{% endtrans %} {% endif %} {% if lot.needsRefill %} - - - - {% trans %}part_lots.need_refill{% endtrans %} - + + + {% trans %}part_lots.need_refill{% endtrans %} + {% endif %} - + {% if lot.lastStocktakeAt %} + + + {{ lot.lastStocktakeAt | format_datetime("short") }} + + {% endif %} + |
+
+{% endif %}
+
{# Needs Review tag #}
{% if part.needsReview %}
+ {{ part.gtin }} +
+
diff --git a/templates/parts/info/_stocktake_modal.html.twig b/templates/parts/info/_stocktake_modal.html.twig
new file mode 100644
index 00000000..5e8c1ae5
--- /dev/null
+++ b/templates/parts/info/_stocktake_modal.html.twig
@@ -0,0 +1,63 @@
+
diff --git a/templates/parts/lists/_filter.html.twig b/templates/parts/lists/_filter.html.twig
index 2fb5bff2..3130f379 100644
--- a/templates/parts/lists/_filter.html.twig
+++ b/templates/parts/lists/_filter.html.twig
@@ -65,6 +65,7 @@
{{ form_row(filterForm.mass) }}
{{ form_row(filterForm.dbId) }}
{{ form_row(filterForm.ipn) }}
+ {{ form_row(filterForm.gtin) }}
{{ form_row(filterForm.lastModified) }}
{{ form_row(filterForm.addedDate) }}
@@ -163,4 +164,4 @@
{{ form_end(filterForm) }}
-
\ No newline at end of file
+
diff --git a/templates/parts/lists/_info_card.html.twig b/templates/parts/lists/_info_card.html.twig
index 876bd31b..a35e2862 100644
--- a/templates/parts/lists/_info_card.html.twig
+++ b/templates/parts/lists/_info_card.html.twig
@@ -84,7 +84,7 @@
- {% if entity is instanceof("App\\Entity\\Parts\\Storelocation") %}
+ {% if entity is instanceof("App\\Entity\\Parts\\StorageLocation") %}
{{ dropdown.profile_dropdown('storelocation', entity.id, true, 'btn-secondary w-100 mt-2') }}
{% endif %}
@@ -136,4 +136,4 @@
{% if filterForm is defined %}
{% include "parts/lists/_filter.html.twig" %}
{% endif %}
-
\ No newline at end of file
+
diff --git a/tests/API/APIDocsAvailabilityTest.php b/tests/API/APIDocsAvailabilityTest.php
index b7caa873..a7bba3d6 100644
--- a/tests/API/APIDocsAvailabilityTest.php
+++ b/tests/API/APIDocsAvailabilityTest.php
@@ -28,7 +28,7 @@ use App\Entity\UserSystem\User;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class APIDocsAvailabilityTest extends WebTestCase
+final class APIDocsAvailabilityTest extends WebTestCase
{
#[DataProvider('urlProvider')]
public function testDocAvailabilityForLoggedInUser(string $url): void
diff --git a/tests/API/APITokenAuthenticationTest.php b/tests/API/APITokenAuthenticationTest.php
index a78b0594..803a1819 100644
--- a/tests/API/APITokenAuthenticationTest.php
+++ b/tests/API/APITokenAuthenticationTest.php
@@ -27,7 +27,7 @@ use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
use App\DataFixtures\APITokenFixtures;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use ApiPlatform\Symfony\Bundle\Test\Client;
-class APITokenAuthenticationTest extends ApiTestCase
+final class APITokenAuthenticationTest extends ApiTestCase
{
public function testUnauthenticated(): void
{
diff --git a/tests/API/Endpoints/ApiTokenEnpointTest.php b/tests/API/Endpoints/ApiTokenEnpointTest.php
index 99340182..f21716bd 100644
--- a/tests/API/Endpoints/ApiTokenEnpointTest.php
+++ b/tests/API/Endpoints/ApiTokenEnpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\AuthenticatedApiTestCase;
-class ApiTokenEnpointTest extends AuthenticatedApiTestCase
+final class ApiTokenEnpointTest extends AuthenticatedApiTestCase
{
public function testGetCurrentToken(): void
{
diff --git a/tests/API/Endpoints/AttachmentTypeEndpointTest.php b/tests/API/Endpoints/AttachmentTypeEndpointTest.php
index f90f3d94..fb5770d5 100644
--- a/tests/API/Endpoints/AttachmentTypeEndpointTest.php
+++ b/tests/API/Endpoints/AttachmentTypeEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class AttachmentTypeEndpointTest extends CrudEndpointTestCase
+final class AttachmentTypeEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/AttachmentsEndpointTest.php b/tests/API/Endpoints/AttachmentsEndpointTest.php
index 8f4d7e77..999b7ad3 100644
--- a/tests/API/Endpoints/AttachmentsEndpointTest.php
+++ b/tests/API/Endpoints/AttachmentsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\AuthenticatedApiTestCase;
-class AttachmentsEndpointTest extends AuthenticatedApiTestCase
+final class AttachmentsEndpointTest extends AuthenticatedApiTestCase
{
public function testGetCollection(): void
{
diff --git a/tests/API/Endpoints/CategoryEndpointTest.php b/tests/API/Endpoints/CategoryEndpointTest.php
index 68f4fd2d..5f54d1dd 100644
--- a/tests/API/Endpoints/CategoryEndpointTest.php
+++ b/tests/API/Endpoints/CategoryEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class CategoryEndpointTest extends CrudEndpointTestCase
+final class CategoryEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/CurrencyEndpointTest.php b/tests/API/Endpoints/CurrencyEndpointTest.php
index a463daeb..a9f36633 100644
--- a/tests/API/Endpoints/CurrencyEndpointTest.php
+++ b/tests/API/Endpoints/CurrencyEndpointTest.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class CurrencyEndpointTest extends CrudEndpointTestCase
+final class CurrencyEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/FootprintsEndpointTest.php b/tests/API/Endpoints/FootprintsEndpointTest.php
index f3f359a2..fd6374f9 100644
--- a/tests/API/Endpoints/FootprintsEndpointTest.php
+++ b/tests/API/Endpoints/FootprintsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class FootprintsEndpointTest extends CrudEndpointTestCase
+final class FootprintsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/InfoEndpointTest.php b/tests/API/Endpoints/InfoEndpointTest.php
index 09f02e8a..6e996c0c 100644
--- a/tests/API/Endpoints/InfoEndpointTest.php
+++ b/tests/API/Endpoints/InfoEndpointTest.php
@@ -25,7 +25,7 @@ namespace API\Endpoints;
use App\Tests\API\AuthenticatedApiTestCase;
-class InfoEndpointTest extends AuthenticatedApiTestCase
+final class InfoEndpointTest extends AuthenticatedApiTestCase
{
public function testGetInfo(): void
{
diff --git a/tests/API/Endpoints/LabelEndpointTest.php b/tests/API/Endpoints/LabelEndpointTest.php
new file mode 100644
index 00000000..338af836
--- /dev/null
+++ b/tests/API/Endpoints/LabelEndpointTest.php
@@ -0,0 +1,186 @@
+.
+ */
+
+declare(strict_types=1);
+
+namespace App\Tests\API\Endpoints;
+
+use App\Tests\API\AuthenticatedApiTestCase;
+
+class LabelEndpointTest extends AuthenticatedApiTestCase
+{
+ public function testGetLabelProfiles(): void
+ {
+ $response = self::createAuthenticatedClient()->request('GET', '/api/label_profiles');
+
+ self::assertResponseIsSuccessful();
+ self::assertResponseHeaderSame('content-type', 'application/ld+json; charset=utf-8');
+
+ // Check that we get an array of label profiles
+ $json = $response->toArray();
+ self::assertIsArray($json['hydra:member']);
+ self::assertNotEmpty($json['hydra:member']);
+
+ // Check the structure of the first profile
+ $firstProfile = $json['hydra:member'][0];
+ self::assertArrayHasKey('@id', $firstProfile);
+ self::assertArrayHasKey('name', $firstProfile);
+ self::assertArrayHasKey('options', $firstProfile);
+ self::assertArrayHasKey('show_in_dropdown', $firstProfile);
+ }
+
+ public function testGetSingleLabelProfile(): void
+ {
+ $response = self::createAuthenticatedClient()->request('GET', '/api/label_profiles/1');
+
+ self::assertResponseIsSuccessful();
+ self::assertJsonContains([
+ '@id' => '/api/label_profiles/1',
+ ]);
+
+ $json = $response->toArray();
+ self::assertArrayHasKey('name', $json);
+ self::assertArrayHasKey('options', $json);
+ // Note: options is serialized but individual fields like width/height
+ // are only available in 'extended' or 'full' serialization groups
+ self::assertIsArray($json['options']);
+ }
+
+ public function testFilterLabelProfilesByElementType(): void
+ {
+ $response = self::createAuthenticatedClient()->request('GET', '/api/label_profiles?options.supported_element=part');
+
+ self::assertResponseIsSuccessful();
+
+ $json = $response->toArray();
+ // Check that we get results - the filter should work even if the field isn't in response
+ self::assertIsArray($json['hydra:member']);
+ // verify we got profiles
+ self::assertNotEmpty($json['hydra:member']);
+ }
+
+ public function testGenerateLabelPdf(): void
+ {
+ $response = self::createAuthenticatedClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => '1',
+ ],
+ ]);
+
+ self::assertResponseIsSuccessful();
+ self::assertResponseHeaderSame('content-type', 'application/pdf');
+
+ // Check that the response contains PDF data
+ $content = $response->getContent();
+ self::assertStringStartsWith('%PDF-', $content);
+
+ // Check Content-Disposition header contains attachment and .pdf
+ $headers = $response->getHeaders();
+ self::assertArrayHasKey('content-disposition', $headers);
+ $disposition = $headers['content-disposition'][0];
+ self::assertStringContainsString('attachment', $disposition);
+ self::assertStringContainsString('.pdf', $disposition);
+ }
+
+ public function testGenerateLabelPdfWithMultipleElements(): void
+ {
+ $response = self::createAuthenticatedClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => '1,2,3',
+ ],
+ ]);
+
+ self::assertResponseIsSuccessful();
+ self::assertResponseHeaderSame('content-type', 'application/pdf');
+ self::assertStringStartsWith('%PDF-', $response->getContent());
+ }
+
+ public function testGenerateLabelPdfWithRange(): void
+ {
+ $response = self::createAuthenticatedClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => '1-3',
+ ],
+ ]);
+
+ self::assertResponseIsSuccessful();
+ self::assertResponseHeaderSame('content-type', 'application/pdf');
+ self::assertStringStartsWith('%PDF-', $response->getContent());
+ }
+
+ public function testGenerateLabelPdfWithInvalidProfileId(): void
+ {
+ self::createAuthenticatedClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 99999,
+ 'elementIds' => '1',
+ ],
+ ]);
+
+ self::assertResponseStatusCodeSame(404);
+ }
+
+ public function testGenerateLabelPdfWithInvalidElementIds(): void
+ {
+ $client = self::createAuthenticatedClient();
+ $client->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => 'invalid',
+ ],
+ ]);
+
+ // Should return 400 or 422 (validation error)
+ $response = $client->getResponse();
+ $statusCode = $response->getStatusCode();
+ self::assertTrue(
+ $statusCode === 400 || $statusCode === 422,
+ "Expected status code 400 or 422, got {$statusCode}"
+ );
+ }
+
+ public function testGenerateLabelPdfWithNonExistentElements(): void
+ {
+ self::createAuthenticatedClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => '99999',
+ ],
+ ]);
+
+ self::assertResponseStatusCodeSame(404);
+ }
+
+ public function testGenerateLabelPdfRequiresAuthentication(): void
+ {
+ // Create a non-authenticated client
+ self::createClient()->request('POST', '/api/labels/generate', [
+ 'json' => [
+ 'profileId' => 1,
+ 'elementIds' => '1',
+ ],
+ ]);
+
+ self::assertResponseStatusCodeSame(401);
+ }
+}
diff --git a/tests/API/Endpoints/ManufacturersEndpointTest.php b/tests/API/Endpoints/ManufacturersEndpointTest.php
index 482ec98d..80447c93 100644
--- a/tests/API/Endpoints/ManufacturersEndpointTest.php
+++ b/tests/API/Endpoints/ManufacturersEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class ManufacturersEndpointTest extends CrudEndpointTestCase
+final class ManufacturersEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/MeasurementUnitsEndpointTest.php b/tests/API/Endpoints/MeasurementUnitsEndpointTest.php
index db7341db..d659fb1c 100644
--- a/tests/API/Endpoints/MeasurementUnitsEndpointTest.php
+++ b/tests/API/Endpoints/MeasurementUnitsEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class MeasurementUnitsEndpointTest extends CrudEndpointTestCase
+final class MeasurementUnitsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/OrderdetailsEndpointTest.php b/tests/API/Endpoints/OrderdetailsEndpointTest.php
index 92823103..d7d132d9 100644
--- a/tests/API/Endpoints/OrderdetailsEndpointTest.php
+++ b/tests/API/Endpoints/OrderdetailsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class OrderdetailsEndpointTest extends CrudEndpointTestCase
+final class OrderdetailsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/ParametersEndpointTest.php b/tests/API/Endpoints/ParametersEndpointTest.php
index 733df59a..323fc7b8 100644
--- a/tests/API/Endpoints/ParametersEndpointTest.php
+++ b/tests/API/Endpoints/ParametersEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class ParametersEndpointTest extends CrudEndpointTestCase
+final class ParametersEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/PartAssociationsEndpointTest.php b/tests/API/Endpoints/PartAssociationsEndpointTest.php
index 62408dbb..7ac81ff6 100644
--- a/tests/API/Endpoints/PartAssociationsEndpointTest.php
+++ b/tests/API/Endpoints/PartAssociationsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class PartAssociationsEndpointTest extends CrudEndpointTestCase
+final class PartAssociationsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/PartCustomStateEndpointTest.php b/tests/API/Endpoints/PartCustomStateEndpointTest.php
index ac353d9c..8d1253f3 100644
--- a/tests/API/Endpoints/PartCustomStateEndpointTest.php
+++ b/tests/API/Endpoints/PartCustomStateEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class PartCustomStateEndpointTest extends CrudEndpointTestCase
+final class PartCustomStateEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/PartEndpointTest.php b/tests/API/Endpoints/PartEndpointTest.php
index 9406fc78..8d66d362 100644
--- a/tests/API/Endpoints/PartEndpointTest.php
+++ b/tests/API/Endpoints/PartEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class PartEndpointTest extends CrudEndpointTestCase
+final class PartEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/PartLotsEndpointTest.php b/tests/API/Endpoints/PartLotsEndpointTest.php
index 38aa6b18..70f1f9ab 100644
--- a/tests/API/Endpoints/PartLotsEndpointTest.php
+++ b/tests/API/Endpoints/PartLotsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class PartLotsEndpointTest extends CrudEndpointTestCase
+final class PartLotsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/PricedetailsEndpointTest.php b/tests/API/Endpoints/PricedetailsEndpointTest.php
index 8895365f..5661c0c7 100644
--- a/tests/API/Endpoints/PricedetailsEndpointTest.php
+++ b/tests/API/Endpoints/PricedetailsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class PricedetailsEndpointTest extends CrudEndpointTestCase
+final class PricedetailsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/ProjectBOMEntriesEndpointTest.php b/tests/API/Endpoints/ProjectBOMEntriesEndpointTest.php
index cafb57dc..10dbf747 100644
--- a/tests/API/Endpoints/ProjectBOMEntriesEndpointTest.php
+++ b/tests/API/Endpoints/ProjectBOMEntriesEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class ProjectBOMEntriesEndpointTest extends CrudEndpointTestCase
+final class ProjectBOMEntriesEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/ProjectsEndpointTest.php b/tests/API/Endpoints/ProjectsEndpointTest.php
index 9daf584a..ea9cc6b4 100644
--- a/tests/API/Endpoints/ProjectsEndpointTest.php
+++ b/tests/API/Endpoints/ProjectsEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class ProjectsEndpointTest extends CrudEndpointTestCase
+final class ProjectsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/StorageLocationsEndpointTest.php b/tests/API/Endpoints/StorageLocationsEndpointTest.php
index 8d9641c4..11947e71 100644
--- a/tests/API/Endpoints/StorageLocationsEndpointTest.php
+++ b/tests/API/Endpoints/StorageLocationsEndpointTest.php
@@ -25,7 +25,7 @@ namespace API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class StorageLocationsEndpointTest extends CrudEndpointTestCase
+final class StorageLocationsEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/SuppliersEndpointTest.php b/tests/API/Endpoints/SuppliersEndpointTest.php
index 1941f849..bbb64e90 100644
--- a/tests/API/Endpoints/SuppliersEndpointTest.php
+++ b/tests/API/Endpoints/SuppliersEndpointTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\API\Endpoints;
use App\Tests\API\Endpoints\CrudEndpointTestCase;
-class SuppliersEndpointTest extends CrudEndpointTestCase
+final class SuppliersEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/API/Endpoints/UsersEndpointTest.php b/tests/API/Endpoints/UsersEndpointTest.php
index 0f075a7c..e6e18930 100644
--- a/tests/API/Endpoints/UsersEndpointTest.php
+++ b/tests/API/Endpoints/UsersEndpointTest.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace App\Tests\API\Endpoints;
-class UsersEndpointTest extends CrudEndpointTestCase
+final class UsersEndpointTest extends CrudEndpointTestCase
{
protected function getBasePath(): string
diff --git a/tests/ApplicationAvailabilityFunctionalTest.php b/tests/ApplicationAvailabilityFunctionalTest.php
index d5bced49..c7449411 100644
--- a/tests/ApplicationAvailabilityFunctionalTest.php
+++ b/tests/ApplicationAvailabilityFunctionalTest.php
@@ -32,7 +32,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
*/
#[Group('DB')]
#[Group('slow')]
-class ApplicationAvailabilityFunctionalTest extends WebTestCase
+final class ApplicationAvailabilityFunctionalTest extends WebTestCase
{
#[DataProvider('urlProvider')]
public function testPageIsSuccessful(string $url): void
diff --git a/tests/Controller/AdminPages/AttachmentTypeController.php b/tests/Controller/AdminPages/AttachmentTypeController.php
index 599a6f69..90e6583d 100644
--- a/tests/Controller/AdminPages/AttachmentTypeController.php
+++ b/tests/Controller/AdminPages/AttachmentTypeController.php
@@ -27,7 +27,7 @@ use App\Entity\Attachments\AttachmentType;
#[Group('slow')]
#[Group('DB')]
-class AttachmentTypeController extends AbstractAdminController
+final class AttachmentTypeController extends AbstractAdminController
{
protected static string $base_path = '/en/attachment_type';
protected static string $entity_class = AttachmentType::class;
diff --git a/tests/Controller/AdminPages/CategoryController.php b/tests/Controller/AdminPages/CategoryController.php
index c1bac093..5d8396e7 100644
--- a/tests/Controller/AdminPages/CategoryController.php
+++ b/tests/Controller/AdminPages/CategoryController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\Category;
#[Group('slow')]
#[Group('DB')]
-class CategoryController extends AbstractAdminController
+final class CategoryController extends AbstractAdminController
{
protected static string $base_path = '/en/category';
protected static string $entity_class = Category::class;
diff --git a/tests/Controller/AdminPages/CurrencyController.php b/tests/Controller/AdminPages/CurrencyController.php
index 21f94a29..4ebd82e2 100644
--- a/tests/Controller/AdminPages/CurrencyController.php
+++ b/tests/Controller/AdminPages/CurrencyController.php
@@ -28,7 +28,7 @@ use App\Entity\Parts\Manufacturer;
#[Group('slow')]
#[Group('DB')]
-class CurrencyController extends AbstractAdminController
+final class CurrencyController extends AbstractAdminController
{
protected static string $base_path = '/en/currency';
protected static string $entity_class = Currency::class;
diff --git a/tests/Controller/AdminPages/FootprintController.php b/tests/Controller/AdminPages/FootprintController.php
index 7d617ba8..2643d3f1 100644
--- a/tests/Controller/AdminPages/FootprintController.php
+++ b/tests/Controller/AdminPages/FootprintController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\Footprint;
#[Group('slow')]
#[Group('DB')]
-class FootprintController extends AbstractAdminController
+final class FootprintController extends AbstractAdminController
{
protected static string $base_path = '/en/footprint';
protected static string $entity_class = Footprint::class;
diff --git a/tests/Controller/AdminPages/LabelProfileController.php b/tests/Controller/AdminPages/LabelProfileController.php
index 838d872e..d407701a 100644
--- a/tests/Controller/AdminPages/LabelProfileController.php
+++ b/tests/Controller/AdminPages/LabelProfileController.php
@@ -46,7 +46,7 @@ use PHPUnit\Framework\Attributes\Group;
use App\Entity\LabelSystem\LabelProfile;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-class LabelProfileController extends AbstractAdminController
+final class LabelProfileController extends AbstractAdminController
{
protected static string $base_path = '/en/label_profile';
protected static string $entity_class = LabelProfile::class;
diff --git a/tests/Controller/AdminPages/ManufacturerController.php b/tests/Controller/AdminPages/ManufacturerController.php
index c2666f72..2a5ed386 100644
--- a/tests/Controller/AdminPages/ManufacturerController.php
+++ b/tests/Controller/AdminPages/ManufacturerController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\Manufacturer;
#[Group('slow')]
#[Group('DB')]
-class ManufacturerController extends AbstractAdminController
+final class ManufacturerController extends AbstractAdminController
{
protected static string $base_path = '/en/manufacturer';
protected static string $entity_class = Manufacturer::class;
diff --git a/tests/Controller/AdminPages/MeasurementUnitController.php b/tests/Controller/AdminPages/MeasurementUnitController.php
index 351f4e51..c15d4af4 100644
--- a/tests/Controller/AdminPages/MeasurementUnitController.php
+++ b/tests/Controller/AdminPages/MeasurementUnitController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\MeasurementUnit;
#[Group('slow')]
#[Group('DB')]
-class MeasurementUnitController extends AbstractAdminController
+final class MeasurementUnitController extends AbstractAdminController
{
protected static string $base_path = '/en/measurement_unit';
protected static string $entity_class = MeasurementUnit::class;
diff --git a/tests/Controller/AdminPages/PartCustomStateControllerTest.php b/tests/Controller/AdminPages/PartCustomStateControllerTest.php
index 3e87dfe2..77d1127c 100644
--- a/tests/Controller/AdminPages/PartCustomStateControllerTest.php
+++ b/tests/Controller/AdminPages/PartCustomStateControllerTest.php
@@ -27,7 +27,7 @@ use PHPUnit\Framework\Attributes\Group;
#[Group('slow')]
#[Group('DB')]
-class PartCustomStateControllerTest extends AbstractAdminController
+final class PartCustomStateControllerTest extends AbstractAdminController
{
protected static string $base_path = '/en/part_custom_state';
protected static string $entity_class = PartCustomState::class;
diff --git a/tests/Controller/AdminPages/ProjectController.php b/tests/Controller/AdminPages/ProjectController.php
index 1de4bf52..d7bec069 100644
--- a/tests/Controller/AdminPages/ProjectController.php
+++ b/tests/Controller/AdminPages/ProjectController.php
@@ -28,7 +28,7 @@ use App\Entity\ProjectSystem\Project;
#[Group('slow')]
#[Group('DB')]
-class ProjectController extends AbstractAdminController
+final class ProjectController extends AbstractAdminController
{
protected static string $base_path = '/en/project';
protected static string $entity_class = Project::class;
diff --git a/tests/Controller/AdminPages/StorelocationController.php b/tests/Controller/AdminPages/StorelocationController.php
index fee06c67..f19a5f6a 100644
--- a/tests/Controller/AdminPages/StorelocationController.php
+++ b/tests/Controller/AdminPages/StorelocationController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\StorageLocation;
#[Group('slow')]
#[Group('DB')]
-class StorelocationController extends AbstractAdminController
+final class StorelocationController extends AbstractAdminController
{
protected static string $base_path = '/en/store_location';
protected static string $entity_class = StorageLocation::class;
diff --git a/tests/Controller/AdminPages/SupplierController.php b/tests/Controller/AdminPages/SupplierController.php
index 3549eb4b..1e1d720a 100644
--- a/tests/Controller/AdminPages/SupplierController.php
+++ b/tests/Controller/AdminPages/SupplierController.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\Supplier;
#[Group('slow')]
#[Group('DB')]
-class SupplierController extends AbstractAdminController
+final class SupplierController extends AbstractAdminController
{
protected static string $base_path = '/en/supplier';
protected static string $entity_class = Supplier::class;
diff --git a/tests/Controller/BulkInfoProviderImportControllerTest.php b/tests/Controller/BulkInfoProviderImportControllerTest.php
index 8961d23b..ec3629fe 100644
--- a/tests/Controller/BulkInfoProviderImportControllerTest.php
+++ b/tests/Controller/BulkInfoProviderImportControllerTest.php
@@ -22,6 +22,8 @@ declare(strict_types=1);
namespace App\Tests\Controller;
+use App\Services\InfoProviderSystem\BulkInfoProviderService;
+use App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO;
use App\Entity\InfoProviderSystem\BulkImportJobStatus;
use App\Entity\InfoProviderSystem\BulkInfoProviderImportJob;
use App\Entity\Parts\Part;
@@ -36,7 +38,7 @@ use Symfony\Component\HttpFoundation\Response;
#[Group("slow")]
#[Group("DB")]
-class BulkInfoProviderImportControllerTest extends WebTestCase
+final class BulkInfoProviderImportControllerTest extends WebTestCase
{
public function testStep1WithoutIds(): void
{
@@ -174,8 +176,8 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
// Verify the template rendered the source_field and source_keyword correctly
$content = $client->getResponse()->getContent();
- $this->assertStringContainsString('test_field', $content);
- $this->assertStringContainsString('test_keyword', $content);
+ $this->assertStringContainsString('test_field', (string) $content);
+ $this->assertStringContainsString('test_keyword', (string) $content);
// Clean up - find by ID to avoid detached entity issues
$jobId = $job->getId();
@@ -607,7 +609,7 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
- $this->assertStringContainsString('Bulk Info Provider Import', $client->getResponse()->getContent());
+ $this->assertStringContainsString('Bulk Info Provider Import', (string) $client->getResponse()->getContent());
}
public function testStep1FormSubmissionWithErrors(): void
@@ -630,7 +632,7 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
- $this->assertStringContainsString('Bulk Info Provider Import', $client->getResponse()->getContent());
+ $this->assertStringContainsString('Bulk Info Provider Import', (string) $client->getResponse()->getContent());
}
public function testBulkInfoProviderServiceKeywordExtraction(): void
@@ -647,18 +649,18 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
// Test that the service can extract keywords from parts
- $bulkService = $client->getContainer()->get(\App\Services\InfoProviderSystem\BulkInfoProviderService::class);
+ $bulkService = $client->getContainer()->get(BulkInfoProviderService::class);
// Create field mappings to verify the service works
$fieldMappings = [
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO('name', ['test'], 1),
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO('mpn', ['test'], 2)
+ new BulkSearchFieldMappingDTO('name', ['test'], 1),
+ new BulkSearchFieldMappingDTO('mpn', ['test'], 2)
];
// The service may return an empty result or throw when no results are found
try {
$result = $bulkService->performBulkSearch([$part], $fieldMappings, false);
- $this->assertInstanceOf(\App\Services\InfoProviderSystem\DTOs\BulkSearchResponseDTO::class, $result);
+ $this->assertInstanceOf(BulkSearchResponseDTO::class, $result);
} catch (\RuntimeException $e) {
$this->assertStringContainsString('No search results found', $e->getMessage());
}
@@ -725,12 +727,12 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
// Test that the service can handle supplier part number fields
- $bulkService = $client->getContainer()->get(\App\Services\InfoProviderSystem\BulkInfoProviderService::class);
+ $bulkService = $client->getContainer()->get(BulkInfoProviderService::class);
// Create field mappings with supplier SPN field mapping
$fieldMappings = [
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO('invalid_field', ['test'], 1),
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO('test_supplier_spn', ['test'], 2)
+ new BulkSearchFieldMappingDTO('invalid_field', ['test'], 1),
+ new BulkSearchFieldMappingDTO('test_supplier_spn', ['test'], 2)
];
// The service should be able to process the request and throw an exception when no results are found
@@ -756,11 +758,11 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
// Test that the service can handle batch processing
- $bulkService = $client->getContainer()->get(\App\Services\InfoProviderSystem\BulkInfoProviderService::class);
+ $bulkService = $client->getContainer()->get(BulkInfoProviderService::class);
// Create field mappings with multiple keywords
$fieldMappings = [
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchFieldMappingDTO('empty', ['test'], 1)
+ new BulkSearchFieldMappingDTO('empty', ['test'], 1)
];
// The service should be able to process the request and throw an exception when no results are found
@@ -786,7 +788,7 @@ class BulkInfoProviderImportControllerTest extends WebTestCase
}
// Test that the service can handle prefetch details
- $bulkService = $client->getContainer()->get(\App\Services\InfoProviderSystem\BulkInfoProviderService::class);
+ $bulkService = $client->getContainer()->get(BulkInfoProviderService::class);
// Create empty search results to test prefetch method
$searchResults = new BulkSearchResponseDTO([
diff --git a/tests/Controller/KiCadApiControllerTest.php b/tests/Controller/KiCadApiControllerTest.php
index a66cb8a4..9d33512a 100644
--- a/tests/Controller/KiCadApiControllerTest.php
+++ b/tests/Controller/KiCadApiControllerTest.php
@@ -27,7 +27,7 @@ use App\DataFixtures\APITokenFixtures;
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class KiCadApiControllerTest extends WebTestCase
+final class KiCadApiControllerTest extends WebTestCase
{
private const BASE_URL = '/en/kicad-api/v1';
diff --git a/tests/Controller/PartControllerTest.php b/tests/Controller/PartControllerTest.php
index 8c9f3729..c15bdd51 100644
--- a/tests/Controller/PartControllerTest.php
+++ b/tests/Controller/PartControllerTest.php
@@ -38,7 +38,7 @@ use Symfony\Component\HttpFoundation\Response;
#[Group("slow")]
#[Group("DB")]
-class PartControllerTest extends WebTestCase
+final class PartControllerTest extends WebTestCase
{
public function testShowPart(): void
{
diff --git a/tests/Controller/RedirectControllerTest.php b/tests/Controller/RedirectControllerTest.php
index ac2776e5..420b0f49 100644
--- a/tests/Controller/RedirectControllerTest.php
+++ b/tests/Controller/RedirectControllerTest.php
@@ -33,7 +33,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
#[Group('slow')]
#[Group('DB')]
-class RedirectControllerTest extends WebTestCase
+final class RedirectControllerTest extends WebTestCase
{
protected EntityManagerInterface $em;
protected UserRepository $userRepo;
diff --git a/tests/Controller/ScanControllerTest.php b/tests/Controller/ScanControllerTest.php
index 98992e09..b504cd29 100644
--- a/tests/Controller/ScanControllerTest.php
+++ b/tests/Controller/ScanControllerTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class ScanControllerTest extends WebTestCase
+final class ScanControllerTest extends WebTestCase
{
private ?KernelBrowser $client = null;
diff --git a/tests/DataTables/Filters/CompoundFilterTraitTest.php b/tests/DataTables/Filters/CompoundFilterTraitTest.php
index 93f3c1e1..d9bf20b0 100644
--- a/tests/DataTables/Filters/CompoundFilterTraitTest.php
+++ b/tests/DataTables/Filters/CompoundFilterTraitTest.php
@@ -27,7 +27,7 @@ use App\DataTables\Filters\FilterInterface;
use Doctrine\ORM\QueryBuilder;
use PHPUnit\Framework\TestCase;
-class CompoundFilterTraitTest extends TestCase
+final class CompoundFilterTraitTest extends TestCase
{
public function testFindAllChildFiltersEmpty(): void
@@ -49,9 +49,9 @@ class CompoundFilterTraitTest extends TestCase
public function testFindAllChildFilters(): void
{
- $f1 = $this->createMock(FilterInterface::class);
- $f2 = $this->createMock(FilterInterface::class);
- $f3 = $this->createMock(FilterInterface::class);
+ $f1 = $this->createStub(FilterInterface::class);
+ $f2 = $this->createStub(FilterInterface::class);
+ $f3 = $this->createStub(FilterInterface::class);
$filter = new class($f1, $f2, $f3, null) {
use CompoundFilterTrait;
@@ -108,7 +108,7 @@ class CompoundFilterTraitTest extends TestCase
}
};
- $qb = $this->createMock(QueryBuilder::class);
+ $qb = $this->createStub(QueryBuilder::class);
$filter->_applyAllChildFilters($qb);
}
diff --git a/tests/DataTables/Filters/Constraints/FilterTraitTest.php b/tests/DataTables/Filters/Constraints/FilterTraitTest.php
index e1e459d5..a7493dcf 100644
--- a/tests/DataTables/Filters/Constraints/FilterTraitTest.php
+++ b/tests/DataTables/Filters/Constraints/FilterTraitTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\DataTables\Filters\Constraints\FilterTrait;
use PHPUnit\Framework\TestCase;
-class FilterTraitTest extends TestCase
+final class FilterTraitTest extends TestCase
{
use FilterTrait;
diff --git a/tests/DataTables/Filters/Constraints/Part/BulkImportJobStatusConstraintTest.php b/tests/DataTables/Filters/Constraints/Part/BulkImportJobStatusConstraintTest.php
index 816a8035..333b9af5 100644
--- a/tests/DataTables/Filters/Constraints/Part/BulkImportJobStatusConstraintTest.php
+++ b/tests/DataTables/Filters/Constraints/Part/BulkImportJobStatusConstraintTest.php
@@ -28,7 +28,7 @@ use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\QueryBuilder;
use PHPUnit\Framework\TestCase;
-class BulkImportJobStatusConstraintTest extends TestCase
+final class BulkImportJobStatusConstraintTest extends TestCase
{
private BulkImportJobStatusConstraint $constraint;
private QueryBuilder $queryBuilder;
@@ -46,7 +46,7 @@ class BulkImportJobStatusConstraintTest extends TestCase
public function testConstructor(): void
{
- $this->assertEquals([], $this->constraint->getValue());
+ $this->assertSame([], $this->constraint->getValue());
$this->assertEmpty($this->constraint->getOperator());
$this->assertFalse($this->constraint->isEnabled());
}
@@ -56,7 +56,7 @@ class BulkImportJobStatusConstraintTest extends TestCase
$values = ['pending', 'in_progress'];
$this->constraint->setValue($values);
- $this->assertEquals($values, $this->constraint->getValue());
+ $this->assertSame($values, $this->constraint->getValue());
}
public function testGetAndSetOperator(): void
@@ -64,7 +64,7 @@ class BulkImportJobStatusConstraintTest extends TestCase
$operator = 'ANY';
$this->constraint->setOperator($operator);
- $this->assertEquals($operator, $this->constraint->getOperator());
+ $this->assertSame($operator, $this->constraint->getOperator());
}
public function testIsEnabledWithEmptyValues(): void
diff --git a/tests/DataTables/Filters/Constraints/Part/BulkImportPartStatusConstraintTest.php b/tests/DataTables/Filters/Constraints/Part/BulkImportPartStatusConstraintTest.php
index bc110eda..e2b37287 100644
--- a/tests/DataTables/Filters/Constraints/Part/BulkImportPartStatusConstraintTest.php
+++ b/tests/DataTables/Filters/Constraints/Part/BulkImportPartStatusConstraintTest.php
@@ -28,7 +28,7 @@ use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\QueryBuilder;
use PHPUnit\Framework\TestCase;
-class BulkImportPartStatusConstraintTest extends TestCase
+final class BulkImportPartStatusConstraintTest extends TestCase
{
private BulkImportPartStatusConstraint $constraint;
private QueryBuilder $queryBuilder;
@@ -46,7 +46,7 @@ class BulkImportPartStatusConstraintTest extends TestCase
public function testConstructor(): void
{
- $this->assertEquals([], $this->constraint->getValue());
+ $this->assertSame([], $this->constraint->getValue());
$this->assertEmpty($this->constraint->getOperator());
$this->assertFalse($this->constraint->isEnabled());
}
@@ -56,7 +56,7 @@ class BulkImportPartStatusConstraintTest extends TestCase
$values = ['pending', 'completed', 'skipped'];
$this->constraint->setValue($values);
- $this->assertEquals($values, $this->constraint->getValue());
+ $this->assertSame($values, $this->constraint->getValue());
}
public function testGetAndSetOperator(): void
@@ -64,7 +64,7 @@ class BulkImportPartStatusConstraintTest extends TestCase
$operator = 'ANY';
$this->constraint->setOperator($operator);
- $this->assertEquals($operator, $this->constraint->getOperator());
+ $this->assertSame($operator, $this->constraint->getOperator());
}
public function testIsEnabledWithEmptyValues(): void
@@ -294,6 +294,6 @@ class BulkImportPartStatusConstraintTest extends TestCase
$this->constraint->apply($this->queryBuilder);
- $this->assertEquals($statusValues, $this->constraint->getValue());
+ $this->assertSame($statusValues, $this->constraint->getValue());
}
}
diff --git a/tests/DatatablesAvailabilityTest.php b/tests/DatatablesAvailabilityTest.php
index dad61be3..1447da73 100644
--- a/tests/DatatablesAvailabilityTest.php
+++ b/tests/DatatablesAvailabilityTest.php
@@ -44,7 +44,7 @@ namespace App\Tests;
use PHPUnit\Framework\Attributes\DataProvider;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class DatatablesAvailabilityTest extends WebTestCase
+final class DatatablesAvailabilityTest extends WebTestCase
{
#[DataProvider('urlProvider')]
public function testDataTable(string $url, ?array $ordering = null): void
diff --git a/tests/Doctrine/SQLiteRegexMiddlewareTest.php b/tests/Doctrine/SQLiteRegexMiddlewareTest.php
index 67410f76..aa5e4da1 100644
--- a/tests/Doctrine/SQLiteRegexMiddlewareTest.php
+++ b/tests/Doctrine/SQLiteRegexMiddlewareTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Doctrine\Middleware\SQLiteRegexExtensionMiddlewareDriver;
use PHPUnit\Framework\TestCase;
-class SQLiteRegexMiddlewareTest extends TestCase
+final class SQLiteRegexMiddlewareTest extends TestCase
{
public static function regexpDataProvider(): \Generator
diff --git a/tests/Entity/Attachments/AttachmentTest.php b/tests/Entity/Attachments/AttachmentTest.php
index 35222d63..9e912b97 100644
--- a/tests/Entity/Attachments/AttachmentTest.php
+++ b/tests/Entity/Attachments/AttachmentTest.php
@@ -55,7 +55,7 @@ use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
use ReflectionClass;
-class AttachmentTest extends TestCase
+final class AttachmentTest extends TestCase
{
public function testEmptyState(): void
{
@@ -279,4 +279,32 @@ class AttachmentTest extends TestCase
$reflection_property->setAccessible(true);
$reflection_property->setValue($object, $value);
}
+
+ public function testIsLocalHTMLFile(): void
+ {
+ $attachment = new PartAttachment();
+
+ $attachment->setExternalPath('https://google.de');
+ $this->assertFalse($attachment->isLocalHTMLFile());
+
+ $attachment->setExternalPath('https://google.de/test.html');
+ $this->assertFalse($attachment->isLocalHTMLFile());
+
+ $attachment->setInternalPath('%MEDIA%/test.html');
+ $this->assertTrue($attachment->isLocalHTMLFile());
+
+ $attachment->setInternalPath('%MEDIA%/test.htm');
+ $this->assertTrue($attachment->isLocalHTMLFile());
+
+ $attachment->setInternalPath('%MEDIA%/test.txt');
+ $this->assertFalse($attachment->isLocalHTMLFile());
+
+ //It works however, if the file is stored as txt, and the internal filename ends with .html
+ $attachment->setInternalPath('%MEDIA%/test.txt');
+ $this->setProtectedProperty($attachment, 'original_filename', 'test.html');
+ $this->assertTrue($attachment->isLocalHTMLFile());
+
+ $this->setProtectedProperty($attachment, 'original_filename', 'test.htm');
+ $this->assertTrue($attachment->isLocalHTMLFile());
+ }
}
diff --git a/tests/Entity/Attachments/AttachmentTypeTest.php b/tests/Entity/Attachments/AttachmentTypeTest.php
index f9f781d8..c966d23f 100644
--- a/tests/Entity/Attachments/AttachmentTypeTest.php
+++ b/tests/Entity/Attachments/AttachmentTypeTest.php
@@ -23,10 +23,12 @@ declare(strict_types=1);
namespace App\Tests\Entity\Attachments;
use App\Entity\Attachments\AttachmentType;
+use App\Entity\Attachments\PartAttachment;
+use App\Entity\Attachments\UserAttachment;
use Doctrine\Common\Collections\Collection;
use PHPUnit\Framework\TestCase;
-class AttachmentTypeTest extends TestCase
+final class AttachmentTypeTest extends TestCase
{
public function testEmptyState(): void
{
@@ -34,4 +36,51 @@ class AttachmentTypeTest extends TestCase
$this->assertInstanceOf(Collection::class, $attachment_type->getAttachmentsForType());
$this->assertEmpty($attachment_type->getFiletypeFilter());
}
+
+ public function testSetAllowedTargets(): void
+ {
+ $attachmentType = new AttachmentType();
+
+
+ $this->expectException(\InvalidArgumentException::class);
+ $attachmentType->setAllowedTargets(['target1', 'target2']);
+ }
+
+ public function testGetSetAllowedTargets(): void
+ {
+ $attachmentType = new AttachmentType();
+
+ $attachmentType->setAllowedTargets([PartAttachment::class, UserAttachment::class]);
+ $this->assertSame([PartAttachment::class, UserAttachment::class], $attachmentType->getAllowedTargets());
+ //Caching should also work
+ $this->assertSame([PartAttachment::class, UserAttachment::class], $attachmentType->getAllowedTargets());
+
+ //Setting null should reset the allowed targets
+ $attachmentType->setAllowedTargets(null);
+ $this->assertNull($attachmentType->getAllowedTargets());
+ }
+
+ public function testIsAllowedForTarget(): void
+ {
+ $attachmentType = new AttachmentType();
+
+ //By default, all targets should be allowed
+ $this->assertTrue($attachmentType->isAllowedForTarget(PartAttachment::class));
+ $this->assertTrue($attachmentType->isAllowedForTarget(UserAttachment::class));
+
+ //Set specific allowed targets
+ $attachmentType->setAllowedTargets([PartAttachment::class]);
+ $this->assertTrue($attachmentType->isAllowedForTarget(PartAttachment::class));
+ $this->assertFalse($attachmentType->isAllowedForTarget(UserAttachment::class));
+
+ //Set both targets
+ $attachmentType->setAllowedTargets([PartAttachment::class, UserAttachment::class]);
+ $this->assertTrue($attachmentType->isAllowedForTarget(PartAttachment::class));
+ $this->assertTrue($attachmentType->isAllowedForTarget(UserAttachment::class));
+
+ //Reset allowed targets
+ $attachmentType->setAllowedTargets(null);
+ $this->assertTrue($attachmentType->isAllowedForTarget(PartAttachment::class));
+ $this->assertTrue($attachmentType->isAllowedForTarget(UserAttachment::class));
+ }
}
diff --git a/tests/Entity/Base/AbstractStructuralDBElementTest.php b/tests/Entity/Base/AbstractStructuralDBElementTest.php
index 3f8157ad..90a7dee2 100644
--- a/tests/Entity/Base/AbstractStructuralDBElementTest.php
+++ b/tests/Entity/Base/AbstractStructuralDBElementTest.php
@@ -31,7 +31,7 @@ use PHPUnit\Framework\TestCase;
* Test StructuralDBElement entities.
* Note: Because StructuralDBElement is abstract we use AttachmentType here as a placeholder.
*/
-class AbstractStructuralDBElementTest extends TestCase
+final class AbstractStructuralDBElementTest extends TestCase
{
protected AttachmentType $root;
protected AttachmentType $child1;
diff --git a/tests/Entity/BulkImportJobStatusTest.php b/tests/Entity/BulkImportJobStatusTest.php
index e8b4a977..c38d62e2 100644
--- a/tests/Entity/BulkImportJobStatusTest.php
+++ b/tests/Entity/BulkImportJobStatusTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Entity;
use App\Entity\InfoProviderSystem\BulkImportJobStatus;
use PHPUnit\Framework\TestCase;
-class BulkImportJobStatusTest extends TestCase
+final class BulkImportJobStatusTest extends TestCase
{
public function testEnumValues(): void
{
diff --git a/tests/Entity/BulkInfoProviderImportJobPartTest.php b/tests/Entity/BulkInfoProviderImportJobPartTest.php
index dd9600dd..94b05637 100644
--- a/tests/Entity/BulkInfoProviderImportJobPartTest.php
+++ b/tests/Entity/BulkInfoProviderImportJobPartTest.php
@@ -28,32 +28,25 @@ use App\Entity\InfoProviderSystem\BulkInfoProviderImportJobPart;
use App\Entity\Parts\Part;
use PHPUnit\Framework\TestCase;
-class BulkInfoProviderImportJobPartTest extends TestCase
+final class BulkInfoProviderImportJobPartTest extends TestCase
{
- private BulkInfoProviderImportJob $job;
- private Part $part;
private BulkInfoProviderImportJobPart $jobPart;
protected function setUp(): void
{
- $this->job = $this->createMock(BulkInfoProviderImportJob::class);
- $this->part = $this->createMock(Part::class);
-
- $this->jobPart = new BulkInfoProviderImportJobPart($this->job, $this->part);
+ $this->jobPart = new BulkInfoProviderImportJobPart($this->createStub(BulkInfoProviderImportJob::class), $this->createStub(Part::class));
}
public function testConstructor(): void
{
- $this->assertSame($this->job, $this->jobPart->getJob());
- $this->assertSame($this->part, $this->jobPart->getPart());
- $this->assertEquals(BulkImportPartStatus::PENDING, $this->jobPart->getStatus());
+ $this->assertSame(BulkImportPartStatus::PENDING, $this->jobPart->getStatus());
$this->assertNull($this->jobPart->getReason());
$this->assertNull($this->jobPart->getCompletedAt());
}
public function testGetAndSetJob(): void
{
- $newJob = $this->createMock(BulkInfoProviderImportJob::class);
+ $newJob = $this->createStub(BulkInfoProviderImportJob::class);
$result = $this->jobPart->setJob($newJob);
@@ -63,7 +56,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
public function testGetAndSetPart(): void
{
- $newPart = $this->createMock(Part::class);
+ $newPart = $this->createStub(Part::class);
$result = $this->jobPart->setPart($newPart);
@@ -76,7 +69,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$result = $this->jobPart->setStatus(BulkImportPartStatus::COMPLETED);
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::COMPLETED, $this->jobPart->getStatus());
+ $this->assertSame(BulkImportPartStatus::COMPLETED, $this->jobPart->getStatus());
}
public function testGetAndSetReason(): void
@@ -86,7 +79,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$result = $this->jobPart->setReason($reason);
$this->assertSame($this->jobPart, $result);
- $this->assertEquals($reason, $this->jobPart->getReason());
+ $this->assertSame($reason, $this->jobPart->getReason());
}
public function testGetAndSetCompletedAt(): void
@@ -108,7 +101,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$afterTime = new \DateTimeImmutable();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::COMPLETED, $this->jobPart->getStatus());
+ $this->assertSame(BulkImportPartStatus::COMPLETED, $this->jobPart->getStatus());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
$this->assertGreaterThanOrEqual($beforeTime, $this->jobPart->getCompletedAt());
$this->assertLessThanOrEqual($afterTime, $this->jobPart->getCompletedAt());
@@ -124,8 +117,8 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$afterTime = new \DateTimeImmutable();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::SKIPPED, $this->jobPart->getStatus());
- $this->assertEquals($reason, $this->jobPart->getReason());
+ $this->assertSame(BulkImportPartStatus::SKIPPED, $this->jobPart->getStatus());
+ $this->assertSame($reason, $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
$this->assertGreaterThanOrEqual($beforeTime, $this->jobPart->getCompletedAt());
$this->assertLessThanOrEqual($afterTime, $this->jobPart->getCompletedAt());
@@ -136,8 +129,8 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$result = $this->jobPart->markAsSkipped();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::SKIPPED, $this->jobPart->getStatus());
- $this->assertEquals('', $this->jobPart->getReason());
+ $this->assertSame(BulkImportPartStatus::SKIPPED, $this->jobPart->getStatus());
+ $this->assertSame('', $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
}
@@ -151,8 +144,8 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$afterTime = new \DateTimeImmutable();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::FAILED, $this->jobPart->getStatus());
- $this->assertEquals($reason, $this->jobPart->getReason());
+ $this->assertSame(BulkImportPartStatus::FAILED, $this->jobPart->getStatus());
+ $this->assertSame($reason, $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
$this->assertGreaterThanOrEqual($beforeTime, $this->jobPart->getCompletedAt());
$this->assertLessThanOrEqual($afterTime, $this->jobPart->getCompletedAt());
@@ -163,8 +156,8 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$result = $this->jobPart->markAsFailed();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::FAILED, $this->jobPart->getStatus());
- $this->assertEquals('', $this->jobPart->getReason());
+ $this->assertSame(BulkImportPartStatus::FAILED, $this->jobPart->getStatus());
+ $this->assertSame('', $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
}
@@ -176,7 +169,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
$result = $this->jobPart->markAsPending();
$this->assertSame($this->jobPart, $result);
- $this->assertEquals(BulkImportPartStatus::PENDING, $this->jobPart->getStatus());
+ $this->assertSame(BulkImportPartStatus::PENDING, $this->jobPart->getStatus());
$this->assertNull($this->jobPart->getReason());
$this->assertNull($this->jobPart->getCompletedAt());
}
@@ -281,7 +274,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
// After marking as skipped, should have reason and completion time
$this->jobPart->markAsSkipped('Skipped reason');
- $this->assertEquals('Skipped reason', $this->jobPart->getReason());
+ $this->assertSame('Skipped reason', $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
// After marking as pending, reason and completion time should be cleared
@@ -291,7 +284,7 @@ class BulkInfoProviderImportJobPartTest extends TestCase
// After marking as failed, should have reason and completion time
$this->jobPart->markAsFailed('Failed reason');
- $this->assertEquals('Failed reason', $this->jobPart->getReason());
+ $this->assertSame('Failed reason', $this->jobPart->getReason());
$this->assertInstanceOf(\DateTimeImmutable::class, $this->jobPart->getCompletedAt());
// After marking as completed, should have completion time (reason may remain from previous state)
diff --git a/tests/Entity/BulkInfoProviderImportJobTest.php b/tests/Entity/BulkInfoProviderImportJobTest.php
index c9841ac4..d1a854cd 100644
--- a/tests/Entity/BulkInfoProviderImportJobTest.php
+++ b/tests/Entity/BulkInfoProviderImportJobTest.php
@@ -22,6 +22,8 @@ declare(strict_types=1);
namespace App\Tests\Entity;
+use App\Entity\Parts\Part;
+use App\Services\InfoProviderSystem\DTOs\BulkSearchPartResultsDTO;
use App\Entity\InfoProviderSystem\BulkImportJobStatus;
use App\Entity\InfoProviderSystem\BulkInfoProviderImportJob;
use App\Entity\UserSystem\User;
@@ -31,7 +33,7 @@ use App\Services\InfoProviderSystem\DTOs\BulkSearchResponseDTO;
use App\Services\InfoProviderSystem\DTOs\SearchResultDTO;
use PHPUnit\Framework\TestCase;
-class BulkInfoProviderImportJobTest extends TestCase
+final class BulkInfoProviderImportJobTest extends TestCase
{
private BulkInfoProviderImportJob $job;
private User $user;
@@ -45,9 +47,9 @@ class BulkInfoProviderImportJobTest extends TestCase
$this->job->setCreatedBy($this->user);
}
- private function createMockPart(int $id): \App\Entity\Parts\Part
+ private function createMockPart(int $id): Part
{
- $part = $this->createMock(\App\Entity\Parts\Part::class);
+ $part = $this->createMock(Part::class);
$part->method('getId')->willReturn($id);
$part->method('getName')->willReturn("Test Part {$id}");
return $part;
@@ -58,7 +60,7 @@ class BulkInfoProviderImportJobTest extends TestCase
$job = new BulkInfoProviderImportJob();
$this->assertInstanceOf(\DateTimeImmutable::class, $job->getCreatedAt());
- $this->assertEquals(BulkImportJobStatus::PENDING, $job->getStatus());
+ $this->assertSame(BulkImportJobStatus::PENDING, $job->getStatus());
$this->assertEmpty($job->getPartIds());
$this->assertEmpty($job->getFieldMappings());
$this->assertEmpty($job->getSearchResultsRaw());
@@ -70,14 +72,14 @@ class BulkInfoProviderImportJobTest extends TestCase
public function testBasicGettersSetters(): void
{
$this->job->setName('Test Job');
- $this->assertEquals('Test Job', $this->job->getName());
+ $this->assertSame('Test Job', $this->job->getName());
// Test with actual parts - this is what actually works
$parts = [$this->createMockPart(1), $this->createMockPart(2), $this->createMockPart(3)];
foreach ($parts as $part) {
$this->job->addPart($part);
}
- $this->assertEquals([1, 2, 3], $this->job->getPartIds());
+ $this->assertSame([1, 2, 3], $this->job->getPartIds());
$fieldMappings = [new BulkSearchFieldMappingDTO(field: 'field1', providers: ['provider1', 'provider2'])];
$this->job->setFieldMappings($fieldMappings);
@@ -98,24 +100,24 @@ class BulkInfoProviderImportJobTest extends TestCase
$this->assertFalse($this->job->isStopped());
$this->job->markAsInProgress();
- $this->assertEquals(BulkImportJobStatus::IN_PROGRESS, $this->job->getStatus());
+ $this->assertSame(BulkImportJobStatus::IN_PROGRESS, $this->job->getStatus());
$this->assertTrue($this->job->isInProgress());
$this->assertFalse($this->job->isPending());
$this->job->markAsCompleted();
- $this->assertEquals(BulkImportJobStatus::COMPLETED, $this->job->getStatus());
+ $this->assertSame(BulkImportJobStatus::COMPLETED, $this->job->getStatus());
$this->assertTrue($this->job->isCompleted());
$this->assertNotNull($this->job->getCompletedAt());
$job2 = new BulkInfoProviderImportJob();
$job2->markAsFailed();
- $this->assertEquals(BulkImportJobStatus::FAILED, $job2->getStatus());
+ $this->assertSame(BulkImportJobStatus::FAILED, $job2->getStatus());
$this->assertTrue($job2->isFailed());
$this->assertNotNull($job2->getCompletedAt());
$job3 = new BulkInfoProviderImportJob();
$job3->markAsStopped();
- $this->assertEquals(BulkImportJobStatus::STOPPED, $job3->getStatus());
+ $this->assertSame(BulkImportJobStatus::STOPPED, $job3->getStatus());
$this->assertTrue($job3->isStopped());
$this->assertNotNull($job3->getCompletedAt());
}
@@ -139,7 +141,7 @@ class BulkInfoProviderImportJobTest extends TestCase
public function testPartCount(): void
{
- $this->assertEquals(0, $this->job->getPartCount());
+ $this->assertSame(0, $this->job->getPartCount());
// Test with actual parts - setPartIds doesn't actually add parts
$parts = [
@@ -152,31 +154,31 @@ class BulkInfoProviderImportJobTest extends TestCase
foreach ($parts as $part) {
$this->job->addPart($part);
}
- $this->assertEquals(5, $this->job->getPartCount());
+ $this->assertSame(5, $this->job->getPartCount());
}
public function testResultCount(): void
{
- $this->assertEquals(0, $this->job->getResultCount());
+ $this->assertSame(0, $this->job->getResultCount());
$searchResults = new BulkSearchResponseDTO([
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchPartResultsDTO(
+ new BulkSearchPartResultsDTO(
part: $this->createMockPart(1),
searchResults: [new BulkSearchPartResultDTO(searchResult: new SearchResultDTO(provider_key: 'dummy', provider_id: '1234', name: 'Part 1', description: 'A part'))]
),
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchPartResultsDTO(
+ new BulkSearchPartResultsDTO(
part: $this->createMockPart(2),
searchResults: [new BulkSearchPartResultDTO(searchResult: new SearchResultDTO(provider_key: 'dummy', provider_id: '1234', name: 'Part 2', description: 'A part')),
new BulkSearchPartResultDTO(searchResult: new SearchResultDTO(provider_key: 'dummy', provider_id: '5678', name: 'Part 2 Alt', description: 'Another part'))]
),
- new \App\Services\InfoProviderSystem\DTOs\BulkSearchPartResultsDTO(
+ new BulkSearchPartResultsDTO(
part: $this->createMockPart(3),
searchResults: []
)
]);
$this->job->setSearchResults($searchResults);
- $this->assertEquals(3, $this->job->getResultCount());
+ $this->assertSame(3, $this->job->getResultCount());
}
public function testPartProgressTracking(): void
@@ -222,21 +224,21 @@ class BulkInfoProviderImportJobTest extends TestCase
$this->job->addPart($part);
}
- $this->assertEquals(0, $this->job->getCompletedPartsCount());
- $this->assertEquals(0, $this->job->getSkippedPartsCount());
+ $this->assertSame(0, $this->job->getCompletedPartsCount());
+ $this->assertSame(0, $this->job->getSkippedPartsCount());
$this->job->markPartAsCompleted(1);
$this->job->markPartAsCompleted(2);
$this->job->markPartAsSkipped(3, 'Error');
- $this->assertEquals(2, $this->job->getCompletedPartsCount());
- $this->assertEquals(1, $this->job->getSkippedPartsCount());
+ $this->assertSame(2, $this->job->getCompletedPartsCount());
+ $this->assertSame(1, $this->job->getSkippedPartsCount());
}
public function testProgressPercentage(): void
{
$emptyJob = new BulkInfoProviderImportJob();
- $this->assertEquals(100.0, $emptyJob->getProgressPercentage());
+ $this->assertEqualsWithDelta(100.0, $emptyJob->getProgressPercentage(), PHP_FLOAT_EPSILON);
// Test with actual parts - setPartIds doesn't actually add parts
$parts = [
@@ -250,18 +252,18 @@ class BulkInfoProviderImportJobTest extends TestCase
$this->job->addPart($part);
}
- $this->assertEquals(0.0, $this->job->getProgressPercentage());
+ $this->assertEqualsWithDelta(0.0, $this->job->getProgressPercentage(), PHP_FLOAT_EPSILON);
$this->job->markPartAsCompleted(1);
$this->job->markPartAsCompleted(2);
- $this->assertEquals(40.0, $this->job->getProgressPercentage());
+ $this->assertEqualsWithDelta(40.0, $this->job->getProgressPercentage(), PHP_FLOAT_EPSILON);
$this->job->markPartAsSkipped(3, 'Error');
- $this->assertEquals(60.0, $this->job->getProgressPercentage());
+ $this->assertEqualsWithDelta(60.0, $this->job->getProgressPercentage(), PHP_FLOAT_EPSILON);
$this->job->markPartAsCompleted(4);
$this->job->markPartAsCompleted(5);
- $this->assertEquals(100.0, $this->job->getProgressPercentage());
+ $this->assertEqualsWithDelta(100.0, $this->job->getProgressPercentage(), PHP_FLOAT_EPSILON);
}
public function testIsAllPartsCompleted(): void
@@ -301,8 +303,8 @@ class BulkInfoProviderImportJobTest extends TestCase
$this->job->addPart($part);
}
- $this->assertEquals('info_providers.bulk_import.job_name_template', $this->job->getDisplayNameKey());
- $this->assertEquals(['%count%' => 3], $this->job->getDisplayNameParams());
+ $this->assertSame('info_providers.bulk_import.job_name_template', $this->job->getDisplayNameKey());
+ $this->assertSame(['%count%' => 3], $this->job->getDisplayNameParams());
}
public function testFormattedTimestamp(): void
diff --git a/tests/Entity/LogSystem/AbstractLogEntryTest.php b/tests/Entity/LogSystem/AbstractLogEntryTest.php
index 3f223693..d99b8e73 100644
--- a/tests/Entity/LogSystem/AbstractLogEntryTest.php
+++ b/tests/Entity/LogSystem/AbstractLogEntryTest.php
@@ -58,7 +58,7 @@ use App\Entity\UserSystem\Group;
use App\Entity\UserSystem\User;
use PHPUnit\Framework\TestCase;
-class AbstractLogEntryTest extends TestCase
+final class AbstractLogEntryTest extends TestCase
{
public function testSetGetTarget(): void
{
diff --git a/tests/Entity/LogSystem/LogLevelTest.php b/tests/Entity/LogSystem/LogLevelTest.php
index 402942e1..0125b0cd 100644
--- a/tests/Entity/LogSystem/LogLevelTest.php
+++ b/tests/Entity/LogSystem/LogLevelTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Entity\LogSystem;
use App\Entity\LogSystem\LogLevel;
use PHPUnit\Framework\TestCase;
-class LogLevelTest extends TestCase
+final class LogLevelTest extends TestCase
{
public function testToPSR3LevelString(): void
diff --git a/tests/Entity/LogSystem/LogTargetTypeTest.php b/tests/Entity/LogSystem/LogTargetTypeTest.php
index 46682496..06e2ead1 100644
--- a/tests/Entity/LogSystem/LogTargetTypeTest.php
+++ b/tests/Entity/LogSystem/LogTargetTypeTest.php
@@ -30,7 +30,7 @@ use App\Entity\Parts\Category;
use App\Entity\UserSystem\User;
use PHPUnit\Framework\TestCase;
-class LogTargetTypeTest extends TestCase
+final class LogTargetTypeTest extends TestCase
{
public function testToClass(): void
diff --git a/tests/Entity/Parameters/PartParameterTest.php b/tests/Entity/Parameters/PartParameterTest.php
index 64550eee..6a07468e 100644
--- a/tests/Entity/Parameters/PartParameterTest.php
+++ b/tests/Entity/Parameters/PartParameterTest.php
@@ -45,7 +45,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Entity\Parameters\PartParameter;
use PHPUnit\Framework\TestCase;
-class PartParameterTest extends TestCase
+final class PartParameterTest extends TestCase
{
public static function valueWithUnitDataProvider(): \Iterator
{
diff --git a/tests/Entity/Parts/InfoProviderReferenceTest.php b/tests/Entity/Parts/InfoProviderReferenceTest.php
index a1a8d5de..dcc6a43c 100644
--- a/tests/Entity/Parts/InfoProviderReferenceTest.php
+++ b/tests/Entity/Parts/InfoProviderReferenceTest.php
@@ -26,7 +26,7 @@ use App\Entity\Parts\InfoProviderReference;
use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
use PHPUnit\Framework\TestCase;
-class InfoProviderReferenceTest extends TestCase
+final class InfoProviderReferenceTest extends TestCase
{
public function testNoProvider(): void
{
diff --git a/tests/Entity/Parts/PartAssociationTest.php b/tests/Entity/Parts/PartAssociationTest.php
index e002846e..25487d1f 100644
--- a/tests/Entity/Parts/PartAssociationTest.php
+++ b/tests/Entity/Parts/PartAssociationTest.php
@@ -26,7 +26,7 @@ use App\Entity\Parts\AssociationType;
use App\Entity\Parts\PartAssociation;
use PHPUnit\Framework\TestCase;
-class PartAssociationTest extends TestCase
+final class PartAssociationTest extends TestCase
{
public function testGetTypeTranslationKey(): void
diff --git a/tests/Entity/Parts/PartLotTest.php b/tests/Entity/Parts/PartLotTest.php
index 30687b72..10cc80b9 100644
--- a/tests/Entity/Parts/PartLotTest.php
+++ b/tests/Entity/Parts/PartLotTest.php
@@ -26,7 +26,7 @@ use App\Entity\Parts\PartLot;
use DateTime;
use PHPUnit\Framework\TestCase;
-class PartLotTest extends TestCase
+final class PartLotTest extends TestCase
{
public function testIsExpired(): void
{
diff --git a/tests/Entity/Parts/PartTest.php b/tests/Entity/Parts/PartTest.php
index c1ae8935..e855c340 100644
--- a/tests/Entity/Parts/PartTest.php
+++ b/tests/Entity/Parts/PartTest.php
@@ -29,7 +29,7 @@ use DateTime;
use Doctrine\Common\Collections\Collection;
use PHPUnit\Framework\TestCase;
-class PartTest extends TestCase
+final class PartTest extends TestCase
{
public function testAddRemovePartLot(): void
{
diff --git a/tests/Entity/PriceSystem/CurrencyTest.php b/tests/Entity/PriceSystem/CurrencyTest.php
index 0058d501..018092e5 100644
--- a/tests/Entity/PriceSystem/CurrencyTest.php
+++ b/tests/Entity/PriceSystem/CurrencyTest.php
@@ -26,7 +26,7 @@ use App\Entity\PriceInformations\Currency;
use Brick\Math\BigDecimal;
use PHPUnit\Framework\TestCase;
-class CurrencyTest extends TestCase
+final class CurrencyTest extends TestCase
{
public function testGetInverseExchangeRate(): void
{
diff --git a/tests/Entity/PriceSystem/OrderdetailTest.php b/tests/Entity/PriceSystem/OrderdetailTest.php
index 497f9ab3..2becb74e 100644
--- a/tests/Entity/PriceSystem/OrderdetailTest.php
+++ b/tests/Entity/PriceSystem/OrderdetailTest.php
@@ -27,7 +27,7 @@ use App\Entity\PriceInformations\Pricedetail;
use Doctrine\Common\Collections\Collection;
use PHPUnit\Framework\TestCase;
-class OrderdetailTest extends TestCase
+final class OrderdetailTest extends TestCase
{
public function testAddRemovePricdetails(): void
{
@@ -61,4 +61,18 @@ class OrderdetailTest extends TestCase
$this->assertSame($price5, $orderdetail->findPriceForQty(5.3));
$this->assertSame($price5, $orderdetail->findPriceForQty(10000));
}
+
+ public function testGetSetPricesIncludesVAT(): void
+ {
+ $orderdetail = new Orderdetail();
+
+ //By default, the pricesIncludesVAT property should be null for empty orderdetails
+ $this->assertNull($orderdetail->getPricesIncludesVAT());
+
+ $orderdetail->setPricesIncludesVAT(true);
+ $this->assertTrue($orderdetail->getPricesIncludesVAT());
+
+ $orderdetail->setPricesIncludesVAT(false);
+ $this->assertFalse($orderdetail->getPricesIncludesVAT());
+ }
}
diff --git a/tests/Entity/PriceSystem/PricedetailTest.php b/tests/Entity/PriceSystem/PricedetailTest.php
index 8a3cf328..effe6fd6 100644
--- a/tests/Entity/PriceSystem/PricedetailTest.php
+++ b/tests/Entity/PriceSystem/PricedetailTest.php
@@ -28,7 +28,7 @@ use App\Entity\PriceInformations\Pricedetail;
use Brick\Math\BigDecimal;
use PHPUnit\Framework\TestCase;
-class PricedetailTest extends TestCase
+final class PricedetailTest extends TestCase
{
public function testGetPricePerUnit(): void
{
diff --git a/tests/Entity/UserSystem/ApiTokenTypeTest.php b/tests/Entity/UserSystem/ApiTokenTypeTest.php
index a8e520f1..7a4506ba 100644
--- a/tests/Entity/UserSystem/ApiTokenTypeTest.php
+++ b/tests/Entity/UserSystem/ApiTokenTypeTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Entity\UserSystem;
use App\Entity\UserSystem\ApiTokenType;
use PHPUnit\Framework\TestCase;
-class ApiTokenTypeTest extends TestCase
+final class ApiTokenTypeTest extends TestCase
{
public function testGetTokenPrefix(): void
diff --git a/tests/Entity/UserSystem/PermissionDataTest.php b/tests/Entity/UserSystem/PermissionDataTest.php
index 4fd8c5ce..3d250a81 100644
--- a/tests/Entity/UserSystem/PermissionDataTest.php
+++ b/tests/Entity/UserSystem/PermissionDataTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Entity\UserSystem;
use App\Entity\UserSystem\PermissionData;
use PHPUnit\Framework\TestCase;
-class PermissionDataTest extends TestCase
+final class PermissionDataTest extends TestCase
{
public function testGetSetIs(): void
diff --git a/tests/Entity/UserSystem/UserTest.php b/tests/Entity/UserSystem/UserTest.php
index a4349e1d..12797ad1 100644
--- a/tests/Entity/UserSystem/UserTest.php
+++ b/tests/Entity/UserSystem/UserTest.php
@@ -31,7 +31,7 @@ use PHPUnit\Framework\TestCase;
use Symfony\Component\Uid\Uuid;
use Webauthn\TrustPath\EmptyTrustPath;
-class UserTest extends TestCase
+final class UserTest extends TestCase
{
public function testGetFullName(): void
{
diff --git a/tests/EnvVarProcessors/AddSlashEnvVarProcessorTest.php b/tests/EnvVarProcessors/AddSlashEnvVarProcessorTest.php
index 4099f0ee..c4c9f04b 100644
--- a/tests/EnvVarProcessors/AddSlashEnvVarProcessorTest.php
+++ b/tests/EnvVarProcessors/AddSlashEnvVarProcessorTest.php
@@ -1,4 +1,7 @@
.
*/
-
namespace App\Tests\EnvVarProcessors;
use App\EnvVarProcessors\AddSlashEnvVarProcessor;
use PHPUnit\Framework\TestCase;
-class AddSlashEnvVarProcessorTest extends TestCase
+final class AddSlashEnvVarProcessorTest extends TestCase
{
protected AddSlashEnvVarProcessor $processor;
diff --git a/tests/EventListener/RegisterSynonymsAsTranslationParametersTest.php b/tests/EventListener/RegisterSynonymsAsTranslationParametersTest.php
index 58573ae6..3a35c670 100644
--- a/tests/EventListener/RegisterSynonymsAsTranslationParametersTest.php
+++ b/tests/EventListener/RegisterSynonymsAsTranslationParametersTest.php
@@ -1,4 +1,7 @@
.
*/
-
namespace App\Tests\EventListener;
use App\EventListener\RegisterSynonymsAsTranslationParametersListener;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-class RegisterSynonymsAsTranslationParametersTest extends KernelTestCase
+final class RegisterSynonymsAsTranslationParametersTest extends KernelTestCase
{
private RegisterSynonymsAsTranslationParametersListener $listener;
diff --git a/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php b/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
index 0eaf931c..3d2089e1 100644
--- a/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
+++ b/tests/EventSubscriber/PasswordChangeNeededSubscriberTest.php
@@ -33,7 +33,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\Uid\Uuid;
use Webauthn\TrustPath\EmptyTrustPath;
-class PasswordChangeNeededSubscriberTest extends TestCase
+final class PasswordChangeNeededSubscriberTest extends TestCase
{
public function testTFARedirectNeeded(): void
{
diff --git a/tests/Exceptions/TwigModeExceptionTest.php b/tests/Exceptions/TwigModeExceptionTest.php
index 686a87a2..09468291 100644
--- a/tests/Exceptions/TwigModeExceptionTest.php
+++ b/tests/Exceptions/TwigModeExceptionTest.php
@@ -27,7 +27,7 @@ use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Twig\Error\Error;
-class TwigModeExceptionTest extends KernelTestCase
+final class TwigModeExceptionTest extends KernelTestCase
{
private string $projectPath;
diff --git a/tests/Form/InfoProviderSystem/GlobalFieldMappingTypeTest.php b/tests/Form/InfoProviderSystem/GlobalFieldMappingTypeTest.php
index 89e362e4..07106505 100644
--- a/tests/Form/InfoProviderSystem/GlobalFieldMappingTypeTest.php
+++ b/tests/Form/InfoProviderSystem/GlobalFieldMappingTypeTest.php
@@ -29,7 +29,7 @@ use Symfony\Component\Form\FormFactoryInterface;
#[Group("slow")]
#[Group("DB")]
-class GlobalFieldMappingTypeTest extends KernelTestCase
+final class GlobalFieldMappingTypeTest extends KernelTestCase
{
private FormFactoryInterface $formFactory;
diff --git a/tests/Helpers/BBCodeToMarkdownConverterTest.php b/tests/Helpers/BBCodeToMarkdownConverterTest.php
index 9506cba4..07fca505 100644
--- a/tests/Helpers/BBCodeToMarkdownConverterTest.php
+++ b/tests/Helpers/BBCodeToMarkdownConverterTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Helpers\BBCodeToMarkdownConverter;
use PHPUnit\Framework\TestCase;
-class BBCodeToMarkdownConverterTest extends TestCase
+final class BBCodeToMarkdownConverterTest extends TestCase
{
protected BBCodeToMarkdownConverter $converter;
diff --git a/tests/Helpers/IPAnonymizerTest.php b/tests/Helpers/IPAnonymizerTest.php
index e16368eb..7efd27ac 100644
--- a/tests/Helpers/IPAnonymizerTest.php
+++ b/tests/Helpers/IPAnonymizerTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Helpers\IPAnonymizer;
use PHPUnit\Framework\TestCase;
-class IPAnonymizerTest extends TestCase
+final class IPAnonymizerTest extends TestCase
{
public static function anonymizeDataProvider(): \Generator
diff --git a/tests/Helpers/Projects/ProjectBuildRequestTest.php b/tests/Helpers/Projects/ProjectBuildRequestTest.php
index 1158d89a..c1fd1498 100644
--- a/tests/Helpers/Projects/ProjectBuildRequestTest.php
+++ b/tests/Helpers/Projects/ProjectBuildRequestTest.php
@@ -30,7 +30,7 @@ use App\Entity\ProjectSystem\ProjectBOMEntry;
use App\Helpers\Projects\ProjectBuildRequest;
use PHPUnit\Framework\TestCase;
-class ProjectBuildRequestTest extends TestCase
+final class ProjectBuildRequestTest extends TestCase
{
/** @var Project */
diff --git a/tests/Helpers/TreeViewNodeTest.php b/tests/Helpers/TreeViewNodeTest.php
index 9005651d..b1179f6c 100644
--- a/tests/Helpers/TreeViewNodeTest.php
+++ b/tests/Helpers/TreeViewNodeTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Helpers;
use App\Helpers\Trees\TreeViewNode;
use PHPUnit\Framework\TestCase;
-class TreeViewNodeTest extends TestCase
+final class TreeViewNodeTest extends TestCase
{
/**
* @var TreeViewNode
diff --git a/tests/Helpers/TrinaryLogicHelperTest.php b/tests/Helpers/TrinaryLogicHelperTest.php
index 3082571b..4b8c9f01 100644
--- a/tests/Helpers/TrinaryLogicHelperTest.php
+++ b/tests/Helpers/TrinaryLogicHelperTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Helpers;
use App\Helpers\TrinaryLogicHelper;
use PHPUnit\Framework\TestCase;
-class TrinaryLogicHelperTest extends TestCase
+final class TrinaryLogicHelperTest extends TestCase
{
public function testNot()
diff --git a/tests/Repository/AttachmentContainingDBElementRepositoryTest.php b/tests/Repository/AttachmentContainingDBElementRepositoryTest.php
index f61750d9..38aca071 100644
--- a/tests/Repository/AttachmentContainingDBElementRepositoryTest.php
+++ b/tests/Repository/AttachmentContainingDBElementRepositoryTest.php
@@ -28,7 +28,7 @@ use Doctrine\ORM\EntityManagerInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-class AttachmentContainingDBElementRepositoryTest extends KernelTestCase
+final class AttachmentContainingDBElementRepositoryTest extends KernelTestCase
{
private EntityManagerInterface $entityManager;
diff --git a/tests/Repository/DBElementRepositoryTest.php b/tests/Repository/DBElementRepositoryTest.php
index 05ede7e2..5f1ac0e1 100644
--- a/tests/Repository/DBElementRepositoryTest.php
+++ b/tests/Repository/DBElementRepositoryTest.php
@@ -33,7 +33,7 @@ use Doctrine\ORM\EntityManagerInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-class DBElementRepositoryTest extends KernelTestCase
+final class DBElementRepositoryTest extends KernelTestCase
{
private EntityManagerInterface $entityManager;
diff --git a/tests/Repository/LogEntryRepositoryTest.php b/tests/Repository/LogEntryRepositoryTest.php
index f6cc991d..46093a9e 100644
--- a/tests/Repository/LogEntryRepositoryTest.php
+++ b/tests/Repository/LogEntryRepositoryTest.php
@@ -33,7 +33,7 @@ use Doctrine\ORM\EntityManagerInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-class LogEntryRepositoryTest extends KernelTestCase
+final class LogEntryRepositoryTest extends KernelTestCase
{
private EntityManagerInterface $entityManager;
@@ -75,6 +75,7 @@ class LogEntryRepositoryTest extends KernelTestCase
//We have a edit log entry for the category with ID 1
$category = $this->entityManager->find(Category::class, 1);
$adminUser = $this->entityManager->getRepository(User::class)->findOneBy(['name' => 'admin']);
+ $this->assertInstanceOf(Category::class, $category);
$user = $this->repo->getLastEditingUser($category);
@@ -83,6 +84,7 @@ class LogEntryRepositoryTest extends KernelTestCase
//For the category 2, the user must be null
$category = $this->entityManager->find(Category::class, 2);
+ $this->assertInstanceOf(Category::class, $category);
$user = $this->repo->getLastEditingUser($category);
$this->assertNull($user);
}
@@ -92,6 +94,7 @@ class LogEntryRepositoryTest extends KernelTestCase
//We have a edit log entry for the category with ID 1
$category = $this->entityManager->find(Category::class, 1);
$adminUser = $this->entityManager->getRepository(User::class)->findOneBy(['name' => 'admin']);
+ $this->assertInstanceOf(Category::class, $category);
$user = $this->repo->getCreatingUser($category);
@@ -100,6 +103,7 @@ class LogEntryRepositoryTest extends KernelTestCase
//For the category 2, the user must be null
$category = $this->entityManager->find(Category::class, 2);
+ $this->assertInstanceOf(Category::class, $category);
$user = $this->repo->getCreatingUser($category);
$this->assertNull($user);
}
@@ -119,6 +123,7 @@ class LogEntryRepositoryTest extends KernelTestCase
public function testGetElementExistedAtTimestamp(): void
{
$part = $this->entityManager->find(Part::class, 3);
+ $this->assertInstanceOf(Part::class, $part);
//Assume that the part is existing now
$this->assertTrue($this->repo->getElementExistedAtTimestamp($part, new \DateTimeImmutable()));
@@ -130,6 +135,7 @@ class LogEntryRepositoryTest extends KernelTestCase
public function testGetElementHistory(): void
{
$category = $this->entityManager->find(Category::class, 1);
+ $this->assertInstanceOf(Category::class, $category);
$history = $this->repo->getElementHistory($category);
@@ -141,6 +147,7 @@ class LogEntryRepositoryTest extends KernelTestCase
public function testGetTimetravelDataForElement(): void
{
$category = $this->entityManager->find(Category::class, 1);
+ $this->assertInstanceOf(Category::class, $category);
$data = $this->repo->getTimetravelDataForElement($category, new \DateTimeImmutable('2020-01-01'));
//The data must contain only ElementChangedLogEntry
diff --git a/tests/Repository/NamedDBElementRepositoryTest.php b/tests/Repository/NamedDBElementRepositoryTest.php
index 117d7d0e..dc8b2a5c 100644
--- a/tests/Repository/NamedDBElementRepositoryTest.php
+++ b/tests/Repository/NamedDBElementRepositoryTest.php
@@ -30,7 +30,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
/**
* @Group DB
*/
-class NamedDBElementRepositoryTest extends WebTestCase
+final class NamedDBElementRepositoryTest extends WebTestCase
{
/**
* @var StructuralDBElementRepository
diff --git a/tests/Repository/PartRepositoryTest.php b/tests/Repository/PartRepositoryTest.php
index 68b75abb..c2e7858a 100644
--- a/tests/Repository/PartRepositoryTest.php
+++ b/tests/Repository/PartRepositoryTest.php
@@ -60,8 +60,8 @@ final class PartRepositoryTest extends TestCase
$classMetadata = new ClassMetadata(Part::class);
$emMock->method('getClassMetadata')->with(Part::class)->willReturn($classMetadata);
- $translatorMock = $this->createMock(TranslatorInterface::class);
- $ipnSuggestSettings = $this->createMock(IpnSuggestSettings::class);
+ $translatorMock = $this->createStub(TranslatorInterface::class);
+ $ipnSuggestSettings = $this->createStub(IpnSuggestSettings::class);
$repo = $this->getMockBuilder(PartRepository::class)
->setConstructorArgs([$emMock, $translatorMock, $ipnSuggestSettings])
@@ -120,7 +120,7 @@ final class PartRepositoryTest extends TestCase
return $id;
});
- $ipnSuggestSettings = $this->createMock(IpnSuggestSettings::class);
+ $ipnSuggestSettings = $this->createStub(IpnSuggestSettings::class);
$ipnSuggestSettings->suggestPartDigits = 4;
$ipnSuggestSettings->useDuplicateDescription = false;
@@ -204,7 +204,7 @@ final class PartRepositoryTest extends TestCase
return $id;
});
- $ipnSuggestSettings = $this->createMock(IpnSuggestSettings::class);
+ $ipnSuggestSettings = $this->createStub(IpnSuggestSettings::class);
$ipnSuggestSettings->suggestPartDigits = 4;
$ipnSuggestSettings->useDuplicateDescription = false;
diff --git a/tests/Repository/StructuralDBElementRepositoryTest.php b/tests/Repository/StructuralDBElementRepositoryTest.php
index 5ab8b788..16e92837 100644
--- a/tests/Repository/StructuralDBElementRepositoryTest.php
+++ b/tests/Repository/StructuralDBElementRepositoryTest.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace App\Tests\Repository;
+use App\Entity\Base\AbstractStructuralDBElement;
use App\Entity\Attachments\AttachmentType;
use App\Helpers\Trees\TreeViewNode;
use App\Repository\StructuralDBElementRepository;
@@ -30,7 +31,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
/**
* @Group DB
*/
-class StructuralDBElementRepositoryTest extends WebTestCase
+final class StructuralDBElementRepositoryTest extends WebTestCase
{
/**
* @var StructuralDBElementRepository
@@ -108,6 +109,7 @@ class StructuralDBElementRepositoryTest extends WebTestCase
{
//List all nodes that are children to Node 1
$node1 = $this->repo->find(1);
+ $this->assertInstanceOf(AbstractStructuralDBElement::class, $node1);
$nodes = $this->repo->getFlatList($node1);
$this->assertCount(3, $nodes);
diff --git a/tests/Repository/UserRepositoryTest.php b/tests/Repository/UserRepositoryTest.php
index 67a77aea..24a2d657 100644
--- a/tests/Repository/UserRepositoryTest.php
+++ b/tests/Repository/UserRepositoryTest.php
@@ -27,7 +27,7 @@ use App\Repository\UserRepository;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class UserRepositoryTest extends WebTestCase
+final class UserRepositoryTest extends WebTestCase
{
/**
diff --git a/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php b/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
index c9a14426..2fedf108 100644
--- a/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
+++ b/tests/Security/EnsureSAMLUserForSAMLLoginCheckerTest.php
@@ -30,7 +30,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
use Symfony\Component\Security\Core\Exception\CustomUserMessageAccountStatusException;
-class EnsureSAMLUserForSAMLLoginCheckerTest extends WebTestCase
+final class EnsureSAMLUserForSAMLLoginCheckerTest extends WebTestCase
{
/** @var EnsureSAMLUserForSAMLLoginChecker */
protected $service;
diff --git a/tests/Security/SamlUserFactoryTest.php b/tests/Security/SamlUserFactoryTest.php
index 7780b4be..b975ca0d 100644
--- a/tests/Security/SamlUserFactoryTest.php
+++ b/tests/Security/SamlUserFactoryTest.php
@@ -26,7 +26,7 @@ use App\Entity\UserSystem\User;
use App\Security\SamlUserFactory;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class SamlUserFactoryTest extends WebTestCase
+final class SamlUserFactoryTest extends WebTestCase
{
/** @var SamlUserFactory */
diff --git a/tests/Security/UserCheckerTest.php b/tests/Security/UserCheckerTest.php
index 35c2e1e5..e32d5bfe 100644
--- a/tests/Security/UserCheckerTest.php
+++ b/tests/Security/UserCheckerTest.php
@@ -27,7 +27,7 @@ use App\Security\UserChecker;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\Security\Core\Exception\CustomUserMessageAccountStatusException;
-class UserCheckerTest extends WebTestCase
+final class UserCheckerTest extends WebTestCase
{
protected $service;
diff --git a/tests/Serializer/BigNumberNormalizerTest.php b/tests/Serializer/BigNumberNormalizerTest.php
index f64347ee..509d6352 100644
--- a/tests/Serializer/BigNumberNormalizerTest.php
+++ b/tests/Serializer/BigNumberNormalizerTest.php
@@ -29,7 +29,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Brick\Math\BigDecimal;
use Brick\Math\BigNumber;
-class BigNumberNormalizerTest extends WebTestCase
+final class BigNumberNormalizerTest extends WebTestCase
{
/** @var BigNumberNormalizer */
protected $service;
diff --git a/tests/Serializer/PartNormalizerTest.php b/tests/Serializer/PartNormalizerTest.php
index 9baff750..2f07f36d 100644
--- a/tests/Serializer/PartNormalizerTest.php
+++ b/tests/Serializer/PartNormalizerTest.php
@@ -31,7 +31,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-class PartNormalizerTest extends WebTestCase
+final class PartNormalizerTest extends WebTestCase
{
/** @var PartNormalizer */
protected DenormalizerInterface&NormalizerInterface $service;
diff --git a/tests/Serializer/StructuralElementDenormalizerTest.php b/tests/Serializer/StructuralElementDenormalizerTest.php
index 31c9f0bb..e8e46611 100644
--- a/tests/Serializer/StructuralElementDenormalizerTest.php
+++ b/tests/Serializer/StructuralElementDenormalizerTest.php
@@ -27,7 +27,7 @@ use App\Entity\Parts\Category;
use App\Serializer\StructuralElementDenormalizer;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class StructuralElementDenormalizerTest extends WebTestCase
+final class StructuralElementDenormalizerTest extends WebTestCase
{
/** @var StructuralElementDenormalizer */
diff --git a/tests/Serializer/StructuralElementFromNameDenormalizerTest.php b/tests/Serializer/StructuralElementFromNameDenormalizerTest.php
index b344508c..b4bdcdac 100644
--- a/tests/Serializer/StructuralElementFromNameDenormalizerTest.php
+++ b/tests/Serializer/StructuralElementFromNameDenormalizerTest.php
@@ -26,7 +26,7 @@ use App\Entity\Parts\Category;
use App\Serializer\StructuralElementFromNameDenormalizer;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class StructuralElementFromNameDenormalizerTest extends WebTestCase
+final class StructuralElementFromNameDenormalizerTest extends WebTestCase
{
/** @var StructuralElementFromNameDenormalizer */
diff --git a/tests/Serializer/StructuralElementNormalizerTest.php b/tests/Serializer/StructuralElementNormalizerTest.php
index 79f739fa..4b335bcd 100644
--- a/tests/Serializer/StructuralElementNormalizerTest.php
+++ b/tests/Serializer/StructuralElementNormalizerTest.php
@@ -30,7 +30,7 @@ use App\Serializer\StructuralElementNormalizer;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class StructuralElementNormalizerTest extends WebTestCase
+final class StructuralElementNormalizerTest extends WebTestCase
{
/** @var StructuralElementNormalizer */
diff --git a/tests/Services/Attachments/AttachmentPathResolverTest.php b/tests/Services/Attachments/AttachmentPathResolverTest.php
index 69658e13..b145e482 100644
--- a/tests/Services/Attachments/AttachmentPathResolverTest.php
+++ b/tests/Services/Attachments/AttachmentPathResolverTest.php
@@ -28,10 +28,8 @@ use App\Services\Attachments\AttachmentPathResolver;
use const DIRECTORY_SEPARATOR;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class AttachmentPathResolverTest extends WebTestCase
+final class AttachmentPathResolverTest extends WebTestCase
{
- protected string $media_path;
- protected string $footprint_path;
protected $projectDir_orig;
protected $projectDir;
/**
@@ -46,8 +44,8 @@ class AttachmentPathResolverTest extends WebTestCase
$this->projectDir_orig = realpath(self::$kernel->getProjectDir());
$this->projectDir = str_replace('\\', '/', $this->projectDir_orig);
- $this->media_path = $this->projectDir.'/public/media';
- $this->footprint_path = $this->projectDir.'/public/img/footprints';
+ $media_path = $this->projectDir.'/public/media';
+ $footprint_path = $this->projectDir.'/public/img/footprints';
$this->service = self::getContainer()->get(AttachmentPathResolver::class);
}
diff --git a/tests/Services/Attachments/AttachmentURLGeneratorTest.php b/tests/Services/Attachments/AttachmentURLGeneratorTest.php
index e9e6d992..4359c1b9 100644
--- a/tests/Services/Attachments/AttachmentURLGeneratorTest.php
+++ b/tests/Services/Attachments/AttachmentURLGeneratorTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Services\Attachments\AttachmentURLGenerator;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class AttachmentURLGeneratorTest extends WebTestCase
+final class AttachmentURLGeneratorTest extends WebTestCase
{
protected const PUBLIC_DIR = '/public';
diff --git a/tests/Services/Attachments/BuiltinAttachmentsFinderTest.php b/tests/Services/Attachments/BuiltinAttachmentsFinderTest.php
index 80c699ac..5198ddea 100644
--- a/tests/Services/Attachments/BuiltinAttachmentsFinderTest.php
+++ b/tests/Services/Attachments/BuiltinAttachmentsFinderTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Services\Attachments\BuiltinAttachmentsFinder;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class BuiltinAttachmentsFinderTest extends WebTestCase
+final class BuiltinAttachmentsFinderTest extends WebTestCase
{
protected static array $mock_list = [
'%FOOTPRINTS%/test/test.jpg', '%FOOTPRINTS%/test/test.png', '%FOOTPRINTS%/123.jpg', '%FOOTPRINTS%/123.jpeg',
diff --git a/tests/Services/Attachments/FileTypeFilterToolsTest.php b/tests/Services/Attachments/FileTypeFilterToolsTest.php
index 1b85eaeb..f089feec 100644
--- a/tests/Services/Attachments/FileTypeFilterToolsTest.php
+++ b/tests/Services/Attachments/FileTypeFilterToolsTest.php
@@ -26,7 +26,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
use App\Services\Attachments\FileTypeFilterTools;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class FileTypeFilterToolsTest extends WebTestCase
+final class FileTypeFilterToolsTest extends WebTestCase
{
protected static $service;
diff --git a/tests/Services/ElementTypeNameGeneratorTest.php b/tests/Services/ElementTypeNameGeneratorTest.php
index 8739dd06..21797137 100644
--- a/tests/Services/ElementTypeNameGeneratorTest.php
+++ b/tests/Services/ElementTypeNameGeneratorTest.php
@@ -35,7 +35,7 @@ use App\Services\Formatters\AmountFormatter;
use App\Settings\SynonymSettings;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class ElementTypeNameGeneratorTest extends WebTestCase
+final class ElementTypeNameGeneratorTest extends WebTestCase
{
protected ElementTypeNameGenerator $service;
private SynonymSettings $synonymSettings;
diff --git a/tests/Services/ElementTypesTest.php b/tests/Services/ElementTypesTest.php
index d4fa77ff..15e5d8bb 100644
--- a/tests/Services/ElementTypesTest.php
+++ b/tests/Services/ElementTypesTest.php
@@ -1,4 +1,7 @@
.
*/
-
namespace App\Tests\Services;
use App\Entity\Parameters\CategoryParameter;
@@ -26,7 +28,7 @@ use App\Exceptions\EntityNotSupportedException;
use App\Services\ElementTypes;
use PHPUnit\Framework\TestCase;
-class ElementTypesTest extends TestCase
+final class ElementTypesTest extends TestCase
{
public function testFromClass(): void
diff --git a/tests/Services/EntityMergers/Mergers/EntityMergerHelperTraitTest.php b/tests/Services/EntityMergers/Mergers/EntityMergerHelperTraitTest.php
index 22fa220b..f5fd8334 100644
--- a/tests/Services/EntityMergers/Mergers/EntityMergerHelperTraitTest.php
+++ b/tests/Services/EntityMergers/Mergers/EntityMergerHelperTraitTest.php
@@ -28,7 +28,7 @@ use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-class EntityMergerHelperTraitTest extends KernelTestCase
+final class EntityMergerHelperTraitTest extends KernelTestCase
{
use EntityMergerHelperTrait;
diff --git a/tests/Services/EntityMergers/Mergers/PartMergerTest.php b/tests/Services/EntityMergers/Mergers/PartMergerTest.php
index 7db4ddd6..f6a75790 100644
--- a/tests/Services/EntityMergers/Mergers/PartMergerTest.php
+++ b/tests/Services/EntityMergers/Mergers/PartMergerTest.php
@@ -36,7 +36,7 @@ use App\Services\EntityMergers\Mergers\PartMerger;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-class PartMergerTest extends KernelTestCase
+final class PartMergerTest extends KernelTestCase
{
/** @var PartMerger|null */
diff --git a/tests/Services/Formatters/AmountFormatterTest.php b/tests/Services/Formatters/AmountFormatterTest.php
index 40f9b7cf..9fdeb441 100644
--- a/tests/Services/Formatters/AmountFormatterTest.php
+++ b/tests/Services/Formatters/AmountFormatterTest.php
@@ -27,7 +27,7 @@ use App\Services\Formatters\AmountFormatter;
use InvalidArgumentException;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class AmountFormatterTest extends WebTestCase
+final class AmountFormatterTest extends WebTestCase
{
/**
* @var AmountFormatter
diff --git a/tests/Services/Formatters/SIFormatterTest.php b/tests/Services/Formatters/SIFormatterTest.php
index 79668589..62ca0187 100644
--- a/tests/Services/Formatters/SIFormatterTest.php
+++ b/tests/Services/Formatters/SIFormatterTest.php
@@ -25,7 +25,7 @@ namespace App\Tests\Services\Formatters;
use App\Services\Formatters\SIFormatter;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-class SIFormatterTest extends WebTestCase
+final class SIFormatterTest extends WebTestCase
{
/**
* @var SIFormatter
diff --git a/tests/Services/ImportExportSystem/BOMImporterTest.php b/tests/Services/ImportExportSystem/BOMImporterTest.php
index 47ddcc24..5a9d4121 100644
--- a/tests/Services/ImportExportSystem/BOMImporterTest.php
+++ b/tests/Services/ImportExportSystem/BOMImporterTest.php
@@ -22,6 +22,8 @@ declare(strict_types=1);
*/
namespace App\Tests\Services\ImportExportSystem;
+use App\Entity\PriceInformations\Orderdetail;
+use App\Entity\Parts\Category;
use App\Entity\Parts\Part;
use App\Entity\Parts\Supplier;
use App\Entity\ProjectSystem\Project;
@@ -31,7 +33,7 @@ use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\HttpFoundation\File\File;
-class BOMImporterTest extends WebTestCase
+final class BOMImporterTest extends WebTestCase
{
/**
@@ -391,7 +393,7 @@ class BOMImporterTest extends WebTestCase
// Check first entry
$this->assertEquals('R1,R2', $bom_entries[0]->getMountnames());
- $this->assertEquals(2.0, $bom_entries[0]->getQuantity());
+ $this->assertEqualsWithDelta(2.0, $bom_entries[0]->getQuantity(), PHP_FLOAT_EPSILON);
$this->assertEquals('CRCW080510K0FKEA (R_0805_2012Metric)', $bom_entries[0]->getName());
$this->assertStringContainsString('Value: 10k', $bom_entries[0]->getComment());
$this->assertStringContainsString('MPN: CRCW080510K0FKEA', $bom_entries[0]->getComment());
@@ -402,7 +404,7 @@ class BOMImporterTest extends WebTestCase
// Check second entry
$this->assertEquals('C1', $bom_entries[1]->getMountnames());
- $this->assertEquals(1.0, $bom_entries[1]->getQuantity());
+ $this->assertEqualsWithDelta(1.0, $bom_entries[1]->getQuantity(), PHP_FLOAT_EPSILON);
$this->assertStringContainsString('LCSC SPN: C789012', $bom_entries[1]->getComment());
$this->assertStringContainsString('Mouser SPN: 80-CL21A104KOCLRNC', $bom_entries[1]->getComment());
@@ -542,7 +544,7 @@ class BOMImporterTest extends WebTestCase
$this->assertCount(1, $bom_entries); // Should merge into one entry
$this->assertEquals('R1,R2', $bom_entries[0]->getMountnames());
- $this->assertEquals(2.0, $bom_entries[0]->getQuantity());
+ $this->assertEqualsWithDelta(2.0, $bom_entries[0]->getQuantity(), PHP_FLOAT_EPSILON);
$this->assertEquals('CRCW080510K0FKEA', $bom_entries[0]->getName());
}
@@ -616,15 +618,190 @@ class BOMImporterTest extends WebTestCase
$this->assertEquals('R1,R2', $bom_entries[0]->getMountnames());
}
+ public function testStringToBOMEntriesKiCADSchematicWithSupplierSPN(): void
+ {
+ // Create test supplier
+ $lcscSupplier = new Supplier();
+ $lcscSupplier->setName('LCSC');
+ $this->entityManager->persist($lcscSupplier);
+
+ // Create a test part with required fields
+ $part = new Part();
+ $part->setName('Test Resistor 10k 0805');
+ $part->setCategory($this->getDefaultCategory($this->entityManager));
+ $this->entityManager->persist($part);
+
+ // Create orderdetail linking the part to a supplier SPN
+ $orderdetail = new Orderdetail();
+ $orderdetail->setPart($part);
+ $orderdetail->setSupplier($lcscSupplier);
+ $orderdetail->setSupplierpartnr('C123456');
+ $this->entityManager->persist($orderdetail);
+
+ $this->entityManager->flush();
+
+ // Import CSV with LCSC SPN matching the orderdetail
+ $input = <<