Skip to content

Commit 3f19930

Browse files
makasimmakasim
authored
Merge pull request #1131 from andrewmy/add-php-8
PHPUnit 9.5
2 parents fba5420 + 1cad99f commit 3f19930

File tree

150 files changed

+603
-440
lines changed

Some content is hidden

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

150 files changed

+603
-440
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
2727
- uses: shivammathur/setup-php@v2
2828
with:
29-
php-version: '7.1'
29+
php-version: '7.4'
3030
coverage: none
3131
extensions: mongodb, redis, :xdebug
3232
ini-values: memory_limit=2048M
@@ -63,7 +63,7 @@ jobs:
6363
6464
- uses: shivammathur/setup-php@v2
6565
with:
66-
php-version: '7.1'
66+
php-version: '7.4'
6767
coverage: none
6868
extensions: mongodb, redis, :xdebug
6969
ini-values: memory_limit=2048M
@@ -78,27 +78,10 @@ jobs:
7878
tests:
7979
runs-on: ubuntu-latest
8080
strategy:
81+
fail-fast: false
8182
matrix:
8283
php: ['7.4']
8384
include:
84-
- php: 7.1
85-
symfony_version: 4.3.*
86-
unit_tests: true
87-
functional_tests: false
88-
rdkafka_tests: false
89-
prepare_container: false
90-
- php: 7.2
91-
symfony_version: 4.3.*
92-
unit_tests: true
93-
functional_tests: false
94-
rdkafka_tests: false
95-
prepare_container: false
96-
- php: 7.2
97-
symfony_version: 5.0.*
98-
unit_tests: true
99-
functional_tests: false
100-
rdkafka_tests: false
101-
prepare_container: false
10285
- php: 7.3
10386
symfony_version: 4.3.*
10487
unit_tests: true

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ var
1717
.php_cs
1818
.php_cs.cache
1919
composer.lock
20+
.phpunit.result.cache

