Skip to content

Public cleanup 2 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kendraSO merged 3 commits into from
Jul 22, 2026
Merged

Public cleanup 2 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
360dde3
standardize tooling
cviebrock Jul 17, 2026
d4ff04f
Format XML (all whitespace)
cviebrock Jul 17, 2026
b8eb6f4
bump admin package
cviebrock Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.php]
[*.{php,xml}]
indent_size = 4

[*.{diff,md}]
trim_trailing_whitespace = false

[Jenkinsfile]
indent_size = 4
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"

- name: Cache dependencies
uses: actions/cache@v4
Expand Down
22 changes: 13 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
vendor/
node_modules/
/vendor/
/node_modules/

# misc
.DS_Store
.env
.idea/
npm-debug.log*
.php-cs-fixer.cache
/.idea/
pnpm-debug.log*
pnpm-error.log*
*.swp

# dependency lock file
composer.lock
# testing/tooling output
.php-cs-fixer.cache
.phpunit.cache
.phpunit.result.cache
/build/

# overrides for local tooling
/phpstan.neon
/phpstan-baseline.neon
phpstan.neon
phpstan-baseline.neon
phpunit.xml
10 changes: 7 additions & 3 deletions .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;

$finder = (new Finder())
->in(__DIR__);
->in(__DIR__)
->append([__FILE__]);

return (new Config())
->setParallelConfig(ParallelConfigFactory::detect(null, null, 2**18-1))
->setParallelConfig(ParallelConfigFactory::detect(null, null, 2 ** 18 - 1))
->setRules([
'@PhpCsFixer' => true,
'@PHP8x2Migration' => true,
'@PHP8x2Migration' => true,
'indentation_type' => true,

// Overrides for (opinionated) @PhpCsFixer and @Symfony rules:
Expand All @@ -22,6 +23,9 @@
// Subset of statements that should be proceeded with blank line
'blank_line_before_statement' => ['statements' => ['case', 'continue', 'declare', 'default', 'return', 'throw', 'try', 'yield', 'yield_from']],

// Allow class list for multiple extends/implements to span multiple lines
'class_definition' => ['multi_line_extends_each_single_line' => true],

// Enforce space around concatenation operator
'concat_space' => ['spacing' => 'one'],

Expand Down
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/composer.lock
/pnpm-lock.yaml

42 changes: 21 additions & 21 deletions Building/admin/components/Block/attachment-edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" standalone="no"?>
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE swatml SYSTEM "http://swat.silverorange.com/swatml1.dtd">
<swatml>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">File</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField">
<property name="title" translatable="yes">File</property>
<widget class="SwatFileEntry" id="file_upload" />
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Title</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
<property name="required" type="boolean">true</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">File</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField">
<property name="title" translatable="yes">File</property>
<widget class="SwatFileEntry" id="file_upload" />
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Title</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
<property name="required" type="boolean">true</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
</swatml>
62 changes: 31 additions & 31 deletions Building/admin/components/Block/image-edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?xml version="1.0" standalone="no"?>
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE swatml SYSTEM "http://swat.silverorange.com/swatml1.dtd">
<swatml>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Image</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatImagePreviewDisplay" id="image_preview">
<property name="visible" type="boolean">false</property>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Image</property>
<widget class="SwatFileEntry" id="image_upload">
<property name="accept_mime_types[]">image/jpeg</property>
<property name="accept_mime_types[]">image/png</property>
<property name="accept_mime_types[]">image/tiff</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Caption</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Description</property>
<widget class="SwatTextarea" id="description" />
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Image</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatImagePreviewDisplay" id="image_preview">
<property name="visible" type="boolean">false</property>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Image</property>
<widget class="SwatFileEntry" id="image_upload">
<property name="accept_mime_types[]">image/jpeg</property>
<property name="accept_mime_types[]">image/png</property>
<property name="accept_mime_types[]">image/tiff</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Caption</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Description</property>
<widget class="SwatTextarea" id="description" />
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
</swatml>
46 changes: 23 additions & 23 deletions Building/admin/components/Block/video-edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" standalone="no"?>
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE swatml SYSTEM "http://swat.silverorange.com/swatml1.dtd">
<swatml>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Video</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatContentBlock" id="player">
<property name="content_type">text/xml</property>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Caption</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Description</property>
<widget class="SwatTextarea" id="description" />
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Video</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatContentBlock" id="player">
<property name="content_type">text/xml</property>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Caption</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField">
<property name="title" translatable="yes">Description</property>
<widget class="SwatTextarea" id="description" />
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
</swatml>
38 changes: 19 additions & 19 deletions Building/admin/components/Block/xhtml-edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" standalone="no"?>
<?xml version="1.0" standalone="no" ?>
<!DOCTYPE swatml SYSTEM "http://swat.silverorange.com/swatml1.dtd">
<swatml>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Text Content</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField" id="bodytext_field">
<property name="title" translatable="yes">Text Content</property>
<property name="show_title" type="boolean">false</property>
<widget class="SwatTextareaEditor" id="bodytext">
<property name="required" type="boolean">true</property>
<property name="rows" type="integer">40</property>
<property name="width">640px</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Text Content</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField" id="bodytext_field">
<property name="title" translatable="yes">Text Content</property>
<property name="show_title" type="boolean">false</property>
<widget class="SwatTextareaEditor" id="bodytext">
<property name="required" type="boolean">true</property>
<property name="rows" type="integer">40</property>
<property name="width">640px</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
</swatml>
40 changes: 0 additions & 40 deletions Jenkinsfile
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"name": "silverorange/building",
"description": "Basic CMS framework.",
"license": "MIT",
"type": "library",
"keywords": [
"cms"
],
"homepage": "https://github.com/silverorange/building",
"license": "MIT",
"authors": [
{
"name": "Michael Gauthier",
"email": "mike@silverorange.com"
}
],
"homepage": "https://github.com/silverorange/building",
"require": {
"php": ">=8.2",
"ext-mbstring": "*",
"silverorange/admin": "^7.0.3",
"silverorange/site": "^15.3.2",
"silverorange/swat": "^7.9.2"
"silverorange/admin": "^7.1.0",
"silverorange/site": "^16.1.0",
"silverorange/swat": "^7.10.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "3.88.2",
"phpstan/phpstan": "^2.2",
"rector/rector": "^2.4"
},
"autoload": {
"classmap": [
"Building/"
]
},
"config": {
"sort-packages": true
},
"scripts": {
"phpcs": "./vendor/bin/php-cs-fixer check -v",
"phpcs:ci": "./vendor/bin/php-cs-fixer check --config=.php-cs-fixer.php --no-interaction --show-progress=none --diff --using-cache=no -vvv",
"phpcs:fix": "./vendor/bin/php-cs-fixer fix -v",
"phpstan": "./vendor/bin/phpstan analyze",
"phpstan:ci": "./vendor/bin/phpstan analyze -vvv --no-progress --memory-limit 2G",
"phpstan:baseline": "./vendor/bin/phpstan analyze --generate-baseline",
"phpstan:ci": "./vendor/bin/phpstan analyze -vvv --no-progress --memory-limit 2G",
"rector": "./vendor/bin/rector --dry-run",
"rector:fix": "./vendor/bin/rector"
},
"autoload": {
"classmap": [
"Building/"
]
},
"config": {
"sort-packages": true
}
}
Loading
Loading