Change inject generator

- do not regenerate inject if exists
wavevision · Oct 15, 2019 · 53b668c · 53b668c
1 parent 89ea03b
commit 53b668c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/src/DIServiceAnnotation/ExtractServices.php b/src/DIServiceAnnotation/ExtractServices.php
@@ -162,17 +162,20 @@ private function generateInject(string $className, SplFileInfo $file): void
 		$namespace = $reflectionClass->getNamespaceName();
 		$name = $reflectionClass->getShortName();
 		$injectName = sprintf($this->configuration->getInjectMask(), $name);
-		$this->renderTemplate(
-			'inject',
-			dirname($file->getPathname()) . "/$injectName.php",
-			[
-				$namespace,
-				$injectName,
-				$name,
-				lcfirst($injectName),
-				lcfirst($name),
-			]
-		);
+		$outputFile = dirname($file->getPathname()) . "/$injectName.php";
+		if (!is_file($outputFile)) {
+			$this->renderTemplate(
+				'inject',
+				$outputFile,
+				[
+					$namespace,
+					$injectName,
+					$name,
+					lcfirst($injectName),
+					lcfirst($name),
+				]
+			);
+		}
 	}
 
 	private function generateComponent(string $className, SplFileInfo $file, string $originalName): void

diff --git a/tests/DIServiceAnnotationTests/ExtractServicesTest.php b/tests/DIServiceAnnotationTests/ExtractServicesTest.php
@@ -19,6 +19,7 @@ class ExtractServicesTest extends TestCase
 	public function testRun(): void
 	{
 		$filesToCreate = $this->getFilesToCreate();
+		$filesToCreate[] = $this->path('Services', 'InjectExistingInject.php');
 		$servicesDir = __DIR__ . '/Services';
 		$extractServices = new ExtractServices(
 			(new Configuration($servicesDir, $this->resultNeon(self::DEFAULT_NEON)))
@@ -32,13 +33,14 @@ public function testRun(): void
 						'Wavevision\DIServiceAnnotationTests\Services\Nested' => $this->resultNeon(self::NESTED_NEON),
 					]
 				)
+				->setComponentMask('%sComponent')
 		);
 		$extractServices->run();
 		$this->assertSameConfig(self::DEFAULT_NEON);
 		$this->assertSameConfig(self::NESTED_NEON);
 		foreach ($filesToCreate as $file) {
 			$this->assertFileExists($file);
-			$this->assertSameFileContent($file, Strings::replace($file, '/Services/', '/expected/Services/'));
+			$this->assertSameFileContent(Strings::replace($file, '/Services/', '/expected/Services/'), $file);
 		}
 	}
 

diff --git a/tests/DIServiceAnnotationTests/Services/ExistingInject.php b/tests/DIServiceAnnotationTests/Services/ExistingInject.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types = 1);
+
+namespace Wavevision\DIServiceAnnotationTests\Services;
+
+use Nette\SmartObject;
+use Wavevision\DIServiceAnnotation\DIService;
+
+/**
+ * @DIService(generateInject=true)
+ */
+class ExistingInject
+{
+
+	use SmartObject;
+
+}
diff --git a/tests/DIServiceAnnotationTests/Services/InjectExistingInject.php b/tests/DIServiceAnnotationTests/Services/InjectExistingInject.php
@@ -0,0 +1,8 @@
+<?php declare (strict_types = 1);
+
+namespace Wavevision\DIServiceAnnotationTests\Services;
+
+trait InjectExistingInject
+{
+
+}
diff --git a/tests/DIServiceAnnotationTests/expected/Services/InjectExistingInject.php b/tests/DIServiceAnnotationTests/expected/Services/InjectExistingInject.php
@@ -0,0 +1,8 @@
+<?php declare (strict_types = 1);
+
+namespace Wavevision\DIServiceAnnotationTests\Services;
+
+trait InjectExistingInject
+{
+
+}
diff --git a/tests/DIServiceAnnotationTests/expected/default.neon b/tests/DIServiceAnnotationTests/expected/default.neon
@@ -1,5 +1,7 @@
 # generated file do not modify directly
 services:
+	- factory: Wavevision\DIServiceAnnotationTests\Services\ExistingInject
+	  inject: on
 	- implement: Wavevision\DIServiceAnnotationTests\Services\InterfaceService
 	  arguments: [%wwwDir%, @name]
 	  inject: on