wexample-wex-addon-dev-php 8.13.0__tar.gz → 9.0.0__tar.gz

{wexample_wex_addon_dev_php-8.13.0 → wexample_wex_addon_dev_php-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 8.13.0
+Version: 9.0.0
 Summary: Python dev addon for wex
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -12,9 +12,9 @@ Requires-Python: >=3.10
 Requires-Dist: attrs>=23.1.0
 Requires-Dist: cattrs>=23.1.0
 Requires-Dist: wexample-filestate-php>=6.4.0
-Requires-Dist: wexample-wex-addon-ai>=12.0.0
-Requires-Dist: wexample-wex-addon-app>=28.0.0
-Requires-Dist: wexample-wex-addon-dev-javascript>=7.16.0
+Requires-Dist: wexample-wex-addon-ai>=12.1.0
+Requires-Dist: wexample-wex-addon-app>=29.0.0
+Requires-Dist: wexample-wex-addon-dev-javascript>=8.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_php
 
-Version: 8.13.0
+Version: 9.0.0
 
 Python dev addon for wex
 
@@ -105,9 +105,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - attrs: >=23.1.0
 - cattrs: >=23.1.0
 - wexample-filestate-php: >=6.4.0
-- wexample-wex-addon-ai: >=12.0.0
-- wexample-wex-addon-app: >=28.0.0
-- wexample-wex-addon-dev-javascript: >=7.16.0
+- wexample-wex-addon-ai: >=12.1.0
+- wexample-wex-addon-app: >=29.0.0
+- wexample-wex-addon-dev-javascript: >=8.0.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-8.13.0 → wexample_wex_addon_dev_php-9.0.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 8.13.0
+Version: 9.0.0
 
 Python dev addon for wex
 
@@ -83,9 +83,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - attrs: >=23.1.0
 - cattrs: >=23.1.0
 - wexample-filestate-php: >=6.4.0
-- wexample-wex-addon-ai: >=12.0.0
-- wexample-wex-addon-app: >=28.0.0
-- wexample-wex-addon-dev-javascript: >=7.16.0
+- wexample-wex-addon-ai: >=12.1.0
+- wexample-wex-addon-app: >=29.0.0
+- wexample-wex-addon-dev-javascript: >=8.0.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-8.13.0 → wexample_wex_addon_dev_php-9.0.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "8.13.0"
+version = "9.0.0"
 description = "Python dev addon for wex"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -21,9 +21,9 @@ dependencies = [
     "attrs>=23.1.0",
     "cattrs>=23.1.0",
     "wexample-filestate-php>=6.4.0",
-    "wexample-wex-addon-ai>=12.0.0",
-    "wexample-wex-addon-app>=28.0.0",
-    "wexample-wex-addon-dev-javascript>=7.16.0",
+    "wexample-wex-addon-ai>=12.1.0",
+    "wexample-wex-addon-app>=29.0.0",
+    "wexample-wex-addon-dev-javascript>=8.0.0",
 ]
 
 [project.readme]

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/composer/commands/service/install_local.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+# In-container layout convention shared by the local dev composes: the app is
+# served from APP_DIR and each locally-developed vendor suite is mounted under
+# VENDOR_DEV_DIR/<vendor> (see the `local_packages` env config section).
+APP_DIR = "/var/www/html"
+VENDOR_DEV_DIR = "/var/www/vendor-dev"
+
+# Dev images are expected to ship a working composer on PATH (official
+# installer against the runtime php). Images with a broken wrapper (e.g. a
+# /usr/bin/composer pinned to an older php) pass their own composer_bin.
+COMPOSER_BIN = "composer"
+
+
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Wire locally-developed composer packages into vendor/ (local env only)",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def composer__service__install_local(
+    context: ExecutionContext,
+    service: AppService,
+    composer_bin: str = COMPOSER_BIN,
+) -> None:
+    """Generic composer wiring, reusable by any PHP runtime service.
+
+    Delegating services (laravel, symfony…) call this with their own
+    ``service`` so the work runs inside their container, then append their
+    framework-specific steps (cache clears…).
+    """
+    php_packages = service.app_workdir.get_runtime_config().search(
+        "local_packages.php"
+    )
+    if php_packages.is_none():
+        context.io.log("No local_packages.php configured, nothing to wire.")
+        return
+
+    vendors = " ".join(sorted(php_packages.to_dict().keys()))
+
+    # 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
+    # vendor, installed or not.
+    script = f"""
+set -e
+cd {APP_DIR}
+{composer_bin} install --no-scripts
+for vendor in {vendors}; do
+  [ -d "{VENDOR_DEV_DIR}/$vendor" ] || continue
+  mkdir -p "vendor/$vendor"
+  for src in {VENDOR_DEV_DIR}/$vendor/*/; do
+    pkg=$(basename "$src")
+    [ -f "$src/composer.json" ] || continue
+    rm -rf "vendor/$vendor/$pkg"
+    ln -s "${{src%/}}" "vendor/$vendor/$pkg"
+    echo "  symlinked $vendor/$pkg"
+  done
+done
+{composer_bin} dump-autoload
+"""
+
+    context.io.log(f"Wiring local composer packages ({vendors}) into vendor/…")
+    output = service.addon_manager.docker_exec(
+        service.name, ["/bin/sh", "-c", script]
+    )
+    context.io.log(output)

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/composer/commands/service/refresh_lock.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_cli.decorator.option import option
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.install_local import (
+    APP_DIR,
+    COMPOSER_BIN,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+
+@option(
+    name="composer_packages",
+    type=str,
+    required=True,
+    description="Space-separated composer package names whose constraint changed in composer.json",
+)
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Refresh composer.lock after a composer.json dependency change",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def composer__service__refresh_lock(
+    context: ExecutionContext,
+    service: AppService,
+    composer_packages: str,
+    composer_bin: str = COMPOSER_BIN,
+) -> None:
+    """Generic composer lock refresh, reusable by any PHP runtime service.
+
+    Delegating services (laravel, symfony…) call this with their own
+    ``service`` so the work runs inside their container.
+    """
+    # --no-install rewrites composer.lock only: vendor/ may hold local
+    # development symlinks that a real install would overwrite.
+    # --with-all-dependencies lets the updated packages' own (locked)
+    # dependencies move too, or sibling library bumps would dead-lock the
+    # partial update.
+    output = service.addon_manager.docker_exec(
+        service.name,
+        [
+            "/bin/sh",
+            "-c",
+            f"cd {APP_DIR} && {composer_bin} update --no-install"
+            f" --with-all-dependencies {composer_packages}",
+        ],
+    )
+    context.io.log(output)

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/laravel/commands/service/install_local.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.install_local import (
+    APP_DIR,
+    composer__service__install_local,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Wire locally-developed composer packages into vendor/ (local env only)",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        DomainTag.FRAMEWORK,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def laravel__service__install_local(
+    context: ExecutionContext,
+    service: AppService,
+) -> None:
+    # Laravel caches its package manifest: a provider removed by the composer
+    # pass would keep crashing artisan from the stale cache, so purge first.
+    service.addon_manager.docker_exec(
+        service.name,
+        [
+            "/bin/sh",
+            "-c",
+            f"rm -f {APP_DIR}/bootstrap/cache/packages.php"
+            f" {APP_DIR}/bootstrap/cache/services.php",
+        ],
+    )
+
+    # Generic composer wiring, executed in this service's container.
+    composer__service__install_local.function(context=context, service=service)
+
+    output = service.addon_manager.docker_exec(
+        service.name,
+        ["/bin/sh", "-c", f"cd {APP_DIR} && php artisan optimize:clear"],
+    )
+    context.io.log(output)

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/laravel/commands/service/refresh_lock.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_cli.decorator.option import option
+from wexample_wex_addon_dev_javascript.services.node.commands.service.refresh_lock import (
+    node__service__refresh_lock,
+)
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.refresh_lock import (
+    composer__service__refresh_lock,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+
+@option(
+    name="composer_packages",
+    type=str,
+    required=False,
+    default="",
+    description="Space-separated composer package names whose constraint changed in composer.json",
+)
+@option(
+    name="npm_packages",
+    type=str,
+    required=False,
+    default="",
+    description="Space-separated npm package names whose constraint changed in package.json",
+)
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Refresh composer and javascript lock files after a dependency change",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        DomainTag.FRAMEWORK,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def laravel__service__refresh_lock(
+    context: ExecutionContext,
+    service: AppService,
+    composer_packages: str = "",
+    npm_packages: str = "",
+) -> None:
+    # Generic lock refreshes, executed in this service's container.
+    if composer_packages:
+        composer__service__refresh_lock.function(
+            context=context, service=service, composer_packages=composer_packages
+        )
+    if npm_packages:
+        node__service__refresh_lock.function(
+            context=context, service=service, npm_packages=npm_packages
+        )

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/symfony/app_service.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+from wexample_filestate.const.disk import DiskItemType
+from wexample_wex_addon_app.service.app_service import AppService as BaseAppService
+
+_D = DiskItemType.DIRECTORY
+
+# php-fpm in the Alpine-based images runs as www-data uid 82, NOT the Debian
+# 33. Symfony must be able to write its runtime dirs as that user. Declared
+# here so rectify keeps them owned by 82 and stops them from flipping back to
+# the host uid (e.g. after own/this, a git checkout or a fresh image deploy),
+# which surfaces as a 500 with nothing written to var/log.
+_SYMFONY_WEB_OWNER = "82:82"
+
+_WORKDIR_CONTRIBUTION: dict = {
+    "children": [
+        {
+            "name": "var",
+            "type": _D,
+            "should_exist": True,
+            "mode": {
+                "owner": _SYMFONY_WEB_OWNER,
+                "recursive": True,
+            },
+        },
+    ]
+}
+
+
+class AppService(BaseAppService):
+    def get_workdir_contribution(self, workdir) -> dict:
+        return _WORKDIR_CONTRIBUTION

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/symfony/commands/service/deploy.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.install_local import (
+    APP_DIR,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Post-deployment tasks for a symfony app (doctrine migrations)",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        DomainTag.FRAMEWORK,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+    ],
+)
+def symfony__service__deploy(
+    context: ExecutionContext,
+    service: AppService,
+) -> None:
+    """Run once by `.release/deploy` after the app restarted on new images.
+
+    Idempotent: applies pending doctrine migrations only. --no-interaction is
+    vital — the deploy webhook has no TTY, doctrine's data-loss prompt would
+    silently abort the migration (which is how unapplied migrations reached
+    prod). Apps without a migrations/ directory are skipped.
+    """
+    script = f"""
+set -e
+cd {APP_DIR}
+if [ -d migrations ]; then
+  bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration
+else
+  echo "No migrations/ directory, skipping."
+fi
+"""
+    output = service.addon_manager.docker_exec(
+        service.name, ["/bin/sh", "-c", script]
+    )
+    context.io.log(output)

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/symfony/commands/service/install_local.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_wex_addon_dev_javascript.services.node.commands.service.install_local import (
+    node__service__install_local,
+)
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.install_local import (
+    APP_DIR,
+    composer__service__install_local,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+# Symfony images ship a sane composer on PATH (no php-pinned phar wrapper).
+COMPOSER_BIN = "composer"
+
+
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Wire locally-developed composer and npm packages into the app (local env only)",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        DomainTag.FRAMEWORK,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def symfony__service__install_local(
+    context: ExecutionContext,
+    service: AppService,
+) -> None:
+    # Generic composer and node wiring, executed in this service's container.
+    composer__service__install_local.function(
+        context=context, service=service, composer_bin=COMPOSER_BIN
+    )
+    node__service__install_local.function(context=context, service=service)
+
+    output = service.addon_manager.docker_exec(
+        service.name,
+        ["/bin/sh", "-c", f"cd {APP_DIR} && bin/console cache:clear"],
+    )
+    context.io.log(output)

