Improved organisation of Services

config/services.yaml

@@ -146,15 +146,15 @@ services:
         arguments:
             $base_currency: '%partdb.default_currency%'
 
-    App\Services\PricedetailHelper:
+    App\Services\Parts\PricedetailHelper:
         arguments:
             $base_currency: '%partdb.default_currency%'
 
-    App\Services\MoneyFormatter:
+    App\Services\Formatters\MoneyFormatter:
         arguments:
             $base_currency: '%partdb.default_currency%'
 
-    App\Services\ExchangeRateUpdater:
+    App\Services\Tools\ExchangeRateUpdater:
         arguments:
             $base_currency: '%partdb.default_currency%'
 

src/Command/Currencies/UpdateExchangeRatesCommand.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace App\Command\Currencies;
 
 use App\Entity\PriceInformations\Currency;
-use App\Services\ExchangeRateUpdater;
+use App\Services\Tools\ExchangeRateUpdater;
 use Doctrine\ORM\EntityManagerInterface;
 use Exchanger\Exception\Exception;
 use Symfony\Component\Console\Command\Command;

src/Command/VersionCommand.php

@@ -20,7 +20,7 @@
 
 namespace App\Command;
 
-use App\Services\GitVersionInfo;
+use App\Services\Misc\GitVersionInfo;
 use Shivas\VersioningBundle\Service\VersionManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

src/Controller/AdminPages/AttachmentTypeController.php

@@ -27,9 +27,9 @@ use App\Entity\Attachments\AttachmentTypeAttachment;
 use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\Parameters\AttachmentTypeParameter;
 use App\Form\AdminPages\AttachmentTypeAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/BaseAdminController.php

@@ -37,14 +37,14 @@ use App\Form\AdminPages\ImportType;
 use App\Form\AdminPages\MassCreationForm;
 use App\Repository\AbstractPartsContainingRepository;
 use App\Services\Attachments\AttachmentSubmitHandler;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
 use App\Services\LabelSystem\Barcodes\BarcodeExampleElementsGenerator;
 use App\Services\LabelSystem\LabelGenerator;
 use App\Services\LogSystem\EventCommentHelper;
 use App\Services\LogSystem\HistoryHelper;
 use App\Services\LogSystem\TimeTravel;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;

src/Controller/AdminPages/CategoryController.php

@@ -26,9 +26,9 @@ use App\Entity\Attachments\CategoryAttachment;
 use App\Entity\Parameters\CategoryParameter;
 use App\Entity\Parts\Category;
 use App\Form\AdminPages\CategoryAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/CurrencyController.php

@@ -28,15 +28,15 @@ use App\Entity\Parameters\CurrencyParameter;
 use App\Entity\PriceInformations\Currency;
 use App\Form\AdminPages\CurrencyAdminForm;
 use App\Services\Attachments\AttachmentSubmitHandler;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\ExchangeRateUpdater;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Tools\ExchangeRateUpdater;
 use App\Services\LabelSystem\Barcodes\BarcodeExampleElementsGenerator;
 use App\Services\LabelSystem\LabelGenerator;
 use App\Services\LogSystem\EventCommentHelper;
 use App\Services\LogSystem\HistoryHelper;
 use App\Services\LogSystem\TimeTravel;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Exchanger\Exception\ChainException;
 use Exchanger\Exception\Exception;

src/Controller/AdminPages/DeviceController.php

@@ -26,9 +26,9 @@ use App\Entity\Attachments\DeviceAttachment;
 use App\Entity\Devices\Device;
 use App\Entity\Parameters\DeviceParameter;
 use App\Form\AdminPages\BaseEntityAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/FootprintController.php

@@ -27,9 +27,9 @@ use App\Entity\Attachments\FootprintAttachment;
 use App\Entity\Parameters\FootprintParameter;
 use App\Entity\Parts\Footprint;
 use App\Form\AdminPages\FootprintAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/LabelProfileController.php

@@ -27,9 +27,9 @@ use App\Entity\Attachments\LabelAttachment;
 use App\Entity\LabelSystem\LabelProfile;
 use App\Entity\Parameters\AbstractParameter;
 use App\Form\AdminPages\LabelProfileAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/ManufacturerController.php

@@ -26,9 +26,9 @@ use App\Entity\Attachments\ManufacturerAttachment;
 use App\Entity\Parameters\ManufacturerParameter;
 use App\Entity\Parts\Manufacturer;
 use App\Form\AdminPages\CompanyForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/MeasurementUnitController.php

@@ -27,9 +27,9 @@ use App\Entity\Attachments\MeasurementUnitAttachment;
 use App\Entity\Parameters\MeasurementUnitParameter;
 use App\Entity\Parts\MeasurementUnit;
 use App\Form\AdminPages\MeasurementUnitAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/StorelocationController.php

