From 97e055e424e67f5edfd5183b8b7361d470a29923 Mon Sep 17 00:00:00 2001 From: Howriq Date: Fri, 5 Dec 2025 16:33:32 +0200 Subject: [PATCH 1/5] Code chapter 3 Signed-off-by: Howriq --- bin/doctrine-fixtures.php | 38 ++++++++++++++++ composer.json | 10 +++-- config/autoload/local.php | 1 + src/App/src/ConfigProvider.php | 2 + src/App/src/Factory/BookHandlerFactory.php | 32 ++++++++++++++ src/App/src/Factory/BookRepositoryFactory.php | 31 +++++++++++++ src/App/src/Fixture/BookLoader.php | 32 ++++++++++++++ src/App/templates/layout/default.html.twig | 1 + src/Book/src/ConfigProvider.php | 30 ++++++++++++- src/Book/src/Handler/GetBooksHandler.php | 34 +++++++++++++++ src/Book/src/Repository/BookRepository.php | 23 +++++++++- src/Book/src/RoutesDelegator.php | 24 +++++++++++ src/Page/templates/page/books.html.twig | 43 +++++++++++++++++++ 13 files changed, 295 insertions(+), 6 deletions(-) create mode 100644 bin/doctrine-fixtures.php create mode 100644 src/App/src/Factory/BookHandlerFactory.php create mode 100644 src/App/src/Factory/BookRepositoryFactory.php create mode 100644 src/App/src/Fixture/BookLoader.php create mode 100644 src/Book/src/Handler/GetBooksHandler.php create mode 100644 src/Book/src/RoutesDelegator.php create mode 100644 src/Page/templates/page/books.html.twig diff --git a/bin/doctrine-fixtures.php b/bin/doctrine-fixtures.php new file mode 100644 index 0000000..910a4e4 --- /dev/null +++ b/bin/doctrine-fixtures.php @@ -0,0 +1,38 @@ +#!/usr/bin/env php +get(EntityManager::class); +$config = $container->get('config'); + +// Get fixtures directory from config +$fixturesPath = $config['doctrine']['fixtures']; + +if (! is_dir($fixturesPath)) { + echo "Fixtures directory not found: {$fixturesPath}\n"; + exit(1); +} + +// Load fixtures +$loader = new Loader(); +$loader->loadFromDirectory($fixturesPath); + +// Execute fixtures +$purger = new ORMPurger(); +$executor = new ORMExecutor($entityManager, $purger); + +echo "Loading fixtures from: {$fixturesPath}\n"; + +$executor->execute($loader->getFixtures()); + +echo "Fixtures loaded successfully!\n"; diff --git a/composer.json b/composer.json index 558d0f3..922850e 100644 --- a/composer.json +++ b/composer.json @@ -27,18 +27,20 @@ }, "require": { "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", + "doctrine/data-fixtures": "^2.2", "dotkernel/dot-cache": "^4.0", - "ramsey/uuid": "^4.5.0", - "ramsey/uuid-doctrine": "^2.1.0", - "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0", "dotkernel/dot-errorhandler": "^4.4.0", "laminas/laminas-component-installer": "^3.5.0", "laminas/laminas-config-aggregator": "^1.17.0", "mezzio/mezzio": "^3.24.0", "mezzio/mezzio-fastroute": "^3.13.0", - "mezzio/mezzio-twigrenderer": "^2.17.0" + "mezzio/mezzio-twigrenderer": "^2.17.0", + "ramsey/uuid": "^4.5.0", + "ramsey/uuid-doctrine": "^2.1.0", + "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0" }, "require-dev": { + "doctrine/doctrine-fixtures-bundle": "^4.3", "filp/whoops": "^2.17.0", "laminas/laminas-coding-standard": "^3.0.1", "laminas/laminas-development-mode": "^3.13.0", diff --git a/config/autoload/local.php b/config/autoload/local.php index a58f3f8..2ee32a4 100644 --- a/config/autoload/local.php +++ b/config/autoload/local.php @@ -41,6 +41,7 @@ 'page' => [ 'about' => 'about', 'who-we-are' => 'who-we-are', + 'books' => 'books', ], ], ]; diff --git a/src/App/src/ConfigProvider.php b/src/App/src/ConfigProvider.php index fd5a51b..d81db9b 100644 --- a/src/App/src/ConfigProvider.php +++ b/src/App/src/ConfigProvider.php @@ -56,6 +56,7 @@ * class: class-string, * }, * }, + * fixtures: non-empty-string, * migrations: array{ * migrations_paths: array, * all_or_nothing: bool, @@ -165,6 +166,7 @@ private function getDoctrineConfig(): array 'class' => MappingDriverChain::class, ], ], + 'fixtures' => getcwd() . '/src/App/src/Fixture', 'migrations' => [ 'table_storage' => [ 'table_name' => 'doctrine_migration_versions', diff --git a/src/App/src/Factory/BookHandlerFactory.php b/src/App/src/Factory/BookHandlerFactory.php new file mode 100644 index 0000000..3f01d3e --- /dev/null +++ b/src/App/src/Factory/BookHandlerFactory.php @@ -0,0 +1,32 @@ +get(BookRepository::class); + $template = $container->get(TemplateRendererInterface::class); + + assert($repository instanceof BookRepository); + assert($template instanceof TemplateRendererInterface); + + return new GetBooksHandler($template, $repository); + } +} diff --git a/src/App/src/Factory/BookRepositoryFactory.php b/src/App/src/Factory/BookRepositoryFactory.php new file mode 100644 index 0000000..e7c1e1d --- /dev/null +++ b/src/App/src/Factory/BookRepositoryFactory.php @@ -0,0 +1,31 @@ +get(EntityManager::class); + + $repository = $entityManager->getRepository(Book::class); + assert($repository instanceof BookRepository); + + return $repository; + } +} diff --git a/src/App/src/Fixture/BookLoader.php b/src/App/src/Fixture/BookLoader.php new file mode 100644 index 0000000..4960abb --- /dev/null +++ b/src/App/src/Fixture/BookLoader.php @@ -0,0 +1,32 @@ +setTitle('A Game of Thrones'); + $book1->setAuthor('George Martin'); + $manager->persist($book1); + + $book2 = new Book(); + $book2->setTitle('The Lord of the Rings'); + $book2->setAuthor('J.R.R. Tolkien'); + $manager->persist($book2); + + $book3 = new Book(); + $book3->setTitle('Dune'); + $book3->setAuthor('Frank Herbert'); + $manager->persist($book3); + + $manager->flush(); + } +} diff --git a/src/App/templates/layout/default.html.twig b/src/App/templates/layout/default.html.twig index 6a49363..afdddaa 100644 --- a/src/App/templates/layout/default.html.twig +++ b/src/App/templates/layout/default.html.twig @@ -46,6 +46,7 @@
About Us Who We Are + Books
  • diff --git a/src/Book/src/ConfigProvider.php b/src/Book/src/ConfigProvider.php index 063acbc..1b404ed 100644 --- a/src/Book/src/ConfigProvider.php +++ b/src/Book/src/ConfigProvider.php @@ -6,6 +6,11 @@ use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Doctrine\Persistence\Mapping\Driver\MappingDriver; +use Light\App\Factory\BookHandlerFactory; +use Light\App\Factory\BookRepositoryFactory; +use Light\Book\Handler\GetBooksHandler; +use Light\Book\Repository\BookRepository; +use Mezzio\Application; /** * @phpstan-type ConfigType array{ @@ -23,6 +28,10 @@ * }, * }, * } + * @phpstan-type DependenciesType array{ + * delegators: array>, + * factories: array, + * } */ class ConfigProvider { @@ -32,7 +41,26 @@ class ConfigProvider public function __invoke(): array { return [ - 'doctrine' => $this->getDoctrineConfig(), + 'dependencies' => $this->getDependencies(), + 'doctrine' => $this->getDoctrineConfig(), + ]; + } + + /** + * @return DependenciesType + */ + private function getDependencies(): array + { + return [ + 'delegators' => [ + Application::class => [ + RoutesDelegator::class, + ], + ], + 'factories' => [ + GetBooksHandler::class => BookHandlerFactory::class, + BookRepository::class => BookRepositoryFactory::class, + ], ]; } diff --git a/src/Book/src/Handler/GetBooksHandler.php b/src/Book/src/Handler/GetBooksHandler.php new file mode 100644 index 0000000..adb8ade --- /dev/null +++ b/src/Book/src/Handler/GetBooksHandler.php @@ -0,0 +1,34 @@ +bookRepository->getTitles(); + $authors = $this->bookRepository->getAuthors(); + + return new HtmlResponse( + $this->template->render('page::books', [ + 'titles' => $titles, + 'authors' => $authors, + ]) + ); + } +} diff --git a/src/Book/src/Repository/BookRepository.php b/src/Book/src/Repository/BookRepository.php index 44352b0..8bb1d8e 100644 --- a/src/Book/src/Repository/BookRepository.php +++ b/src/Book/src/Repository/BookRepository.php @@ -5,10 +5,31 @@ namespace Light\Book\Repository; use Light\App\Repository\AbstractRepository; +use Light\Book\Entity\Book; class BookRepository extends AbstractRepository { /** - * Any other custom methods can be added here + * @return array */ + public function getTitles(): array + { + $qb = $this->getQueryBuilder() + ->select('book.id, book.title') + ->from(Book::class, 'book'); + + return $qb->getQuery()->getResult(); + } + + /** + * @return array + */ + public function getAuthors(): array + { + $qb = $this->getQueryBuilder() + ->select('book.id, book.author') + ->from(Book::class, 'book'); + + return $qb->getQuery()->getResult(); + } } diff --git a/src/Book/src/RoutesDelegator.php b/src/Book/src/RoutesDelegator.php new file mode 100644 index 0000000..56b0a1f --- /dev/null +++ b/src/Book/src/RoutesDelegator.php @@ -0,0 +1,24 @@ +get('/books', [GetBooksHandler::class], 'books::list'); + + return $app; + } +} diff --git a/src/Page/templates/page/books.html.twig b/src/Page/templates/page/books.html.twig new file mode 100644 index 0000000..91eb0d7 --- /dev/null +++ b/src/Page/templates/page/books.html.twig @@ -0,0 +1,43 @@ +{% extends '@layout/default.html.twig' %} + +{% block title %}Books{% endblock %} + +{% block content %} +
    +

    Book Titles

    + + + + + + + + + {% for title in titles %} + + + + + {% endfor %} + +
    Book IDTitle
    {{ title.id }}{{ title.title }}
    + +

    Book Authors

    + + + + + + + + + {% for author in authors %} + + + + + {% endfor %} + +
    Book IDAuthor
    {{ author.id }}{{ author.author }}
    +
    +{% endblock %} \ No newline at end of file From 9a1d6c7941e67e70ecc00acf4e193e47cb38917c Mon Sep 17 00:00:00 2001 From: Howriq Date: Mon, 8 Dec 2025 17:29:51 +0200 Subject: [PATCH 2/5] Code chapter 3 Signed-off-by: Howriq --- config/autoload/local.php | 47 ------------------- src/Book/src/ConfigProvider.php | 15 ++++++ .../templates/page/books.html.twig | 0 3 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 config/autoload/local.php rename src/{Page => Book}/templates/page/books.html.twig (100%) diff --git a/config/autoload/local.php b/config/autoload/local.php deleted file mode 100644 index 2ee32a4..0000000 --- a/config/autoload/local.php +++ /dev/null @@ -1,47 +0,0 @@ - [ - 'host' => 'localhost', - 'dbname' => 'light', - 'user' => 'root', - 'password' => '123', - 'port' => 3306, - 'driver' => 'pdo_mysql', - 'charset' => 'utf8mb4', - 'collate' => 'utf8mb4_general_ci', - ], - // you can add more database connections into this array -]; - -return [ - 'databases' => $databases, - 'doctrine' => [ - 'connection' => [ - 'orm_default' => [ - 'params' => $databases['default'], - ], - ], - ], - 'application' => [ - 'url' => $baseUrl, - ], - 'routes' => [ - 'page' => [ - 'about' => 'about', - 'who-we-are' => 'who-we-are', - 'books' => 'books', - ], - ], -]; diff --git a/src/Book/src/ConfigProvider.php b/src/Book/src/ConfigProvider.php index 1b404ed..19e1f30 100644 --- a/src/Book/src/ConfigProvider.php +++ b/src/Book/src/ConfigProvider.php @@ -43,6 +43,7 @@ public function __invoke(): array return [ 'dependencies' => $this->getDependencies(), 'doctrine' => $this->getDoctrineConfig(), + 'templates' => $this->getTemplates(), ]; } @@ -84,4 +85,18 @@ private function getDoctrineConfig(): array ], ]; } + + /** + @return array{ + * paths: array{page: array{literal-string&non-falsy-string}} + * } + */ + private function getTemplates(): array + { + return [ + 'paths' => [ + 'page' => [__DIR__ . '/../templates/page'], + ], + ]; + } } diff --git a/src/Page/templates/page/books.html.twig b/src/Book/templates/page/books.html.twig similarity index 100% rename from src/Page/templates/page/books.html.twig rename to src/Book/templates/page/books.html.twig From b7e75768deef4ce35d58838d8877ed2f64dca946 Mon Sep 17 00:00:00 2001 From: Howriq Date: Tue, 9 Dec 2025 12:27:30 +0200 Subject: [PATCH 3/5] Code chapter 3 Signed-off-by: Howriq --- composer.json | 8 ++++---- src/Book/templates/page/books.html.twig | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 922850e..c0f01ba 100644 --- a/composer.json +++ b/composer.json @@ -29,15 +29,15 @@ "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "doctrine/data-fixtures": "^2.2", "dotkernel/dot-cache": "^4.0", + "ramsey/uuid": "^4.5.0", + "ramsey/uuid-doctrine": "^2.1.0", + "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0", "dotkernel/dot-errorhandler": "^4.4.0", "laminas/laminas-component-installer": "^3.5.0", "laminas/laminas-config-aggregator": "^1.17.0", "mezzio/mezzio": "^3.24.0", "mezzio/mezzio-fastroute": "^3.13.0", - "mezzio/mezzio-twigrenderer": "^2.17.0", - "ramsey/uuid": "^4.5.0", - "ramsey/uuid-doctrine": "^2.1.0", - "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0" + "mezzio/mezzio-twigrenderer": "^2.17.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "^4.3", diff --git a/src/Book/templates/page/books.html.twig b/src/Book/templates/page/books.html.twig index 91eb0d7..482e2c7 100644 --- a/src/Book/templates/page/books.html.twig +++ b/src/Book/templates/page/books.html.twig @@ -40,4 +40,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} From 918aaab8dae2820b713b84e1dd296d591022f194 Mon Sep 17 00:00:00 2001 From: Howriq Date: Tue, 9 Dec 2025 19:12:15 +0200 Subject: [PATCH 4/5] Code chapter 3 Signed-off-by: Howriq --- bin/{doctrine-fixtures.php => doctrine-fixtures} | 0 bin/{doctrine-migrations.php => doctrine-migrations} | 0 composer.json | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename bin/{doctrine-fixtures.php => doctrine-fixtures} (100%) rename bin/{doctrine-migrations.php => doctrine-migrations} (100%) diff --git a/bin/doctrine-fixtures.php b/bin/doctrine-fixtures similarity index 100% rename from bin/doctrine-fixtures.php rename to bin/doctrine-fixtures diff --git a/bin/doctrine-migrations.php b/bin/doctrine-migrations similarity index 100% rename from bin/doctrine-migrations.php rename to bin/doctrine-migrations diff --git a/composer.json b/composer.json index c0f01ba..47fb533 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "require": { "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "doctrine/data-fixtures": "^2.2", + "doctrine/doctrine-fixtures-bundle": "^4.3", "dotkernel/dot-cache": "^4.0", "ramsey/uuid": "^4.5.0", "ramsey/uuid-doctrine": "^2.1.0", @@ -40,7 +41,6 @@ "mezzio/mezzio-twigrenderer": "^2.17.0" }, "require-dev": { - "doctrine/doctrine-fixtures-bundle": "^4.3", "filp/whoops": "^2.17.0", "laminas/laminas-coding-standard": "^3.0.1", "laminas/laminas-development-mode": "^3.13.0", From 33bfd7f679cba5e6ba85ae73769737be9331565d Mon Sep 17 00:00:00 2001 From: Howriq Date: Wed, 10 Dec 2025 12:20:10 +0200 Subject: [PATCH 5/5] fix type docs Signed-off-by: Howriq --- src/Book/src/ConfigProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Book/src/ConfigProvider.php b/src/Book/src/ConfigProvider.php index 19e1f30..0e31bea 100644 --- a/src/Book/src/ConfigProvider.php +++ b/src/Book/src/ConfigProvider.php @@ -87,7 +87,7 @@ private function getDoctrineConfig(): array } /** - @return array{ + * @return array{ * paths: array{page: array{literal-string&non-falsy-string}} * } */