FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Refactor autoloading and normalize test structure by fadrian06 · Pull Request #709 · flightphp/core · GitHub

/ core Public

Refactor autoloading and normalize test structure - #709

Merged
n0nag0n merged 13 commits into
masterfrom
autoload-rework
Jun 25, 2026
ConversationCommits (13)ChecksFiles changed
Merged

Refactor autoloading and normalize test structure#709
n0nag0n merged 13 commits into
masterfrom
autoload-rework

Conversation

fadrian06 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

This pull request refactors the project’s autoloading and test structure to modernize dependency management, standardize naming conventions, and improve test reliability. The most significant changes include removing the custom autoloader in favor of Composer's autoloader, updating namespaces and directory structures for consistency, and cleaning up test and configuration files.

Autoloading and Dependency Management:

  • Removed the custom flight/autoload.php file and its usage throughout the codebase, switching all autoloading to Composer's vendor/autoload.php. This simplifies dependency management and aligns with modern PHP practices. (composer.json, index.php, flight/Flight.php, tests/server/index.php, tests/phpunit_autoload.php, [1] [2] [3] [4] [5]
  • Updated composer.json autoload and autoload-dev sections to use PSR-4 autoloading for both source and test code, and removed the files autoload section. (composer.json, composer.jsonL30-R39)

