refactor: restructure template into samples/ + source/ layout #38

Open

jmiller wants to merge 11 commits from dev into main

pull from: dev

merge into: :main

:main

:dev

:rc

:feature/21-feat-add-joomla-metadata-validation-step

Conversation 0 Commits 11 Files Changed 32

+1958 -1252

jmiller commented 2026-07-04 06:25:32 +00:00

Owner

Copy Link

Copy Source

Summary

Promotes the samples/ + source/ restructure from dev to main. dev was first synced up to main (it had been 111 commits behind), so this PR's diff is only the restructure — 32 files, +1966 / −1260, no stray workflow changes.

Changes

• samples/manifest/ — well-formed reference <extension> manifests for all six extension types (component, template, module, plugin, package, library)
• samples/script/ — standard script.php install/update handler templates ({REPONAME}/{PACKAGENAME} placeholders)
• source/ — new canonical build root; CI scans source//src//htdocs/
• Removed types/ per-type scaffolds
• Rewrote root README.md for the new structure + CI table
• .gitignore — anchored the Python MANIFEST rule to root (/MANIFEST) so it no longer swallows samples/manifest/ on case-insensitive filesystems (Windows/macOS)
• ci-joomla.yml — added SQL, language-key consistency/orphan, PHP CodeSniffer, security-pattern, updates.xml, asset-existence, MVC-naming, router, ACL, webservices, ZIP dry-run, and JS/CSS checks

Notes

• dev was brought current with main first (merge + conflict resolution favoring main's canonical synced workflows) and a stale duplicate workflow-sync-trigger.yml at the old path was removed, so this PR does not regress any workflow.
• The .gitignore fix is important: without it, the manifest samples look committed locally but are silently absent from the repo and any repo generated from this template.
• Supersedes PR #37 (the feat/restructure-samples-source → main PR), now closed.

Authored-by: Moko Consulting

## Summary Promotes the `samples/` + `source/` restructure from `dev` to `main`. `dev` was first synced up to `main` (it had been 111 commits behind), so this PR's diff is **only the restructure** — 32 files, +1966 / −1260, no stray workflow changes. ## Changes - **`samples/manifest/`** — well-formed reference `<extension>` manifests for all six extension types (component, template, module, plugin, package, library) - **`samples/script/`** — standard `script.php` install/update handler templates (`{REPONAME}`/`{PACKAGENAME}` placeholders) - **`source/`** — new canonical build root; CI scans `source/`/`src/`/`htdocs/` - **Removed** `types/` per-type scaffolds - **Rewrote root `README.md`** for the new structure + CI table - **`.gitignore`** — anchored the Python `MANIFEST` rule to root (`/MANIFEST`) so it no longer swallows `samples/manifest/` on case-insensitive filesystems (Windows/macOS) - **`ci-joomla.yml`** — added SQL, language-key consistency/orphan, PHP CodeSniffer, security-pattern, updates.xml, asset-existence, MVC-naming, router, ACL, webservices, ZIP dry-run, and JS/CSS checks ## Notes - `dev` was brought current with `main` first (merge + conflict resolution favoring main's canonical synced workflows) and a stale duplicate `workflow-sync-trigger.yml` at the old path was removed, so this PR does not regress any workflow. - The `.gitignore` fix is important: without it, the manifest samples look committed locally but are silently absent from the repo and any repo generated from this template. - Supersedes PR #37 (the `feat/restructure-samples-source` → `main` PR), now closed. Authored-by: Moko Consulting

jmiller added 11 commits 2026-07-04 06:25:33 +00:00

chore: sync .mokogitea/workflows/pre-release.yml from moko-platform [skip ci] 73628c509b

chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] a02da1ad84

revert: re-enable auto-bump on dev push [skip ci] 5cd184a7dc

fix(ci): run repo-health on PR to main only, not on push 51807ff944

fix(ci): run repo-health on PR to main only, not on push 1b56994f16

chore: remove security-audit.yml -- handled by MokoGitea 48ee0ce5bb

chore(workflows): sync shared workflows from Template-Generic ... 757887ea11

Bring dev's shared .mokogitea/workflows up to Template-Generic main (best
version): add ci-generic (on PR), ci-issue-reporter, hardened rc-revert,
version-set, workflow-sync-trigger; update the rest. Also normalizes CRLF->LF
per .gitattributes. Platform workflow (ci-joomla) preserved.

