From 741819f060e750a8bb94a774827dc2c5502cc4a7 Mon Sep 17 00:00:00 2001
From: Thomas Ploch <thomas.ploch@flixbus.com>
Date: Tue, 15 Aug 2017 10:28:43 +0200
Subject: [PATCH] Revert "Minor coding style fixes and more docblock removal"

This reverts commit ec3eed68ca0551edc33fb1dc94a604d84857a122.
---
 .../ORM/Tools/Export/Driver/AnnotationExporter.php | 12 +++++++++++-
 .../ORM/Tools/Export/Driver/PhpExporter.php        | 13 +++++++++----
 .../ORM/Tools/Export/Driver/XmlExporter.php        | 14 +++++++-------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php
index d14ca9263..43d120161 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php
@@ -46,7 +46,7 @@ class AnnotationExporter extends AbstractExporter
      */
     public function exportClassMetadata(ClassMetadataInfo $metadata): string
     {
-        if (!$this->_entityGenerator) {
+        if ( ! $this->_entityGenerator) {
             throw new \RuntimeException('For the AnnotationExporter you must set an EntityGenerator instance with the setEntityGenerator() method.');
         }
 
@@ -58,11 +58,21 @@ class AnnotationExporter extends AbstractExporter
         return $this->_entityGenerator->generateEntityClass($metadata);
     }
 
+    /**
+     * @param \Doctrine\ORM\Mapping\ClassMetadataInfo $metadata
+     *
+     * @return string
+     */
     protected function _generateOutputPath(ClassMetadataInfo $metadata): string
     {
         return $this->_outputDir . '/' . str_replace('\\', '/', $metadata->name) . $this->_extension;
     }
 
+    /**
+     * @param \Doctrine\ORM\Tools\EntityGenerator $entityGenerator
+     *
+     * @return void
+     */
     public function setEntityGenerator(EntityGenerator $entityGenerator): void
     {
         $this->_entityGenerator = $entityGenerator;
diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
index cecefeab8..5054743aa 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
@@ -161,6 +161,11 @@ class PhpExporter extends AbstractExporter
         return implode("\n", $lines);
     }
 
+    /**
+     * @param mixed $var
+     *
+     * @return string
+     */
     protected function _varExport($var): string
     {
         $export = var_export($var, true);
@@ -185,11 +190,11 @@ class PhpExporter extends AbstractExporter
 
         foreach ($metadata->entityListeners as $event => $entityListenerConfig) {
             foreach ($entityListenerConfig as $entityListener) {
-                $lines[] = \sprintf(
+                $lines[] = sprintf(
                     '$metadata->addEntityListener(%s, %s, %s);',
-                    \var_export($event, true),
-                    \var_export($entityListener['class'], true),
-                    \var_export($entityListener['method'], true)
+                    var_export($event, true),
+                    var_export($entityListener['class'], true),
+                    var_export($entityListener['method'], true)
                 );
             }
         }
diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
index 0776a0694..fb45516eb 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
@@ -41,10 +41,10 @@ class XmlExporter extends AbstractExporter
      */
     public function exportClassMetadata(ClassMetadataInfo $metadata): string
     {
-        $xml = new SimpleXmlElement('<?xml version="1.0" encoding="utf-8"?><doctrine-mapping ' .
-            'xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" ' .
-            'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
-            'xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" />');
+        $xml = new SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
+            "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
+            "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
 
         if ($metadata->isMappedSuperclass) {
             $root = $xml->addChild('mapped-superclass');
@@ -98,7 +98,7 @@ class XmlExporter extends AbstractExporter
 
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
 
-        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
+        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
             $root->addChild('change-tracking-policy', $trackingPolicy);
         }
 
@@ -144,7 +144,7 @@ class XmlExporter extends AbstractExporter
             }
         }
 
-        if (!$metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
+        if ( ! $metadata->isIdentifierComposite && $idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
             $id[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $idGeneratorType;
         }
 
@@ -430,7 +430,7 @@ class XmlExporter extends AbstractExporter
     {
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
 
-        if (!($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
+        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
             return;
         }