@@ -26,9 +26,9 @@ use App\Entity\Attachments\StorelocationAttachment;
 use App\Entity\Parameters\StorelocationParameter;
 use App\Entity\Parts\Storelocation;
 use App\Form\AdminPages\StorelocationAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/AdminPages/SupplierController.php

@@ -26,9 +26,9 @@ use App\Entity\Attachments\SupplierAttachment;
 use App\Entity\Parameters\SupplierParameter;
 use App\Entity\Parts\Supplier;
 use App\Form\AdminPages\SupplierForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Controller/GroupController.php

@@ -28,9 +28,9 @@ use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\Parameters\GroupParameter;
 use App\Entity\UserSystem\Group;
 use App\Form\AdminPages\GroupAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use App\Services\UserSystem\PermissionPresetsHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;

src/Controller/HomepageController.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\DataTables\LogDataTable;
-use App\Services\GitVersionInfo;
+use App\Services\Misc\GitVersionInfo;
 use const DIRECTORY_SEPARATOR;
 use Omines\DataTablesBundle\DataTableFactory;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/Controller/PartController.php

@@ -39,7 +39,7 @@ use App\Services\LogSystem\EventCommentHelper;
 use App\Services\LogSystem\HistoryHelper;
 use App\Services\LogSystem\TimeTravel;
 use App\Services\Parameters\ParameterExtractor;
-use App\Services\PricedetailHelper;
+use App\Services\Parts\PricedetailHelper;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;

src/Controller/StatisticsController.php

@@ -41,7 +41,7 @@ declare(strict_types=1);
 
 namespace App\Controller;
 
-use App\Services\StatisticsHelper;
+use App\Services\Tools\StatisticsHelper;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;

src/Controller/ToolsController.php

@@ -20,7 +20,7 @@
 
 namespace App\Controller;
 
-use App\Services\GitVersionInfo;
+use App\Services\Misc\GitVersionInfo;
 use App\Services\Misc\DBInfoHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

src/Controller/TypeaheadController.php

@@ -36,7 +36,7 @@ use App\Entity\PriceInformations\Currency;
 use App\Repository\ParameterRepository;
 use App\Services\Attachments\AttachmentURLGenerator;
 use App\Services\Attachments\BuiltinAttachmentsFinder;
-use App\Services\TagFinder;
+use App\Services\Tools\TagFinder;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Asset\Packages;

src/Controller/UserController.php

@@ -31,9 +31,9 @@ use App\Events\SecurityEvent;
 use App\Events\SecurityEvents;
 use App\Form\Permissions\PermissionsType;
 use App\Form\UserAdminForm;
-use App\Services\EntityExporter;
-use App\Services\EntityImporter;
-use App\Services\StructuralElementRecursionHelper;
+use App\Services\ImportExportSystem\EntityExporter;
+use App\Services\ImportExportSystem\EntityImporter;
+use App\Services\Trees\StructuralElementRecursionHelper;
 use App\Services\UserSystem\PermissionPresetsHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;

src/DataTables/Column/MarkdownColumn.php

@@ -22,7 +22,7 @@ declare(strict_types=1);
 
 namespace App\DataTables\Column;
 
-use App\Services\MarkdownParser;
+use App\Services\Formatters\MarkdownParser;
 use Omines\DataTablesBundle\Column\AbstractColumn;
 
 class MarkdownColumn extends AbstractColumn

src/DataTables/Column/PartAttachmentsColumn.php

@@ -26,7 +26,7 @@ use App\Entity\Attachments\Attachment;
 use App\Entity\Parts\Part;
 use App\Services\Attachments\AttachmentManager;
 use App\Services\EntityURLGenerator;
-use App\Services\FAIconGenerator;
+use App\Services\Misc\FAIconGenerator;
 use Omines\DataTablesBundle\Column\AbstractColumn;
 use RuntimeException;
 use Symfony\Component\OptionsResolver\OptionsResolver;

src/DataTables/Column/SIUnitNumberColumn.php

@@ -20,7 +20,7 @@
 
 namespace App\DataTables\Column;
 
-use App\Services\SIFormatter;
+use App\Services\Formatters\SIFormatter;
 use Omines\DataTablesBundle\Column\AbstractColumn;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

src/DataTables/PartsDataTable.php

@@ -41,7 +41,7 @@ use App\Entity\Parts\Part;
 use App\Entity\Parts\PartLot;
 use App\Entity\Parts\Storelocation;
 use App\Entity\Parts\Supplier;
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use App\Services\Attachments\AttachmentURLGenerator;
 use App\Services\Attachments\PartPreviewGenerator;
 use App\Services\EntityURLGenerator;

