Skip to content

Public cleanup 2 #73

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 5 commits into from
Jul 22, 2026
Merged

Public cleanup 2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b99800d
standardize tooling
cviebrock Jul 17, 2026
a24f641
Fix up some phpstan errors and typos, and ignore other ones (for now)
cviebrock Jul 17, 2026
7896956
format XML
cviebrock Jul 17, 2026
ab317b4
tweak rector config (since we pass already)
cviebrock Jul 17, 2026
d9ee1c1
Bump admin version
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
10 changes: 1 addition & 9 deletions .github/workflows/pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Setup Tailscale
uses: tailscale/github-action@v3
with:
oauth-client-id: ${{ secrets.SILVERORANGE_TAILSCALE_OAUTH_CLIENT_ID }}
oauth-secret: ${{ secrets.SILVERORANGE_TAILSCALE_OAUTH_SECRET }}
tags: tag:silverorange-gh-actions
version: latest

- name: Check out repository code
uses: actions/checkout@v4

Expand Down Expand Up @@ -45,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
21 changes: 11 additions & 10 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +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/
.php-cs-fixer.cache
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/.idea/
pnpm-debug.log*
pnpm-error.log*
*.swp

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

# overrides for local tooling
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
2 changes: 1 addition & 1 deletion .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/composer.lock
/pnpm-lock.yaml
/.pnpm-store

2 changes: 1 addition & 1 deletion Inquisition/admin/components/Inquisition/Details.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protected function getTableModel(SwatView $view): ?SwatTableModel
return $model;
}

