Skip to content

Commit cfea5f7

Browse files
committed
Merge branch '4.0.x' into 3.14.x-merge-up-into-4.0.x_SqVt4Z5I
2 parents 87db491 + 35bc78e commit cfea5f7

32 files changed

Lines changed: 478 additions & 725 deletions

.github/workflows/docs-build-try.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/docs-build.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ test: phpunit
4040
.PHONY: dev
4141
dev: static test ## run dev tools
4242

43-
.PHONY: docs
44-
docs: mkdocs ## run mkdocs
45-
cd docs && python3 -m mkdocs serve
46-
47-
.PHONY: mkdocs
48-
mkdocs: ## run mkdocs
49-
cd docs && pip3 install -r requirements.txt
50-
5143
.PHONY: docs-extract-php
5244
docs-extract-php:
5345
bin/docs-extract-php-code

bin/docs-extract-php-code

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (file_exists($targetDir)) {
2323
mkdir($targetDir);
2424

2525
$finder = new Symfony\Component\Finder\Finder();
26-
$finder->files()->in(__DIR__ . '/../docs/pages')->name('*.md');
26+
$finder->files()->in(__DIR__ . '/../docs')->name('*.md');
2727

2828
foreach ($finder as $file) {
2929
$fileName = pathinfo($file->getBasename(), PATHINFO_FILENAME);

bin/docs-inject-php-code

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (!file_exists($targetDir)) {
2525
}
2626

2727
$finder = new Symfony\Component\Finder\Finder();
28-
$finder->files()->in(__DIR__ . '/../docs/pages')->name('*.md');
28+
$finder->files()->in(__DIR__ . '/../docs')->name('*.md');
2929

3030
foreach ($finder as $file) {
3131
$fileName = pathinfo($file->getBasename(), PATHINFO_FILENAME);

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"require": {
2121
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
22-
"patchlevel/event-sourcing": "^3.13.0",
22+
"patchlevel/event-sourcing": "4.0.x-dev",
2323
"symfony/cache": "^6.4.0 || ^7.0.0 || ^8.0.0",
2424
"symfony/config": "^6.4.0 || ^7.0.0 || ^8.0.0",
2525
"symfony/console": "^6.4.1 || ^7.0.1 || ^8.0.0",

0 commit comments

Comments
 (0)