shipit-cli 0.14.0__py3-none-any.whl → 0.15.1__py3-none-any.whl

shipit/providers/php.py

@@ -1,8 +1,6 @@
-from __future__ import annotations
-
 import json
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Dict, Optional, Literal
 
 from .base import (
     DetectResult,
@@ -12,17 +10,35 @@ from .base import (
     MountSpec,
     ServiceSpec,
     VolumeSpec,
-    CustomCommands,
+    Config,
 )
+from pydantic_settings import SettingsConfigDict
+
+
+class PhpConfig(Config):
+    model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
+
+    use_composer: bool = False
+    php_version: Optional[str] = "8.3"
+    php_architecture: Optional[Literal["64-bit", "32-bit"]] = "64-bit"
 
 
 class PhpProvider:
-    def __init__(self, path: Path, custom_commands: CustomCommands):
+    def __init__(self, path: Path, config: PhpConfig):
         self.path = path
-        self.custom_commands = custom_commands
-        self.has_composer = _exists(self.path, "composer.json", "composer.lock") or (
-            custom_commands.install and custom_commands.install.startswith("composer ")
+        self.config = config
+
+    @classmethod
+    def load_config(cls, path: Path, base_config: Config) -> PhpConfig:
+        use_composer = (
+            _exists(path, "composer.json", "composer.lock")
+            or (
+                base_config.commands.install
+                and base_config.commands.install.startswith("composer ")
+            )
+            or False
         )
+        return PhpConfig(use_composer=use_composer, **base_config.model_dump())
 
     @classmethod
     def name(cls) -> str:
@@ -30,7 +46,7 @@ class PhpProvider:
 
     @classmethod
     def detect(
-        cls, path: Path, custom_commands: CustomCommands
+        cls, path: Path, config: Config
     ) -> Optional[DetectResult]:
         if _exists(path, "composer.json") and _exists(path, "public/index.php"):
             return DetectResult(cls.name(), 60)
@@ -40,55 +56,46 @@ class PhpProvider:
             or _exists(path, "app/index.php")
         ):
             return DetectResult(cls.name(), 10)
-        if custom_commands.start and custom_commands.start.startswith("php "):
+        if config.commands.start and config.commands.start.startswith("php "):
             return DetectResult(cls.name(), 70)
-        if custom_commands.install and custom_commands.install.startswith("composer "):
+        if config.commands.install and config.commands.install.startswith("composer "):
             return DetectResult(cls.name(), 30)
         return None
 
-    def initialize(self) -> None:
-        pass
-
     def serve_name(self) -> Optional[str]:
         return None
 
-    def platform(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         deps = [
             DependencySpec(
                 "php",
-                env_var="SHIPIT_PHP_VERSION",
-                default_version="8.3",
-                architecture_var="SHIPIT_PHP_ARCHITECTURE",
+                var_name="config.php_version",
+                architecture_var_name="config.php_architecture",
                 use_in_build=True,
                 use_in_serve=True,
             ),
         ]
-        if self.has_composer:
+        if self.config.use_composer:
             deps.append(DependencySpec("composer", use_in_build=True))
             deps.append(DependencySpec("bash", use_in_serve=True))
         return deps
 
     def declarations(self) -> Optional[str]:
-        if self.has_composer:
-            return 'HOME = getenv("HOME")\n'
         return None
 
     def build_steps(self) -> list[str]:
         steps = [
-            'workdir(app["build"])',
+            'workdir(app.path)',
         ]
         if _exists(self.path, "php.ini"):
-            steps.append('copy("php.ini", "{}/php.ini".format(assets["build"]))')
+            steps.append('copy("php.ini", "{}/php.ini".format(assets.path))')
         else:
             steps.append(
-                'copy("php/php.ini", "{}/php.ini".format(assets["build"]), base="assets")'
+                'copy("php/php.ini", "{}/php.ini".format(assets.path), base="assets")'
             )
 
-        if self.has_composer:
-            steps.append('env(HOME=HOME, COMPOSER_FUND="0")')
+        if self.config.use_composer:
+            steps.append('env(COMPOSER_HOME="/tmp", COMPOSER_FUND="0")')
             steps.append(
                 'run("composer install --optimize-autoloader --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
             )
@@ -100,24 +107,21 @@ class PhpProvider:
         return None
 
     def commands(self) -> Dict[str, str]:
-        commands = self.base_commands()
-        if self.custom_commands.start:
-            commands["start"] = json.dumps(self.custom_commands.start)
-        return commands
+        return self.base_commands()
 
     def base_commands(self) -> Dict[str, str]:
         if _exists(self.path, "public/index.php"):
             return {
-                "start": '"php -S localhost:{} -t {}/public".format(PORT, app["serve"])'
+                "start": '"php -S localhost:{} -t {}/public".format(PORT, app.serve_path)'
             }
         elif _exists(self.path, "app/index.php"):
             return {
-                "start": '"php -S localhost:{} -t {}/app".format(PORT, app["serve"])'
+                "start": '"php -S localhost:{} -t {}/app".format(PORT, app.serve_path)'
             }
         elif _exists(self.path, "index.php"):
-            return {"start": '"php -S localhost:{} -t {}".format(PORT, app["serve"])'}
+            return {"start": '"php -S localhost:{} -t {}".format(PORT, app.serve_path)'}
         return {
-            "start": '"php -S localhost:{} -t {}".format(PORT, app["serve"])',
+            "start": '"php -S localhost:{} -t {}".format(PORT, app.serve_path)',
         }
 
     def mounts(self) -> list[MountSpec]:
@@ -131,7 +135,7 @@ class PhpProvider:
 
     def env(self) -> Optional[Dict[str, str]]:
         return {
-            "PHP_INI_SCAN_DIR": '"{}".format(assets["serve"])',
+            "PHP_INI_SCAN_DIR": '"{}".format(assets.serve_path)',
         }
 
     def services(self) -> list[ServiceSpec]: