mirror of
https://github.com/FOSSBilling/FOSSBilling.git
synced 2026-11-08 21:15:33 +09:00
b82df887feee9762591dcfda0a4daffe53702ec3
13
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
b82df887fe |
Enhance CI/CD with Docker optimizations and error handling (#3509)
* Bump Dockerfile syntax to 1.18 * Add getStatusCode to Response and update test * Expect error code 740 for invalid theme action * Use Docker-based CI/test image and live test script * Add PHP 8.5 to CI matrix * Add Buildx caching and optimize Docker build * Add CI timeouts, quoting fixes, and release tree build * Add concurrency, caching, and cleanup to CI * Grant permissions for preview-build job * Map error code 740 to HTTP 404 and update test * Update cache-scope names in GitHub workflows * Remove redundant status guard in theme admin test Agent-Logs-Url: https://github.com/FOSSBilling/FOSSBilling/sessions/b20f484f-0aaa-4afc-ae43-adb264bb05aa Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Grant cache export permissions to CI build job Agent-Logs-Url: https://github.com/FOSSBilling/FOSSBilling/sessions/a088c94f-a176-40fb-9e0b-ee3cac2aeb5b Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Disable cache for release artifact build * Fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> |
||
|
Adam Daley
|
53eb4f2fca |
Refactor Twig environments and extensions (#2752)
* Replace Custom Twig components Replace custom Twig components with native Twig components, remove unused custom Twig components, and move functionality to macros where appropriate. m Update partial_extensions.html.twig * Update Twig components and migrate to FOSSBilling namespace * Update Currency module... * Refactor Twig environment config and loading * Switch CSRF to cookie-based double-submit * Add Api Twig extension and restore widget/svg helpers * Cast language flags; improve JSON parsing * Add markdown DI service and use in Admin API * Refactor Twig extensions and markdown, simplify APIs * Add sandboxed email Twig env, update render APIs * Fix pagination URL usage and menu class * Fix HTML markup in email templates * Use macro for avatars and status badges * Fix Twig spacing and pagination URL filter order * Replace Custom Twig components Replace custom Twig components with native Twig components, remove unused custom Twig components, and move functionality to macros where appropriate. m Update partial_extensions.html.twig * Update Twig components and migrate to FOSSBilling namespace * Refactor Twig environment config and loading * Add Api Twig extension and restore widget/svg helpers * Cast language flags; improve JSON parsing * Add markdown DI service and use in Admin API * Refactor Twig extensions and markdown, simplify APIs * Fix pagination URL usage and menu class * Fix Twig spacing and pagination URL filter order * Use `current_theme` global and refactor `period_title` * Allow markdown and date in email Twig sandbox * Update email template examples * Fix Twig URLs, quoting, and logo alt text * Fix Twig templates: URLs, i18n, search params * Use `templates/*` directories for module templates * Tighten Twig sandbox and add tests * Add Twig environment and template docs to `AGENTS.md` * Use Symfony Filesystem/Finder and assorted fixes * Fix ticket reply link fragment concatenation * Close missing divs in dashboard template * Use detailed `toApiArray` for client * Fix module name resolution for email templates * Regenerate `composer.lock` * Use `markdown_to_html` filter in admin macro * Handle null price/quantity and rename test method * Use `Tools::isHTTPS()` for HTTPS checks * Add 'area' param to `url` filter and update templates * Use client area URLs in admin templates * Use client area and guest API URLs in templates * Remove client-side invoice delete feature * Create Twig env via `TwigFactory` for PDF rendering * Add embedded orderbutton JS and update render * Add 'srclink' to cspell allowlist * Use `renderEmailTplString` for email rendering * Bump twig/markdown-extra to v3.24 * Use `markdown_to_html` for privacy policy * Escape API JSON, handle null IP, client URLs * Remove initial admin creation flow * Handle HTTP failures and make tests robust * Use `api_url` helper in admin templates * Use `url` filter for footer link 5 * Add patch53 to remove legacy html templates * Bump setting last_patch to 53 * Add patch54 to restore legacy email templates * Use renderEmailTplString for email templating * Remove redundant else/endif in order template * Add file-hash cache buster for asset URLs * Remove raw Twig filter and handle missing modules dir * Return '-' for future timestamps * Register and reuse TwigFactory and add CSRF cookie * Adjust API URL helper and add Twig error handling * Update composer.lock and package-lock.json * Add twig_factory to ServiceTest DI * Use url filter for link_page in template * Composer - update deps and add markdown-extra * Remove docblocks and inline comments in `TwigFactory` * Add patches 53-55 and update `last_patch` * Add `has_permission` Twig function; exclude `href` * Remove duplicate network interface form * Guard removal of legacy dirs; add network input * Handle null category descriptions in template * Add Twig adapter env and sandbox policy * Add 'striptags' to cspell word list * Update composer.lock (deps updated/removed) * Sanitize custom payment adapter templates * Remove redundant legacy API tests * Bump `last_patch` setting to 56 * Coalesce null before `markdown_to_html` * Move update patcher to system CLI command * Remove stray `endif` from recaptcha macro * Update composer.lock * Fix extra closing brace in Api ServiceTest * Fix test errors from main merge - Remove testGetRequestCount tests (method moved to RateLimiter) - Remove testGetDi from Staff and System GuestTest (protected method) - Fix IP error message in testLoginCheckIpException - Add rate_limiter mock to Staff GuestTest tests that need it * Fix remaining Staff GuestTest issues - Add extension service mock for captcha check - Fix error message from 'User not found' to 'Admin not found' * Fix Staff GuestTest: update query and add logger mock * Fix Staff GuestTest: set admin status to active for password reset flow * Fix stale API calls and inverted required condition - Notification: replace removed system_string_render with direct output - Antispam settings: replace |alink/|link with |url/|api_url filters - build_form macro: fix inverted required condition for non-textarea inputs * Sanitize JS/data URIs and disable buttons by permission * Use client login/profile links in support emails * Encode fb-api JSON and tighten URL sanitization * Prefer session auth for API key methods * Remove stray endif and fix template formatting * Add CSRF token to CSV exports; fix template * Remove stray endif in currency template * Make invoice PDF generation return Response * Fix Twig filters, templates, and form handling * Remove readonly from anonymous class in test * Inline DebugBar CSS/JS in renderHead * Add Bootstrap Tab to global bootstrap * Capitalize template UI strings * Use CKEditor API for reply quotes * Remove WYSIWYG module and move CKEditor to themes * Bump `last_patch` in install SQL to 59 * Remove Spamchecker module * Run domain management script only for active orders * Standardize UI text capitalization & minor fixes * Remove Spamchecker legacy tests; fix period test * Rename Spamchecker tests to Antispam * Restore antispam config in tests; remove fixture * Refactor Antispam Guest tests for config checks * Update theme build docs; remove Wysiwyg module * Remove spamchecker from cspell and tweak comment * Add spamchecker to cspell word list * Capitalize 'Update Graphs' button label |
||
|
Copilotandadmdly
|
230b285dd7 |
Fix SSL typo, invalid transaction status, and unsafe array access in APIHelper (#3399)
* Initial plan * Fix typos, invalid transaction status, and unsafe array access in APIHelper Agent-Logs-Url: https://github.com/FOSSBilling/FOSSBilling/sessions/5ec74911-4de8-4620-a3e3-cd6e36a975fb Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix getHasSll typo in Directadmin.php to match baseline suppression Agent-Logs-Url: https://github.com/FOSSBilling/FOSSBilling/sessions/e74d2b4a-d375-4c99-b557-9050dc9f0c55 Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> |
||
|
FOSSBilling BotandFOSSBilling Bot
|
3b14e9214b |
Apply PHP Code Styling & Quality Changes (#3393)
Co-authored-by: FOSSBilling Bot <fossbilling-bot> |
||
|
Adam Daley
|
435944defa |
Refactor pagination and API with strict types and validation (#3391)
* Add strict types; refactor pagination, tools & API * Replace `Box_Paginator` with FOSSBilling `Paginator` * Clarify paginator comment wording * Validate JSON response and include HTTP code * Cast language params to bool and add JSON preview |
||
|
|
b41aad26ce |
Migrated the Currency module to Doctrine (#2963)
* Migrated the Currency module to Doctrine * Caching and other improvements * Types, error handling and other improvements * Don't return false but throw an exception * Types * Refactor currency model usage to new Currency entity * Remove Fastnetmon submodule Deleted the Fastnetmon submodule from src/modules. This change may be part of a cleanup or migration away from using Fastnetmon as a submodule. * Refactor currency API admin get test * Fix failing Currency-related tests after Doctrine migration Updated test files to work with the new Doctrine-based Currency implementation. * Refactor currency retrieval to use repository * Refactor Currency database handling in several services and tests * Replace anonymous class mocks with standard PHPUnit mocks in Invoice tests (#3037) * Refactor currency retrieval and currency service * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Confirm updateCurrencyRates() method signature alignment (#3034) * Add null check for currency in Cart::toApiArray to prevent fatal error (#3035) * Initial plan * Add null check for currency in toApiArray method Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Initial plan * Replace anonymous class mocks with standard PHPUnit mocks for consistency Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: Adam Daley <admdly@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix incorrect getRateByCode call in Order service (#3039) * Initial plan * Fix getRateByCode call and add null check with proper exception Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix silent failure in Currency::getBaseCurrencyRate when currency not found (#3040) * Initial plan * Throw exception when currency not found in getBaseCurrencyRate Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Use FOSSBilling\Exception for currency conversion rate failures (#3041) Use FOSSBilling\Exception for conversion rate fetch failures Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Remove problematic reflection usage in Cart service tests (#3042) Remove problematic reflection usage in Cart test Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Update tests-legacy/modules/Cart/Api/GuestTest.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Entity/Currency.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Use FOSSBilling\Exception for null currency check in Cart service (#3058) * Initial plan * Use FOSSBilling\Exception for null currency check in Cart service Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Use consistent error message for default currency not found Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Remove silent fallback in CurrencyRepository::findDefault() (#3057) * Add logging for default currency fallback behavior - Log warning when no default currency is found and falling back to ID 1 - Log critical error when neither default currency nor ID 1 exists - Clarify return type documentation - Cache result even if null to avoid repeated warnings Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Remove silent fallback to currency ID 1 in findDefault() Instead of silently falling back to currency ID 1 when no default is found, the method now returns null and lets callers handle it. This addresses the feedback about the silent fallback hiding configuration issues. All existing callers already properly handle null by throwing exceptions, so this change makes the error visible rather than hidden. Benefits: - No silent failures hiding misconfiguration - Cleaner separation of concerns (repositories for data access only) - Better adherence to Doctrine repository pattern - All callers already handle null appropriately Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Remove redundant documentation in findDefault() Simplified @return annotation to avoid redundancy with the description. Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix Currency entity getId() to handle uninitialized state (#3059) Make Currency::getId() return nullable int to prevent runtime errors Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Remove static cache from CurrencyRepository to fix long-running process issues (#3061) * Initial plan * Remove static cache from CurrencyRepository to fix long-running process issues Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix inconsistent null handling in CurrencyRepository::getRateByCode callers (#3062) * Fix null handling in Invoice/Service.php getRateByCode call Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix Invoice test to mock getRateByCode with valid return value Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Refactor Qwen `settings.json` structure and update version * Verify null handling consistency in CurrencyRepository::getRateByCode (#3073) Initial plan Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> * Update src/modules/Order/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Repository/CurrencyRepository.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Improve return type annotation for Currency Admin API get_pairs method (#3075) * Initial plan * Improve return type annotation for get_pairs method in Currency Admin API Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix return type description to accurately reflect the return format Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix nullable type inconsistency in Currency entity setCode/getCode methods (#3074) * Initial plan * Fix nullable type in Currency entity setCode and getCode methods Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix PHPUnit test failures by updating mock return values for getCode Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Restore deleted Cart API Guest tests for Doctrine Currency migration (#3076) * Initial plan * Restore deleted Cart API Guest tests and update for Doctrine Currency migration Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix testAddItemSingle mock to return boolean instead of cart object Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Refactor currency handling in `Cart` and `Invoice` services Updated `Cart` and `Invoice` services to consistently use `CurrencyRepository` for retrieving currency entities and default currency. Improved error handling for missing currencies and updated related tests to mock new repository methods. Also fixed minor typos and improved code clarity in tests. * Refactor currency handling in `Cart` Service Replaced direct property access of currency code and conversion rate with getter methods in `Cart` Service. This improves encapsulation and consistency when handling currency-related operations. * Update src/modules/Cart/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update tests-legacy/modules/Order/ServiceTest.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Service.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/Currency/Entity/Currency.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix exception signature and type hint in `Currency` service Updated the exception thrown in `validateCurrencyForma`t to include a null second parameter for compatibility. Also added a return type to the closure in `Cart` `ServiceTest` for better type safety. * Refactor currency selection logic in `Cart` Service Improves clarity by separating client currency retrieval and default currency fallback. Ensures that the default currency is only checked and exception thrown if both client and default currencies are unavailable. * Add precision handling and caching for Currency conversionRate property (#3082) * Add documentation and caching for conversionRate precision handling Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Use sprintf for float-to-string conversion to avoid scientific notation Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix Doctrine identity map caching issue when changing default currency (#3081) * Fix Doctrine identity map caching issue in setAsDefault method Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Store currency code before clearing identity map to avoid detached entity access Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Fix PHPUnit test for setAsDefault method by mocking findOneByCode and clear Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> * Refactor currency test mocks for static data providers Replaces direct mock object creation in static data providers with string flags or placeholders, enabling proper mock instantiation within test methods. Updates test signatures and logic to handle these flags, improving test maintainability and compatibility with PHPUnit static context constraints. --------- Co-authored-by: Adam Daley <admdly@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: admdly <2807620+admdly@users.noreply.github.com> |
||
|
Adam Daley
|
a9b903c222 |
Codebase modernisation, configuration cleanup, and improved type safety (#2957)
* Refactor tests to replace depreciated functions * Update Rector config and dependencies * Rector: Add explicit string casting for stricter type safety * Rector: Add return type hints to methods across codebase * Rector: Increase dead code level and refactor invoice item logic * Remove unnecessary `willReturn` from test mocks Eliminate redundant `willReturn(null)` and similar calls from PHPUnit mock setups in legacy module tests, leaving only method expectations. Also update some test values to use floats for consistency. * Refactor API controller and email adapter return values * Update formatting and guidelines in `AGENTS.md` |
||
|
Adam DaleyandCopilot
|
315f9f3944 |
Refactor Filesystem and Path handling (#2836)
* Removed legacy files * Refactor Filesystem and Path handling * Removed `FOSSBilling\Tools` legacy functions * Update live-tests to include file check for `php_error.log` * Update Extension module tables to fix wrapping issue * Apply suggestions from @Copilot Co-Authored-By: Copilot <175728472+Copilot@users.noreply.github.com> * Update Extension module icon URL handling --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> |
||
|
Belle Aerni
|
45db4910a7 |
PHP 8.4 prep (#2464)
* Update CI for PHP 8.4 * Update composer deps for PHP 8.4 * Updates * This is the default mode and this constant causes test failutes * Explicily install the PDO extensions * Temporarily downgrade the live tests to PHP 8.3 It would seem that there is some kind of problem with PHP 8.4 in regards to these tests. I believe it is outside of our control however as it installs fine for me with PHP 8.4 under DirectAdmin * Update to address deprecations * Make that nullable * Fixed my typo * Bump PHPunit to v11 * Also take care of two minor things * Formatting fix |
||
|
Belle Aerni
|
cca0515491 |
Transfer carts when logging in (#2083)
* Transfer the cart when logging in * Wrote a test for it * This should at least fix one of the tests * Oops * Wrong spot... * Ah-ha! |
||
|
Belle Aerni
|
8f4d0d4cac |
More tests and CI improvements (#2078)
* Wrote a few more tests, improvements * Ran Rector & PHP-CS-Fixer * Append a capital letter to the test client passwords * Minor tweaks * Display more info after the tests run * Oops, I forgot to set the dir * Fix cron behavior for test env, dropped legacy tests * Rename the empty test suite so PHPUnit ignores it * Update cspell.json * Minor tweaks to the tests * Fixes |
||
|
Belle Aerni
|
1b0fba1922 |
Various additional tests (#2069)
* Various additional tests * Fixes * More fixes * Fixed my other mistakes * Final fix |
||
|
Belle Aerni
|
ccc97a3ec9 |
Initial implementation of CI against a live FOSSBilling Install (#2067)
* Rename tests to tests-legacy * Groundwork for live tests * Somewhat working tests on a live instance * Hmmmmmm * Fix * Fixed the other bug * Added a handful of various tests * Typos, all these are admin endpoints * Bypass this check for testing envs * Disable it for now * Mini cleanup * Cleanup from debugging, ran PHP-CS-Fixer |