Skip to content

Commit 87b0d2f

Browse files
vladvildanovvladvildanov
authored
Merge test reports (#1424)
1 parent b02c331 commit 87b0d2f

12 files changed

+137
-100
lines changed

‎.github/workflows/stack.yml

-71
This file was deleted.

‎.github/workflows/tests.yml

+116-8
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,27 @@ jobs:
6666

6767
- name: Run tests with coverage
6868
if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
69-
run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml --coverage-filter ./src
69+
run: vendor/bin/phpunit --coverage-php build/cov/coverage-predis.cov --coverage-filter ./src
7070

7171
- name: Run tests using Relay
72-
if: ${{ matrix.redis >= '6' }}
72+
if: ${{ matrix.redis >= '6' && (matrix.php != '8.1' || matrix.redis != '7')}}
7373
run: vendor/bin/phpunit -c phpunit.relay.xml
7474

75+
- name: Run tests using Relay with coverage
76+
if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
77+
run: vendor/bin/phpunit -c phpunit.relay.xml --coverage-php build/cov/coverage-relay.cov --coverage-filter ./src
78+
79+
- name: Merge coverage reports
80+
if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
81+
run: php vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
82+
7583
- name: Send coverage to Coveralls
76-
env:
77-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78-
if: ${{ env.COVERALLS_REPO_TOKEN && matrix.php == '8.1' && matrix.redis == '7' }}
79-
run: |
80-
wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.3/php-coveralls.phar"
81-
php ./php-coveralls.phar -v
84+
uses: coverallsapp/github-action@v2
85+
if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
86+
with:
87+
flag-name: Predis-Relay
88+
github-token: ${{ secrets.GITHUB_TOKEN }}
89+
parallel: true
8290

8391
predis-cluster:
8492

@@ -122,3 +130,103 @@ jobs:
122130
run: |
123131
sleep 5 # Timeout to make sure that docker image is setup
124132
vendor/bin/phpunit --group cluster,gears-cluster
133+
134+
predis-stack:
135+
136+
name: PHP ${{ matrix.php }} (Redis Stack ${{ matrix.redis }})
137+
needs: predis
138+
runs-on: ubuntu-latest
139+
140+
services:
141+
redis:
142+
image: redis/redis-stack-server:${{ matrix.redis }}
143+
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
144+
ports:
145+
- 6379:6379
146+
147+
strategy:
148+
fail-fast: false
149+
matrix:
150+
php:
151+
- '7.2'
152+
- '7.3'
153+
- '7.4'
154+
- '8.0'
155+
- '8.1'
156+
- '8.2'
157+
redis:
158+
- edge
159+
160+
steps:
161+
- name: Checkout
162+
uses: actions/checkout@v3
163+
164+
- name: Setup PHP with Composer and extensions
165+
uses: shivammathur/setup-php@v2
166+
with:
167+
php-version: ${{ matrix.php }}
168+
extensions: relay
169+
170+
- name: Get Composer cache directory
171+
id: composer-cache
172+
run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
173+
174+
- name: Cache Composer dependencies
175+
uses: actions/cache@v3
176+
with:
177+
path: ${{ steps.composer-cache.outputs.directory }}
178+
key: tests-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
179+
restore-keys: tests-php-${{ matrix.php }}-composer
180+
181+
- name: Install Composer dependencies
182+
env:
183+
PHP_VERSION: ${{ matrix.php }}
184+
run: composer install --ansi --no-progress --prefer-dist
185+
186+
- name: Run tests
187+
if: ${{ matrix.php != '8.1' }}
188+
run: vendor/bin/phpunit --group realm-stack
189+
190+
- name: Run tests with coverage
191+
if: ${{ matrix.php == '8.1' }}
192+
run: vendor/bin/phpunit --group realm-stack --coverage-php build/cov/coverage-stack.cov --coverage-filter ./src
193+
194+
- name: Run redis gears tests
195+
if: ${{ matrix.php != '8.1' }}
196+
run: vendor/bin/phpunit --group gears
197+
198+
- name: Run redis gears tests with coverage
199+
if: ${{ matrix.php == '8.1' }}
200+
run: vendor/bin/phpunit --group gears --coverage-php build/cov/coverage-gears.cov --coverage-filter ./src
201+
202+
- name: Run tests using Relay
203+
if: ${{ matrix.php != '8.1' }}
204+
run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml
205+
206+
- name: Run tests using Relay with coverage
207+
if: ${{ matrix.php == '8.1' }}
208+
run: vendor/bin/phpunit --group realm-stack --coverage-php build/cov/coverage-relay-stack.cov --coverage-filter ./src -c phpunit.relay.xml
209+
210+
- name: Merge coverage reports
211+
if: ${{ matrix.php == '8.1' }}
212+
run: php vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
213+
214+
- name: Send coverage to Coveralls
215+
uses: coverallsapp/github-action@v2
216+
if: ${{ matrix.php == '8.1' }}
217+
with:
218+
flag-name: Stack
219+
github-token: ${{ secrets.GITHUB_TOKEN }}
220+
parallel: true
221+
222+
finish:
223+
name: Finish Coverall
224+
needs: predis-stack
225+
if: ${{ always() }}
226+
runs-on: ubuntu-latest
227+
steps:
228+
- name: Coveralls Finished
229+
uses: coverallsapp/github-action@v2
230+
with:
231+
parallel-finished: true
232+
carryforward: "Predis-Relay,Stack"

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"require-dev": {
2828
"friendsofphp/php-cs-fixer": "^3.3",
2929
"phpstan/phpstan": "^1.9",
30-
"phpunit/phpunit": "^8.0 || ~9.4.4"
30+
"phpunit/phpunit": "^8.0 || ~9.4.4",
31+
"phpunit/phpcov": "^6.0 || ^8.0"
3132
},
3233
"suggest": {
3334
"ext-relay": "Faster connection with in-memory caching (>=0.6.2)"

‎phpunit.relay.xml

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
</testsuite>
1818
</testsuites>
1919

20+
<logging>
21+
<log type="coverage-php" target="build/cov/coverage.cov"/>
22+
</logging>
23+
2024
<groups>
2125
<exclude>
2226
<group>relay-incompatible</group>

‎phpunit.xml.dist

+3-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717
</testsuite>
1818
</testsuites>
1919

20-
<coverage processUncoveredFiles="true">
21-
<include>
22-
<directory suffix=".php">./src</directory>
23-
</include>
24-
<report>
25-
<clover outputFile="build/logs/clover.xml"/>
26-
</report>
27-
</coverage>
20+
<logging>
21+
<log type="coverage-php" target="build/cov/coverage.cov"/>
22+
</logging>
2823

2924
<groups>
3025
<exclude>

‎src/Connection/RelayConnection.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class RelayConnection extends StreamConnection
5656
/**
5757
* The Relay instance.
5858
*
59-
* @var \Relay\Relay
59+
* @var Relay
6060
*/
6161
protected $client;
6262

@@ -150,7 +150,7 @@ protected function assertParameters(ParametersInterface $parameters)
150150
/**
151151
* Creates a new instance of the client.
152152
*
153-
* @return \Relay\Relay
153+
* @return Relay
154154
*/
155155
private function createClient()
156156
{
@@ -188,7 +188,7 @@ private function createClient()
188188
/**
189189
* Returns the underlying client.
190190
*
191-
* @return \Relay\Relay
191+
* @return Relay
192192
*/
193193
public function getClient()
194194
{

‎src/Pipeline/RelayPipeline.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RelayPipeline extends Pipeline
3131
*/
3232
protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
3333
{
34-
/** @var \Predis\Connection\RelayConnection $connection */
34+
/** @var RelayConnection $connection */
3535
$client = $connection->getClient();
3636

3737
$throw = $this->client->getOptions()->exceptions;

‎tests/PHPUnit/PredisTestCase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function assertSameWithPrecision($expected, $actual, int $precision = 0,
151151
* Asserts that a string matches a given regular expression.
152152
*
153153
* @throws ExpectationFailedException
154-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
154+
* @throws SebastianBergmann\RecursionContext\InvalidArgumentException
155155
*/
156156
public static function assertMatchesRegularExpression(string $pattern, string $string, $message = ''): void
157157
{
@@ -424,7 +424,7 @@ public function isRedisServerVersion(string $operator, string $version): bool
424424
* decorates test methods while the version of the Redis server used to run
425425
* integration tests is retrieved directly from the server by using `INFO`.
426426
*
427-
* @throws \PHPUnit\Framework\SkippedTestError When the required Redis server version is not met
427+
* @throws PHPUnit\Framework\SkippedTestError When the required Redis server version is not met
428428
*/
429429
protected function checkRequiredRedisServerVersion(): void
430430
{

‎tests/Predis/ClientTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ public function testGetClientByMethodSupportsSelectingConnectionByRole(): void
957957
*/
958958
public function testGetClientByMethodSupportsSelectingConnectionByCommand(): void
959959
{
960-
$command = \Predis\Command\RawCommand::create('GET', 'key');
960+
$command = Command\RawCommand::create('GET', 'key');
961961
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
962962

963963
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')

‎tests/Predis/CommunicationExceptionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function testCommunicationExceptionHandlingWhenShouldResetConnectionIsFal
117117
* @param int $code Exception code.
118118
* @param Exception $inner Inner exception.
119119
*
120-
* @return \Predis\CommunicationException
120+
* @return CommunicationException
121121
*/
122122
protected function createMockException(
123123
Connection\NodeConnectionInterface $connection,

‎tests/Predis/Configuration/Option/ConnectionsTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function testDefaultOptionValue(): void
3636
*/
3737
public function testAcceptsNamedArrayWithSchemeToConnectionClassMappings(): void
3838
{
39-
/** @var \Predis\Configuration\OptionsInterface */
39+
/** @var OptionsInterface */
4040
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
4141

4242
$class = get_class($this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock());
@@ -184,7 +184,7 @@ public function testAcceptsCallableReturningConnectionFactoryInstance(): void
184184
{
185185
$option = new Connections();
186186

187-
/** @var \Predis\Configuration\OptionsInterface */
187+
/** @var OptionsInterface */
188188
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
189189

190190
$callable = $this->getMockBuilder('stdClass')
@@ -211,7 +211,7 @@ public function testThrowsExceptionOnInvalidArguments(): void
211211

212212
$option = new Connections();
213213

214-
/** @var \Predis\Configuration\OptionsInterface */
214+
/** @var OptionsInterface */
215215
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
216216

217217
$option->filter($options, new stdClass());

‎tests/bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
if (file_exists(__DIR__ . '/../autoload.php')) {
1414
require __DIR__ . '/../autoload.php';
15-
} elseif (@include('Predis/Autoloader.php')) {
15+
} elseif (@include ('Predis/Autoloader.php')) {
1616
Predis\Autoloader::register();
1717
} else {
1818
exit('ERROR: Unable to find a suitable mean to register Predis\Autoloader.');

0 commit comments

Comments
 (0)