From 7cf427cfbf386d85da947cf0893f255b2e179c04 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 19 Oct 2014 17:53:40 +0200
Subject: [PATCH] #1120 - avoiding version comparisons when working with
 version-dependant constants

---
 .../ORM/Tools/Console/Command/MappingDescribeCommand.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
index 1894c5e44..1300a088d 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
@@ -234,7 +234,7 @@ EOT
         }
 
         if (is_array($value)) {
-            if (version_compare(phpversion(), '5.4.0', '>=')) {
+            if (defined('JSON_UNESCAPED_UNICODE') && defined('JSON_UNESCAPED_SLASHES')) {
                 return json_encode($value, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
             }
 
@@ -275,8 +275,10 @@ EOT
     private function formatAssociationMappings($associationMappings)
     {
         $this->formatField('Association mappings:', '');
+
         foreach ($associationMappings as $associationName => $mapping) {
-            $this->formatField(sprintf('  %s',$associationName), '');
+            $this->formatField(sprintf('  %s', $associationName), '');
+
             foreach ($mapping as $field => $value) {
                 $this->formatField(sprintf('    %s', $field), $this->formatValue($value));
             }