‎composer.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
1010
},
1111
"require": {
12-
"php": "^7.1.3",
12+
"php": "^7.3",
1313

1414
"ext-amqp": "^1.9.3",
1515
"ext-gearman": "^2.0",
1616
"ext-mongodb": "^1.5",
17-
"ext-rdkafka": "^3.0.3",
17+
"ext-rdkafka": "^3.0.3|^4.0|^5.0",
1818

1919
"queue-interop/amqp-interop": "^0.8",
2020
"queue-interop/queue-interop": "^0.7|^0.8",
@@ -41,7 +41,8 @@
4141
"datadog/php-datadogstatsd": "^1.3"
4242
},
4343
"require-dev": {
44-
"phpunit/phpunit": "^7.5",
44+
"ext-pcntl": "*",
45+
"phpunit/phpunit": "^9.5",
4546
"phpstan/phpstan": "^0.12",
4647
"queue-interop/queue-spec": "^0.6",
4748
"symfony/browser-kit": "^3.4|^4",
@@ -60,7 +61,9 @@
6061
"doctrine/mongodb-odm-bundle": "^3.5|^4",
6162
"alcaeus/mongo-php-adapter": "^1.0",
6263
"kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
63-
"friendsofphp/php-cs-fixer": "^2"
64+
"friendsofphp/php-cs-fixer": "^2",
65+
"dms/phpunit-arraysubset-asserts": "^0.2.1",
66+
"phpspec/prophecy-phpunit": "^2.0"
6467
},
6568
"autoload": {
6669
"psr-4": {

‎docs/bundle/functional_testing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class FooTest extends WebTestCase
5757
/** @var \Symfony\Bundle\FrameworkBundle\Client */
5858
private $client;
5959
60-
public function setUp()
60+
public function setUp(): void
6161
{
6262
$this->client = static::createClient();
6363
}

‎phpunit.xml.dist‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<phpunit
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
66
backupGlobals="false"
77
backupStaticAttributes="false"
88
colors="true"
@@ -129,12 +129,12 @@
129129
<env name="SHELL_VERBOSITY" value="-1"/>
130130
</php>
131131

132-
<filter>
133-
<whitelist>
132+
<coverage>
133+
<include>
134134
<directory suffix=".php">.</directory>
135-
<exclude>
136-
<directory>./vendor</directory>
137-
</exclude>
138-
</whitelist>
139-
</filter>
135+
</include>
136+
<exclude>
137+
<directory>./vendor</directory>
138+
</exclude>
139+
</coverage>
140140
</phpunit>

‎pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
use Enqueue\AmqpBunny\AmqpConnectionFactory;
66
use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
77
use Enqueue\Test\ClassExtensionTrait;
8+
use Enqueue\Test\ReadAttributeTrait;
89
use Interop\Queue\ConnectionFactory;
910
use PHPUnit\Framework\TestCase;
1011

1112
class AmqpConnectionFactoryTest extends TestCase
1213
{
1314
use ClassExtensionTrait;
15+
use ReadAttributeTrait;
1416

1517
public function testShouldImplementConnectionFactoryInterface()
1618
{

‎pkg/amqp-bunny/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.1.3",
9+
"php": "^7.3",
1010
"queue-interop/amqp-interop": "^0.8",
1111
"queue-interop/queue-interop": "^0.8",
1212
"bunny/bunny": "^0.4",
1313
"enqueue/amqp-tools": "^0.10"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": "~7.5",
16+
"phpunit/phpunit": "^9.5",
1717
"enqueue/test": "0.10.x-dev",
1818
"enqueue/null": "0.10.x-dev",
1919
"queue-interop/queue-spec": "^0.6"

‎pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
use Enqueue\AmqpExt\AmqpContext;
77
use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
88
use Enqueue\Test\ClassExtensionTrait;
9+
use Enqueue\Test\ReadAttributeTrait;
910
use Interop\Queue\ConnectionFactory;
1011
use PHPUnit\Framework\TestCase;
1112

1213
class AmqpConnectionFactoryTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testShouldImplementConnectionFactoryInterface()
1719
{
@@ -34,6 +36,6 @@ public function testShouldCreateLazyContext()
3436
$this->assertInstanceOf(AmqpContext::class, $context);
3537

3638
$this->assertAttributeEquals(null, 'extChannel', $context);
37-
$this->assertInternalType('callable', $this->readAttribute($context, 'extChannelFactory'));
39+
self::assertIsCallable($this->readAttribute($context, 'extChannelFactory'));
3840
}
3941
}

‎pkg/amqp-ext/Tests/AmqpContextTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Enqueue\Null\NullQueue;
1010
use Enqueue\Null\NullTopic;
1111
use Enqueue\Test\ClassExtensionTrait;
12+
use Enqueue\Test\ReadAttributeTrait;
1213
use Interop\Amqp\Impl\AmqpMessage;
1314
use Interop\Amqp\Impl\AmqpQueue;
1415
use Interop\Amqp\Impl\AmqpTopic;
@@ -20,6 +21,7 @@
2021
class AmqpContextTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
24+
use ReadAttributeTrait;
2325

2426
public function testShouldImplementQueueInteropContextInterface()
2527
{

‎pkg/amqp-ext/Tests/Functional/AmqpCommonUseCasesTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
*/
1515
class AmqpCommonUseCasesTest extends TestCase
1616
{
17-
use RabbitmqAmqpExtension;
1817
use RabbitManagementExtensionTrait;
18+
use RabbitmqAmqpExtension;
1919

2020
/**
2121
* @var AmqpContext
2222
*/
2323
private $amqpContext;
2424

25-
public function setUp()
25+
protected function setUp(): void
2626
{
2727
$this->amqpContext = $this->buildAmqpContext();
2828

2929
$this->removeQueue('amqp_ext.test');
3030
$this->removeExchange('amqp_ext.test_exchange');
3131
}
3232

33-
public function tearDown(): void
33+
protected function tearDown(): void
3434
{
3535
$this->amqpContext->close();
3636
}
@@ -128,7 +128,7 @@ public function testProduceAndReceiveOneMessageSentDirectlyToTemporaryQueue()
128128
public function testProduceAndReceiveOneMessageSentDirectlyToTopic()
129129
{
130130
$topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
131-
$topic->setType(AMQP_EX_TYPE_FANOUT);
131+
$topic->setType(\AMQP_EX_TYPE_FANOUT);
132132
$this->amqpContext->declareTopic($topic);
133133

134134
$queue = $this->amqpContext->createQueue('amqp_ext.test');
@@ -153,7 +153,7 @@ public function testProduceAndReceiveOneMessageSentDirectlyToTopic()
153153
public function testConsumerReceiveMessageFromTopicDirectly()
154154
{
155155
$topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
156-
$topic->setType(AMQP_EX_TYPE_FANOUT);
156+
$topic->setType(\AMQP_EX_TYPE_FANOUT);
157157

158158
$this->amqpContext->declareTopic($topic);
159159

@@ -176,7 +176,7 @@ public function testConsumerReceiveMessageFromTopicDirectly()
176176
public function testConsumerReceiveMessageWithZeroTimeout()
177177
{
178178
$topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
179-
$topic->setType(AMQP_EX_TYPE_FANOUT);
179+
$topic->setType(\AMQP_EX_TYPE_FANOUT);
180180

181181
$this->amqpContext->declareTopic($topic);
182182

0 commit comments

Comments
 (0)