wexample-wex-addon-dev-php 12.2.0__tar.gz → 12.3.0__tar.gz

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 12.2.0
+Version: 12.3.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
@@ -13,9 +13,9 @@ Requires-Dist: attrs>=23.1.0
 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>=15.0.0
-Requires-Dist: wexample-wex-addon-app>=31.1.0
-Requires-Dist: wexample-wex-addon-dev-javascript>=8.1.0
+Requires-Dist: wexample-wex-addon-ai>=16.0.0
+Requires-Dist: wexample-wex-addon-app>=32.0.0
+Requires-Dist: wexample-wex-addon-dev-javascript>=8.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_php
 
-Version: 12.2.0
+Version: 12.3.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.
 
@@ -275,9 +275,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - cattrs: >=23.1.0
 - wexample-filestate-php: >=6.4.0
 - wexample-filestate-symfony: >=2.0.0
-- wexample-wex-addon-ai: >=15.0.0
-- wexample-wex-addon-app: >=31.1.0
-- wexample-wex-addon-dev-javascript: >=8.1.0
+- wexample-wex-addon-ai: >=16.0.0
+- wexample-wex-addon-app: >=32.0.0
+- wexample-wex-addon-dev-javascript: >=8.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 12.2.0
+Version: 12.3.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.
 
@@ -252,9 +252,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - cattrs: >=23.1.0
 - wexample-filestate-php: >=6.4.0
 - wexample-filestate-symfony: >=2.0.0
