From a2e31665eae3394aa0b307b601ef0e09aaf09438 Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Wed, 8 Nov 2023 23:03:41 +0100 Subject: [PATCH 1/6] WIP --- composer.json | 1 + composer.lock | 169 ++++++++++++++++++++++++++++++- config/bundles.php | 5 +- src/DataFixtures/AppFixtures.php | 17 ++++ symfony.lock | 12 +++ 5 files changed, 198 insertions(+), 6 deletions(-) create mode 100644 src/DataFixtures/AppFixtures.php diff --git a/composer.json b/composer.json index 46f6bac..67bc6af 100644 --- a/composer.json +++ b/composer.json @@ -96,6 +96,7 @@ } }, "require-dev": { + "doctrine/doctrine-fixtures-bundle": "^3.4", "friendsofphp/php-cs-fixer": "^3.21", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5", diff --git a/composer.lock b/composer.lock index b0241a3..4d7efad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e0d0272d134103b1c3eb7b8dd6218014", + "content-hash": "3f7c88a7058a622c9199a3974b60a59b", "packages": [ { "name": "components/font-awesome", @@ -7809,6 +7809,171 @@ ], "time": "2022-02-25T21:32:43+00:00" }, + { + "name": "doctrine/data-fixtures", + "version": "1.6.7", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "ae4e845decbe177348fdbecd04331f4fb96aa301" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/ae4e845decbe177348fdbecd04331f4fb96aa301", + "reference": "ae4e845decbe177348fdbecd04331f4fb96aa301", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^0.5.3 || ^1.0", + "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", + "php": "^7.2 || ^8.0" + }, + "conflict": { + "doctrine/dbal": "<2.13", + "doctrine/orm": "<2.14", + "doctrine/phpcr-odm": "<1.3.0" + }, + "require-dev": { + "doctrine/coding-standard": "^11.0", + "doctrine/dbal": "^2.13 || ^3.0", + "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", + "doctrine/orm": "^2.14", + "ext-sqlite3": "*", + "phpstan/phpstan": "^1.5", + "phpunit/phpunit": "^8.5 || ^9.5 || ^10.0", + "symfony/cache": "^5.0 || ^6.0", + "vimeo/psalm": "^4.10 || ^5.9" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "database" + ], + "support": { + "issues": "https://github.com/doctrine/data-fixtures/issues", + "source": "https://github.com/doctrine/data-fixtures/tree/1.6.7" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", + "type": "tidelift" + } + ], + "time": "2023-08-17T21:15:33+00:00" + }, + { + "name": "doctrine/doctrine-fixtures-bundle", + "version": "3.4.4", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", + "reference": "9ec3139c52a42e94c9fd1e95f8d2bca94326edfb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/9ec3139c52a42e94c9fd1e95f8d2bca94326edfb", + "reference": "9ec3139c52a42e94c9fd1e95f8d2bca94326edfb", + "shasum": "" + }, + "require": { + "doctrine/data-fixtures": "^1.3", + "doctrine/doctrine-bundle": "^1.11|^2.0", + "doctrine/orm": "^2.6.0", + "doctrine/persistence": "^1.3.7|^2.0|^3.0", + "php": "^7.1 || ^8.0", + "symfony/config": "^3.4|^4.3|^5.0|^6.0", + "symfony/console": "^3.4|^4.3|^5.0|^6.0", + "symfony/dependency-injection": "^3.4.47|^4.3|^5.0|^6.0", + "symfony/doctrine-bridge": "^3.4|^4.1|^5.0|^6.0", + "symfony/http-kernel": "^3.4|^4.3|^5.0|^6.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "^1.4.10", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", + "symfony/phpunit-bridge": "^6.0.8", + "vimeo/psalm": "^4.22" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\FixturesBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Doctrine Project", + "homepage": "https://www.doctrine-project.org" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DoctrineFixturesBundle", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "Fixture", + "persistence" + ], + "support": { + "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.4" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "type": "tidelift" + } + ], + "time": "2023-05-02T15:12:16+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v3.36.0", @@ -10289,5 +10454,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/config/bundles.php b/config/bundles.php index 075b830..555b1b8 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -1,8 +1,4 @@ ['all' => true], @@ -16,4 +12,5 @@ Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], + Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AppFixtures.php new file mode 100644 index 0000000..987f6fe --- /dev/null +++ b/src/DataFixtures/AppFixtures.php @@ -0,0 +1,17 @@ +persist($product); + + $manager->flush(); + } +} diff --git a/symfony.lock b/symfony.lock index 6692ab7..04a2866 100644 --- a/symfony.lock +++ b/symfony.lock @@ -22,6 +22,18 @@ "src/Repository/.gitignore" ] }, + "doctrine/doctrine-fixtures-bundle": { + "version": "3.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.0", + "ref": "1f5514cfa15b947298df4d771e694e578d4c204d" + }, + "files": [ + "src/DataFixtures/AppFixtures.php" + ] + }, "doctrine/doctrine-migrations-bundle": { "version": "3.2", "recipe": { From a1b29063c16c720bed3ea2f3c54e8b5ee37b4ed5 Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Wed, 8 Nov 2023 23:17:14 +0100 Subject: [PATCH 2/6] WIP --- src/DataFixtures/UserFixtures.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/DataFixtures/UserFixtures.php diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php new file mode 100644 index 0000000..19b6995 --- /dev/null +++ b/src/DataFixtures/UserFixtures.php @@ -0,0 +1,26 @@ +flush(); + } + + private function getUserData(): array + { + + $users = [ + + ]; + + return $users; + + } +} \ No newline at end of file From e223be2bd84614455daf6f6309a0a1ab75336f60 Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Mon, 8 Jan 2024 20:21:22 +0100 Subject: [PATCH 3/6] WIP --- src/Command/Preview/OrcanoPreviewCommand.php | 69 +++++++++++++++++++ .../{AppFixtures.php => AssetFixtures.php} | 10 ++- src/DataFixtures/UserFixtures.php | 48 ++++++++++++- 3 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 src/Command/Preview/OrcanoPreviewCommand.php rename src/DataFixtures/{AppFixtures.php => AssetFixtures.php} (54%) diff --git a/src/Command/Preview/OrcanoPreviewCommand.php b/src/Command/Preview/OrcanoPreviewCommand.php new file mode 100644 index 0000000..cc74d03 --- /dev/null +++ b/src/Command/Preview/OrcanoPreviewCommand.php @@ -0,0 +1,69 @@ +parameterBag->get('kernel.project_dir') . '/src/DataFixtures'; + + $fixtures = Finder::create()->in($fixturesPath); + + $progressBar = new ProgressBar($output, count($fixtures)); + $progressBar->start(); + + foreach($fixtures as $fixture){ + + $class = str_replace('Fixtures.php', '', $fixture->getRelativePathname()); + + $io->info($class . ' successfully created'); + $progressBar->advance(); + + } + + $progressBar->finish(); + $output->writeln(PHP_EOL); + + + $process = new Process(['php', 'bin/console', 'doctrine:fixtures:load', '--no-interaction']); + $process->run(); + if (!$process->isSuccessful()) { + throw new ProcessFailedException($process); + } + + $output->writeln($process->getOutput()); + + $io->success('Preview Data was successfully loaded!'); + + return Command::SUCCESS; + } +} diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AssetFixtures.php similarity index 54% rename from src/DataFixtures/AppFixtures.php rename to src/DataFixtures/AssetFixtures.php index 987f6fe..d4fb999 100644 --- a/src/DataFixtures/AppFixtures.php +++ b/src/DataFixtures/AssetFixtures.php @@ -3,9 +3,10 @@ namespace App\DataFixtures; use Doctrine\Bundle\FixturesBundle\Fixture; +use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; -class AppFixtures extends Fixture +class AssetFixtures extends Fixture implements DependentFixtureInterface { public function load(ObjectManager $manager): void { @@ -14,4 +15,11 @@ public function load(ObjectManager $manager): void $manager->flush(); } + + public function getDependencies() + { + return [ + UserFixtures::class, + ]; + } } diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index 19b6995..22341f7 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -2,14 +2,41 @@ namespace App\DataFixtures; -use Doctrine\Bundle\FixturesBundle\Fixture; +use App\Entity\User; use Doctrine\Persistence\ObjectManager; +use Doctrine\Bundle\FixturesBundle\Fixture; +use Symfony\Component\PasswordHasher\PasswordHasherInterface; +use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory; +use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; class UserFixtures extends Fixture { + + public function __construct(private readonly UserPasswordHasherInterface $hasher) + {} + public function load(ObjectManager $manager): void { + $users = $this->getUserData(); + + foreach($users as $key => $data){ + + ${$key} = new User(); + ${$key}->setEmail($data['email']); + ${$key}->setRoles($data['roles']); + + $password = $this->hasher->hashPassword(${$key}, $data['password']); + + ${$key}->setPassword($password); + ${$key}->setName($data['name']); + ${$key}->setTheme($data['theme']); + ${$key}->setRowLimit($data['rowLimit']); + ${$key}->setLanguage($data['language']); + $manager->persist(${$key}); + + } + $manager->flush(); } @@ -17,7 +44,24 @@ private function getUserData(): array { $users = [ - + 'standard-user' => [ + 'email' => 'test@localhost.local', + 'roles' => ['ROLE_USER'], + 'password' => 'test', + 'name' => 'User', + 'theme' => 'dark', + 'rowLimit' => 25, + 'language' => 'auto' + ], + 'admin-user' => [ + 'email' => 'admin@localhost.local', + 'roles' => ['ROLE_ADMIN'], + 'password' => 'admin', + 'name' => 'Admin', + 'theme' => 'light', + 'rowLimit' => 25, + 'language' => 'auto' + ] ]; return $users; From dc957038dca78990587480e728ad013ecc401b17 Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Sun, 17 Nov 2024 20:10:02 +0100 Subject: [PATCH 4/6] Add Fixtures for Preview --- makefile | 9 +++++ src/DataFixtures/AssetFixtures.php | 13 +++++-- src/DataFixtures/AssetGroupFixtures.php | 36 +++++++++++++++++++ src/DataFixtures/CheckScriptFixtures.php | 43 +++++++++++++++++++++++ src/DataFixtures/ServiceCheckFixtures.php | 36 +++++++++++++++++++ src/DataFixtures/UserFixtures.php | 6 ++++ 6 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 src/DataFixtures/AssetGroupFixtures.php create mode 100644 src/DataFixtures/CheckScriptFixtures.php create mode 100644 src/DataFixtures/ServiceCheckFixtures.php diff --git a/makefile b/makefile index 1689e81..cdac69b 100644 --- a/makefile +++ b/makefile @@ -73,3 +73,12 @@ ifndef mode else ifeq ($(mode), no-dry-run) php ./vendor/bin/rector process endif + +fixtures: APP_ENV=test ## Load Fixtures in Test Environment +fixtures: ## Load Example data + @php bin/console doctrine:database:drop --force || true + @php bin/console doctrine:database:create + @php bin/console make:migration + @php bin/console doctrine:migrations:migrate -n + @php bin/console doctrine:fixtures:load -n + rm ./migrations/*.php \ No newline at end of file diff --git a/src/DataFixtures/AssetFixtures.php b/src/DataFixtures/AssetFixtures.php index d4fb999..6e4025b 100644 --- a/src/DataFixtures/AssetFixtures.php +++ b/src/DataFixtures/AssetFixtures.php @@ -2,17 +2,23 @@ namespace App\DataFixtures; +use App\Entity\Asset; +use Doctrine\Persistence\ObjectManager; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; -use Doctrine\Persistence\ObjectManager; class AssetFixtures extends Fixture implements DependentFixtureInterface { public function load(ObjectManager $manager): void { - // $product = new Product(); - // $manager->persist($product); + $asset = new Asset(); + $asset->setName('Fixture'); + $asset->setHostname('www.google.com'); + $asset->setIpv4Address('172.217.18.4'); + $asset->setIpv6Address('2a00:1450:4016:80a::2004'); + $asset->addAssetGroup($this->getReference(AssetGroupFixtures::REFERENCE_KEY_ASSET_GROUP)); + $manager->persist($asset); $manager->flush(); } @@ -20,6 +26,7 @@ public function getDependencies() { return [ UserFixtures::class, + AssetGroupFixtures::class ]; } } diff --git a/src/DataFixtures/AssetGroupFixtures.php b/src/DataFixtures/AssetGroupFixtures.php new file mode 100644 index 0000000..c7c9e77 --- /dev/null +++ b/src/DataFixtures/AssetGroupFixtures.php @@ -0,0 +1,36 @@ +setName('Fixture'); + + $this->addReference(self::REFERENCE_KEY_ASSET_GROUP, $assetGroup); + $manager->persist($assetGroup); + $manager->flush(); + } + + public function getDependencies() + { + return [ + UserFixtures::class + ]; + } + + + + +} diff --git a/src/DataFixtures/CheckScriptFixtures.php b/src/DataFixtures/CheckScriptFixtures.php new file mode 100644 index 0000000..f7490fe --- /dev/null +++ b/src/DataFixtures/CheckScriptFixtures.php @@ -0,0 +1,43 @@ +setName('Fixture Script') + ->setFilename('Ping v4') + ->setDescription('Ping Connection') + ->setFilehash(md5(file_get_contents($this->kernel->getProjectDir() . self::SCRIPT_PATH . self::SCRIPT_FILE))) + ; + + $this->addReference(self::REFERENCE_KEY_CHECK_SCRIPT, $checkScript); + $manager->persist($checkScript); + $manager->flush(); + } + + public function getDependencies() + { + return [ + UserFixtures::class + ]; + } +} diff --git a/src/DataFixtures/ServiceCheckFixtures.php b/src/DataFixtures/ServiceCheckFixtures.php new file mode 100644 index 0000000..7c020ca --- /dev/null +++ b/src/DataFixtures/ServiceCheckFixtures.php @@ -0,0 +1,36 @@ +setName('Fixture Service Check') + ->setCheckScript($this->getReference(CheckScriptFixtures::REFERENCE_KEY_CHECK_SCRIPT)) + ->setCheckIntervalSeconds(15) + ->setRetryIntervalSeconds(60) + ->setMaxRetries(3) + ->setNotificationsEnabled(false) + ->addAssetGroup($this->getReference(AssetGroupFixtures::REFERENCE_KEY_ASSET_GROUP)) + ; + $manager->persist($serviceCheck); + $manager->flush(); + } + + public function getDependencies() + { + return [ + UserFixtures::class, + AssetGroupFixtures::class, + CheckScriptFixtures::class + ]; + } +} diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index 22341f7..55d62b0 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -33,6 +33,9 @@ public function load(ObjectManager $manager): void ${$key}->setTheme($data['theme']); ${$key}->setRowLimit($data['rowLimit']); ${$key}->setLanguage($data['language']); + + $this->addReference($key, ${$key}); + $manager->persist(${$key}); } @@ -40,6 +43,9 @@ public function load(ObjectManager $manager): void $manager->flush(); } + /** + * @return array|int|string>> + */ private function getUserData(): array { From af396274c34d3319b31512c4952581ba7129684a Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Sun, 17 Nov 2024 20:40:00 +0100 Subject: [PATCH 5/6] Rector Fix --- src/DataFixtures/UserFixtures.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index 55d62b0..4b6e301 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -49,7 +49,7 @@ public function load(ObjectManager $manager): void private function getUserData(): array { - $users = [ + return [ 'standard-user' => [ 'email' => 'test@localhost.local', 'roles' => ['ROLE_USER'], @@ -70,7 +70,5 @@ private function getUserData(): array ] ]; - return $users; - } } \ No newline at end of file From 2fc4f1524d728ed5fe077df7f88764f10a9899d6 Mon Sep 17 00:00:00 2001 From: MCubeDev01 Date: Sun, 17 Nov 2024 20:53:58 +0100 Subject: [PATCH 6/6] CSFIX --- config/bundles.php | 4 +++ config/preload.php | 2 +- public/index.php | 2 +- rector.php | 2 +- src/Command/Asset/ListAssetCommand.php | 2 +- src/Command/Asset/RegisterAssetCommand.php | 2 +- .../AssetGroup/ListAssetGroupCommand.php | 2 +- .../AssetGroup/RegisterAssetGroupCommand.php | 2 +- src/Command/ConditionTestCommand.php | 2 +- src/Command/Preview/OrcanoPreviewCommand.php | 31 +++++++++---------- src/Command/Scheduler/RunSchedulerCommand.php | 2 +- .../Scripts/ListCheckScriptsCommand.php | 2 +- .../Scripts/RefreshCheckScriptsCommand.php | 2 +- .../ServiceCheck/ListServiceCheckCommand.php | 2 +- .../RegisterServiceCheckCommand.php | 2 +- src/Command/User/RegisterUserCommand.php | 2 +- src/Condition/AbstractCondition.php | 2 +- src/Condition/ConditionCollection.php | 2 +- src/Condition/ConditionInterface.php | 2 +- src/Condition/Criteria.php | 2 +- src/Condition/EqualsCondition.php | 2 +- src/Condition/MinMaxCondition.php | 2 +- src/Context/Context.php | 2 +- src/Context/ContextLoader.php | 2 +- .../Account/AccountPageController.php | 2 +- src/Controller/Api/AbstractApiController.php | 2 +- .../Api/Search/ApiSearchController.php | 2 +- .../Api/Upsert/ApiUpsertController.php | 2 +- src/Controller/DefaultController.php | 2 +- .../Edit/AssetGroupPageController.php | 2 +- src/Controller/Edit/AssetPageController.php | 2 +- .../Edit/CheckScriptPageController.php | 2 +- .../Edit/ServiceCheckPageController.php | 2 +- src/Controller/ErrorController.php | 2 +- .../Listing/ListingPageController.php | 2 +- .../Page/AbstractPageController.php | 2 +- src/Controller/Page/CmsController.php | 2 +- src/Controller/SecurityController.php | 2 +- src/DataFixtures/AssetFixtures.php | 8 +++-- src/DataFixtures/AssetGroupFixtures.php | 14 ++++----- src/DataFixtures/CheckScriptFixtures.php | 13 ++++---- src/DataFixtures/ServiceCheckFixtures.php | 7 +++-- src/DataFixtures/UserFixtures.php | 27 +++++++--------- .../Api/ApiInfoMessageDataObject.php | 2 +- .../Collection/DataObjectCollection.php | 2 +- .../DataObjectCollectionInterface.php | 2 +- .../SearchResultDataObjectCollection.php | 2 +- src/DataObject/DataObjectInterface.php | 2 +- .../Page/AbstractPageDataObject.php | 2 +- src/DataObject/Page/ListingPageDataObject.php | 2 +- src/DataObject/Page/PageDataObject.php | 2 +- .../Page/PageDataObjectInterface.php | 2 +- src/DataObject/Page/PageMessageDataObject.php | 2 +- src/DataObject/PaginationDataObject.php | 2 +- src/DataObject/RandomImageDataObject.php | 2 +- src/DataObject/ScriptResultDataObject.php | 2 +- src/DataObject/Scripts/MetaDataObject.php | 2 +- src/Entity/ApiEntityInterface.php | 2 +- src/Entity/Asset.php | 2 +- src/Entity/AssetGroup.php | 2 +- .../AssetGroupServiceCheckCondition.php | 2 +- src/Entity/CheckScript.php | 2 +- src/Entity/ServiceCheck.php | 2 +- src/Entity/ServiceCheckWorkerStats.php | 2 +- src/Entity/Trait/IdTrait.php | 2 +- src/Entity/Trait/SetDataTrait.php | 2 +- src/Entity/User.php | 2 +- src/Entity/Worker.php | 2 +- src/Event/EntityUpsertEvent.php | 2 +- src/Exception/ArrayIsNullException.php | 2 +- src/Exception/EntityNotFoundException.php | 2 +- src/Exception/HttpExceptionListener.php | 2 +- src/Exception/MetaDataNotFoundException.php | 2 +- src/Exception/MissingKeyException.php | 2 +- .../ODataStringNotFoundException.php | 2 +- src/Exception/RepositoryNotFoundException.php | 2 +- src/Kernel.php | 2 +- src/Message/CheckNotification.php | 2 +- src/Message/CheckResultNotification.php | 2 +- .../CheckNotificationHandler.php | 2 +- .../CheckResultNotificationHandler.php | 2 +- .../AbstractServiceEntityRepository.php | 2 +- src/Repository/AssetGroupRepository.php | 2 +- ...etGroupServiceCheckConditionRepository.php | 2 +- src/Repository/AssetRepository.php | 2 +- src/Repository/BaseRepositoryTrait.php | 2 +- src/Repository/CheckScriptRepository.php | 2 +- src/Repository/ServiceCheckRepository.php | 2 +- .../ServiceCheckWorkerStatsRepository.php | 2 +- src/Repository/UserRepository.php | 2 +- src/Repository/WorkerRepository.php | 2 +- src/Service/Api/EntityUpsertService.php | 2 +- src/Service/AssetGroup/AssetGroupService.php | 2 +- src/Service/Condition/ConditionService.php | 2 +- src/Service/Converter/CaseConverter.php | 2 +- src/Service/FileIteratorService.php | 2 +- src/Service/Image/RandomImageService.php | 2 +- src/Service/Page/AbstractPageLoader.php | 2 +- src/Service/Page/AssetGroupPageLoader.php | 2 +- src/Service/Page/AssetPageLoader.php | 2 +- src/Service/Page/CheckScriptPageLoader.php | 2 +- src/Service/Page/ListingPageLoader.php | 2 +- src/Service/Page/ServiceCheckPageLoader.php | 2 +- src/Service/SchedulerService.php | 2 +- src/Service/Scripts/HashService.php | 2 +- src/Service/Scripts/MetaDataService.php | 2 +- src/Service/Scripts/ResultParserService.php | 2 +- src/Service/Scripts/ScriptsService.php | 2 +- src/Service/User/RegistrationService.php | 2 +- src/Subscriber/LocaleSubscriber.php | 2 +- .../LoginSuccessEventSubscriber.php | 2 +- .../UserEntityUpsertEventSubscriber.php | 2 +- src/Twig/ExistsExtension.php | 2 +- src/Twig/RandomImageExtension.php | 2 +- .../ConditionCollectionSerializeTest.php | 2 +- tests/Condition/ConditionCollectionTest.php | 2 +- tests/Condition/CriteriaTest.php | 2 +- tests/Condition/EqualsConditionTest.php | 2 +- tests/Condition/MinMaxConditionTest.php | 2 +- tests/Context/ContextTest.php | 2 +- .../Collection/DataObjectCollectionTest.php | 2 +- tests/DataObject/TestDataObject.php | 2 +- tests/Entity/AssetGroupTest.php | 2 +- tests/Entity/AssetTest.php | 2 +- tests/Entity/CheckScriptTest.php | 2 +- tests/Entity/ServiceCheckTest.php | 2 +- tests/Entity/ServiceCheckWorkerStatsTest.php | 2 +- tests/Entity/UserTest.php | 2 +- tests/Entity/WorkerTest.php | 2 +- tests/Event/EntityUpsertEventTest.php | 2 +- tests/Exception/HttpExceptionListenerTest.php | 2 +- .../AssetGroup/AssetGroupServiceTest.php | 2 +- tests/Service/Converter/CaseConverterTest.php | 2 +- tests/Service/FileIteratorServiceTest.php | 2 +- .../Service/Image/RandomImageServiceTest.php | 2 +- tests/Service/Page/ListingPageLoaderTest.php | 2 +- tests/Service/Scripts/HashServiceTest.php | 2 +- tests/Service/Scripts/MetaDataServiceTest.php | 2 +- .../Scripts/ResultParserServiceTest.php | 2 +- tests/Service/Scripts/ScriptsServiceTest.php | 2 +- .../Service/User/RegistrationServiceTest.php | 2 +- tests/Subscriber/LocaleSubscriberTest.php | 2 +- tests/Trait/GetterSetterTestingTrait.php | 2 +- tests/Twig/RandomTwigExtensionTest.php | 2 +- tests/bootstrap.php | 2 +- 145 files changed, 191 insertions(+), 189 deletions(-) diff --git a/config/bundles.php b/config/bundles.php index 555b1b8..6cab317 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -1,4 +1,8 @@ ['all' => true], diff --git a/config/preload.php b/config/preload.php index e23eaf0..c14136e 100644 --- a/config/preload.php +++ b/config/preload.php @@ -1,7 +1,7 @@ parameterBag->get('kernel.project_dir') . '/src/DataFixtures'; $fixtures = Finder::create()->in($fixturesPath); @@ -41,25 +41,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int $progressBar = new ProgressBar($output, count($fixtures)); $progressBar->start(); - foreach($fixtures as $fixture){ - + foreach ($fixtures as $fixture) { $class = str_replace('Fixtures.php', '', $fixture->getRelativePathname()); - + $io->info($class . ' successfully created'); $progressBar->advance(); - } $progressBar->finish(); $output->writeln(PHP_EOL); - $process = new Process(['php', 'bin/console', 'doctrine:fixtures:load', '--no-interaction']); $process->run(); if (!$process->isSuccessful()) { throw new ProcessFailedException($process); } - + $output->writeln($process->getOutput()); $io->success('Preview Data was successfully loaded!'); diff --git a/src/Command/Scheduler/RunSchedulerCommand.php b/src/Command/Scheduler/RunSchedulerCommand.php index 0d04be3..f68d5c9 100644 --- a/src/Command/Scheduler/RunSchedulerCommand.php +++ b/src/Command/Scheduler/RunSchedulerCommand.php @@ -1,7 +1,7 @@ setName('Fixture'); - + $this->addReference(self::REFERENCE_KEY_ASSET_GROUP, $assetGroup); $manager->persist($assetGroup); $manager->flush(); @@ -26,11 +28,7 @@ public function load(ObjectManager $manager): void public function getDependencies() { return [ - UserFixtures::class + UserFixtures::class, ]; } - - - - } diff --git a/src/DataFixtures/CheckScriptFixtures.php b/src/DataFixtures/CheckScriptFixtures.php index f7490fe..60d4f00 100644 --- a/src/DataFixtures/CheckScriptFixtures.php +++ b/src/DataFixtures/CheckScriptFixtures.php @@ -1,4 +1,8 @@ setName('Fixture Service Check') ->setCheckScript($this->getReference(CheckScriptFixtures::REFERENCE_KEY_CHECK_SCRIPT)) @@ -30,7 +33,7 @@ public function getDependencies() return [ UserFixtures::class, AssetGroupFixtures::class, - CheckScriptFixtures::class + CheckScriptFixtures::class, ]; } } diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php index 4b6e301..11d07e4 100644 --- a/src/DataFixtures/UserFixtures.php +++ b/src/DataFixtures/UserFixtures.php @@ -1,27 +1,25 @@ getUserData(); - foreach($users as $key => $data){ - + foreach ($users as $key => $data) { ${$key} = new User(); ${$key}->setEmail($data['email']); ${$key}->setRoles($data['roles']); @@ -37,7 +35,6 @@ public function load(ObjectManager $manager): void $this->addReference($key, ${$key}); $manager->persist(${$key}); - } $manager->flush(); @@ -48,7 +45,6 @@ public function load(ObjectManager $manager): void */ private function getUserData(): array { - return [ 'standard-user' => [ 'email' => 'test@localhost.local', @@ -57,7 +53,7 @@ private function getUserData(): array 'name' => 'User', 'theme' => 'dark', 'rowLimit' => 25, - 'language' => 'auto' + 'language' => 'auto', ], 'admin-user' => [ 'email' => 'admin@localhost.local', @@ -66,9 +62,8 @@ private function getUserData(): array 'name' => 'Admin', 'theme' => 'light', 'rowLimit' => 25, - 'language' => 'auto' - ] + 'language' => 'auto', + ], ]; - } -} \ No newline at end of file +} diff --git a/src/DataObject/Api/ApiInfoMessageDataObject.php b/src/DataObject/Api/ApiInfoMessageDataObject.php index 04c0a24..bc20384 100644 --- a/src/DataObject/Api/ApiInfoMessageDataObject.php +++ b/src/DataObject/Api/ApiInfoMessageDataObject.php @@ -1,7 +1,7 @@