wexample-wex-addon-dev-php 8.10.1__tar.gz → 8.12.0__tar.gz

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-php
-Version: 8.10.1
+Version: 8.12.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>=11.1.0
-Requires-Dist: wexample-wex-addon-app>=25.4.0
-Requires-Dist: wexample-wex-addon-dev-javascript>=7.13.0
+Requires-Dist: wexample-wex-addon-ai>=11.3.0
+Requires-Dist: wexample-wex-addon-app>=26.1.0
+Requires-Dist: wexample-wex-addon-dev-javascript>=7.15.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.10.1
+Version: 8.12.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: >=11.1.0
-- wexample-wex-addon-app: >=25.4.0
-- wexample-wex-addon-dev-javascript: >=7.13.0
+- wexample-wex-addon-ai: >=11.3.0
+- wexample-wex-addon-app: >=26.1.0
+- wexample-wex-addon-dev-javascript: >=7.15.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_php
 
-Version: 8.10.1
+Version: 8.12.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: >=11.1.0
-- wexample-wex-addon-app: >=25.4.0
-- wexample-wex-addon-dev-javascript: >=7.13.0
+- wexample-wex-addon-ai: >=11.3.0
+- wexample-wex-addon-app: >=26.1.0
+- wexample-wex-addon-dev-javascript: >=7.15.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-php"
-version = "8.10.1"
+version = "8.12.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>=11.1.0",
-    "wexample-wex-addon-app>=25.4.0",
-    "wexample-wex-addon-dev-javascript>=7.13.0",
+    "wexample-wex-addon-ai>=11.3.0",
+    "wexample-wex-addon-app>=26.1.0",
+    "wexample-wex-addon-dev-javascript>=7.15.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/src/wexample_wex_addon_dev_php/file/php_composer_json_file.py

@@ -33,7 +33,7 @@ class PhpComposerJsonFile(AppDependenciesConfigFileMixin, JsonFile):
         group_key = "require-dev" if group == "dev" else "require"
 
         # Composer uses simple version constraints (no pip-style operators)
-        constraint = f"{operator}{version}".strip()
+        constraint = (f"{operator}{version}" if operator else version).strip()
 
         config = self.read_config()
 
@@ -62,7 +62,7 @@ class PhpComposerJsonFile(AppDependenciesConfigFileMixin, JsonFile):
         content["name"] = workdir.get_package_name()
         content["version"] = workdir.get_setup_version()
 
-        return super().dumps(content or {})
+        return super().dumps(content)
 
     def get_dependencies_versions(
         self, optional: bool = False, group: str = "dev"

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/src/wexample_wex_addon_dev_php/php_addon_manager.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING
 
 from wexample_wex_core.common.abstract_addon_manager import AbstractAddonManager
 
+if TYPE_CHECKING:
+    from typing import Any
+
 
 class PhpAddonManager(AbstractAddonManager):
     @classmethod

wexample_wex_addon_dev_php-8.12.0/src/wexample_wex_addon_dev_php/services/laravel/app_service.py

@@ -0,0 +1,49 @@
+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
+
+# Apache in the wexample/php-8.2 image (Alpine-based) runs as www-data uid 82,
+# NOT the Debian 33. Laravel must be able to write its runtime dirs as that
+# user. Declared here so app/start's rectify keeps them owned by 82 and stops
+# them from flipping back to the host uid (e.g. after own/this or a git
+# checkout), which is what caused the recurring "could not be opened in append
+# mode: Permission denied" on storage/logs.
+_LARAVEL_WEB_OWNER = "82:82"
+
+_WORKDIR_CONTRIBUTION: dict = {
+    "children": [
+        {
+            "name": "storage",
+            "type": _D,
+            "should_exist": True,
+            "mode": {
+                "owner": _LARAVEL_WEB_OWNER,
+                "recursive": True,
+            },
+        },
+        {
+            "name": "bootstrap",
+            "type": _D,
+            "should_exist": True,
+            "children": [
+                {
+                    "name": "cache",
+                    "type": _D,
+                    "should_exist": True,
+                    "mode": {
+                        "owner": _LARAVEL_WEB_OWNER,
+                        "recursive": True,
+                    },
+                },
+            ],
+        },
+    ]
+}
+
+
+class AppService(BaseAppService):
+    def get_workdir_contribution(self, workdir) -> dict:
+        return _WORKDIR_CONTRIBUTION

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/src/wexample_wex_addon_dev_php/services/wordpress/commands/url/replace.py

@@ -68,7 +68,7 @@ def wordpress__url__replace(
     app_project_name = runtime.search("app.project_name").get_str()
     cli_container = f"{app_project_name}_wordpress_cli"
 
-    target_url = _normalize_url(new_url or _guess_new_url(service))
+    target_url = _normalize_url(new_url or _guess_new_url(runtime))
 
     if old_url is None:
         detect = subprocess.run(
@@ -109,16 +109,15 @@ def wordpress__url__replace(
     )
 
 
-def _guess_new_url(service: AppService) -> str:
-    runtime = service.app_workdir.get_runtime_config()
+def _guess_new_url(runtime) -> str:
     domains = runtime.search("app.domains").get_list_or_default([])
     if domains:
         first = domains[0].get_str()
-        return _normalize_url(f"https://{first}")
+        return f"https://{first}"
 
     domain = runtime.search("app.domain").get_str_or_none()
     if domain:
-        return _normalize_url(f"https://{domain}")
+        return f"https://{domain}"
 
     raise RuntimeError("Unable to guess the new WordPress URL from runtime app domains")
 

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/src/wexample_wex_addon_dev_php/workdir/php_package_workdir.py

@@ -94,14 +94,17 @@ class PhpPackageWorkdir(WithRunnerWorkdirMixin, PhpWorkdir):
         )
         from wexample_helpers_git.helpers.git import git_has_changes_since_tag
 
-        if not git_has_changes_since_tag(last_tag, "src", cwd=self.get_path()):
+        path = self.get_path()
+
+        if not git_has_changes_since_tag(last_tag, "src", cwd=path):
             return UPGRADE_TYPE_MINOR
 
         try:
+            runners = self.get_runners()
             package_rel = str(
-                self.get_path()
+                path
                 .resolve()
-                .relative_to(self.get_runners()["roave"].mount_path)
+                .relative_to(runners["roave"].mount_path)
             )
 
             self.log(f"Running roave backward compatibility check from {last_tag}...")

{wexample_wex_addon_dev_php-8.10.1 → wexample_wex_addon_dev_php-8.12.0}/src/wexample_wex_addon_dev_php/workdir/php_workdir.py

@@ -50,11 +50,7 @@ class PhpWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
 
         options = super().get_options_providers()
 
-        options.extend(
-            [
-                PhpOptionsProvider,
-            ]
-        )
+        options.append(PhpOptionsProvider)
 
         return options