From 8a893068cefe3e7400908512b21ec365bbd32653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Fri, 24 Nov 2017 00:56:42 +0100 Subject: [PATCH] Remove constants existence validation These constants are available since PHP 5.4 and since we're requiring PHP 7.1 there's no reason to require them. I've also simplified the `array_map()` call since it's useless to define a closure that simply calls a function. --- .../Console/Command/MappingDescribeCommand.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php index 8eca10197..f6814407e 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php @@ -217,11 +217,7 @@ EOT } if (is_array($value)) { - if (defined('JSON_UNESCAPED_UNICODE') && defined('JSON_UNESCAPED_SLASHES')) { - return json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); - } - - return json_encode($value); + return json_encode($value, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); } if (is_object($value)) { @@ -283,14 +279,6 @@ EOT */ private function formatEntityListeners(array $entityListeners) { - return $this->formatField( - 'Entity listeners', - array_map( - function ($entityListener) { - return get_class($entityListener); - }, - $entityListeners - ) - ); + return $this->formatField('Entity listeners', array_map('get_class', $entityListeners)); } }