From 0552bd962cee1976728c9a0cbb0ed3e37ae68210 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@ebay.com>
Date: Thu, 23 Apr 2015 17:01:38 -0500
Subject: [PATCH] MAGETWO-36072: Move dev/tools/Magento/Tools/Di/compiler.php
- Changes based on CR feedback.
---
lib/internal/Magento/Framework/Code/Generator.php | 4 ++--
.../Setup/Console/Command/DiCompileMultiTenantCommand.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 88caea3c838..da6d60b14ed 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -68,7 +68,7 @@ class Generator
* Generate Class
*
* @param string $className
- * @return string
+ * @return string | void
* @throws \Magento\Framework\Exception\LocalizedException
* @throws \InvalidArgumentException
*/
@@ -108,8 +108,8 @@ class Generator
);
}
$this->includeFile($file);
+ return self::GENERATION_SUCCESS;
}
- return self::GENERATION_SUCCESS;
}
/**
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
index 871c056d294..a2f270cf278 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
@@ -349,6 +349,6 @@ class DiCompileMultiTenantCommand extends Command
if (!file_exists(dirname($pluginDefFile))) {
mkdir(dirname($pluginDefFile), 0777, true);
}
- file_put_contents($pluginDefFile, $outputContent);
+ file_put_contents($pluginDefFile, $outputContent);
}
}
--
GitLab