wexample-wex-addon-dev-php 12.5.0__tar.gz → 12.6.0__tar.gz

{wexample_wex_addon_dev_php-12.5.0 → wexample_wex_addon_dev_php-12.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 12.5.0
+Version: 12.6.0
 Summary: Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -14,7 +14,7 @@ Requires-Dist: cattrs>=23.1.0
 Requires-Dist: wexample-filestate-php>=6.4.0
 Requires-Dist: wexample-filestate-symfony>=2.0.0
 Requires-Dist: wexample-wex-addon-ai>=17.0.0
-Requires-Dist: wexample-wex-addon-app>=32.3.0
+Requires-Dist: wexample-wex-addon-app>=32.4.0
 Requires-Dist: wexample-wex-addon-dev-javascript>=8.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_php
 
-Version: 12.5.0
+Version: 12.6.0
 
 `wex_addon_dev_php` extends the wex CLI with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers. It is aimed at PHP developers who manage their apps through wex and need framework-aware automation — dependency wiring, migration runs, lock-file refreshes — executed directly inside the running service containers. The addon registers four workdir types (`php`, `php-package`, `php-packages-suite`, `php-symfony`) and contributes its commands through the standard `PhpAddonManager` plugin point.
 
@@ -276,7 +276,7 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - wexample-filestate-php: >=6.4.0
 - wexample-filestate-symfony: >=2.0.0
 - wexample-wex-addon-ai: >=17.0.0
-- wexample-wex-addon-app: >=32.3.0
+- wexample-wex-addon-app: >=32.4.0
 - wexample-wex-addon-dev-javascript: >=8.2.0
 
 ## Versioning & Compatibility Policy

{wexample_wex_addon_dev_php-12.5.0 → wexample_wex_addon_dev_php-12.6.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 12.5.0
+Version: 12.6.0
 
 `wex_addon_dev_php` extends the wex CLI with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers. It is aimed at PHP developers who manage their apps through wex and need framework-aware automation — dependency wiring, migration runs, lock-file refreshes — executed directly inside the running service containers. The addon registers four workdir types (`php`, `php-package`, `php-packages-suite`, `php-symfony`) and contributes its commands through the standard `PhpAddonManager` plugin point.
 
@@ -253,7 +253,7 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - wexample-filestate-php: >=6.4.0
 - wexample-filestate-symfony: >=2.0.0
 - wexample-wex-addon-ai: >=17.0.0
-- wexample-wex-addon-app: >=32.3.0
+- wexample-wex-addon-app: >=32.4.0
 - wexample-wex-addon-dev-javascript: >=8.2.0
 
 ## Versioning & Compatibility Policy

{wexample_wex_addon_dev_php-12.5.0 → wexample_wex_addon_dev_php-12.6.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "12.5.0"
+version = "12.6.0"
 description = "Extends wex with PHP-specific development commands for Composer, Laravel, Symfony, and WordPress services running in Docker containers"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -23,7 +23,7 @@ dependencies = [
     "wexample-filestate-php>=6.4.0",
     "wexample-filestate-symfony>=2.0.0",
     "wexample-wex-addon-ai>=17.0.0",
-    "wexample-wex-addon-app>=32.3.0",
+    "wexample-wex-addon-app>=32.4.0",
     "wexample-wex-addon-dev-javascript>=8.2.0",
 ]
 

{wexample_wex_addon_dev_php-12.5.0 → wexample_wex_addon_dev_php-12.6.0}/src/wexample_wex_addon_dev_php/deployment/step/symfony_env_local_deployment_step.py

@@ -149,9 +149,23 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
         import secrets
         import shlex
 
-        from wexample_wex_addon_app.helper.deployment import DEPLOYMENT_HOST_USER
+        from wexample_wex_addon_app.helper.deployment import (
+            DEPLOYMENT_HOST_USER,
+            host_secret_file_seal,
+        )
         from wexample_wex_addon_app.helper.remote import remote_run
 
+        path = f"{remote['path']}/.env.local"
+        if self._exists(remote):
+            # An existing file is the host's: only who may read it is put right.
+            result = remote_run(remote, host_secret_file_seal(path))
+            if result.returncode != 0:
+                raise RuntimeError(
+                    f"Fixing the rights of {path} on {remote['host']} failed: "
+                    f"{result.stderr.strip()[:300]}"
+                )
+            return f"Made {path} on {remote['host']} readable by the docker group"
+
         defaults = self._host_defaults(workdir, remote)
         values: dict[str, str] = {}
         generated: list[str] = []
@@ -164,13 +178,13 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
                 # an empty one is how an app says « not used here ».
                 values[key] = defaults.get(key, "")
 
-        path = f"{remote['path']}/.env.local"
         # Through stdin, never a command line: a secret must not show in the host's
         # process list nor in a shell history. The `${KEY}` are resolved there.
         result = remote_run(
             remote,
             f"sudo -n -u {DEPLOYMENT_HOST_USER} python3 -c {shlex.quote(_HOST_WRITER)} "
-            f"{shlex.quote(remote['path'] + '/.wex/local/env.yml')} {shlex.quote(path)}",
+            f"{shlex.quote(remote['path'] + '/.wex/local/env.yml')} {shlex.quote(path)} && "
+            + host_secret_file_seal(path),
             input="".join(f"{key}={_quote(value)}\n" for key, value in values.items()),
         )
         if result.returncode != 0:
@@ -190,8 +204,13 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
         return f"Wrote {path} on {remote['host']}{made}.{rest}"
 
     def can_apply(self, workdir: ManagedWorkdir, remote: ResolvedRemote | None) -> bool:
-        # Written when there is none, never over one: an existing file is the host's.
-        return self._host_keys(remote) == set() and not self._exists(remote)
+        from wexample_wex_addon_app.helper.deployment import host_secret_file_unsealed
+
+        # Written when there is none, never over one: an existing file is the host's,
+        # only its rights are put right.
+        if self._exists(remote):
+            return host_secret_file_unsealed(remote, f"{remote['path']}/.env.local") is not None
+        return self._host_keys(remote) == set()
 
     def check(self, workdir: ManagedWorkdir, remote: ResolvedRemote | None) -> tuple[str, str]:
         present = self._host_keys(remote)
@@ -199,12 +218,21 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
             return DEPLOYMENT_STATUS_UNKNOWN, "could not read it"
         if not present and not self._exists(remote):
             return DEPLOYMENT_STATUS_KO, f"no {remote['path']}/.env.local"
+        from wexample_wex_addon_app.helper.deployment import host_secret_file_unsealed
+
+        unsealed = host_secret_file_unsealed(remote, f"{remote['path']}/.env.local")
+        if unsealed:
+            return DEPLOYMENT_STATUS_KO, f"the app's commands cannot read it ({unsealed})"
         missing = [key for key in self._needed(workdir) if key not in present]
         if missing:
             return DEPLOYMENT_STATUS_KO, f"no value for {', '.join(missing)}"
         return DEPLOYMENT_STATUS_OK, f"{remote['path']}/.env.local"
 
     def hint(self, workdir: ManagedWorkdir, remote: ResolvedRemote | None) -> str:
+        from wexample_wex_addon_app.helper.deployment import host_secret_file_unsealed
+
+        if host_secret_file_unsealed(remote, f"{remote['path']}/.env.local"):
+            return "Run `wex app::release/setup` to make it readable by the docker group."
         present = self._host_keys(remote) or set()
         missing = [key for key in self._needed(workdir) if key not in present]
         return (
@@ -253,6 +281,7 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
 
         config = workdir.get_path() / "config"
         referenced: set[str] = set()
+        defaulted: set[str] = set()
         for path in config.rglob("*.yaml"):
             if any(part in NOT_DEPLOYED_ENVS for part in path.relative_to(config).parts):
                 continue
@@ -262,13 +291,18 @@ class SymfonyEnvLocalDeploymentStep(AbstractDeploymentStep):
                 # `default::KEY` falls back on its own: the app runs without it.
                 if "default:" not in f"{processors}:":
                     referenced.add(key)
+            # A parameter `env(KEY): value` is the value the app falls back on.
+            defaulted.update(re.findall(r"^\s+env\(([A-Za-z_][A-Za-z0-9_]*)\)\s*:", content, re.M))
         built = self._build_env_keys(workdir)
-        needed = {key for key in referenced if key not in built} | set(ALWAYS_FROM_THE_HOST)
+        needed = {
+            key for key in referenced if key not in built and key not in defaulted
+        } | set(ALWAYS_FROM_THE_HOST)
         return sorted(needed)
 
 
 # Run on the host: fills every `${KEY}` of the content on stdin from the host's env
-# file, then writes it for the owner alone. A key the env file lacks stays as it is.
+# file, then writes it for the owner alone — the caller then opens it to the docker
+# group. A key the env file lacks stays as it is.
 _HOST_WRITER = """
 import os, re, sys
 values = {}

wexample_wex_addon_dev_php-12.6.0/src/wexample_wex_addon_dev_php/services/frankenphp/samples/caddy/Caddyfile

@@ -0,0 +1,17 @@
+{
+    frankenphp
+    auto_https off
+    admin off
+}
+
+:80 {
+    root * /var/www/html/public
+
+    encode zstd br gzip
+
+    # Where installed packages add their directives (the Mercure hub of
+    # wexample/symfony-live): inside the site, the only place Caddy reads them.
+    # wex:install
+
+    php_server
+}

{wexample_wex_addon_dev_php-12.5.0 → wexample_wex_addon_dev_php-12.6.0}/src/wexample_wex_addon_dev_php/services/php/samples/caddy/Caddyfile

@@ -26,5 +26,9 @@
     }
     respond @hidden 404
 
+    # Where installed packages add their directives (the Mercure hub of
+    # wexample/symfony-live): inside the site, the only place Caddy reads them.
+    # wex:install
+
     php_server
 }

wexample_wex_addon_dev_php-12.5.0/src/wexample_wex_addon_dev_php/services/frankenphp/samples/caddy/Caddyfile

@@ -1,13 +0,0 @@
-{
-    frankenphp
-    auto_https off
-    admin off
-}
-
-:80 {
-    root * /var/www/html/public
-
-    encode zstd br gzip
-
-    php_server
-}