Separate Symbols #3

Open

XedinUnknown wants to merge 9 commits from XedinUnknown/task/separate-symbols into main

XedinUnknown commented

2020-11-12 07:56:03 +00:00

(Migrated from github.com)

Identifiers are separated into 3 types: classes (classes, interfaces, and traits), functions, and constants. This is in line with what Reflector expects.
IdentifierExtractor now returns a new IdentifiersInterface, which separates identifiers by type, and also allows retrieving all identifiers in a flat list.
IdentifierExtractor retrieves an IdentifierInterface per file, and uses a CompositeIdentifiers to merge the identifier collections from all files together.

- Identifiers are separated into 3 types: classes (classes, interfaces, and traits), functions, and constants. This is in line with what [`Reflector`][] expects. - `IdentifierExtractor` now returns a new `IdentifiersInterface`, which separates identifiers by type, and also allows retrieving all identifiers in a flat list. - `IdentifierExtractor` retrieves an `IdentifierInterface` per file, and uses a `CompositeIdentifiers` to merge the identifier collections from all files together. [`Reflector`]: https://github.com/humbug/php-scoper/blob/117ed8c3cf278d2fba5ca5115e74bb88f984916d/src/Reflector.php

This pull request has changes conflicting with the target branch.

src/IdentifierExtractor.php

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Separate Symbols' (#3) from XedinUnknown/task/separate-symbols into main

Merge commit body

Reviewed-on: https://git.pxlrbt.de/pxlrbt/php-scoper-prefix-remover/pulls/3

Merge pull request 'Separate Symbols' (#3) from XedinUnknown/task/separate-symbols into main

Reviewed-on: https://git.pxlrbt.de/pxlrbt/php-scoper-prefix-remover/pulls/3

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin XedinUnknown/task/separate-symbols:XedinUnknown/task/separate-symbols

git switch XedinUnknown/task/separate-symbols

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff XedinUnknown/task/separate-symbols

git switch XedinUnknown/task/separate-symbols

git rebase main

git switch main

git merge --ff-only XedinUnknown/task/separate-symbols

git switch XedinUnknown/task/separate-symbols

git rebase main

git switch main

git merge --no-ff XedinUnknown/task/separate-symbols

git switch main

git merge --squash XedinUnknown/task/separate-symbols