@flarum/cli 2.0.2 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.md +40 -22
- package/boilerplate/skeleton/extension/.github/workflows/backend.yml +1 -1
- package/boilerplate/skeleton/extension/.github/workflows/frontend.yml +2 -1
- package/boilerplate/skeleton/extension/.github/workflows/phpstan.yml +12 -0
- package/boilerplate/skeleton/extension/composer.json +8 -4
- package/boilerplate/skeleton/extension/gitignore +1 -0
- package/boilerplate/skeleton/extension/js/jest.config.cjs +1 -0
- package/boilerplate/skeleton/extension/js/package.json +6 -3
- package/boilerplate/skeleton/extension/js/src/admin/extend.js +8 -0
- package/boilerplate/skeleton/extension/js/src/admin/extend.ts +8 -0
- package/boilerplate/skeleton/extension/js/src/admin/index.js +2 -0
- package/boilerplate/skeleton/extension/js/src/admin/index.ts +3 -1
- package/boilerplate/skeleton/extension/js/src/common/extend.js +5 -0
- package/boilerplate/skeleton/extension/js/src/common/extend.ts +5 -0
- package/boilerplate/skeleton/extension/js/src/common/index.ts +1 -1
- package/boilerplate/skeleton/extension/js/src/forum/extend.js +8 -0
- package/boilerplate/skeleton/extension/js/src/forum/extend.ts +8 -0
- package/boilerplate/skeleton/extension/js/src/forum/index.js +2 -0
- package/boilerplate/skeleton/extension/js/src/forum/index.ts +3 -1
- package/boilerplate/skeleton/extension/js/tests/unit/.gitkeep +0 -0
- package/boilerplate/skeleton/extension/js/tsconfig.test.json +10 -0
- package/boilerplate/skeleton/extension/locale/en.yml +1 -1
- package/boilerplate/skeleton/extension/phpstan.neon +12 -0
- package/boilerplate/skeleton/extension/tests/phpunit.integration.xml +5 -7
- package/boilerplate/skeleton/extension/tests/phpunit.unit.xml +5 -10
- package/boilerplate/stubs/backend/advanced-api-resource.php +85 -0
- package/boilerplate/stubs/backend/api-resource.php +73 -0
- package/boilerplate/stubs/backend/command.php +2 -2
- package/boilerplate/stubs/backend/controller.php +19 -0
- package/boilerplate/stubs/backend/event-listener.php +1 -1
- package/boilerplate/stubs/backend/filter.php +25 -0
- package/boilerplate/stubs/backend/handler/command.php +6 -20
- package/boilerplate/stubs/backend/handler/handler.php +6 -14
- package/boilerplate/stubs/backend/integration-test.php +10 -7
- package/boilerplate/stubs/backend/job.php +6 -11
- package/boilerplate/stubs/backend/mail-driver.php +36 -0
- package/boilerplate/stubs/backend/middleware.php +19 -0
- package/boilerplate/stubs/backend/model.php +1 -1
- package/boilerplate/stubs/backend/notification-blueprint.php +42 -0
- package/boilerplate/stubs/backend/notification-driver.php +32 -0
- package/boilerplate/stubs/backend/policy.php +1 -1
- package/boilerplate/stubs/backend/post-type.php +35 -0
- package/boilerplate/stubs/backend/repository.php +2 -10
- package/boilerplate/stubs/backend/search/driver.php +13 -0
- package/boilerplate/stubs/backend/search/searcher.php +41 -0
- package/boilerplate/stubs/backend/service-provider.php +1 -1
- package/boilerplate/stubs/backend/validator.php +1 -1
- package/boilerplate/stubs/frontend/component.js +1 -1
- package/boilerplate/stubs/frontend/forum-page.js +68 -0
- package/boilerplate/stubs/frontend/gambit/boolean.js +12 -0
- package/boilerplate/stubs/frontend/gambit/key-value.js +16 -0
- package/boilerplate/stubs/frontend/modal.js +1 -1
- package/boilerplate/stubs/frontend/model.js +1 -1
- package/boilerplate/stubs/frontend/notification.js +22 -0
- package/boilerplate/stubs/frontend/post-type.js +13 -0
- package/boilerplate/stubs/migration.php +1 -1
- package/boilerplate/stubs/views/email/html/information.blade.php +8 -0
- package/boilerplate/stubs/views/email/html/notification.blade.php +8 -0
- package/boilerplate/stubs/views/email/plain/information.blade.php +7 -0
- package/boilerplate/stubs/views/email/plain/notification.blade.php +6 -0
- package/lib/base-command.d.ts +19 -5
- package/lib/base-command.js +73 -28
- package/lib/boilersmith/io.d.ts +9 -7
- package/lib/boilersmith/io.js +28 -15
- package/lib/boilersmith/paths.d.ts +1 -1
- package/lib/boilersmith/scaffolding/audit-step-factory.js +1 -1
- package/lib/boilersmith/scaffolding/module.d.ts +4 -4
- package/lib/boilersmith/scaffolding/module.js +6 -6
- package/lib/boilersmith/scaffolding/scaffolder.d.ts +1 -1
- package/lib/boilersmith/scaffolding/scaffolder.js +1 -1
- package/lib/boilersmith/scaffolding/template-param.d.ts +1 -1
- package/lib/boilersmith/step-manager.d.ts +15 -10
- package/lib/boilersmith/step-manager.js +35 -9
- package/lib/boilersmith/steps/stub-base.js +1 -1
- package/lib/boilersmith/utils/json-leaf-paths.d.ts +2 -2
- package/lib/commands/audit/infra.d.ts +1 -4
- package/lib/commands/audit/infra.js +1 -1
- package/lib/commands/flarum/change.js +2 -2
- package/lib/commands/flarum/info.js +1 -1
- package/lib/commands/infra.d.ts +1 -9
- package/lib/commands/infra.js +2 -2
- package/lib/commands/init.d.ts +1 -4
- package/lib/commands/init.js +3 -3
- package/lib/commands/make/backend/{api-serializer.d.ts → api-resource.d.ts} +2 -5
- package/lib/commands/make/backend/api-resource.js +26 -0
- package/lib/commands/make/backend/command.d.ts +1 -4
- package/lib/commands/make/backend/command.js +2 -2
- package/lib/commands/make/backend/{api-controller.d.ts → controller.d.ts} +2 -5
- package/lib/commands/make/backend/controller.js +31 -0
- package/lib/commands/make/backend/event-listener.d.ts +1 -4
- package/lib/commands/make/backend/event-listener.js +1 -1
- package/lib/commands/make/backend/{api-serializer-attributes.d.ts → filter.d.ts} +3 -6
- package/lib/commands/make/backend/filter.js +26 -0
- package/lib/commands/make/backend/handler.d.ts +2 -5
- package/lib/commands/make/backend/handler.js +6 -6
- package/lib/commands/make/backend/integration-test.d.ts +1 -4
- package/lib/commands/make/backend/integration-test.js +2 -2
- package/lib/commands/make/backend/job.d.ts +1 -4
- package/lib/commands/make/backend/job.js +2 -2
- package/lib/commands/make/backend/mail-driver.d.ts +12 -0
- package/lib/commands/make/backend/mail-driver.js +29 -0
- package/lib/commands/make/backend/middleware.d.ts +11 -0
- package/lib/commands/make/backend/middleware.js +26 -0
- package/lib/commands/make/backend/migration.d.ts +1 -4
- package/lib/commands/make/backend/migration.js +9 -2
- package/lib/commands/make/backend/model.d.ts +6 -7
- package/lib/commands/make/backend/model.js +68 -447
- package/lib/commands/make/backend/notification-blueprint.d.ts +12 -0
- package/lib/commands/make/backend/notification-blueprint.js +29 -0
- package/lib/commands/make/backend/notification-driver.d.ts +12 -0
- package/lib/commands/make/backend/notification-driver.js +29 -0
- package/lib/commands/make/backend/policy.d.ts +1 -4
- package/lib/commands/make/backend/policy.js +1 -1
- package/lib/commands/make/backend/post-type.d.ts +12 -0
- package/lib/commands/make/backend/post-type.js +29 -0
- package/lib/commands/make/backend/repository.d.ts +1 -4
- package/lib/commands/make/backend/repository.js +1 -1
- package/lib/commands/make/backend/route.d.ts +1 -4
- package/lib/commands/make/backend/route.js +1 -1
- package/lib/commands/make/backend/search-driver.d.ts +11 -0
- package/lib/commands/make/backend/search-driver.js +51 -0
- package/lib/commands/make/backend/service-provider.d.ts +1 -4
- package/lib/commands/make/backend/service-provider.js +2 -2
- package/lib/commands/make/backend/validator.d.ts +1 -4
- package/lib/commands/make/backend/validator.js +2 -2
- package/lib/commands/make/frontend/component.d.ts +4 -5
- package/lib/commands/make/frontend/component.js +7 -2
- package/lib/commands/make/frontend/forum-page.d.ts +11 -0
- package/lib/commands/make/frontend/forum-page.js +92 -0
- package/lib/commands/make/frontend/gambit.d.ts +11 -0
- package/lib/commands/make/frontend/gambit.js +30 -0
- package/lib/commands/make/frontend/modal.d.ts +1 -4
- package/lib/commands/make/frontend/modal.js +3 -2
- package/lib/commands/make/frontend/model.d.ts +6 -7
- package/lib/commands/make/frontend/model.js +26 -24
- package/lib/commands/make/frontend/notification.d.ts +12 -0
- package/lib/commands/make/frontend/notification.js +62 -0
- package/lib/commands/make/frontend/post-type.d.ts +12 -0
- package/lib/commands/make/frontend/post-type.js +59 -0
- package/lib/commands/make/locale.d.ts +11 -0
- package/lib/commands/make/locale.js +27 -0
- package/lib/commands/make/model.d.ts +12 -0
- package/lib/commands/make/model.js +29 -0
- package/lib/commands/make/notification.d.ts +11 -0
- package/lib/commands/make/notification.js +33 -0
- package/lib/commands/make/post-type.d.ts +11 -0
- package/lib/commands/make/post-type.js +31 -0
- package/lib/commands/monorepo/create.d.ts +1 -4
- package/lib/commands/monorepo/create.js +1 -1
- package/lib/commands/monorepo/split.d.ts +1 -4
- package/lib/commands/monorepo/split.js +1 -1
- package/lib/commands/update/js-imports.d.ts +1 -4
- package/lib/commands/update/js-imports.js +1 -1
- package/lib/commands/upgrade/2.0.d.ts +17 -0
- package/lib/commands/upgrade/2.0.js +113 -0
- package/lib/help.js +1 -1
- package/lib/providers/php-provider.d.ts +7 -1
- package/lib/providers/php-provider.js +16 -3
- package/lib/steps/extenders/{api-serializer.d.ts → api-resource.d.ts} +1 -1
- package/lib/steps/extenders/api-resource.js +38 -0
- package/lib/steps/extenders/base.d.ts +1 -1
- package/lib/steps/extenders/base.js +13 -1
- package/lib/steps/extenders/console-command.js +1 -1
- package/lib/steps/extenders/event.js +1 -1
- package/lib/steps/extenders/mail-driver.d.ts +5 -0
- package/lib/steps/extenders/mail-driver.js +58 -0
- package/lib/steps/extenders/middleware.d.ts +5 -0
- package/lib/steps/extenders/middleware.js +57 -0
- package/lib/steps/extenders/notification-driver.d.ts +5 -0
- package/lib/steps/extenders/notification-driver.js +58 -0
- package/lib/steps/extenders/notification-type.d.ts +5 -0
- package/lib/steps/extenders/notification-type.js +55 -0
- package/lib/steps/extenders/policy.js +1 -1
- package/lib/steps/extenders/post-type.d.ts +5 -0
- package/lib/steps/extenders/post-type.js +42 -0
- package/lib/steps/extenders/route.js +11 -2
- package/lib/steps/extenders/search-driver.d.ts +5 -0
- package/lib/steps/extenders/search-driver.js +38 -0
- package/lib/steps/extenders/search-filter.d.ts +5 -0
- package/lib/steps/extenders/search-filter.js +67 -0
- package/lib/steps/extenders/service-provider.js +1 -1
- package/lib/steps/gen-ext-scaffolder.d.ts +3 -3
- package/lib/steps/gen-ext-scaffolder.js +79 -7
- package/lib/steps/js/base.d.ts +14 -5
- package/lib/steps/js/base.js +101 -25
- package/lib/steps/js/model.d.ts +4 -7
- package/lib/steps/js/model.js +45 -19
- package/lib/steps/js/notification.d.ts +7 -0
- package/lib/steps/js/notification.js +58 -0
- package/lib/steps/js/post-type.d.ts +8 -0
- package/lib/steps/js/post-type.js +60 -0
- package/lib/steps/js/routes.d.ts +7 -0
- package/lib/steps/js/routes.js +63 -0
- package/lib/steps/js/search-driver-locale.d.ts +8 -0
- package/lib/steps/js/search-driver-locale.js +36 -0
- package/lib/steps/js/search-gambit.d.ts +7 -0
- package/lib/steps/js/search-gambit.js +51 -0
- package/lib/steps/locale/base.d.ts +32 -0
- package/lib/steps/locale/base.js +97 -0
- package/lib/steps/misc/git.js +1 -1
- package/lib/steps/monorepo/create.d.ts +2 -0
- package/lib/steps/monorepo/create.js +5 -4
- package/lib/steps/monorepo/split.js +1 -1
- package/lib/steps/stubs/backend/advanced-api-resource.d.ts +13 -0
- package/lib/steps/stubs/backend/advanced-api-resource.js +81 -0
- package/lib/steps/stubs/backend/{api-serializer.d.ts → api-resource.d.ts} +1 -1
- package/lib/steps/stubs/backend/{api-serializer.js → api-resource.js} +9 -9
- package/lib/steps/stubs/backend/command.d.ts +2 -16
- package/lib/steps/stubs/backend/command.js +14 -1
- package/lib/steps/stubs/backend/{api-controller.d.ts → controller.d.ts} +3 -13
- package/lib/steps/stubs/backend/controller.js +40 -0
- package/lib/steps/stubs/backend/event-listener.js +1 -1
- package/lib/steps/stubs/backend/filter.d.ts +8 -0
- package/lib/steps/stubs/backend/filter.js +44 -0
- package/lib/steps/stubs/backend/handler-command.d.ts +2 -27
- package/lib/steps/stubs/backend/handler-command.js +2 -1
- package/lib/steps/stubs/backend/handler.js +1 -1
- package/lib/steps/stubs/backend/integration-test.js +0 -5
- package/lib/steps/stubs/backend/mail-driver.d.ts +7 -0
- package/lib/steps/stubs/backend/mail-driver.js +30 -0
- package/lib/steps/stubs/backend/middleware.d.ts +22 -0
- package/lib/steps/stubs/backend/middleware.js +31 -0
- package/lib/steps/stubs/backend/model.d.ts +2 -24
- package/lib/steps/stubs/backend/model.js +2 -5
- package/lib/steps/stubs/backend/notification-blueprint.d.ts +7 -0
- package/lib/steps/stubs/backend/notification-blueprint.js +44 -0
- package/lib/steps/stubs/backend/notification-driver.d.ts +7 -0
- package/lib/steps/stubs/backend/notification-driver.js +30 -0
- package/lib/steps/stubs/backend/policy.js +1 -1
- package/lib/steps/stubs/backend/post-type.d.ts +7 -0
- package/lib/steps/stubs/backend/post-type.js +44 -0
- package/lib/steps/stubs/backend/repository.js +1 -1
- package/lib/steps/stubs/backend/search-driver-searcher.d.ts +24 -0
- package/lib/steps/stubs/backend/search-driver-searcher.js +32 -0
- package/lib/steps/stubs/backend/search-driver.d.ts +8 -0
- package/lib/steps/stubs/backend/search-driver.js +49 -0
- package/lib/steps/stubs/flarum-base.js +1 -1
- package/lib/steps/stubs/frontend/forum-page.d.ts +25 -0
- package/lib/steps/stubs/frontend/forum-page.js +37 -0
- package/lib/steps/stubs/frontend/gambit.d.ts +7 -0
- package/lib/steps/stubs/frontend/gambit.js +50 -0
- package/lib/steps/stubs/frontend/model.d.ts +12 -0
- package/lib/steps/stubs/frontend/model.js +5 -0
- package/lib/steps/stubs/frontend/notification.d.ts +11 -0
- package/lib/steps/stubs/frontend/notification.js +48 -0
- package/lib/steps/stubs/frontend/post-type.d.ts +11 -0
- package/lib/steps/stubs/frontend/post-type.js +48 -0
- package/lib/steps/stubs/js-base.js +5 -1
- package/lib/steps/stubs/php-base.js +3 -1
- package/lib/steps/update/js-imports.js +1 -1
- package/lib/steps/upgrade/twopointoh/backend/email-views.d.ts +18 -0
- package/lib/steps/upgrade/twopointoh/backend/email-views.js +81 -0
- package/lib/steps/upgrade/twopointoh/backend/filesystem.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/backend/filesystem.js +40 -0
- package/lib/steps/upgrade/twopointoh/backend/intervention-image.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/backend/intervention-image.js +44 -0
- package/lib/steps/upgrade/twopointoh/backend/json-api.d.ts +12 -0
- package/lib/steps/upgrade/twopointoh/backend/json-api.js +111 -0
- package/lib/steps/upgrade/twopointoh/backend/mailer.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/backend/mailer.js +37 -0
- package/lib/steps/upgrade/twopointoh/backend/misc.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/backend/misc.js +42 -0
- package/lib/steps/upgrade/twopointoh/backend/phpunit.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/backend/phpunit.js +52 -0
- package/lib/steps/upgrade/twopointoh/backend/search.d.ts +28 -0
- package/lib/steps/upgrade/twopointoh/backend/search.js +200 -0
- package/lib/steps/upgrade/twopointoh/base.d.ts +58 -0
- package/lib/steps/upgrade/twopointoh/base.js +284 -0
- package/lib/steps/upgrade/twopointoh/dependencies.d.ts +10 -0
- package/lib/steps/upgrade/twopointoh/dependencies.js +108 -0
- package/lib/steps/upgrade/twopointoh/frontend/code-splitting/usage-of-lazy-modules.d.ts +26 -0
- package/lib/steps/upgrade/twopointoh/frontend/code-splitting/usage-of-lazy-modules.js +418 -0
- package/lib/steps/upgrade/twopointoh/frontend/export-registry/compat.d.ts +12 -0
- package/lib/steps/upgrade/twopointoh/frontend/export-registry/compat.js +75 -0
- package/lib/steps/upgrade/twopointoh/frontend/export-registry/import-ext.d.ts +13 -0
- package/lib/steps/upgrade/twopointoh/frontend/export-registry/import-ext.js +126 -0
- package/lib/steps/upgrade/twopointoh/frontend/format.d.ts +8 -0
- package/lib/steps/upgrade/twopointoh/frontend/format.js +32 -0
- package/lib/steps/upgrade/twopointoh/frontend/misc.d.ts +17 -0
- package/lib/steps/upgrade/twopointoh/frontend/misc.js +433 -0
- package/lib/steps/upgrade/twopointoh/infra.d.ts +10 -0
- package/lib/steps/upgrade/twopointoh/infra.js +51 -0
- package/lib/steps/upgrade/twopointoh/less.d.ts +12 -0
- package/lib/steps/upgrade/twopointoh/less.js +217 -0
- package/lib/utils/add-extenders.d.ts +2 -0
- package/lib/utils/add-extenders.js +115 -0
- package/lib/utils/ast.d.ts +22 -0
- package/lib/utils/ast.js +235 -0
- package/lib/utils/composer.d.ts +1 -1
- package/lib/utils/model-name.d.ts +1 -0
- package/lib/utils/model-name.js +7 -3
- package/lib/utils/monorepo.d.ts +2 -2
- package/lib/utils/validation.d.ts +4 -1
- package/lib/utils/validation.js +9 -0
- package/oclif.manifest.json +1 -1
- package/package.json +20 -13
- package/php-subsystem/composer.json +3 -1
- package/php-subsystem/composer.lock +13 -11
- package/php-subsystem/index.php +41 -6
- package/php-subsystem/src/CustomPrettyPrinter.php +1 -1
- package/php-subsystem/src/ExtenderUtil.php +7 -13
- package/php-subsystem/src/NodeUtil.php +72 -0
- package/php-subsystem/src/NodeVisitors/AddExtender.php +28 -12
- package/php-subsystem/src/NodeVisitors/AddUses.php +24 -0
- package/php-subsystem/src/NodeVisitors/ChangeSignatures.php +200 -0
- package/php-subsystem/src/NodeVisitors/ReplaceUses.php +175 -0
- package/php-subsystem/src/Upgrade/Replacement.php +51 -0
- package/php-subsystem/src/Upgrade/ReplacementResult.php +17 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/EmailViews.php +94 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/Filesystem.php +88 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/InterventionImage.php +86 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/JsonApi.php +186 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/Misc.php +584 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/PhpUnit.php +241 -0
- package/php-subsystem/src/Upgrade/TwoPointOh/Search.php +589 -0
- package/php-subsystem/vendor/autoload.php +18 -0
- package/php-subsystem/vendor/bin/php-parse +119 -0
- package/php-subsystem/vendor/composer/ClassLoader.php +166 -32
- package/php-subsystem/vendor/composer/InstalledVersions.php +350 -209
- package/php-subsystem/vendor/composer/autoload_classmap.php +1 -1
- package/php-subsystem/vendor/composer/autoload_namespaces.php +1 -1
- package/php-subsystem/vendor/composer/autoload_psr4.php +1 -1
- package/php-subsystem/vendor/composer/autoload_real.php +3 -22
- package/php-subsystem/vendor/composer/installed.json +12 -10
- package/php-subsystem/vendor/composer/installed.php +29 -30
- package/php-subsystem/vendor/composer/platform_check.php +2 -2
- package/php-subsystem/vendor/nikic/php-parser/README.md +74 -62
- package/php-subsystem/vendor/nikic/php-parser/bin/php-parse +12 -11
- package/php-subsystem/vendor/nikic/php-parser/composer.json +6 -4
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php +58 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Class_.php +54 -25
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Declaration.php +11 -4
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php +87 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Enum_.php +116 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Function_.php +22 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Interface_.php +26 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Method.php +31 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php +5 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php +69 -26
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Property.php +47 -18
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php +6 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php +25 -28
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Trait_.php +31 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder/Use_.php +8 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Builder.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php +85 -70
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php +119 -71
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Comment/Doc.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Comment.php +35 -67
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php +3 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php +17 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Error.php +24 -33
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php +6 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ErrorHandler.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php +11 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Internal/Differ.php +36 -22
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php +24 -14
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenPolyfill.php +237 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php +63 -69
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/JsonDecoder.php +15 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php +74 -92
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php +11 -18
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php +10 -15
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php +45 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php +19 -25
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php +6 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php +22 -29
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyFunctionTokenEmulator.php +31 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php +31 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php +6 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php +10 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer.php +70 -491
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Modifiers.php +69 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NameContext.php +23 -24
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Arg.php +13 -14
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/ArrayItem.php +43 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Attribute.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php +5 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/ClosureUse.php +36 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/ComplexType.php +13 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Const_.php +12 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/DeclareItem.php +37 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php +10 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php +1 -39
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php +11 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php +35 -30
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php +8 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php +35 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php +5 -6
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php +5 -6
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php +12 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php +34 -27
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php +1 -32
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php +5 -6
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php +10 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php +15 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php +13 -14
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php +11 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php +12 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php +8 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php +18 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php +17 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php +18 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php +10 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php +6 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php +10 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php +9 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php +19 -14
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php +11 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php +12 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php +6 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php +6 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php +10 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Expr.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php +6 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Identifier.php +13 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/InterpolatedStringPart.php +32 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php +27 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/MatchArm.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Name.php +80 -53
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/NullableType.php +10 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Param.php +47 -23
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/PropertyItem.php +37 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php +1 -68
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php +1 -29
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php +1 -28
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Float_.php +78 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/Int_.php +82 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/InterpolatedString.php +34 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php +1 -71
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php +44 -24
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/StaticVar.php +39 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Block.php +29 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php +10 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php +11 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php +33 -27
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php +15 -15
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php +66 -71
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php +48 -61
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php +1 -32
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php +12 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php +11 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php +17 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php +19 -15
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php +20 -17
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php +31 -27
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php +16 -14
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php +18 -15
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php +13 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php +11 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php +35 -36
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php +1 -32
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php +1 -35
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php +8 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php +8 -9
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php +12 -13
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php +3 -4
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php +10 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php +11 -12
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php +7 -8
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php +1 -50
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php +16 -16
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php +9 -10
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/UnionType.php +8 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/UseItem.php +55 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php +27 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node.php +24 -29
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeAbstract.php +20 -20
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php +169 -82
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeFinder.php +28 -19
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php +71 -84
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php +4 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/CommentAnnotatingVisitor.php +82 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php +4 -5
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php +6 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php +40 -24
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php +2 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php +8 -11
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor.php +59 -7
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php +1 -2
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php +2011 -2058
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser/Php8.php +2717 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser.php +9 -3
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php +466 -248
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/ParserFactory.php +31 -33
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/PhpVersion.php +164 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php +419 -338
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter.php +51 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php +587 -431
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Token.php +18 -0
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/compatibility_tokens.php +63 -0
- package/boilerplate/stubs/backend/api-controller/create.php +0 -53
- package/boilerplate/stubs/backend/api-controller/delete.php +0 -52
- package/boilerplate/stubs/backend/api-controller/list.php +0 -61
- package/boilerplate/stubs/backend/api-controller/normal.php +0 -29
- package/boilerplate/stubs/backend/api-controller/show.php +0 -48
- package/boilerplate/stubs/backend/api-controller/update.php +0 -54
- package/boilerplate/stubs/backend/api-serializer.php +0 -36
- package/lib/commands/make/backend/api-controller.js +0 -26
- package/lib/commands/make/backend/api-serializer-attributes.js +0 -14
- package/lib/commands/make/backend/api-serializer.js +0 -15
- package/lib/steps/extenders/api-serializer.js +0 -77
- package/lib/steps/stubs/backend/api-controller.js +0 -65
- package/lib/steps/stubs/frontend/migration.js +0 -1
- package/php-subsystem/vendor/nikic/php-parser/.editorconfig +0 -9
- package/php-subsystem/vendor/nikic/php-parser/grammar/README.md +0 -27
- package/php-subsystem/vendor/nikic/php-parser/grammar/parser.template +0 -106
- package/php-subsystem/vendor/nikic/php-parser/grammar/php5.y +0 -1026
- package/php-subsystem/vendor/nikic/php-parser/grammar/php7.y +0 -1152
- package/php-subsystem/vendor/nikic/php-parser/grammar/phpyLang.php +0 -192
- package/php-subsystem/vendor/nikic/php-parser/grammar/rebuildParsers.php +0 -81
- package/php-subsystem/vendor/nikic/php-parser/grammar/tokens.template +0 -17
- package/php-subsystem/vendor/nikic/php-parser/grammar/tokens.y +0 -115
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php +0 -47
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php +0 -76
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php +0 -23
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php +0 -105
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php +0 -30
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser/Multiple.php +0 -55
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php +0 -2630
- package/php-subsystem/vendor/nikic/php-parser/lib/PhpParser/Parser/Tokens.php +0 -145
- /package/{lib/steps/stubs/frontend/migration.d.ts → boilerplate/skeleton/extension/js/tests/integration/.gitkeep} +0 -0
- /package/boilerplate/skeleton/extension/js/{webpack.config.js → webpack.config.cjs} +0 -0
|
@@ -0,0 +1,589 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
namespace Flarum\CliPhpSubsystem\Upgrade\TwoPointOh;
|
|
4
|
+
|
|
5
|
+
use Flarum\CliPhpSubsystem\ExtenderUtil;
|
|
6
|
+
use Flarum\CliPhpSubsystem\NodeUtil;
|
|
7
|
+
use Flarum\CliPhpSubsystem\NodeVisitors\ChangeSignatures;
|
|
8
|
+
use Flarum\CliPhpSubsystem\NodeVisitors\ReplaceUses;
|
|
9
|
+
use Flarum\CliPhpSubsystem\Upgrade\Replacement;
|
|
10
|
+
use Flarum\CliPhpSubsystem\Upgrade\ReplacementResult;
|
|
11
|
+
use PhpParser\Modifiers;
|
|
12
|
+
use PhpParser\Node;
|
|
13
|
+
use PhpParser\NodeVisitor;
|
|
14
|
+
|
|
15
|
+
class Search extends Replacement
|
|
16
|
+
{
|
|
17
|
+
protected $data = [];
|
|
18
|
+
|
|
19
|
+
protected function operations(): array
|
|
20
|
+
{
|
|
21
|
+
return ['gambitToFilter', 'run', 'replaceNamespaces', 'changeSignatures', 'extenders', 'removeOldExtenders'];
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function gambitToFilter(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
25
|
+
{
|
|
26
|
+
$filterClasses = ! empty($data['filterClasses'])
|
|
27
|
+
? $data['filterClasses']
|
|
28
|
+
: [];
|
|
29
|
+
|
|
30
|
+
if (! in_array($file, $filterClasses)) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (strpos($code, 'implements FilterInterface') !== false) {
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
$data['filterKey'] = $data['gambits'][0]['filterKey'] ?? '';
|
|
39
|
+
|
|
40
|
+
$traverser = $this->traverser();
|
|
41
|
+
|
|
42
|
+
$traverser->addVisitor(new NodeVisitor\NameResolver(null, [
|
|
43
|
+
'replaceNodes' => false,
|
|
44
|
+
]));
|
|
45
|
+
|
|
46
|
+
$traverser->addVisitor(new class ($data) extends \PhpParser\NodeVisitorAbstract {
|
|
47
|
+
public $data = [];
|
|
48
|
+
|
|
49
|
+
public function __construct($data)
|
|
50
|
+
{
|
|
51
|
+
$this->data = $data;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
public function leaveNode(Node $node)
|
|
55
|
+
{
|
|
56
|
+
if ($node instanceof Node\Stmt\Namespace_) {
|
|
57
|
+
NodeUtil::addUsesToNamespace($node, [
|
|
58
|
+
'Flarum\\Search\\Filter\\FilterInterface',
|
|
59
|
+
]);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
if ($node instanceof Node\Stmt\Class_) {
|
|
63
|
+
$implementsFilterInterface = false;
|
|
64
|
+
|
|
65
|
+
foreach ($node->implements as $interface) {
|
|
66
|
+
if ($interface->name === 'FilterInterface') {
|
|
67
|
+
$implementsFilterInterface = true;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (! $implementsFilterInterface) {
|
|
72
|
+
$node->implements[] = new Node\Name('FilterInterface', [
|
|
73
|
+
'resolvedName' => new Node\Name('Flarum\\Search\\Filter\\FilterInterface'),
|
|
74
|
+
]);
|
|
75
|
+
|
|
76
|
+
$node->stmts[] = new Node\Stmt\ClassMethod('getFilterKey', [
|
|
77
|
+
'type' => Modifiers::PUBLIC,
|
|
78
|
+
'stmts' => [
|
|
79
|
+
new Node\Stmt\Return_(
|
|
80
|
+
new Node\Scalar\String_($this->data['filterKey'])
|
|
81
|
+
),
|
|
82
|
+
],
|
|
83
|
+
'returnType' => new Node\Name('string'),
|
|
84
|
+
]);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
return new ReplacementResult($traverser->traverse($ast));
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
function run(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
94
|
+
{
|
|
95
|
+
$traverser = $this->traverser();
|
|
96
|
+
|
|
97
|
+
$traverser->addVisitor(new NodeVisitor\NameResolver(null, [
|
|
98
|
+
'replaceNodes' => false,
|
|
99
|
+
]));
|
|
100
|
+
|
|
101
|
+
if (strpos($file, 'Repository') !== false || strpos($code, ' extends AbstractSearcher') !== false) {
|
|
102
|
+
///**
|
|
103
|
+
// * Get a new query builder for the banned IP table.
|
|
104
|
+
// *
|
|
105
|
+
// * @return Builder
|
|
106
|
+
// */
|
|
107
|
+
// public function query()
|
|
108
|
+
// {
|
|
109
|
+
// return BannedIP::query();
|
|
110
|
+
// }
|
|
111
|
+
// ------------------
|
|
112
|
+
//public function __construct(array $filters, array $filterMutators, BannedIPRepository $bannedIPs)
|
|
113
|
+
// {
|
|
114
|
+
// parent::__construct($filters, $filterMutators);
|
|
115
|
+
//
|
|
116
|
+
// $this->bannedIPs = $bannedIPs;
|
|
117
|
+
// }
|
|
118
|
+
//
|
|
119
|
+
// protected function getQuery(User $actor): Builder
|
|
120
|
+
// {
|
|
121
|
+
// return $this->bannedIPs->query();
|
|
122
|
+
// }
|
|
123
|
+
$traverser->addVisitor($collector = new class($file, $code) extends \PhpParser\NodeVisitorAbstract {
|
|
124
|
+
public $data = [];
|
|
125
|
+
protected $file;
|
|
126
|
+
protected $code;
|
|
127
|
+
protected $map = [];
|
|
128
|
+
|
|
129
|
+
public function __construct($file, $code)
|
|
130
|
+
{
|
|
131
|
+
$this->file = $file;
|
|
132
|
+
$this->code = $code;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
public function enterNode(Node $node)
|
|
136
|
+
{
|
|
137
|
+
$exploded = explode(DIRECTORY_SEPARATOR, $this->file);
|
|
138
|
+
$class = str_replace('.php', '', $exploded[count($exploded) - 1]);
|
|
139
|
+
preg_match('/namespace (.*);/', $this->code, $matches);
|
|
140
|
+
$namespace = $matches[1] ?? '';
|
|
141
|
+
$fqnClass = $namespace . '\\' . $class;
|
|
142
|
+
|
|
143
|
+
if (strpos($this->file, 'Repository') !== false) {
|
|
144
|
+
if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === 'query') {
|
|
145
|
+
if (isset($node->stmts[0]) && $node->stmts[0] instanceof Node\Stmt\Return_) {
|
|
146
|
+
$expr = $node->stmts[0]->expr;
|
|
147
|
+
|
|
148
|
+
if ($expr instanceof Node\Expr\StaticCall) {
|
|
149
|
+
$model = $expr->class->getAttribute('resolvedName')->name;
|
|
150
|
+
$this->data['repositories'][$class]['model'] = $model;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
if (strpos($this->code, ' extends AbstractSearcher') !== false) {
|
|
157
|
+
// public function __construct(array $filters, array $filterMutators, BannedIPRepository $bannedIPs)
|
|
158
|
+
// we first need a map of properties to their types
|
|
159
|
+
if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === '__construct') {
|
|
160
|
+
foreach ($node->params as $param) {
|
|
161
|
+
if ($param->type instanceof Node\Name && ! empty($param->type->getAttribute('resolvedName'))) {
|
|
162
|
+
$this->map[$param->var->name] = $param->type->name;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
if ($node instanceof Node\Stmt\ClassMethod && $node->name->name === 'getQuery') {
|
|
168
|
+
if (isset($node->stmts[0]) && $node->stmts[0] instanceof Node\Stmt\Return_) {
|
|
169
|
+
$expr = $node->stmts[0]->expr;
|
|
170
|
+
|
|
171
|
+
// return $this->bannedIPs->query();
|
|
172
|
+
// we need the repository class
|
|
173
|
+
if ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\PropertyFetch && isset($this->map[$expr->var->name->name])) {
|
|
174
|
+
$this->data['searchers'][$fqnClass]['repository'] = $this->map[$expr->var->name->name];
|
|
175
|
+
} elseif ($expr instanceof Node\Expr\MethodCall && $expr->var instanceof Node\Expr\StaticCall) {
|
|
176
|
+
$model = $expr->var->class->getAttribute('resolvedName')->name;
|
|
177
|
+
$this->data['searchers'][$fqnClass]['model'] = $model;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
if (strpos($file, 'extend.php') !== false) {
|
|
187
|
+
//// before
|
|
188
|
+
//(new Extend\Filter(PostFilterer::class))
|
|
189
|
+
// ->addFilter(PostTagFilter::class),
|
|
190
|
+
//
|
|
191
|
+
//(new Extend\Filter(DiscussionFilterer::class))
|
|
192
|
+
// ->addFilter(TagFilterGambit::class)
|
|
193
|
+
// ->addFilterMutator(HideHiddenTagsFromAllDiscussionsPage::class),
|
|
194
|
+
//
|
|
195
|
+
//(new Extend\SimpleFlarumSearch(DiscussionSearcher::class))
|
|
196
|
+
// ->addGambit(TagFilterGambit::class),
|
|
197
|
+
//
|
|
198
|
+
//(new Extend\SimpleFlarumSearch(TagSearcher::class))
|
|
199
|
+
// ->setFullTextGambit(FullTextGambit::class),
|
|
200
|
+
//
|
|
201
|
+
//// after
|
|
202
|
+
//(new Extend\SearchDriver(DatabaseSearchDriver::class))
|
|
203
|
+
// ->addFilter(PostSearcher::class, PostTagFilter::class)
|
|
204
|
+
// ->addFilter(DiscussionSearcher::class, TagFilter::class)
|
|
205
|
+
// ->addMutator(DiscussionSearcher::class, HideHiddenTagsFromAllDiscussionsPage::class)
|
|
206
|
+
// ->addSearcher(Tag::class, TagSearcher::class)
|
|
207
|
+
// ->setFulltext(TagSearcher::class, FulltextFilter::class),
|
|
208
|
+
|
|
209
|
+
if (strpos($code, 'namespace ') === false) {
|
|
210
|
+
$returnExtendersNode = $ast[count($ast) - 1];
|
|
211
|
+
} else {
|
|
212
|
+
$returnExtendersNode = null;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
$traverser->addVisitor($visitor = new class ($returnExtendersNode) extends \PhpParser\NodeVisitorAbstract {
|
|
216
|
+
public $data = [
|
|
217
|
+
'to_delete' => [],
|
|
218
|
+
// searcherClass => [
|
|
219
|
+
// 'mutators' => [],
|
|
220
|
+
// 'filters' => [],
|
|
221
|
+
// 'fulltext' => [],
|
|
222
|
+
// ]
|
|
223
|
+
'searchers' => [],
|
|
224
|
+
];
|
|
225
|
+
/** @var Node\Stmt\Return_ */
|
|
226
|
+
protected $returnExtendersNode = null;
|
|
227
|
+
|
|
228
|
+
public function __construct($returnExtendersNode)
|
|
229
|
+
{
|
|
230
|
+
$this->returnExtendersNode = $returnExtendersNode;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
private function findNew(Node $node): ?Node\Expr\New_
|
|
234
|
+
{
|
|
235
|
+
if ($node instanceof Node\Expr\New_) {
|
|
236
|
+
return $node;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
if ($node instanceof Node\Expr\MethodCall) {
|
|
240
|
+
return $this->findNew($node->var);
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
return null;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
public function leaveNode(Node $node)
|
|
247
|
+
{
|
|
248
|
+
if ($node instanceof Node\Expr\MethodCall) {
|
|
249
|
+
$method = $node->name->name;
|
|
250
|
+
|
|
251
|
+
if (! in_array($method, ['addFilter', 'addFilterMutator', 'addGambit', 'setFullTextGambit'])) {
|
|
252
|
+
return $node;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
$new = $this->findNew($node);
|
|
256
|
+
|
|
257
|
+
if (! $new) {
|
|
258
|
+
return $node;
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
$resolvedName = $new->class->getAttribute('resolvedName');
|
|
262
|
+
|
|
263
|
+
if (! $resolvedName) {
|
|
264
|
+
return $node;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
$class = $resolvedName->name;
|
|
268
|
+
|
|
269
|
+
if (! in_array($class, ['Flarum\\Extend\\Filter', 'Flarum\\Extend\\SimpleFlarumSearch'])) {
|
|
270
|
+
return $node;
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
if ($class === 'Flarum\Extend\Filter') {
|
|
274
|
+
$filterer = $new->args[0]->value->class->getAttribute('resolvedName')->name;
|
|
275
|
+
|
|
276
|
+
if ($filterer === 'Flarum\\Discussion\\Filter\\DiscussionFilterer') {
|
|
277
|
+
$searcher = 'Flarum\\Discussion\\Search\\DiscussionSearcher';
|
|
278
|
+
} elseif ($filterer === 'Flarum\\Post\\Filter\\PostFilterer') {
|
|
279
|
+
$searcher = 'Flarum\\Post\\Filter\\PostSearcher';
|
|
280
|
+
} else {
|
|
281
|
+
$searcher = str_replace('Filterer', 'Searcher', $filterer);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
$arg = $node->args[0];
|
|
285
|
+
|
|
286
|
+
if ($arg->value instanceof Node\Expr\ClassConstFetch) {
|
|
287
|
+
$arg->value->class->name = str_replace(['FilterGambit', 'GambitFilter'], 'Filter', $arg->value->class->name);
|
|
288
|
+
$arg->value->class->name = str_replace('Gambit', 'Filter', $arg->value->class->name);
|
|
289
|
+
} elseif ($arg->value instanceof Node\Scalar\String_) {
|
|
290
|
+
$arg->value->value = str_replace(['FilterGambit', 'GambitFilter'], 'Filter', $arg->value->value);
|
|
291
|
+
$arg->value->value = str_replace('Gambit', 'Filter', $arg->value->value);
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
if ($method === 'addFilter') {
|
|
295
|
+
$this->data['searchers'][$searcher]['filters'][] = $arg->value;
|
|
296
|
+
} elseif ($method === 'addFilterMutator') {
|
|
297
|
+
$this->data['searchers'][$searcher]['mutators'][] = $arg->value;
|
|
298
|
+
}
|
|
299
|
+
} elseif ($class === 'Flarum\Extend\SimpleFlarumSearch') {
|
|
300
|
+
$searcher = $new->args[0]->value->class->getAttribute('resolvedName')->name;
|
|
301
|
+
|
|
302
|
+
$arg = $node->args[0];
|
|
303
|
+
|
|
304
|
+
if ($arg->value instanceof Node\Expr\ClassConstFetch) {
|
|
305
|
+
$arg->value->class->name = str_replace(['FilterGambit', 'GambitFilter'], 'Filter', $arg->value->class->name);
|
|
306
|
+
$arg->value->class->name = str_replace('Gambit', 'Filter', $arg->value->class->name);
|
|
307
|
+
|
|
308
|
+
/** @var Node\Identifier $resolvedName */
|
|
309
|
+
$resolvedName = $arg->value->class->getAttribute('resolvedName');
|
|
310
|
+
|
|
311
|
+
if ($resolvedName) {
|
|
312
|
+
$resolvedName->name = str_replace(['FilterGambit', 'GambitFilter'], 'Filter', $resolvedName->name);
|
|
313
|
+
$resolvedName->name = str_replace('Gambit', 'Filter', $resolvedName->name);
|
|
314
|
+
}
|
|
315
|
+
} elseif ($arg->value instanceof Node\Scalar\String_) {
|
|
316
|
+
$arg->value->value = str_replace(['FilterGambit', 'GambitFilter'], 'Filter', $arg->value->value);
|
|
317
|
+
$arg->value->value = str_replace('Gambit', 'Filter', $arg->value->value);
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
if ($method === 'addGambit') {
|
|
321
|
+
$this->data['searchers'][$searcher]['filters'][] = $arg->value;
|
|
322
|
+
} elseif ($method === 'setFullTextGambit') {
|
|
323
|
+
$this->data['searchers'][$searcher]['fulltext'] = isset($resolvedName)
|
|
324
|
+
? $resolvedName->name
|
|
325
|
+
: ($arg->value instanceof Node\Expr\ClassConstFetch
|
|
326
|
+
? $arg->value->class->name
|
|
327
|
+
: $arg->value->value);
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
if ($node->var instanceof Node\Expr\New_) {
|
|
332
|
+
$this->data['to_delete'][] = $node;
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
if ($node instanceof Node\Stmt\Namespace_) {
|
|
337
|
+
$this->returnExtendersNode = $node->stmts[count($node->stmts) - 1];
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
});
|
|
341
|
+
|
|
342
|
+
$traverser->addVisitor(new class ($visitor) extends \PhpParser\NodeVisitorAbstract {
|
|
343
|
+
public $visitor;
|
|
344
|
+
|
|
345
|
+
public function __construct($visitor)
|
|
346
|
+
{
|
|
347
|
+
$this->visitor = $visitor;
|
|
348
|
+
}
|
|
349
|
+
});
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
$traverser->traverse($ast);
|
|
353
|
+
|
|
354
|
+
if (isset($visitor)) {
|
|
355
|
+
$this->data = $visitor->data;
|
|
356
|
+
|
|
357
|
+
foreach ($this->data['searchers'] ?? [] as $searcher => $_) {
|
|
358
|
+
$className = explode('\\', $searcher)[count(explode('\\', $searcher)) - 1];
|
|
359
|
+
|
|
360
|
+
foreach ($this->data['searchers'] ?? [] as $secondSearcher => $__) {
|
|
361
|
+
if ($searcher === $secondSearcher) {
|
|
362
|
+
continue;
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
$secondClassName = explode('\\', $secondSearcher)[count(explode('\\', $secondSearcher)) - 1];
|
|
366
|
+
|
|
367
|
+
if ($className === $secondClassName) {
|
|
368
|
+
if (strpos($searcher, 'Filter') !== false) {
|
|
369
|
+
unset($this->data['searchers'][$searcher]);
|
|
370
|
+
} else {
|
|
371
|
+
unset($this->data['searchers'][$secondSearcher]);
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
$collectorData = [];
|
|
379
|
+
|
|
380
|
+
if (isset($collector)) {
|
|
381
|
+
$collectorData = $collector->data;
|
|
382
|
+
} elseif (isset($visitor)) {
|
|
383
|
+
$collectorData = [
|
|
384
|
+
'extendData' => $visitor->data,
|
|
385
|
+
];
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
return new ReplacementResult($code, $collectorData);
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
function replaceNamespaces(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
392
|
+
{
|
|
393
|
+
$traverser = $this->traverser();
|
|
394
|
+
|
|
395
|
+
$traverser->addVisitor(new ReplaceUses(array_merge([
|
|
396
|
+
[
|
|
397
|
+
'from' => 'Flarum\\Search\\AbstractSearcher',
|
|
398
|
+
'to' => 'Flarum\\Search\\Database\\AbstractSearcher',
|
|
399
|
+
],
|
|
400
|
+
[
|
|
401
|
+
'from' => 'Flarum\\Filter\\FilterState',
|
|
402
|
+
'to' => 'Flarum\\Search\\SearchState',
|
|
403
|
+
],
|
|
404
|
+
[
|
|
405
|
+
'from' => 'Flarum\\Query',
|
|
406
|
+
'to' => 'Flarum\\Search',
|
|
407
|
+
'partial' => true,
|
|
408
|
+
],
|
|
409
|
+
[
|
|
410
|
+
'from' => 'Flarum\\Filter',
|
|
411
|
+
'to' => 'Flarum\\Search\\Filter',
|
|
412
|
+
'partial' => true,
|
|
413
|
+
],
|
|
414
|
+
[
|
|
415
|
+
'from' => 'Flarum\\Search\\QueryCriteria',
|
|
416
|
+
'to' => 'Flarum\\Search\\SearchCriteria',
|
|
417
|
+
],
|
|
418
|
+
], $data['replacements'] ?? [])));
|
|
419
|
+
|
|
420
|
+
return new ReplacementResult($traverser->traverse($ast));
|
|
421
|
+
}
|
|
422
|
+
|
|
423
|
+
function changeSignatures(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
424
|
+
{
|
|
425
|
+
$traverser = $this->traverser();
|
|
426
|
+
|
|
427
|
+
$traverser->addVisitor(new NodeVisitor\NameResolver(null, [
|
|
428
|
+
'replaceNodes' => false,
|
|
429
|
+
]));
|
|
430
|
+
|
|
431
|
+
$traverser->addVisitor(new ChangeSignatures([
|
|
432
|
+
'Flarum\\Search\\Filter\\FilterInterface' => [
|
|
433
|
+
'filter' => [
|
|
434
|
+
'visibility' => Modifiers::PUBLIC,
|
|
435
|
+
'params' => [
|
|
436
|
+
'state' => ['SearchState'],
|
|
437
|
+
'value' => ['array', 'string'],
|
|
438
|
+
'negate' => ['bool'],
|
|
439
|
+
],
|
|
440
|
+
'return' => ['void'],
|
|
441
|
+
],
|
|
442
|
+
'constrain' => [
|
|
443
|
+
'params' => [
|
|
444
|
+
'query' => ['\\Illuminate\\Database\\Eloquent\\Builder'],
|
|
445
|
+
'actor' => ['\\Flarum\\User\\User'],
|
|
446
|
+
'negate' => ['bool'],
|
|
447
|
+
],
|
|
448
|
+
'return' => ['void'],
|
|
449
|
+
],
|
|
450
|
+
],
|
|
451
|
+
]));
|
|
452
|
+
|
|
453
|
+
return new ReplacementResult($traverser->traverse($ast));
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
function extenders(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
457
|
+
{
|
|
458
|
+
if (empty($this->data['searchers'])) {
|
|
459
|
+
return null;
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
$extenderDef = [
|
|
463
|
+
'extender' => [
|
|
464
|
+
'className' => '\\Flarum\\Extend\\SearchDriver',
|
|
465
|
+
'args' => [
|
|
466
|
+
[
|
|
467
|
+
'type' => 'class_const',
|
|
468
|
+
'value' => '\\Flarum\\Search\\Database\\DatabaseSearchDriver',
|
|
469
|
+
'auxiliaryValue' => 'class',
|
|
470
|
+
],
|
|
471
|
+
],
|
|
472
|
+
],
|
|
473
|
+
'methodCalls' => [],
|
|
474
|
+
];
|
|
475
|
+
|
|
476
|
+
$collectedData = $data['collectedData'] ?? [];
|
|
477
|
+
|
|
478
|
+
foreach (($collectedData['searchers'] ?? []) as $searcher => $data) {
|
|
479
|
+
if (empty($data['repository']) && (empty($data['model']))) {
|
|
480
|
+
continue;
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
$extenderDef['methodCalls'][] = [
|
|
484
|
+
'methodName' => 'addSearcher',
|
|
485
|
+
'args' => [
|
|
486
|
+
[
|
|
487
|
+
'type' => 'class_const',
|
|
488
|
+
'value' => $data['model'] ?? $collectedData['repositories'][$data['repository']]['model'],
|
|
489
|
+
'auxiliaryValue' => 'class',
|
|
490
|
+
],
|
|
491
|
+
[
|
|
492
|
+
'type' => 'class_const',
|
|
493
|
+
'value' => $searcher,
|
|
494
|
+
'auxiliaryValue' => 'class',
|
|
495
|
+
],
|
|
496
|
+
],
|
|
497
|
+
];
|
|
498
|
+
}
|
|
499
|
+
|
|
500
|
+
foreach (($this->data['searchers'] ?? []) as $searcher => $data) {
|
|
501
|
+
/** @var Node\Arg $filter */
|
|
502
|
+
foreach (($data['filters'] ?? []) as $filter) {
|
|
503
|
+
$extenderDef['methodCalls'][] = [
|
|
504
|
+
'methodName' => 'addFilter',
|
|
505
|
+
'args' => [
|
|
506
|
+
[
|
|
507
|
+
'type' => 'class_const',
|
|
508
|
+
'value' => $searcher,
|
|
509
|
+
'auxiliaryValue' => 'class',
|
|
510
|
+
],
|
|
511
|
+
[
|
|
512
|
+
'type' => 'raw',
|
|
513
|
+
'value' => $filter
|
|
514
|
+
],
|
|
515
|
+
],
|
|
516
|
+
];
|
|
517
|
+
}
|
|
518
|
+
|
|
519
|
+
/** @var Node\Arg $mutator */
|
|
520
|
+
foreach (($data['mutators'] ?? []) as $mutator) {
|
|
521
|
+
$extenderDef['methodCalls'][] = [
|
|
522
|
+
'methodName' => 'addMutator',
|
|
523
|
+
'args' => [
|
|
524
|
+
[
|
|
525
|
+
'type' => 'class_const',
|
|
526
|
+
'value' => $searcher,
|
|
527
|
+
'auxiliaryValue' => 'class',
|
|
528
|
+
],
|
|
529
|
+
[
|
|
530
|
+
'type' => 'raw',
|
|
531
|
+
'value' => $mutator
|
|
532
|
+
],
|
|
533
|
+
],
|
|
534
|
+
];
|
|
535
|
+
}
|
|
536
|
+
|
|
537
|
+
if ($data['fulltext'] ?? null) {
|
|
538
|
+
$extenderDef['methodCalls'][] = [
|
|
539
|
+
'methodName' => 'setFulltext',
|
|
540
|
+
'args' => [
|
|
541
|
+
[
|
|
542
|
+
'type' => 'class_const',
|
|
543
|
+
'value' => $searcher,
|
|
544
|
+
'auxiliaryValue' => 'class',
|
|
545
|
+
],
|
|
546
|
+
[
|
|
547
|
+
'type' => 'class_const',
|
|
548
|
+
'value' => $data['fulltext'],
|
|
549
|
+
'auxiliaryValue' => 'class',
|
|
550
|
+
],
|
|
551
|
+
],
|
|
552
|
+
];
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
|
|
556
|
+
return new ReplacementResult((new ExtenderUtil($code))->add($extenderDef)['code']);
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
function removeOldExtenders(string $file, string $code, array $ast, array $data): ?ReplacementResult
|
|
560
|
+
{
|
|
561
|
+
$traverser = $this->traverser();
|
|
562
|
+
|
|
563
|
+
if (strpos($file, 'extend.php') !== false) {
|
|
564
|
+
$traverser->addVisitor(new class ($this->data) extends \PhpParser\NodeVisitorAbstract {
|
|
565
|
+
public $data = [
|
|
566
|
+
'to_delete' => [],
|
|
567
|
+
];
|
|
568
|
+
|
|
569
|
+
public function __construct($data)
|
|
570
|
+
{
|
|
571
|
+
$this->data = $data;
|
|
572
|
+
}
|
|
573
|
+
|
|
574
|
+
public function leaveNode(Node $node)
|
|
575
|
+
{
|
|
576
|
+
if ($node instanceof Node\ArrayItem && count(array_filter($this->data['to_delete'], function (Node $item) use ($node) {
|
|
577
|
+
return $item->getStartTokenPos() === $node->getStartTokenPos();
|
|
578
|
+
})) === 1) {
|
|
579
|
+
return NodeVisitor::REMOVE_NODE;
|
|
580
|
+
}
|
|
581
|
+
|
|
582
|
+
return $node;
|
|
583
|
+
}
|
|
584
|
+
});
|
|
585
|
+
}
|
|
586
|
+
|
|
587
|
+
return new ReplacementResult($traverser->traverse($ast));
|
|
588
|
+
}
|
|
589
|
+
}
|
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
|
|
3
3
|
// autoload.php @generated by Composer
|
|
4
4
|
|
|
5
|
+
if (PHP_VERSION_ID < 50600) {
|
|
6
|
+
if (!headers_sent()) {
|
|
7
|
+
header('HTTP/1.1 500 Internal Server Error');
|
|
8
|
+
}
|
|
9
|
+
$err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
|
|
10
|
+
if (!ini_get('display_errors')) {
|
|
11
|
+
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
|
|
12
|
+
fwrite(STDERR, $err);
|
|
13
|
+
} elseif (!headers_sent()) {
|
|
14
|
+
echo $err;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
trigger_error(
|
|
18
|
+
$err,
|
|
19
|
+
E_USER_ERROR
|
|
20
|
+
);
|
|
21
|
+
}
|
|
22
|
+
|
|
5
23
|
require_once __DIR__ . '/composer/autoload_real.php';
|
|
6
24
|
|
|
7
25
|
return ComposerAutoloaderInit033f1ff7c16740840897bb4dbdb77dd3::getLoader();
|