RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

#1120 - avoiding version comparisons when working with version-dependant constants

Browse source
This commit is contained in:
Marco Pivetta 2014-10-19 17:53:40 +02:00
parent ed79648d7d
commit 7cf427cfbf
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php
View file

@ -234,7 +234,7 @@ EOT
} }
if (is_array($value)) { 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); return json_encode($value, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
} }
@ -275,8 +275,10 @@ EOT
private function formatAssociationMappings($associationMappings) private function formatAssociationMappings($associationMappings)
{ {
$this->formatField('Association mappings:', ''); $this->formatField('Association mappings:', '');
foreach ($associationMappings as $associationName => $mapping) { foreach ($associationMappings as $associationName => $mapping) {
$this->formatField(sprintf(' %s',$associationName), ''); $this->formatField(sprintf(' %s', $associationName), '');
foreach ($mapping as $field => $value) { foreach ($mapping as $field => $value) {
$this->formatField(sprintf(' %s', $field), $this->formatValue($value)); $this->formatField(sprintf(' %s', $field), $this->formatValue($value));
} }