Skip to content

Commit 92f792e

Browse files
igorwigorw
committed
Merge remote-tracking branch 'origin/psr-4'
* origin/psr-4: [tests] Add bootstrap back to not pollute prod-ish setups Update child repos to PSR-4 for git subs-plit PSR-4
2 parents 0c8eaec + d2111c4 commit 92f792e

File tree

140 files changed

+104
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+104
-107
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions

‎composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
},
2929
"suggest": {
3030
"ext-libevent": "*",
31+
"ext-event": "*",
3132
"ext-libev": "*"
3233
},
3334
"autoload": {
34-
"psr-0": { "React": "src" }
35+
"psr-4": {
36+
"React\\": "src"
37+
}
3538
},
3639
"extra": {
3740
"branch-alias": {

‎composer.lock

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
>
1414
<testsuites>
1515
<testsuite name="React Test Suite">
16-
<directory>./tests/React/</directory>
16+
<directory>./tests/</directory>
1717
</testsuite>
1818
</testsuites>
1919

‎scripts/do-split.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ $GIT_SUBSPLIT init https://github.com/reactphp/react
1010
$GIT_SUBSPLIT update
1111

1212
$GIT_SUBSPLIT publish "
13-
src/React/EventLoop:git@github.com:reactphp/event-loop.git
14-
src/React/Stream:git@github.com:reactphp/stream.git
15-
src/React/Cache:git@github.com:reactphp/cache.git
16-
src/React/Socket:git@github.com:reactphp/socket.git
17-
src/React/SocketClient:git@github.com:reactphp/socket-client.git
18-
src/React/Http:git@github.com:reactphp/http.git
19-
src/React/HttpClient:git@github.com:reactphp/http-client.git
20-
src/React/Dns:git@github.com:reactphp/dns.git
13+
src/EventLoop:git@github.com:reactphp/event-loop.git
14+
src/Stream:git@github.com:reactphp/stream.git
15+
src/Cache:git@github.com:reactphp/cache.git
16+
src/Socket:git@github.com:reactphp/socket.git
17+
src/SocketClient:git@github.com:reactphp/socket-client.git
18+
src/Http:git@github.com:reactphp/http.git
19+
src/HttpClient:git@github.com:reactphp/http-client.git
20+
src/Dns:git@github.com:reactphp/dns.git
2121
" --heads=master

‎src/React/Cache/ArrayCache.php renamed to ‎src/Cache/ArrayCache.php

File renamed without changes.

‎src/React/Cache/CacheInterface.php renamed to ‎src/Cache/CacheInterface.php

File renamed without changes.

‎src/React/Cache/README.md renamed to ‎src/Cache/README.md

‎src/React/Cache/composer.json renamed to ‎src/Cache/composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
"keywords": ["cache"],
55
"license": "MIT",
66
"require": {
7-
"php": ">=5.3.2",
8-
"react/promise": "~1.0"
7+
"php": ">=5.4.0",
8+
"react/promise": "~2.0"
99
},
1010
"autoload": {
11-
"psr-0": { "React\\Cache": "" }
11+
"psr-4": { "React\\Cache\\": "" }
1212
},
13-
"target-dir": "React/Cache",
1413
"extra": {
1514
"branch-alias": {
16-
"dev-master": "0.3-dev"
15+
"dev-master": "0.4-dev"
1716
}
1817
}
1918
}

‎src/React/ChildProcess/Process.php renamed to ‎src/ChildProcess/Process.php

File renamed without changes.

0 commit comments

Comments
 (0)