wexample_wex_addon_dev_php-9.0.0/src/wexample_wex_addon_dev_php/services/symfony/commands/service/refresh_lock.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
+from wexample_cli.decorator.command import command
+from wexample_cli.decorator.option import option
+from wexample_wex_addon_dev_javascript.services.node.commands.service.refresh_lock import (
+    node__service__refresh_lock,
+)
+from wexample_wex_core.const.globals import COMMAND_TYPE_SERVICE
+
+from wexample_wex_addon_dev_php.const.tags import DomainTag
+from wexample_wex_addon_dev_php.services.composer.commands.service.refresh_lock import (
+    composer__service__refresh_lock,
+)
+from wexample_wex_addon_dev_php.services.symfony.commands.service.install_local import (
+    COMPOSER_BIN,
+)
+
+if TYPE_CHECKING:
+    from wexample_cli.context.execution_context import ExecutionContext
+    from wexample_wex_addon_app.service.app_service import AppService
+
+
+@option(
+    name="composer_packages",
+    type=str,
+    required=False,
+    default="",
+    description="Space-separated composer package names whose constraint changed in composer.json",
+)
+@option(
+    name="npm_packages",
+    type=str,
+    required=False,
+    default="",
+    description="Space-separated npm package names whose constraint changed in package.json",
+)
+@command(
+    type=COMMAND_TYPE_SERVICE,
+    description="Refresh composer and javascript lock files after a dependency change",
+    tags=[
+        DomainTag.LANGUAGE_PHP,
+        DomainTag.FRAMEWORK,
+        EffectTag.WRITE,
+        AudienceTag.AGENT_SAFE,
+        ScopeTag.APP,
+        ScopeTag.CONTAINER,
+        ScopeTag.LOCAL,
+    ],
+)
+def symfony__service__refresh_lock(
+    context: ExecutionContext,
+    service: AppService,
+    composer_packages: str = "",
+    npm_packages: str = "",
+) -> None:
+    # Generic lock refreshes, executed in this service's container.
+    if composer_packages:
+        composer__service__refresh_lock.function(
+            context=context,
+            service=service,
+            composer_packages=composer_packages,
+            composer_bin=COMPOSER_BIN,
+        )
+    if npm_packages:
+        node__service__refresh_lock.function(
+            context=context, service=service, npm_packages=npm_packages
+        )

