Release v1.4.0: Twig Extra (REQ-TWIG-004) and Twig-CS-Fixer.

Author: HecFranco

.scripts/check-open-prs.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Fail if the GitHub repo has unresolved open pull requests (REQ-REL-003).
 # Allowed temporary exceptions: label hold|do-not-merge AND a future review-by ISO date
-# in the PR body (or first few comments are not fetched; body must carry the date).
+# in the PR body (body must carry the date).
 set -euo pipefail
 
 ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
@@ -22,7 +22,26 @@ if ! command -v python3 >/dev/null 2>&1; then
   exit 1
 fi
 
-PRS_JSON="$(gh pr list --state open --limit 100 --json number,title,labels,body,url)"
+# Resolve owner/name for -R (works when SSH remotes confuse `gh` default repo detection).
+resolve_repo() {
+  local url owner_repo
+  if url="$(git remote get-url origin 2>/dev/null)"; then
+    # git@github.com:org/repo.git  |  https://github.com/org/repo.git
+    owner_repo="$(printf '%s\n' "${url}" | sed -E 's#^(git@github\.com:|https://github\.com/)##; s#\.git$##')"
+    if [[ "${owner_repo}" == */* ]]; then
+      printf '%s\n' "${owner_repo}"
+      return 0
+    fi
+  fi
+  return 1
+}
+
+REPO_ARGS=()
+if REPO="$(resolve_repo)"; then
+  REPO_ARGS=(-R "${REPO}")
+fi
+
+PRS_JSON="$(gh pr list "${REPO_ARGS[@]}" --state open --limit 100 --json number,title,labels,body,url)"
 
 export PRS_JSON
 python3 <<'PY'
@@ -38,7 +57,6 @@ if not prs:
     sys.exit(0)
 
 HOLD_LABELS = {"hold", "do-not-merge"}
-# review-by: 2026-09-01  |  review_by: 2026-09-01  |  review-by 2026-09-01
 REVIEW_BY_RE = re.compile(
     r"(?i)\breview[-_ ]?by\b\s*[:=]?\s*(\d{4}-\d{2}-\d{2})"
 )

.scripts/check-twig-extra.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# REQ-TWIG-004 — fail when Twig applies but twig/extra-bundle (and demos) are not ready.
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+
+has_twig=0
+if find src -type f -name '*.twig' 2>/dev/null | grep -q .; then
+  has_twig=1
+elif find templates Resources -type f -name '*.twig' 2>/dev/null | grep -q .; then
+  has_twig=1
+fi
+
+if [[ "$has_twig" -eq 0 ]]; then
+  echo "check-twig-extra: Twig does not apply (no templates) — OK"
+  exit 0
+fi
+
+fail=0
+
+if ! grep -q '"twig/extra-bundle"' composer.json; then
+  echo "ERROR: twig/extra-bundle missing from package composer.json require (REQ-TWIG-004)" >&2
+  fail=1
+fi
+
+if ! grep -q '"twig/string-extra"' composer.json; then
+  echo "ERROR: twig/string-extra missing from package composer.json require (REQ-TWIG-004 baseline)" >&2
+  fail=1
+fi
+
+shopt -s nullglob
+for demo_composer in demo/*/composer.json demo/*/*/composer.json; do
+  [[ -f "$demo_composer" ]] || continue
+  demo_dir="$(dirname "$demo_composer")"
+  # Skip demos that never render Twig (no bundles.php / no twig)
+  bundles_php="$demo_dir/config/bundles.php"
+  if [[ ! -f "$bundles_php" ]]; then
+    continue
+  fi
+  if ! grep -q 'TwigBundle' "$bundles_php" 2>/dev/null; then
+    continue
+  fi
+  if ! grep -q '"twig/extra-bundle"' "$demo_composer"; then
+    echo "ERROR: $demo_composer missing twig/extra-bundle (REQ-TWIG-004)" >&2
+    fail=1
+  fi
+  if ! grep -q 'Twig\\\\Extra\\\\TwigExtraBundle\\\\TwigExtraBundle' "$bundles_php" \
+    && ! grep -q 'Twig\\Extra\\TwigExtraBundle\\TwigExtraBundle' "$bundles_php"; then
+    echo "ERROR: $bundles_php missing TwigExtraBundle (REQ-TWIG-004)" >&2
+    fail=1
+  fi
+done
+
+if [[ "$fail" -ne 0 ]]; then
+  exit 1
+fi
+
+echo "check-twig-extra: OK"

.twig-cs-fixer.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use TwigCsFixer\Config\Config;
+use TwigCsFixer\File\Finder;
+use TwigCsFixer\Ruleset\Ruleset;
+use TwigCsFixer\Standard\TwigCsFixer;
+
+$paths = [];
+foreach ([__DIR__ . '/src', __DIR__ . '/templates'] as $path) {
+    if (is_dir($path)) {
+        $paths[] = $path;
+    }
+}
+
+$finder = new Finder();
+foreach ($paths as $path) {
+    $finder->in($path);
+}
+$finder->exclude(['vendor', 'var', 'node_modules', 'coverage', 'demo']);
+
+$ruleset = new Ruleset();
+$ruleset->addStandard(new TwigCsFixer());
+
+$config = new Config();
+$config->setRuleset($ruleset);
+$config->setFinder($finder);
+
+return $config;

Makefile

@@ -1,5 +1,5 @@
 # CKEditor 5 Editor Bundle — development (Docker + pnpm + PHPUnit).
-.PHONY: help up down build shell install test test-coverage coverage-php-percent cs-check cs-fix qa clean assets assets-build assets-watch test-ts ensure-up rector rector-dry phpstan release-check release-check-demos composer-sync update validate validate-translations check-no-cursor-coauthor check-open-prs demo-smoke strip-cursor-coauthor-from-history setup-hooks
+.PHONY: help up down build shell install test test-coverage coverage-php-percent cs-check cs-fix qa clean assets assets-build assets-watch test-ts ensure-up rector rector-dry phpstan release-check release-check-demos composer-sync update validate validate-translations check-no-cursor-coauthor check-open-prs demo-smoke strip-cursor-coauthor-from-history setup-hooks check-twig-extra
 
 COMPOSE_FILE ?= docker-compose.yml
 # Prefer Compose V2 plugin (GitHub Actions / modern Docker Desktop); fall back to docker-compose V1 (REQ-MAKE-010).
@@ -116,7 +116,11 @@ setup-hooks:
 	@git config core.hooksPath .githooks
 	@echo "Git hooks installed (.githooks — includes commit-msg for REQ-GIT-001)."
 
-release-check: check-no-cursor-coauthor check-open-prs ensure-up composer-sync cs-fix cs-check rector-dry phpstan test-coverage test-ts release-check-demos
+
+check-twig-extra:
+	@chmod +x .scripts/check-twig-extra.sh
+	@./.scripts/check-twig-extra.sh
+release-check: check-no-cursor-coauthor check-open-prs check-twig-extra ensure-up composer-sync cs-fix cs-check rector-dry phpstan test-coverage test-ts release-check-demos
 
 release-check-demos:
 	@if [ -d demo ]; then $(MAKE) -C demo release-check; fi
@@ -134,3 +138,6 @@ validate: ensure-up
 BUNDLE_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 # Optional: monorepo helper absent on standalone GitHub Actions checkout (REQ-MAKE-009).
 -include $(BUNDLE_ROOT)/../.scripts/Makefile.update-deps.mk
+
+twig-lint: ensure-up
+	@$(COMPOSE) exec -T $(SERVICE_PHP) composer twig:lint || $(COMPOSE) exec -T $(SERVICE_PHP) ./vendor/bin/twig-cs-fixer lint --config=.twig-cs-fixer.php

composer.json

@@ -44,7 +44,9 @@
         "symfony/http-kernel": "^6.4 || ^7.0 || ^8.0",
         "symfony/routing": "^6.4 || ^7.0 || ^8.0",
         "symfony/security-csrf": "^6.4 || ^7.0 || ^8.0",
-        "symfony/twig-bundle": "^6.4 || ^7.0 || ^8.0"
+        "symfony/twig-bundle": "^6.4 || ^7.0 || ^8.0",
+        "twig/extra-bundle": "^3.12",
+        "twig/string-extra": "^3.12"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
@@ -55,7 +57,8 @@
         "phpstan/phpstan-symfony": "^2.0",
         "phpunit/phpunit": "^11.0",
         "rector/rector": "^2.0",
-        "symfony/yaml": "^6.4 || ^7.0 || ^8.0"
+        "symfony/yaml": "^6.4 || ^7.0 || ^8.0",
+        "vincentlanglet/twig-cs-fixer": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -80,7 +83,10 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "archive": {
-        "exclude": ["/demo", "/.cursor"]
+        "exclude": [
+            "/demo",
+            "/.cursor"
+        ]
     },
     "scripts": {
         "test": "@php vendor/bin/phpunit --color=always",
@@ -93,6 +99,12 @@
         "rector": "@php vendor/bin/rector process",
         "rector-dry": "@php vendor/bin/rector process --dry-run --no-progress-bar",
         "phpstan": "@php vendor/bin/phpstan analyse --memory-limit=512M",
-        "qa": ["@cs-check", "@test"]
+        "qa": [
+            "@cs-check",
+            "@test"
+        ],
+        "twig:lint": "twig-cs-fixer lint --config=.twig-cs-fixer.php",
+        "twig:fix": "twig-cs-fixer fix --config=.twig-cs-fixer.php",
+        "twig:fix:check": "twig-cs-fixer lint --config=.twig-cs-fixer.php --fix"
     }
 }