Namespace and Directory Structure Standardization:

  • Renamed test directories and files from kebab-case to snake_case (e.g., named-arguments to named_arguments, server-v2 to server_v2) and updated namespaces accordingly for consistency and PSR-4 compatibility. (composer.json, phpunit.xml.dist, tests/named_arguments/ExampleClass.php, tests/named_arguments/FlightTest.php, tests/server_v2/AuthCheck.php, [1] [2] [3] [4] [5] [6]
  • Standardized namespaces in test files and middleware classes from Tests\Server to tests\server and from Tests\PHP8 to tests\named_arguments. (tests/EventSystemTest.php, tests/server/AuthCheck.php, tests/server/LayoutMiddleware.php, tests/server/OverwriteBodyMiddleware.php, tests/server/Pascal_Snake_Case.php, [1] [2] [3] [4] [5]

Test and Configuration Improvements:

  • Removed the custom test bootstrap file and its references, relying on Composer's autoloading for test setup. (phpunit.xml.dist, [1] [2]
  • Updated phpunit.xml.dist to match new directory names and removed exclusions for files/directories that no longer exist. (phpunit.xml.dist, phpunit.xml.distL18-R21)
  • Refactored tests in LoaderTest.php to use reflection for accessing private properties instead of anonymous classes, improving maintainability. (tests/LoaderTest.php, [1] [2]
  • Minor fix in LoaderTest.php to use Closure::fromCallable for registering callables. (tests/LoaderTest.php, tests/LoaderTest.phpL88-R89)

Loader and Internal Improvements:

  • Improved the Loader class to use is_iterable for directory addition and normalize directory separators, enhancing cross-platform compatibility. (flight/core/Loader.php, flight/core/Loader.phpL218-R224)
  • Updated docblocks in Loader for clarity and type safety. (flight/core/Loader.php, flight/core/Loader.phpL51-R53)

Miscellaneous:

  • Updated test server scripts and references to use new directory and namespace conventions. (composer.json, tests/server/index.php, [1] [2]

These changes collectively modernize the codebase, improve consistency, and make the project easier to maintain and extend.

fadrian06 added 8 commits June 23, 2026 12:48
autoload reworked
85d2f82 
- removed autoload-dev.classmap
- normalize Tests/* namespace to tests
- rename tests/server-v2 to tests/server_v2
- remove tests/phpunit_autoload.php
- update tests files namespaces
- update tests/server/index.php and tests/server_v2/index.php to use composer autoloader
- extract tests/server_v2/AuthCheck.php
move Flight to a classmap
90a72ae
add flight\ psr-4 autoloader
1a37f91
use is_iterable in Loader::register
921c51a
fix Loader::register docblock
9aab65b
normalize dirs
db34381
refactor LoaderTest
47a3702
remove flight/autoload.php
cf553d3
Copilot AI review requested due to automatic review settings June 23, 2026 17:58
Copilot AI reviewed Jun 23, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Pull request overview

This PR modernizes FlightPHP/Core’s bootstrapping by removing the bespoke framework/test autoloaders and standardizing the test tree so everything loads via Composer (PSR-4), with accompanying namespace and path updates.

Changes:

  • Removed the custom flight/autoload.php and tests/phpunit_autoload.php bootstrap in favor of Composer’s vendor/autoload.php.
  • Standardized test namespaces and moved/renamed test-server assets to PSR-4-friendly paths (tests/server_v2, tests/named_arguments, etc.).
  • Updated Loader internals and related tests to improve portability (iterable support + directory separator normalization).

Reviewed changes

Copilot reviewed 19 out of 20 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
composer.json Switches to PSR-4 autoloading (plus classmap for global Flight) and updates test-server script paths.
index.php Uses Composer autoloader instead of directly including flight/Flight.php.
flight/Flight.php Removes framework-level require of the old custom autoloader.
flight/core/Loader.php Improves directory registration (is_iterable) and normalizes directory separators; docblock tweaks.
flight/autoload.php Deleted custom autoloader.
phpunit.xml.dist Removes bootstrap file reference; updates excluded test directory name.
tests/phpunit_autoload.php Deleted custom PHPUnit bootstrap.
tests/EventSystemTest.php Normalizes test namespace to match new autoload-dev PSR-4 mapping.
tests/LoaderTest.php Updates callable registration and replaces helper subclasses with reflection-based assertions.
tests/named_arguments/FlightTest.php Updates namespace to match renamed directory and PSR-4 mapping.
tests/named_arguments/ExampleClass.php Adds namespace for PSR-4 compatibility.
tests/server/index.php Updates middleware class imports and switches to Composer autoload.
tests/server/AuthCheck.php Namespace updated for PSR-4 mapping consistency.
tests/server/LayoutMiddleware.php Namespace updated for PSR-4 mapping consistency.
tests/server/OverwriteBodyMiddleware.php Namespace updated for PSR-4 mapping consistency.
tests/server/Pascal_Snake_Case.php Namespace updated for PSR-4 mapping consistency.
tests/server-v2/index.php Deleted old v2 test server entrypoint.
tests/server_v2/index.php Adds the new v2 test server entrypoint under the normalized directory name.
tests/server_v2/AuthCheck.php Extracts v2 middleware into a PSR-4-loadable class.
tests/server_v2/template.phtml Adds a template file for the v2 test server.
Comments suppressed due to low confidence (1)

tests/named_arguments/ExampleClass.php:8

  • The PHPCS ignore for a missing namespace is now stale (the file declares a namespace). Keeping this suppression can hide future PHPCS issues and is misleading.

Comment thread tests/server_v2/index.php
Comment thread tests/server_v2/index.php Outdated
Comment thread tests/LoaderTest.php
fadrian06 and others added 3 commits June 23, 2026 14:04
validate ->setAccesible
8ec6817
reset v2ClassLoading
ee9b5f2
Potential fix for pull request finding
770d246 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

n0nag0n commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

This one I can't approve and merge. What you have done long term is correct and the right way to go, but because this was setup the way it is, people who have downloaded the zip rely on that autoload.php file for their workflows. Some of the main selling points of Flight is that it is simple and easy to implement, no dependencies, and no breaking changes are introduced to keep it backwards compatible.

n0nag0n closed this Jun 24, 2026

fadrian06 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

so if I restore autoload.php, this PR could be merged?

fadrian06 reopened this Jun 25, 2026

fadrian06 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Merged the latest master into autoload-rework. The merge resolved automatically without any conflicts — composer.json and tests/named_arguments/FlightTest.php were the only files touched by both branches, and both merged cleanly. The branch is now up to date with master.

n0nag0n merged commit bac3714 into master Jun 25, 2026
21 checks passed
n0nag0n deleted the autoload-rework branch June 25, 2026 13:23

n0nag0n commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

Yeah that's better!

ambrose5773 mentioned this pull request Sep 2, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Back | FazBrowse Home | New Git URL