Skip to content

Commit

Permalink
refactor: migrated category overview page to controller (#3257)
Browse files Browse the repository at this point in the history
Additionally, we can create SBOMs now and we moved the compiled JS code to assets/public
  • Loading branch information
thorsten committed Dec 4, 2024
1 parent 00a9c6b commit 29868fa
Show file tree
Hide file tree
Showing 24 changed files with 1,325 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ phpmyfaq/src/libs
phpmyfaq/admin/assets/css
phpmyfaq/admin/assets/fonts
phpmyfaq/admin/assets/js/editor/*
phpmyfaq/assets/dist
phpmyfaq/assets/public
phpmyfaq/assets/js/libs
phpmyfaq/assets/svg/*.svg
!phpmyfaq/assets/templates/admin
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package.json
pnpm-lock.yaml

# Ignore artifacts
phpmyfaq/assets/dist/
phpmyfaq/assets/public/

# Ignore PNPM Cache
.pnpm-store
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@
"twig/twig": "^3.10"
},
"require-dev": {
"cyclonedx/cyclonedx-php-composer": "^5.2",
"doctrine/instantiator": "2.*",
"mikey179/vfsstream": "^1.6",
"phpdocumentor/reflection-docblock": "5.*",
"phpmd/phpmd" : "@stable",
"phpmd/phpmd": "@stable",
"phpstan/phpstan": "^1.0.0",
"phpunit/phpunit": "11.*",
"rector/rector": "^1.0.0",
Expand All @@ -76,6 +77,7 @@
"vendor-dir": "phpmyfaq/src/libs",
"bin-dir": "phpmyfaq/src/libs/bin",
"allow-plugins": {
"cyclonedx/cyclonedx-php-composer": true,
"php-http/discovery": true
},
"sort-packages": true
Expand All @@ -96,6 +98,7 @@
"phpmd": "./phpmyfaq/src/libs/bin/phpmd ./phpmyfaq/src/phpMyFAQ html rulesets.xml > phpmd.html",
"refactor": "./phpmyfaq/src/libs/bin/rector",
"refactor:dryrun": "./phpmyfaq/src/libs/bin/rector --dry-run",
"sbom:create": "composer CycloneDX:make-sbom --output-format=JSON --output-file=sbom-php.json",
"test": "./phpmyfaq/src/libs/bin/phpunit --coverage-text"
},
"support": {
Expand Down
Loading

0 comments on commit 29868fa

Please sign in to comment.