Merge pull request #41 from reactphp-parallel/2.x-template-types

[2.x] Template types
reactphp-parallel · Feb 10, 2025 · 7056d55 · 7056d55
2 parents a00a968 + fd602a6
commit 7056d55
Show file tree

Hide file tree

Showing 9 changed files with 3,413 additions and 2,040 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 reactphp-parallel
+Copyright (c) 2025 reactphp-parallel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -46,9 +46,6 @@ cs: ## Check the code for code style issues
 stan: ## Run static analysis (PHPStan)
 	$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --ansi -c ./etc/qa/phpstan.neon
 
-psalm: ## Run static analysis (Psalm)
-	$(DOCKER_RUN) vendor/bin/psalm --threads=$(THREADS) --shepherd --stats --config=./etc/qa/psalm.xml
-
 unit-testing: ## Run tests
 	$(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
 	$(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

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## License ##
 
-Copyright 2024 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
+Copyright 2025 [Cees-Jan Kiewiet](http://wyrihaximus.net/)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

diff --git a/composer.json b/composer.json
@@ -12,16 +12,13 @@
     "require": {
         "php": "^8.1",
         "ext-parallel": "*",
-        "react-parallel/event-loop": "^2@dev",
+        "react-parallel/event-loop": "^2.0.0",
         "react/event-loop": "^1.5",
-        "react/promise": "^2.11 || ^3.1",
-        "reactivex/rxphp": "^2.0.12",
-        "wyrihaximus/constants": "^1.6",
-        "wyrihaximus/react-awaitable-observable": "^1",
-        "wyrihaximus/react-event-loop-rx-scheduler-hook-up": "^0.1.1"
+        "react/promise": "^2.11 || ^3.1"
     },
     "require-dev": {
-        "wyrihaximus/async-test-utilities": "^5 || ^7.2",
+        "react-parallel/stubs": "^1.2",
+        "wyrihaximus/async-test-utilities": "^5 || ^7.3",
         "wyrihaximus/ticking-promise": "^3"
     },
     "autoload": {