protected function getQuestionTableModel(SwatTableView $view)
protected function getQuestionTableModel(SwatView $view)
{
$store = new SwatTableStore();

Expand Down
2 changes: 1 addition & 1 deletion Inquisition/admin/components/Inquisition/ImageDelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
abstract class InquisitionInquisitionImageDelete extends AdminDBDelete
{
/**
* @var InquisitonQuestionImageWrapper
* @var InquisitionQuestionImageWrapper
*/
protected $images;

Expand Down
202 changes: 101 additions & 101 deletions Inquisition/admin/components/Inquisition/details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
<?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="details_frame">
<widget class="SwatToolbar" id="details_toolbar">
<widget class="SwatToolLink" id="edit_link">
<property name="title" translatable="yes">Edit</property>
<property name="link">Inquisition/Edit?id=%s</property>
<property name="stock_id">edit</property>
</widget>
<widget class="SwatToolLink" id="delete_link">
<property name="title" translatable="yes">Delete</property>
<property name="link">Inquisition/Delete?id=%s</property>
<property name="stock_id">delete</property>
</widget>
</widget>
<!-- {{{ Details -->
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="details_frame">
<widget class="SwatToolbar" id="details_toolbar">
<widget class="SwatToolLink" id="edit_link">
<property name="title" translatable="yes">Edit</property>
<property name="link">Inquisition/Edit?id=%s</property>
<property name="stock_id">edit</property>
</widget>
<widget class="SwatToolLink" id="delete_link">
<property name="title" translatable="yes">Delete</property>
<property name="link">Inquisition/Delete?id=%s</property>
<property name="stock_id">delete</property>
</widget>
</widget>
<!-- {{{ Details -->

<widget class="SwatDetailsView" id="details_view">
<object class="SwatDetailsViewField" id="title">
<property name="title" translatable="yes">Title</property>
<object class="SwatNullTextCellRenderer">
<property name="text" type="data">title</property>
</object>
</object>
<object class="SwatDetailsViewField" id="createdate">
<property name="title" translatable="yes">Created On</property>
<object class="SwatDateCellRenderer">
<property name="date" type="data">createdate</property>
</object>
</object>
</widget>
<widget class="SwatDetailsView" id="details_view">
<object class="SwatDetailsViewField" id="title">
<property name="title" translatable="yes">Title</property>
<object class="SwatNullTextCellRenderer">
<property name="text" type="data">title</property>
</object>
</object>
<object class="SwatDetailsViewField" id="createdate">
<property name="title" translatable="yes">Created On</property>
<object class="SwatDateCellRenderer">
<property name="date" type="data">createdate</property>
</object>
</object>
</widget>

<!-- }}} -->
<!-- {{{ Questions -->
<!-- }}} -->
<!-- {{{ Questions -->

<widget class="SwatFrame" id="question_frame">
<property name="title" translatable="yes">Questions</property>
<widget class="SwatForm">
<widget class="SwatToolbar" id="question_toolbar">
<widget class="SwatToolLink" id="question_add">
<property name="title" translatable="yes">Add Question</property>
<property name="link">Question/Add?id=%s</property>
<property name="stock_id">add</property>
</widget>
<widget class="SwatToolLink" id="question_import">
<property name="title" translatable="yes">Import Questions</property>
<property name="link">Question/Import?id=%s</property>
<property name="stock_id">add</property>
</widget>
<widget class="SwatToolLink" id="question_order">
<property name="title" translatable="yes">Change Question Order</property>
<property name="link">Question/Order?id=%s</property>
<property name="stock_id">change-order</property>
</widget>
</widget>
<widget class="SwatTableView" id="question_view">
<object class="SwatTableViewCheckboxColumn">
<object class="SwatCheckboxCellRenderer" id="items">
<property name="value" type="data">id</property>
</object>
</object>
<object class="SwatTableViewColumn" id="title">
<object class="AdminTitleLinkCellRenderer">
<property name="text" type="data">title</property>
<property name="link">Question/Details?id=%s</property>
<property name="link_value[]" type="data">id</property>
</object>
</object>
<object class="SwatTableViewColumn" id="enabled_column">
<property name="title">Show on Site</property>
<property name="visible" type="boolean">false</property>
<object class="SwatBooleanCellRenderer">
<property name="value" type="data">enabled</property>
<property name="false_content" translatable="yes">No</property>
</object>
</object>
<object class="SwatTableViewColumn" id="option_count">
<property name="title"># of Options</property>
<object class="SwatNumericCellRenderer">
<property name="value" type="data">option_count</property>
</object>
</object>
<object class="SwatTableViewColumn" id="image_count_column">
<property name="title"># of Images</property>
<object class="SwatNumericCellRenderer">
<property name="value" type="data">image_count</property>
</object>
</object>
<object class="SwatTableViewSpanningColumn" id="bodytext">
<object class="SwatTextCellRenderer">
<property name="text" type="data">bodytext</property>
<property name="content_type">text/xml</property>
</object>
</object>
</widget>
<widget class="SwatActions" id="question_actions">
<widget class="SwatActionItem" id="question_delete">
<property name="title" translatable="yes">delete…</property>
</widget>
</widget>
</widget>
</widget>
<widget class="SwatFrame" id="question_frame">
<property name="title" translatable="yes">Questions</property>
<widget class="SwatForm">
<widget class="SwatToolbar" id="question_toolbar">
<widget class="SwatToolLink" id="question_add">
<property name="title" translatable="yes">Add Question</property>
<property name="link">Question/Add?id=%s</property>
<property name="stock_id">add</property>
</widget>
<widget class="SwatToolLink" id="question_import">
<property name="title" translatable="yes">Import Questions</property>
<property name="link">Question/Import?id=%s</property>
<property name="stock_id">add</property>
</widget>
<widget class="SwatToolLink" id="question_order">
<property name="title" translatable="yes">Change Question Order</property>
<property name="link">Question/Order?id=%s</property>
<property name="stock_id">change-order</property>
</widget>
</widget>
<widget class="SwatTableView" id="question_view">
<object class="SwatTableViewCheckboxColumn">
<object class="SwatCheckboxCellRenderer" id="items">
<property name="value" type="data">id</property>
</object>
</object>
<object class="SwatTableViewColumn" id="title">
<object class="AdminTitleLinkCellRenderer">
<property name="text" type="data">title</property>
<property name="link">Question/Details?id=%s</property>
<property name="link_value[]" type="data">id</property>
</object>
</object>
<object class="SwatTableViewColumn" id="enabled_column">
<property name="title">Show on Site</property>
<property name="visible" type="boolean">false</property>
<object class="SwatBooleanCellRenderer">
<property name="value" type="data">enabled</property>
<property name="false_content" translatable="yes">No</property>
</object>
</object>
<object class="SwatTableViewColumn" id="option_count">
<property name="title"># of Options</property>
<object class="SwatNumericCellRenderer">
<property name="value" type="data">option_count</property>
</object>
</object>
<object class="SwatTableViewColumn" id="image_count_column">
<property name="title"># of Images</property>
<object class="SwatNumericCellRenderer">
<property name="value" type="data">image_count</property>
</object>
</object>
<object class="SwatTableViewSpanningColumn" id="bodytext">
<object class="SwatTextCellRenderer">
<property name="text" type="data">bodytext</property>
<property name="content_type">text/xml</property>
</object>
</object>
</widget>
<widget class="SwatActions" id="question_actions">
<widget class="SwatActionItem" id="question_delete">
<property name="title" translatable="yes">delete…</property>
</widget>
</widget>
</widget>
</widget>

<!-- }}} -->
</widget>
<!-- }}} -->
</widget>
</swatml>
50 changes: 25 additions & 25 deletions Inquisition/admin/components/Inquisition/edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?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">Inquisition</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField" id="title_field">
<property name="title" translatable="yes">Title</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField" id="enabled_field">
<property name="title" translatable="yes">Show on Site?</property>
<!---
<widget class="SwatMessageDisplay" id="message_display" />
<widget class="SwatFrame" id="edit_frame">
<property name="title" translatable="yes">Inquisition</property>
<widget class="SwatForm" id="edit_form">
<widget class="SwatFormField" id="title_field">
<property name="title" translatable="yes">Title</property>
<widget class="SwatEntry" id="title">
<property name="maxlength" type="integer">255</property>
</widget>
</widget>
<widget class="SwatFormField" id="enabled_field">
<property name="title" translatable="yes">Show on Site?</property>
<!--
The enabled field is not visible by default. It can be used
for sites/packages that implement the enabled flag for
inquisition visibility.
--->
<property name="visible" type="boolean">false</property>
<widget class="SwatCheckbox" id="enabled">
<property name="value" type="boolean">true</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
-->
<property name="visible" type="boolean">false</property>
<widget class="SwatCheckbox" id="enabled">
<property name="value" type="boolean">true</property>
</widget>
</widget>
<widget class="SwatFooterFormField">
<widget class="SwatButton" id="submit_button" />
</widget>
</widget>
</widget>
</swatml>
Loading
Loading