From 0c19045d91557c5561d7db1e69a42189dd5756e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Tue, 19 Oct 2021 08:30:58 +0200 Subject: [PATCH 1/3] Hello ReactPHP! Add full core team to the license --- LICENSE | 2 +- README.md | 6 +++--- composer.json | 26 ++++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 3db24de..44acaef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012 Igor Wiedler +Copyright (c) 2012 Christian Lück, Cees-Jan Kiewiet, Jan Sorgalla, Chris Boden, Igor Wiedler 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/README.md b/README.md index 1e46bd9..d23bcc2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # NOTE: This package is no longer maintained. Use [react/promise](https://github.com/reactphp/promise) instead! -# React/Async +# Async -Async utilities for React. +Async utilities for [ReactPHP](https://reactphp.org/). It is heavily influenced by [async.js](https://github.com/caolan/async). @@ -133,4 +133,4 @@ $ php vendor/bin/phpunit ## License -MIT, see LICENSE. +MIT, see [LICENSE file](LICENSE). diff --git a/composer.json b/composer.json index 3977ee7..8b76549 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,30 @@ { "name": "react/async", - "description": "Async utilities for React.", - "keywords": ["async"], + "description": "Async utilities for ReactPHP", + "keywords": ["async", "ReactPHP"], "license": "MIT", + "authors": [ + { + "name": "Christian Lück", + "homepage": "https://clue.engineering/", + "email": "christian@clue.engineering" + }, + { + "name": "Cees-Jan Kiewiet", + "homepage": "https://wyrihaximus.net/", + "email": "reactphp@ceesjankiewiet.nl" + }, + { + "name": "Jan Sorgalla", + "homepage": "https://sorgalla.com/", + "email": "jsorgalla@gmail.com" + }, + { + "name": "Chris Boden", + "homepage": "https://cboden.dev/", + "email": "cboden@gmail.com" + } + ], "require": { "php": ">=5.3.2" }, From f62caaf52916dcf67858583d62aeb8e27e2242a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Mon, 18 Oct 2021 16:48:22 +0200 Subject: [PATCH 2/3] Update to use PSR-4 autoloading --- composer.json | 5 ++++- phpunit.xml.dist | 4 ++-- src/{React/Async => }/Util.php | 0 tests/{React/Tests/Async => }/TestCase.php | 0 tests/{React/Tests/Async => }/Timer.php | 0 tests/{React/Tests/Async => }/UtilParallelTest.php | 0 tests/{React/Tests/Async => }/UtilSeriesTest.php | 0 tests/{React/Tests/Async => }/UtilWaterfallTest.php | 0 tests/bootstrap.php | 4 ---- 9 files changed, 6 insertions(+), 7 deletions(-) rename src/{React/Async => }/Util.php (100%) rename tests/{React/Tests/Async => }/TestCase.php (100%) rename tests/{React/Tests/Async => }/Timer.php (100%) rename tests/{React/Tests/Async => }/UtilParallelTest.php (100%) rename tests/{React/Tests/Async => }/UtilSeriesTest.php (100%) rename tests/{React/Tests/Async => }/UtilWaterfallTest.php (100%) delete mode 100644 tests/bootstrap.php diff --git a/composer.json b/composer.json index 8b76549..3e1ea58 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,10 @@ "react/event-loop": "You need some kind of event loop for this to make sense." }, "autoload": { - "psr-0": { "React\\Async": "src" } + "psr-4": { "React\\Async\\": "src/" } + }, + "autoload-dev": { + "psr-4": { "React\\Tests\\Async\\": "tests/" } }, "extra": { "branch-alias": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6593f58..49eb132 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,11 +9,11 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="tests/bootstrap.php" + bootstrap="vendor/autoload.php" > - ./tests/React/ + ./tests/ diff --git a/src/React/Async/Util.php b/src/Util.php similarity index 100% rename from src/React/Async/Util.php rename to src/Util.php diff --git a/tests/React/Tests/Async/TestCase.php b/tests/TestCase.php similarity index 100% rename from tests/React/Tests/Async/TestCase.php rename to tests/TestCase.php diff --git a/tests/React/Tests/Async/Timer.php b/tests/Timer.php similarity index 100% rename from tests/React/Tests/Async/Timer.php rename to tests/Timer.php diff --git a/tests/React/Tests/Async/UtilParallelTest.php b/tests/UtilParallelTest.php similarity index 100% rename from tests/React/Tests/Async/UtilParallelTest.php rename to tests/UtilParallelTest.php diff --git a/tests/React/Tests/Async/UtilSeriesTest.php b/tests/UtilSeriesTest.php similarity index 100% rename from tests/React/Tests/Async/UtilSeriesTest.php rename to tests/UtilSeriesTest.php diff --git a/tests/React/Tests/Async/UtilWaterfallTest.php b/tests/UtilWaterfallTest.php similarity index 100% rename from tests/React/Tests/Async/UtilWaterfallTest.php rename to tests/UtilWaterfallTest.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index 7e26233..0000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,4 +0,0 @@ -add('React\Tests', __DIR__); From adc6eb04626d09d34ec026a65c46f13db9e320fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Tue, 19 Oct 2021 09:19:09 +0200 Subject: [PATCH 3/3] Add `.gitattributes` to exclude dev files from exports --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..aa6c312 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +/.gitattributes export-ignore +/.github/ export-ignore +/.gitignore export-ignore +/phpunit.xml.dist export-ignore +/tests/ export-ignore