{wexample_wex_addon_dev_php-8.13.0 → wexample_wex_addon_dev_php-9.0.0}/src/wexample_wex_addon_dev_php/workdir/php_workdir.py

@@ -38,6 +38,23 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
     def get_dependencies_versions(self) -> dict[str, str]:
         return self.get_app_config_file().get_dependencies_versions()
 
+    def get_dependency_manifests(self) -> list:
+        from wexample_wex_addon_dev_javascript.file.node_package_json_file import (
+            NodePackageJsonFile,
+        )
+
+        manifests = super().get_dependency_manifests()
+
+        # PHP apps are frequently polyglot (Symfony/Laravel assets built with
+        # node): their package.json must follow library syncs like
+        # composer.json does.
+        package_json = self.find_by_type(NodePackageJsonFile)
+        if package_json is not None and package_json.get_path().exists():
+            package_json.read_text(reload=True)
+            manifests.append(package_json)
+
+        return manifests
+
     def get_main_code_file_extension(self) -> str:
         from wexample_filestate_php.const.php_file import PHP_FILE_EXTENSION
 
@@ -90,6 +107,22 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
             }
         )
 
+        # Polyglot apps: expose the package.json as a dependency manifest
+        # (see get_dependency_manifests). No should_exist: never created when
+        # absent — the workdir path is not resolved yet at this stage, so the
+        # disk check happens in get_dependency_manifests.
+        from wexample_wex_addon_dev_javascript.file.node_package_json_file import (
+            NodePackageJsonFile,
+        )
+
+        children.append(
+            {
+                "class": NodePackageJsonFile,
+                "name": "package.json",
+                "type": DiskItemType.FILE,
+            }
+        )
+
         self.add_gitignore_rules(
             children,
             ".php-cs-fixer.cache",

{wexample_wex_addon_dev_php-8.13.0 → wexample_wex_addon_dev_php-9.0.0}/src/wexample_wex_addon_dev_php/workdir/symfony_workdir.py

@@ -23,13 +23,5 @@ class SymfonyWorkdir(PhpWorkdir):
 
         return workdir_javascript.apply(result=result, **kwargs)
 
-    def libraries_sync(self) -> None:
-        super().libraries_sync()
-
-        self.log("Syncing Javascript...")
-
-        workdir_javascript = JavascriptWorkdir.create_from_path(
-            path=self.get_path(), io=self.io
-        )
-
-        workdir_javascript.libraries_sync()
+    # NOTE: package.json library syncing is handled natively by PhpWorkdir's
+    # dependency manifests (get_dependency_manifests), no facade needed here.