src/EntityListeners/TreeCacheInvalidationListener.php

@@ -27,7 +27,7 @@ use App\Entity\Base\AbstractStructuralDBElement;
 use App\Entity\LabelSystem\LabelProfile;
 use App\Entity\UserSystem\Group;
 use App\Entity\UserSystem\User;
-use App\Services\UserCacheKeyGenerator;
+use App\Services\UserSystem\UserCacheKeyGenerator;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping as ORM;
 use function get_class;

src/Form/Type/SIUnitType.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 namespace App\Form\Type;
 
 use App\Entity\Parts\MeasurementUnit;
-use App\Services\SIFormatter;
+use App\Services\Formatters\SIFormatter;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception;

src/Services/Formatters/AmountFormatter.php

@@ -20,9 +20,10 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Formatters;
 
 use App\Entity\Parts\MeasurementUnit;
+use App\Services\Formatters\SIFormatter;
 use InvalidArgumentException;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;

src/Services/Formatters/MarkdownParser.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Formatters;
 
 use Symfony\Contracts\Translation\TranslatorInterface;
 

src/Services/Formatters/MoneyFormatter.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Formatters;
 
 use App\Entity\PriceInformations\Currency;
 use Locale;

src/Services/Formatters/SIFormatter.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Formatters;
 
 /**
  * A service that helps you to format values using the SI prefixes.

src/Services/ImportExportSystem/EntityExporter.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\ImportExportSystem;
 
 use App\Entity\Base\AbstractNamedDBElement;
 use function in_array;

src/Services/ImportExportSystem/EntityImporter.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\ImportExportSystem;
 
 use App\Entity\Base\AbstractStructuralDBElement;
 use function count;

src/Services/LabelSystem/LabelProfileDropdownHelper.php

@@ -43,7 +43,7 @@ namespace App\Services\LabelSystem;
 
 use App\Entity\LabelSystem\LabelProfile;
 use App\Repository\LabelProfileRepository;
-use App\Services\UserCacheKeyGenerator;
+use App\Services\UserSystem\UserCacheKeyGenerator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;

src/Services/LabelSystem/PlaceholderProviders/PartLotProvider.php

@@ -42,7 +42,7 @@ declare(strict_types=1);
 namespace App\Services\LabelSystem\PlaceholderProviders;
 
 use App\Entity\Parts\PartLot;
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use App\Services\LabelSystem\LabelTextReplacer;
 use IntlDateFormatter;
 use Locale;

src/Services/LabelSystem/PlaceholderProviders/PartProvider.php

@@ -42,7 +42,7 @@ declare(strict_types=1);
 namespace App\Services\LabelSystem\PlaceholderProviders;
 
 use App\Entity\Parts\Part;
-use App\Services\SIFormatter;
+use App\Services\Formatters\SIFormatter;
 use Parsedown;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

src/Services/Misc/FAIconGenerator.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Misc;
 
 use App\Entity\Attachments\Attachment;
 use function in_array;

src/Services/Misc/GitVersionInfo.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Misc;
 
 use Symfony\Component\HttpKernel\KernelInterface;
 

src/Services/Parts/PricedetailHelper.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Parts;
 
 use App\Entity\Parts\Part;
 use App\Entity\PriceInformations\Currency;

src/Services/Tools/ExchangeRateUpdater.php

@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Services;
+namespace App\Services\Tools;
 
 use App\Entity\PriceInformations\Currency;
 use Brick\Math\BigDecimal;

src/Services/Tools/StatisticsHelper.php

@@ -39,7 +39,7 @@ declare(strict_types=1);
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Services;
+namespace App\Services\Tools;
 
 use App\Entity\Attachments\Attachment;
 use App\Entity\Attachments\AttachmentType;

src/Services/Tools/TagFinder.php

@@ -20,12 +20,13 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Tools;
 
 use App\Entity\Parts\Part;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+use function \mb_strlen;
 use function array_slice;
 
 /**

src/Services/Trees/NodesListBuilder.php

@@ -24,7 +24,7 @@ namespace App\Services\Trees;
 
 use App\Entity\Base\AbstractStructuralDBElement;
 use App\Repository\StructuralDBElementRepository;
-use App\Services\UserCacheKeyGenerator;
+use App\Services\UserSystem\UserCacheKeyGenerator;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;

src/Services/Trees/StructuralElementRecursionHelper.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\Trees;
 
 use App\Entity\Base\AbstractStructuralDBElement;
 use Doctrine\ORM\EntityManagerInterface;

src/Services/Trees/ToolsTreeBuilder.php

@@ -37,7 +37,7 @@ use App\Entity\PriceInformations\Currency;
 use App\Entity\UserSystem\Group;
 use App\Entity\UserSystem\User;
 use App\Helpers\Trees\TreeViewNode;
-use App\Services\UserCacheKeyGenerator;
+use App\Services\UserSystem\UserCacheKeyGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Cache\ItemInterface;

src/Services/Trees/TreeViewGenerator.php

@@ -36,8 +36,8 @@ use App\Helpers\Trees\TreeViewNodeIterator;
 use App\Helpers\Trees\TreeViewNodeState;
 use App\Repository\StructuralDBElementRepository;
 use App\Services\EntityURLGenerator;
-use App\Services\MarkdownParser;
-use App\Services\UserCacheKeyGenerator;
+use App\Services\Formatters\MarkdownParser;
+use App\Services\UserSystem\UserCacheKeyGenerator;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use RecursiveIteratorIterator;

src/Services/UserSystem/UserCacheKeyGenerator.php

@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services;
+namespace App\Services\UserSystem;
 
 use App\Entity\UserSystem\User;
 use Locale;

src/Twig/AttachmentExtension.php

@@ -21,7 +21,7 @@
 namespace App\Twig;
 
 use App\Services\Attachments\AttachmentURLGenerator;
-use App\Services\FAIconGenerator;
+use App\Services\Misc\FAIconGenerator;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 

src/Twig/FormatExtension.php

@@ -36,13 +36,13 @@ use App\Entity\Parts\Supplier;
 use App\Entity\PriceInformations\Currency;
 use App\Entity\UserSystem\Group;
 use App\Entity\UserSystem\User;
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use App\Services\Attachments\AttachmentURLGenerator;
 use App\Services\EntityURLGenerator;
-use App\Services\FAIconGenerator;
-use App\Services\MarkdownParser;
-use App\Services\MoneyFormatter;
-use App\Services\SIFormatter;
+use App\Services\Misc\FAIconGenerator;
+use App\Services\Formatters\MarkdownParser;
+use App\Services\Formatters\MoneyFormatter;
+use App\Services\Formatters\SIFormatter;
 use App\Services\Trees\TreeViewGenerator;
 use Brick\Math\BigDecimal;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;

tests/Services/Attachments/AttachmentPathResolverTest.php

@@ -22,7 +22,7 @@ declare(strict_types=1);
 
 namespace App\Tests\Services\Attachments;
 
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use App\Services\Attachments\AttachmentPathResolver;
 use const DIRECTORY_SEPARATOR;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

tests/Services/ElementTypeNameGeneratorTest.php

@@ -28,7 +28,7 @@ use App\Entity\Base\AbstractNamedDBElement;
 use App\Entity\Parts\Category;
 use App\Entity\Parts\Part;
 use App\Exceptions\EntityNotSupportedException;
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use App\Services\ElementTypeNameGenerator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 

tests/Services/Formatters/AmountFormatterTest.php

@@ -20,10 +20,10 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Services;
+namespace App\Tests\Services\Formatters;
 
 use App\Entity\Parts\MeasurementUnit;
-use App\Services\AmountFormatter;
+use App\Services\Formatters\AmountFormatter;
 use InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 

tests/Services/Formatters/SIFormatterTest.php

@@ -20,9 +20,9 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Services;
+namespace App\Tests\Services\Formatters;
 
-use App\Services\SIFormatter;
+use App\Services\Formatters\SIFormatter;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class SIFormatterTest extends WebTestCase

tests/Services/ImportExportSystem/EntityImporterTest.php

@@ -20,11 +20,11 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Services;
+namespace App\Tests\Services\ImportExportSystem;
 
 use App\Entity\Attachments\AttachmentType;
-use App\Services\AmountFormatter;
-use App\Services\EntityImporter;
+use App\Services\Formatters\AmountFormatter;
+use App\Services\ImportExportSystem\EntityImporter;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**

tests/Services/Misc/FAIconGeneratorTest.php

@@ -20,9 +20,10 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Services;
+namespace App\Tests\Services\Misc;
 
-use App\Services\FAIconGenerator;
+use App\Services\Misc\FAIconGenerator;
+use App\Tests\Services\AmountFormatter;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class FAIconGeneratorTest extends WebTestCase

tests/Services/Parts/PricedetailHelperTest.php

@@ -20,13 +20,13 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Services;
+namespace App\Tests\Services\Parts;
 
 use App\Entity\Parts\Part;
 use App\Entity\PriceInformations\Orderdetail;
 use App\Entity\PriceInformations\Pricedetail;
-use App\Services\AmountFormatter;
-use App\Services\PricedetailHelper;
+use App\Services\Formatters\AmountFormatter;
+use App\Services\Parts\PricedetailHelper;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class PricedetailHelperTest extends WebTestCase