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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 12.6.0
+Version: 12.7.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
@@ -11,11 +11,11 @@ Project-URL: homepage, https://github.com/wexample/python-wex-dev-python
 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-filestate-symfony>=2.0.0
-Requires-Dist: wexample-wex-addon-ai>=17.0.0
-Requires-Dist: wexample-wex-addon-app>=32.4.0
-Requires-Dist: wexample-wex-addon-dev-javascript>=8.2.0
+Requires-Dist: wexample-filestate-php>=6.5.0
+Requires-Dist: wexample-filestate-symfony>=2.1.0
+Requires-Dist: wexample-wex-addon-ai>=18.1.0
+Requires-Dist: wexample-wex-addon-app>=33.0.0
+Requires-Dist: wexample-wex-addon-dev-javascript>=8.3.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.6.0
+Version: 12.7.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.
 
@@ -195,7 +195,7 @@ Services live under `src/wexample_wex_addon_dev_php/services/`. Each service has
 
 #### php
 
-Defined in src/wexample_wex_addon_dev_php/services/php/service.yml and src/wexample_wex_addon_dev_php/services/php/docker/docker-compose.yml. The base PHP service: runs `dunglas/frankenphp:php8.4`, mounts the app at `/var/www/html`, and binds a `Caddyfile` and a `web.ini` from the runtime config. The `laravel` and `symfony` containers extend this compose service definition. Sample files for the Caddyfile (serving from `public/`, `php_server` directive) and `web.ini` (upload limits, memory limit) are shipped in `services/php/samples/`.
+Defined in src/wexample_wex_addon_dev_php/services/php/service.yml and src/wexample_wex_addon_dev_php/services/php/docker/docker-compose.yml. The base PHP service: runs `dunglas/frankenphp:1.13.0-php8.5.11`, mounts the app at `/var/www/html`, and binds a `Caddyfile` and a `web.ini` from the runtime config. The `laravel` and `symfony` containers extend this compose service definition. Sample files for the Caddyfile (serving from `public/`, `php_server` directive) and `web.ini` (upload limits, memory limit) are shipped in `services/php/samples/`.
 
 #### frankenphp
 
@@ -203,7 +203,7 @@ Defined in src/wexample_wex_addon_dev_php/services/frankenphp/service.yml. A sta
 
 #### composer
 
-Defined in src/wexample_wex_addon_dev_php/services/composer/service.yml. A dedicated Composer container (`composer:latest`) that mounts the app at `/var/www/html` and stays alive via `tail -f /dev/null`. Its commands are the generic lock-management routines that Laravel and Symfony both call.
+Defined in src/wexample_wex_addon_dev_php/services/composer/service.yml. A dedicated Composer container (`composer:2.9.7`) that mounts the app at `/var/www/html` and stays alive via `tail -f /dev/null`. Its PHP is the image's, not the app's, so it runs with `COMPOSER_IGNORE_PLATFORM_REQS=1`: extensions such as `intl` are the app container's to have. Its commands are the generic lock-management routines that Laravel and Symfony both call.
 
 #### laravel
 
@@ -273,11 +273,11 @@ 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-filestate-symfony: >=2.0.0
-- wexample-wex-addon-ai: >=17.0.0
-- wexample-wex-addon-app: >=32.4.0
-- wexample-wex-addon-dev-javascript: >=8.2.0
+- wexample-filestate-php: >=6.5.0
+- wexample-filestate-symfony: >=2.1.0
+- wexample-wex-addon-ai: >=18.1.0
+- wexample-wex-addon-app: >=33.0.0
+- wexample-wex-addon-dev-javascript: >=8.3.0
 
 ## Versioning & Compatibility Policy
 

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

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 12.6.0
+Version: 12.7.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.
 
@@ -172,7 +172,7 @@ Services live under `src/wexample_wex_addon_dev_php/services/`. Each service has
 
 #### php
 
