Merge pull request #619 from lhsazevedo/entrypoint-namespace

Do not create the entrypoint when namespace isn't set
phel-lang · Oct 5, 2023 · 1036432 · 1036432
2 parents f530dbb + 98a2857
commit 1036432
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 6 deletions.
diff --git a/src/php/Build/BuildFactory.php b/src/php/Build/BuildFactory.php
@@ -35,6 +35,7 @@ public function createProjectCompiler(): ProjectCompiler
             $this->getCommandFacade(),
             $this->createMainPhpEntryPointFile(),
             $this->getConfig()->getPathsToIgnore(),
+            $this->getConfig()->getPhelOutConfig()->shouldCreateEntryPointPhpFile(),
         );
     }
 

diff --git a/src/php/Build/Domain/Compile/ProjectCompiler.php b/src/php/Build/Domain/Compile/ProjectCompiler.php
@@ -27,6 +27,7 @@ public function __construct(
         private CommandFacadeInterface $commandFacade,
         private EntryPointPhpFileInterface $entryPointPhpFile,
         private array $pathsToIgnore,
+        private bool $shouldCreateEntryPointPhpFile,
     ) {
     }
 
@@ -81,7 +82,9 @@ private function compileFromTo(array $srcDirectories, string $dest, BuildOptions
             touch($targetFile, filemtime($info->getFile()));
         }
 
-        $this->entryPointPhpFile->createFile();
+        if ($this->shouldCreateEntryPointPhpFile) {
+            $this->entryPointPhpFile->createFile();
+        }
 
         return $result;
     }

diff --git a/src/php/Config/PhelOutConfig.php b/src/php/Config/PhelOutConfig.php
@@ -66,6 +66,11 @@ public function setMainPhpFilename(string $name): self
         return $this;
     }
 
+    public function shouldCreateEntryPointPhpFile(): bool
+    {
+        return (bool) $this->getMainPhelNamespace();
+    }
+
     public function jsonSerialize(): array
     {
         return [

diff --git a/tests/php/Integration/Build/Command/BuildCommandTest.php b/tests/php/Integration/Build/Command/BuildCommandTest.php
@@ -15,11 +15,6 @@ final class BuildCommandTest extends TestCase
 {
     private BuildCommand $command;
 
-    public static function setUpBeforeClass(): void
-    {
-        Gacela::bootstrap(__DIR__, GacelaConfig::defaultPhpConfig());
-    }
-
     protected function setUp(): void
     {
         $this->command = new BuildCommand();
@@ -32,6 +27,10 @@ protected function setUp(): void
      */
     public function test_build_project(): void
     {
+        Gacela::bootstrap(__DIR__, static function (GacelaConfig $config): void {
+            $config->addAppConfig('config/phel-config.php');
+        });
+
         $this->expectOutputString("This is printed\n");
 
         $this->command->run(
@@ -57,6 +56,10 @@ public function test_build_project(): void
      */
     public function test_build_project_cached(): void
     {
+        Gacela::bootstrap(__DIR__, static function (GacelaConfig $config): void {
+            $config->addAppConfig('config/phel-config.php');
+        });
+
         // Mark file cache invalid by setting the modification time to 0
         touch(__DIR__ . '/out/test_ns/hello.php', 1);
 
@@ -82,6 +85,10 @@ public function test_build_project_cached(): void
      */
     public function test_out_main_file(): void
     {
+        Gacela::bootstrap(__DIR__, static function (GacelaConfig $config): void {
+            $config->addAppConfig('config/phel-config.php');
+        });
+
         $this->command->run(
             new ArrayInput([
                 '--no-source-map' => true,
@@ -102,4 +109,30 @@ public function test_out_main_file(): void
 TXT;
         self::assertSame($expected, $actual);
     }
+
+    /**
+     * @runInSeparateProcess
+     *
+     * @preserveGlobalState disabled
+     */
+    public function test_no_entrypoint_when_namespace_is_not_set(): void
+    {
+        Gacela::bootstrap(__DIR__, static function (GacelaConfig $config): void {
+            $config->addAppConfig('config/phel-config-no-namespace.php');
+        });
+
+        if (file_exists(__DIR__ . '/out/main.php')) {
+            unlink(__DIR__ . '/out/main.php');
+        }
+
+        $this->command->run(
+            new ArrayInput([
+                '--no-source-map' => true,
+                '--no-cache' => true,
+            ]),
+            $this->createStub(OutputInterface::class),
+        );
+
+        $this->assertFileDoesNotExist(__DIR__ . '/out/main.php');
+    }
 }
diff --git a/tests/php/Integration/Build/Command/config/phel-config-no-namespace.php b/tests/php/Integration/Build/Command/config/phel-config-no-namespace.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Phel\Config\PhelOutConfig;
+
+return (new \Phel\Config\PhelConfig())
+    ->setSrcDirs(['../../../../../src/phel/', 'src'])
+    ->setVendorDir('')
+    ->setOut((new PhelOutConfig())
+        ->setDestDir('out'))
+    ->setIgnoreWhenBuilding(['local.phel', 'failing.phel'])
+;