Authored-by: Moko Consulting

Merge pull request 'chore(workflows): sync shared workflows from Template-Generic (dev)' (#34) from fix/sync-from-generic-dev into dev b4c1065b57

Merge main into dev to sync before restructure ... 08a3e7b089

Brings dev up to date with main so the samples/source restructure
applies cleanly. Workflow conflicts resolved in favor of main's
canonical synced versions.

Authored-by: Moko Consulting

# Conflicts:
#	.mokogitea/workflows/auto-release.yml

refactor: restructure template into samples/ + source/ layout ... d46c431189

Replace per-type types/<type>/ scaffolds with a samples/ reference
directory (manifest XML + install script templates for all six
extension types) and a single source/ build directory that CI scans.

- Add samples/manifest/*.xml for component, template, module, plugin,
  package, and library
- Add samples/script/*.php install/update script templates
- Add source/ as the canonical build root (CI scans source/src/htdocs)
- Remove types/ per-type scaffolds
- Rewrite root README for the new structure and expanded CI suite
- Anchor Python MANIFEST ignore rule to root (/MANIFEST) so it no
  longer swallows samples/manifest/ on case-insensitive filesystems
- Expand ci-joomla.yml: SQL, language-key, PHPCS, security, updates.xml,
  asset, MVC naming, router, ACL, webservices, ZIP dry-run, JS/CSS checks

Authored-by: Moko Consulting

chore: drop duplicate workflow-sync-trigger.yml left at old path ... 2cf42b79b7

PR #36 moved this workflow to custom/; the merge of main into dev
re-surfaced the old-path copy. Remove it so dev matches main's layout.

Authored-by: Moko Consulting

Some required checks failed

Hide all checks

Universal: PR Check / Branch Policy (pull_request) Successful in 2s

Details

Generic: Repo Health / Site Health (pull_request) Has been skipped

Details

Generic: Repo Health / Access control (pull_request) Successful in 3s

Details

Universal: Auto Version Bump / Version Bump (push) Successful in 25s

Details

Universal: PR Check / Validate PR (pull_request) Failing after 8s

Details

Universal: PR Check / Secret Scan (pull_request) Successful in 8s

Details

Generic: Project CI / Lint & Validate (pull_request) Failing after 12s

Details

Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 9s

Details

Universal: Build & Release / Promote to RC (pull_request) Failing after 9s

Details

Universal: Build & Release / Build & Release Pipeline (pull_request) Has been skipped

Details

Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Failing after 35s

Details

Generic: Project CI / Tests (pull_request) Has been cancelled

Details

Universal: PR Check / Build RC Package (pull_request) Has been cancelled

Details

Universal: PR Check / Report Issues (pull_request) Has been cancelled

Details

Generic: Repo Health / Scripts governance (pull_request) Has been cancelled

Details

Generic: Repo Health / Repository health (pull_request) Has been cancelled

Details

Generic: Repo Health / Report: Scripts Governance (pull_request) Has been cancelled

Details

Generic: Repo Health / Report: Repository Health (pull_request) Has been cancelled

Details

You are not authorized to merge this pull request.

This pull request can be merged automatically.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin dev:dev

git checkout dev

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

breaking-change

Breaking API or behavior change

ci-cd

CI/CD pipeline changes

config

Configuration changes

css

CSS/styling changes

dependencies

Dependency updates

deploy-failure

Deployment failed

documentation

Documentation changes

good first issue

Good for newcomers

health-check

Repo health check result

help wanted

Extra attention needed

html

HTML/template changes

joomla

Joomla extension

major-release

Major version release

minor-release

Minor version release

mokostandards

Related to MokoStandards framework

patch-release

Patch version release

php

PHP code

push-failure

Git push operation failed

release-candidate

Release candidate build

security

Security vulnerability or hardening

size/l

200-500 lines changed

size/m

50-200 lines changed

size/s

10-50 lines changed

size/xl

500+ lines changed

size/xs

< 10 lines changed

standards-drift

Deviates from MokoStandards

standards-update

MokoStandards compliance update

sync-failure

Sync or mirror failed

version-drift

Version mismatch across files

work-in-progress

Draft or incomplete work

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/Template-Joomla#38