-Defined in src/wexample_wex_addon_dev_php/services/php/service.yml and src/wexample_wex_addon_dev_php/services/php/docker/docker-compose.yml. The base PHP service: runs `dunglas/frankenphp:php8.4`, mounts the app at `/var/www/html`, and binds a `Caddyfile` and a `web.ini` from the runtime config. The `laravel` and `symfony` containers extend this compose service definition. Sample files for the Caddyfile (serving from `public/`, `php_server` directive) and `web.ini` (upload limits, memory limit) are shipped in `services/php/samples/`.
+Defined in src/wexample_wex_addon_dev_php/services/php/service.yml and src/wexample_wex_addon_dev_php/services/php/docker/docker-compose.yml. The base PHP service: runs `dunglas/frankenphp:1.13.0-php8.5.11`, mounts the app at `/var/www/html`, and binds a `Caddyfile` and a `web.ini` from the runtime config. The `laravel` and `symfony` containers extend this compose service definition. Sample files for the Caddyfile (serving from `public/`, `php_server` directive) and `web.ini` (upload limits, memory limit) are shipped in `services/php/samples/`.
 
 #### frankenphp
 
@@ -180,7 +180,7 @@ Defined in src/wexample_wex_addon_dev_php/services/frankenphp/service.yml. A sta
 
 #### composer
 
-Defined in src/wexample_wex_addon_dev_php/services/composer/service.yml. A dedicated Composer container (`composer:latest`) that mounts the app at `/var/www/html` and stays alive via `tail -f /dev/null`. Its commands are the generic lock-management routines that Laravel and Symfony both call.
+Defined in src/wexample_wex_addon_dev_php/services/composer/service.yml. A dedicated Composer container (`composer:2.9.7`) that mounts the app at `/var/www/html` and stays alive via `tail -f /dev/null`. Its PHP is the image's, not the app's, so it runs with `COMPOSER_IGNORE_PLATFORM_REQS=1`: extensions such as `intl` are the app container's to have. Its commands are the generic lock-management routines that Laravel and Symfony both call.
 
 #### laravel
 