-- wexample-wex-addon-ai: >=15.0.0
-- wexample-wex-addon-app: >=31.1.0
-- wexample-wex-addon-dev-javascript: >=8.1.0
+- wexample-wex-addon-ai: >=16.0.0
+- wexample-wex-addon-app: >=32.0.0
+- wexample-wex-addon-dev-javascript: >=8.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "12.2.0"
+version = "12.3.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" },
@@ -22,9 +22,9 @@ dependencies = [
     "cattrs>=23.1.0",
     "wexample-filestate-php>=6.4.0",
     "wexample-filestate-symfony>=2.0.0",
-    "wexample-wex-addon-ai>=15.0.0",
-    "wexample-wex-addon-app>=31.1.0",
-    "wexample-wex-addon-dev-javascript>=8.1.0",
+    "wexample-wex-addon-ai>=16.0.0",
+    "wexample-wex-addon-app>=32.0.0",
+    "wexample-wex-addon-dev-javascript>=8.2.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/src/wexample_wex_addon_dev_php/file/php_composer_json_file.py

@@ -93,6 +93,25 @@ class PhpComposerJsonFile(AppDependenciesConfigFileMixin, JsonFile):
         # wrappers are unwrapped to native str — matches the dict[str, str] signature.
         return require.to_dict_or_none() or {}
 
+    def get_dev_autoload_directories(self) -> list[str]:
+        """Directories autoloaded in development only, as `autoload-dev` maps them."""
+        autoload_dev = self.read_parsed().get("autoload-dev") or {}
+        directories: list[str] = []
+
+        for paths in (autoload_dev.get("psr-4") or {}).values():
+            directories.extend([paths] if isinstance(paths, str) else paths)
+        directories.extend(autoload_dev.get("classmap") or [])
+
+        return [directory.rstrip("/") for directory in directories if directory]
+
+    def get_dev_dependencies_versions(self) -> dict[str, str]:
+        require_dev = self.read_config().search(path="require-dev")
+
+        if not require_dev:
+            return {}
+
+        return require_dev.to_dict_or_none() or {}
+
     def set_private_registry_packages(self, package_names: list[str]) -> bool:
         """Bound every custom composer registry to the private packages.
 

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/src/wexample_wex_addon_dev_php/services/composer/commands/service/install_local.py

@@ -23,6 +23,10 @@ VENDOR_DEV_DIR = "/var/www/vendor-dev"
 # /usr/bin/composer pinned to an older php) pass their own composer_bin.
 COMPOSER_BIN = "composer"
 
+# What `composer install` exits with when composer.json has changed since the
+# lock was written.
+COMPOSER_EXIT_LOCK_OUTDATED = 4
+
 
 @command(
     type=COMMAND_TYPE_SERVICE,
@@ -56,6 +60,11 @@ def composer__service__install_local(
 
     vendors = " ".join(sorted(php_packages.to_dict().keys()))
 
+    # A composer.json edited since the lock was written makes `install` refuse
+    # to start (exit code 4). Locally that lock has no value to keep: it is
+    # written again from composer.json, exactly as deleting it would — and only
+    # then, so an up-to-date lock is installed as it is.
+    #
     # Composer keeps the (possibly stale) registry version of a package even
     # when a newer local source exists, so the deterministic wiring is a
     # forced symlink over vendor/ — every local package of each declared
@@ -63,7 +72,14 @@ def composer__service__install_local(
     script = f"""
 set -e
 cd {APP_DIR}
-{composer_bin} install --no-scripts
+status=0
+{composer_bin} install --no-scripts || status=$?
+if [ "$status" -eq {COMPOSER_EXIT_LOCK_OUTDATED} ]; then
+  echo "  composer.lock is behind composer.json, writing it again"
+  {composer_bin} update --no-scripts
+elif [ "$status" -ne 0 ]; then
+  exit "$status"
+fi
 for vendor in {vendors}; do
   [ -d "{VENDOR_DEV_DIR}/$vendor" ] || continue
   mkdir -p "vendor/$vendor"

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/src/wexample_wex_addon_dev_php/services/symfony/commands/service/watch.py

@@ -27,6 +27,45 @@ PREPARE_STEPS = [
 ]
 
 
+# What the list of entries is built again with, between two watches.
+REGENERATE_STEPS = [
+    "cache:clear --no-warmup",
+    "loader:generate-encore-manifest",
+]
+
+# Webpack is told its entries once, when it starts, so a file created while it
+# runs is compiled by nobody and served to no one. The watchdog in the loader's
+# encore config stops the watch on that code and nothing else, and this starts
+# it again with a list built afresh.
+#
+# The loop runs here, on the host, and not in the node container: the list is
+# built by php, which the node image of some apps does not carry, and a loop
+# inside it could only give up there. From here each step goes to the
+# container that can run it — the watch to node, the list to the php one — so
+# every app restarts on its own. Ctrl-C leaves for good, as it should.
+ENTRY_LIST_CHANGED_EXIT_CODE = 75
+
+
+def build_watch_loop(node_container: str, php_container: str) -> str:
+    import shlex
+
+    regenerate = " && ".join(
+        f"php bin/console {step} >/dev/null" for step in REGENERATE_STEPS
+    )
+
+    return f"""
+trap 'exit 0' INT TERM
+while true; do
+    docker exec -ti -w {shlex.quote(APP_DIR)} {shlex.quote(node_container)} yarn watch
+    code=$?
+    [ "$code" -eq {ENTRY_LIST_CHANGED_EXIT_CODE} ] || exit "$code"
+
+    echo "[watch] the list of entries changed, building it again"
+    docker exec -w {shlex.quote(APP_DIR)} {shlex.quote(php_container)} /bin/sh -c {shlex.quote(regenerate)} || exit $?
+done
+"""
+
+
 @command(
     type=COMMAND_TYPE_SERVICE,
     description="Prepare the front build and start the webpack watcher (local env only)",
@@ -66,17 +105,20 @@ def symfony__service__watch(
             f"No container for the '{NODE_SERVICE}' service — the watcher runs there."
         )
 
+    php_container = service.addon_manager.get_service_docker_container_name(
+        service.name
+    )
+    if not php_container:
+        raise RuntimeError(
+            f"No container for the '{service.name}' service — the list of entries is built there."
+        )
+
     context.io.log("[watch] starting webpack watch…")
     return InteractiveShellCommandResponse(
         kernel=context.kernel,
         content=[
-            "docker",
-            "exec",
-            "-ti",
-            "-w",
-            APP_DIR,
-            node_container,
-            "yarn",
-            "watch",
+            "/bin/sh",
+            "-c",
+            build_watch_loop(node_container, php_container),
         ],
     )

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/src/wexample_wex_addon_dev_php/workdir/php_symfony_workdir.py

@@ -695,7 +695,10 @@ class PhpSymfonyWorkdir(PhpWorkdir):
         excluded_segments = frozenset(excluded)
 
         children_filter = self._create_php_file_children_filter()
-        children_filter.filter = lambda path: excluded_segments.isdisjoint(path.parts)
+        base_filter = children_filter.filter
+        children_filter.filter = lambda path: base_filter(
+            path
+        ) and excluded_segments.isdisjoint(path.parts)
 
         return children_filter
 

{wexample_wex_addon_dev_php-12.2.0 → wexample_wex_addon_dev_php-12.3.0}/src/wexample_wex_addon_dev_php/workdir/php_workdir.py

@@ -10,6 +10,8 @@ from wexample_wex_addon_ai.workdir.mixin.with_ai_workdir_mixin import (
 from wexample_wex_addon_app.workdir.code_base_workdir import CodeBaseWorkdir
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from wexample_config.const.types import DictConfig
     from wexample_config.options_provider.abstract_options_provider import (
         AbstractOptionsProvider,
@@ -55,6 +57,9 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
 
         return manifests
 
+    def get_dev_dependencies_versions(self) -> dict[str, str]:
+        return self.get_app_config_file().get_dev_dependencies_versions()
+
     def get_main_code_file_extension(self) -> str:
         from wexample_filestate_php.const.php_file import PHP_FILE_EXTENSION
 
@@ -84,6 +89,16 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
             return False
         return any(tests_path.rglob("*Test.php"))
 
+    def is_dev_code_path(self, path: Path) -> bool:
+        # autoload-dev is where composer itself draws the line; tests/ is the
+        # convention when a package declares none.
+        directories = self.get_app_config_file().get_dev_autoload_directories() or [
+            "tests"
+        ]
+        root = self.get_path()
+
+        return any(path.is_relative_to(root / directory) for directory in directories)
+
     def prepare_value(self, raw_value: DictConfig | None = None) -> DictConfig:
         from wexample_filestate.const.disk import DiskItemType
 
@@ -170,6 +185,8 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
         )
         from wexample_filestate_php.file.php_file import PhpFile
 
+        root = self.get_path()
+
         return ChildrenFilterOption(
             pattern={
                 "class": PhpFile,
@@ -178,4 +195,9 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
             },
             name_pattern=r"^.*\.php$",
             recursive=True,
+            # Symfony writes its compiled container under var/, test kernels
+            # included (tests/Fixtures/App/var/cache): generated code, not ours
+            # to format. Read relative to the workdir, which may itself sit
+            # under /var.
+            filter=lambda path: "var" not in path.relative_to(root).parts,
         )