Skip to content

Commit f6acdbd

Browse files
committed
MC-40555: Add PHP 7.4 declaration
- Updated MFTF to use PHP 7.4 version - Removed mistakenly added symlink - Fixed ternary
1 parent fcbaf56 commit f6acdbd

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"friendsofphp/php-cs-fixer": "~2.16.0",
9696
"lusitanian/oauth": "~0.8.10",
9797
"magento/magento-coding-standard": "*",
98-
"magento/magento2-functional-testing-framework": "MQE-2488-php73-dev",
98+
"magento/magento2-functional-testing-framework": "MQE-2501-php74-dev",
9999
"pdepend/pdepend": "~2.7.1",
100100
"phpcompatibility/php-compatibility": "^9.3",
101101
"phpmd/phpmd": "@stable",

composer.lock

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

lib/internal/Magento/Framework/ForeignKey

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ private function runDaemonMode(QueueInterface $queue, MergerInterface $merger)
151151
*/
152152
private function run(QueueInterface $queue, MergerInterface $merger, $maxNumberOfMessages)
153153
{
154-
$count = $maxNumberOfMessages
154+
$count = ($maxNumberOfMessages
155155
? $maxNumberOfMessages
156-
: $this->configuration->getMaxMessages() ?: 1;
156+
: $this->configuration->getMaxMessages()) ?: 1;
157157
$transactionCallback = $this->getTransactionCallback($queue, $merger);
158158

159159
if ($this->batchSize) {

0 commit comments

Comments
 (0)