@@ -250,11 +250,11 @@ 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-filestate-symfony: >=2.0.0
-- wexample-wex-addon-ai: >=17.0.0
-- wexample-wex-addon-app: >=32.4.0
-- wexample-wex-addon-dev-javascript: >=8.2.0
+- wexample-filestate-php: >=6.5.0
+- wexample-filestate-symfony: >=2.1.0
+- wexample-wex-addon-ai: >=18.1.0
+- wexample-wex-addon-app: >=33.0.0
+- wexample-wex-addon-dev-javascript: >=8.3.0
 
 ## Versioning & Compatibility Policy
 

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

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "12.6.0"
+version = "12.7.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" },
@@ -20,11 +20,11 @@ classifiers = [
 dependencies = [
     "attrs>=23.1.0",
     "cattrs>=23.1.0",
-    "wexample-filestate-php>=6.4.0",
-    "wexample-filestate-symfony>=2.0.0",
-    "wexample-wex-addon-ai>=17.0.0",
-    "wexample-wex-addon-app>=32.4.0",
-    "wexample-wex-addon-dev-javascript>=8.2.0",
+    "wexample-filestate-php>=6.5.0",
+    "wexample-filestate-symfony>=2.1.0",
+    "wexample-wex-addon-ai>=18.1.0",
+    "wexample-wex-addon-app>=33.0.0",
+    "wexample-wex-addon-dev-javascript>=8.3.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/resources/docker/Dockerfile.roave

@@ -1,4 +1,4 @@
-FROM php:8.5-cli
+FROM php:8.5.11-cli
 
 RUN apt-get update && apt-get install -y \
     git \
@@ -6,7 +6,12 @@ RUN apt-get update && apt-get install -y \
     libicu-dev \
     libzip-dev \
     libpng-dev \
+    libjpeg62-turbo-dev \
+    libwebp-dev \
     && rm -rf /var/lib/apt/lists/* \
+    # GD as the applications have it: a package writing a thumbnail as WebP
+    # from an uploaded JPEG fails here otherwise, and nowhere else.
+    && docker-php-ext-configure gd --with-jpeg --with-webp \
     && docker-php-ext-install bcmath gd intl zip \
     # A test suite compiling a Symfony container outgrows the CLI's 128M.
     && echo 'memory_limit=1G' > /usr/local/etc/php/conf.d/memory.ini
@@ -19,7 +24,7 @@ RUN git config --system --add safe.directory '*'
 RUN groupadd -g 1000 appuser && \
     useradd -m -u 1000 -g 1000 -s /bin/bash appuser
 
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.9.7 /usr/bin/composer /usr/bin/composer
 
 USER appuser
 RUN composer global require roave/backward-compatibility-check

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/services/composer/docker/docker-compose.yml

@@ -2,11 +2,15 @@ services:
   composer:
     restart: unless-stopped
     container_name: ${APP_PROJECT_NAME}_composer
-    image: composer:latest
+    image: composer:2.9.7
     working_dir: /var/www/html
     command: tail -f /dev/null
     environment:
       COMPOSER_ALLOW_SUPERUSER: "1"
+      # This PHP is the composer image's, not the app's: its extensions and version
+      # say nothing about what the app runs on (intl, pdo_pgsql… live in the app
+      # container). Platform requirements are the app container's to check.
+      COMPOSER_IGNORE_PLATFORM_REQS: "1"
     volumes:
       - ${APP_PATH}:/var/www/html
     extends:

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/services/frankenphp/docker/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   frankenphp:
     restart: unless-stopped
     container_name: ${APP_PROJECT_NAME}_frankenphp
-    image: dunglas/frankenphp:php8.4
+    image: dunglas/frankenphp:1.13.0-php8.5.11
     environment:
       - VIRTUAL_HOST=${APP_DOMAINS_STRING}
       - VIRTUAL_PORT=80

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/services/php/docker/docker-compose.yml

@@ -2,7 +2,7 @@ services:
   php:
     restart: unless-stopped
     container_name: ${APP_PROJECT_NAME}_php
-    image: dunglas/frankenphp:php8.4
+    image: dunglas/frankenphp:1.13.0-php8.5.11
     environment:
       - VIRTUAL_HOST=${APP_DOMAINS_STRING}
       - VIRTUAL_PORT=80

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/services/symfony/samples/docker/images/Dockerfile.dev

@@ -2,6 +2,6 @@
 # containers (see the composer and node services), so nothing here needs to
 # know how the app is built.
 
-FROM dunglas/frankenphp:php8.4
+FROM dunglas/frankenphp:1.13.0-php8.5.11
 
-RUN install-php-extensions pdo_pgsql intl
+RUN install-php-extensions pdo_pgsql intl gd

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/services/symfony/samples/docker/images/Dockerfile.release

@@ -6,16 +6,16 @@
 # .wex/docker/env.build lets that kernel boot without any deployment secret;
 # the database is never queried.
 
-FROM dunglas/frankenphp:php8.4 AS build
+FROM dunglas/frankenphp:1.13.0-php8.5.11 AS build
 
-RUN install-php-extensions pdo_pgsql intl zip
+RUN install-php-extensions pdo_pgsql intl zip gd
 
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
     && apt-get install -y --no-install-recommends nodejs git unzip \
     && npm install -g yarn \
     && rm -rf /var/lib/apt/lists/*
 
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.9.7 /usr/bin/composer /usr/bin/composer
 
 WORKDIR /var/www/html
 
@@ -35,9 +35,9 @@ RUN cp .wex/docker/env.build .env \
     && php bin/console cache:warmup \
     && rm -rf node_modules
 
-FROM dunglas/frankenphp:php8.4
+FROM dunglas/frankenphp:1.13.0-php8.5.11
 
-RUN install-php-extensions pdo_pgsql intl opcache
+RUN install-php-extensions pdo_pgsql intl opcache gd
 
 WORKDIR /var/www/html
 

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/workdir/php_package_workdir.py

@@ -195,8 +195,10 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         php is not on the host, and neither are the dependencies: a package's
         vendor/ lives in a Docker volume of its own, mounted where the tests
         expect it, so the host keeps no copy of it for an editor to index. The
-        volume is refilled only when composer.json changed since; no lock is
-        written, the package's own being left as it is.
+        volume is refilled when any composer.json of the suite changed since —
+        the siblings' too, since a path dependency gaining a requirement leaves
+        this package's own manifest untouched and its vendor/ short of it. No
+        lock is written, the package's own being left as it is.
 
         The packages' directory is mounted whole: the local siblings are linked
         into vendor/ by relative paths (composer path repositories). Run as the
@@ -216,6 +218,11 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         vendor_volume = f"wex-php-vendor-{path.name}-{path_hash}"
         cache_volume = "wex-php-composer-cache"
 
+        # The tests run as the user and write in the package (a test kernel's
+        # var/cache…): what an earlier run as root left there is handed back first.
+        if os.geteuid() == 0:
+            self.restore_real_user_ownership()
+
         # The mount point: Docker would create it as root otherwise. Created by
         # the user already when wex itself does not run as root.
         vendor_dir = path / "vendor"
@@ -239,7 +246,10 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         package_dir = f"{packages_dir}/{path.name}"
         script = (
             "set -e; "
-            'sum=$(sha1sum composer.json | cut -d" " -f1); '
+            # Every manifest of the mounted suite, not just this package's:
+            # the siblings are path dependencies, and what they require lands
+            # in this vendor/ without their change showing here.
+            'sum=$(cat composer.json ../*/composer.json | sha1sum | cut -d" " -f1); '
             'if [ "$(cat vendor/.wex-composer-json 2>/dev/null)" != "$sum" ]; then '
             "composer config --global lock false; "
             "composer update --no-interaction --no-progress --no-scripts; "

{wexample_wex_addon_dev_php-12.6.0 → wexample_wex_addon_dev_php-12.7.0}/src/wexample_wex_addon_dev_php/workdir/php_symfony_workdir.py

@@ -94,6 +94,8 @@ class PhpSymfonyWorkdir(PhpWorkdir):
 
         raw_value = super().prepare_value(raw_value=raw_value)
 
+        self._require_symfony_acolyte(raw_value)
+
         # Declared statically rather than left to the inherited recursive
         # filter, because `sidecar_of` resolves its primary by the identity of
         # the very dict declaring it.
@@ -860,3 +862,27 @@ class PhpSymfonyWorkdir(PhpWorkdir):
             install = manifest.get("extra", {}).get("install", {})
             if install:
                 yield name, directory, install
+
+    def _require_symfony_acolyte(self, raw_value: DictConfig) -> None:
+        """Make the app's composer.json require the package its content rules call.
+
+        The Symfony content options (`entity_extend` and siblings) are answered by a
+        console command shipped in a Composer package. Declaring the rules without the
+        package let rectification crash on any app that had not added it by hand — and
+        a local symlink under `vendor/` was no proof of it: without the requirement
+        Composer neither autoloads the package nor the app registers its bundle.
+
+        Only the requirement is written, and only when absent. The bundle still has to be
+        listed in `config/bundles.php`, which is PHP and not a structured file.
+        """
+        from wexample_filestate_symfony.const.symfony import (
+            SYMFONY_ACOLYTE_CONSTRAINT,
+            SYMFONY_ACOLYTE_PACKAGE,
+        )
+
+        for child in raw_value["children"]:
+            if isinstance(child, dict) and child.get("name") == "composer.json":
+                child.setdefault("should_contain_keys", {})[
+                    f"require.{SYMFONY_ACOLYTE_PACKAGE}"
+                ] = SYMFONY_ACOLYTE_CONSTRAINT
+                return