Skip to content

Commit 694413a

Browse files
authored
Remove PHP 7 workarounds (#11324)
1 parent 20a6efd commit 694413a

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

phpcs.xml.dist

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,4 @@
274274
<!-- https://github.com/doctrine/orm/issues/8537 -->
275275
<exclude-pattern>src/QueryBuilder.php</exclude-pattern>
276276
</rule>
277-
278-
<rule ref="SlevomatCodingStandard.PHP.UselessParentheses">
279-
<!-- We need those parentheses to make enum access seem like valid syntax on PHP 7 -->
280-
<exclude-pattern>src/Mapping/Driver/XmlDriver.php</exclude-pattern>
281-
</rule>
282277
</ruleset>

src/Internal/CriteriaOrderings.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ private static function getCriteriaOrderings(Criteria $criteria): array
2626
}
2727

2828
return array_map(
29-
static function (Order $order): string {
30-
return $order->value;
31-
},
29+
static fn (Order $order): string => $order->value,
3230
$criteria->orderings(),
3331
);
3432
}
@@ -45,9 +43,7 @@ private static function mapToOrderEnumIfAvailable(array $orderings): array
4543
}
4644

4745
return array_map(
48-
static function (string $order): Order {
49-
return Order::from(strtoupper($order));
50-
},
46+
static fn (string $order): Order => Order::from(strtoupper($order)),
5147
$orderings,
5248
);
5349
}

src/Mapping/Driver/XmlDriver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
use SimpleXMLElement;
1919

2020
use function assert;
21-
use function class_exists;
2221
use function constant;
2322
use function count;
2423
use function defined;
24+
use function enum_exists;
2525
use function explode;
2626
use function extension_loaded;
2727
use function file_get_contents;
@@ -408,7 +408,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
408408
/** @psalm-suppress DeprecatedConstant */
409409
$orderBy[(string) $orderByField['name']] = isset($orderByField['direction'])
410410
? (string) $orderByField['direction']
411-
: (class_exists(Order::class) ? (Order::Ascending)->value : Criteria::ASC);
411+
: (enum_exists(Order::class) ? Order::Ascending->value : Criteria::ASC);
412412
}
413413

414414
$mapping['orderBy'] = $orderBy;
@@ -537,7 +537,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
537537
/** @psalm-suppress DeprecatedConstant */
538538
$orderBy[(string) $orderByField['name']] = isset($orderByField['direction'])
539539
? (string) $orderByField['direction']
540-
: (class_exists(Order::class) ? (Order::Ascending)->value : Criteria::ASC);
540+
: (enum_exists(Order::class) ? Order::Ascending->value : Criteria::ASC);
541541
}
542542

543543
$mapping['orderBy'] = $orderBy;

0 commit comments

Comments
 (0)