Skip to content

Commit dd4fe07

Browse files
authored
Merge pull request #60 from reactphp-parallel/3.x-template-types
[3.x] Add template types
2 parents a8240a5 + 3b29af9 commit dd4fe07

12 files changed

+3510
-2099
lines changed

Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ cs: ## Check the code for code style issues
4646
stan: ## Run static analysis (PHPStan)
4747
$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --ansi -c ./etc/qa/phpstan.neon
4848

49-
psalm: ## Run static analysis (Psalm)
50-
$(DOCKER_RUN) vendor/bin/psalm --threads=$(THREADS) --shepherd --stats --config=./etc/qa/psalm.xml
51-
5249
unit-testing: ## Run tests
5350
$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
5451
$(DOCKER_RUN) test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
@@ -78,12 +75,21 @@ backward-compatibility-check: ## Check code for backwards incompatible changes
7875
backward-compatibility-check-raw: ## Check code for backwards incompatible changes, doesn't ignore the failure ###
7976
$(DOCKER_RUN) vendor/bin/roave-backward-compatibility-check
8077

81-
shell: ## Provides Shell access in the expected environment ###
82-
$(DOCKER_RUN) ash
78+
shell: ## Provides Shell access in the expected environment ####
79+
$(DOCKER_RUN) bash
80+
81+
install: ## Install dependencies ####
82+
$(DOCKER_RUN) composer install
83+
84+
update: ## Update dependencies ####
85+
$(DOCKER_RUN) composer update -W
86+
87+
outdated: ## Show outdated dependencies ####
88+
$(DOCKER_RUN) composer outdated
8389

8490
task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ###
8591
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
8692

87-
help: ## Show this help ###
93+
help: ## Show this help ####
8894
@printf "\033[33mUsage:\033[0m\n make [target]\n\n\033[33mTargets:\033[0m\n"
8995
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#'

composer.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,24 @@
1212
"require": {
1313
"php": "^8.1",
1414
"ext-parallel": "*",
15-
"react-parallel/contracts": "^2@dev",
16-
"react-parallel/event-loop": "^2@dev",
17-
"react-parallel/runtime": "^3@dev",
15+
"react-parallel/contracts": "^2.0.0",
16+
"react-parallel/event-loop": "^2.0.0",
17+
"react-parallel/runtime": "^3.0.0",
1818
"react/event-loop": "^1.5",
19-
"react/promise": "^2.9 || ^3.1",
19+
"react/promise": "^2.9 || ^3.2",
2020
"thecodingmachine/safe": "^2.5",
2121
"wyrihaximus/constants": "^1.6",
22-
"wyrihaximus/metrics": "^2",
22+
"wyrihaximus/metrics": "^2.1",
2323
"wyrihaximus/pool-info": "^1.1 || ^2.0"
2424
},
2525
"require-dev": {
2626
"moneyphp/money": "^3.2",
27-
"react-parallel/pool-tests": "^4@dev",
28-
"wyrihaximus/async-test-utilities": "^5 || ^7.2"
27+
"react-parallel/pool-tests": "^4.0.0",
28+
"react-parallel/stubs": "^1.2",
29+
"wyrihaximus/async-test-utilities": "^5 || ^7.3"
30+
},
31+
"suggest": {
32+
"ext-random": "More secure group names"
2933
},
3034
"autoload": {
3135
"psr-4": {

0 commit comments

Comments
 (0)