From 51493a170ab30f5563486adcb17f21a9cd25aee6 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:15:45 -0700 Subject: [PATCH 1/7] fix: examples symlink --- examples | 1 + src/Fixers/ClientUpgradeFixer/examples | 1 - .../Fixers/ClientUpgradeFixer/examples}/class_vars.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/class_vars.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/inline_html.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/inline_html.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/kitchen_sink.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/kitchen_sink.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/mixins.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/mixins.new.php | 0 .../ClientUpgradeFixer/examples}/multiple_clients.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/multiple_clients.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/no_args.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/no_args.new.php | 0 .../ClientUpgradeFixer/examples}/non_rpc_methods.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/non_rpc_methods.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/optional_args.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/optional_args.new.php | 0 .../examples}/optional_args_array_keyword.legacy.php | 0 .../examples}/optional_args_array_keyword.new.php | 0 .../examples}/optional_args_variable.legacy.php | 0 .../ClientUpgradeFixer/examples}/optional_args_variable.new.php | 0 .../examples}/required_and_optional_args.legacy.php | 0 .../examples}/required_and_optional_args.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/required_args.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/required_args.new.php | 0 .../Fixers/ClientUpgradeFixer/examples}/var_typehint.legacy.php | 0 .../Fixers/ClientUpgradeFixer/examples}/var_typehint.new.php | 0 .../examples}/vars_defined_elsewhere.legacy.php | 0 .../ClientUpgradeFixer/examples}/vars_defined_elsewhere.new.php | 0 .../ClientUpgradeFixer/examples}/vars_in_constructor.legacy.php | 0 .../ClientUpgradeFixer/examples}/vars_in_constructor.new.php | 0 32 files changed, 1 insertion(+), 1 deletion(-) create mode 120000 examples delete mode 120000 src/Fixers/ClientUpgradeFixer/examples rename {examples => src/Fixers/ClientUpgradeFixer/examples}/class_vars.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/class_vars.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/inline_html.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/inline_html.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/kitchen_sink.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/kitchen_sink.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/mixins.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/mixins.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/multiple_clients.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/multiple_clients.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/no_args.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/no_args.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/non_rpc_methods.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/non_rpc_methods.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args_array_keyword.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args_array_keyword.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args_variable.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/optional_args_variable.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/required_and_optional_args.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/required_and_optional_args.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/required_args.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/required_args.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/var_typehint.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/var_typehint.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/vars_defined_elsewhere.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/vars_defined_elsewhere.new.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/vars_in_constructor.legacy.php (100%) rename {examples => src/Fixers/ClientUpgradeFixer/examples}/vars_in_constructor.new.php (100%) diff --git a/examples b/examples new file mode 120000 index 00000000..f086c380 --- /dev/null +++ b/examples @@ -0,0 +1 @@ +src/Fixers/ClientUpgradeFixer/examples/ \ No newline at end of file diff --git a/src/Fixers/ClientUpgradeFixer/examples b/src/Fixers/ClientUpgradeFixer/examples deleted file mode 120000 index d4cb9b9c..00000000 --- a/src/Fixers/ClientUpgradeFixer/examples +++ /dev/null @@ -1 +0,0 @@ -../../../examples/ \ No newline at end of file diff --git a/examples/class_vars.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/class_vars.legacy.php similarity index 100% rename from examples/class_vars.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/class_vars.legacy.php diff --git a/examples/class_vars.new.php b/src/Fixers/ClientUpgradeFixer/examples/class_vars.new.php similarity index 100% rename from examples/class_vars.new.php rename to src/Fixers/ClientUpgradeFixer/examples/class_vars.new.php diff --git a/examples/inline_html.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/inline_html.legacy.php similarity index 100% rename from examples/inline_html.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/inline_html.legacy.php diff --git a/examples/inline_html.new.php b/src/Fixers/ClientUpgradeFixer/examples/inline_html.new.php similarity index 100% rename from examples/inline_html.new.php rename to src/Fixers/ClientUpgradeFixer/examples/inline_html.new.php diff --git a/examples/kitchen_sink.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/kitchen_sink.legacy.php similarity index 100% rename from examples/kitchen_sink.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/kitchen_sink.legacy.php diff --git a/examples/kitchen_sink.new.php b/src/Fixers/ClientUpgradeFixer/examples/kitchen_sink.new.php similarity index 100% rename from examples/kitchen_sink.new.php rename to src/Fixers/ClientUpgradeFixer/examples/kitchen_sink.new.php diff --git a/examples/mixins.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/mixins.legacy.php similarity index 100% rename from examples/mixins.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/mixins.legacy.php diff --git a/examples/mixins.new.php b/src/Fixers/ClientUpgradeFixer/examples/mixins.new.php similarity index 100% rename from examples/mixins.new.php rename to src/Fixers/ClientUpgradeFixer/examples/mixins.new.php diff --git a/examples/multiple_clients.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/multiple_clients.legacy.php similarity index 100% rename from examples/multiple_clients.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/multiple_clients.legacy.php diff --git a/examples/multiple_clients.new.php b/src/Fixers/ClientUpgradeFixer/examples/multiple_clients.new.php similarity index 100% rename from examples/multiple_clients.new.php rename to src/Fixers/ClientUpgradeFixer/examples/multiple_clients.new.php diff --git a/examples/no_args.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/no_args.legacy.php similarity index 100% rename from examples/no_args.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/no_args.legacy.php diff --git a/examples/no_args.new.php b/src/Fixers/ClientUpgradeFixer/examples/no_args.new.php similarity index 100% rename from examples/no_args.new.php rename to src/Fixers/ClientUpgradeFixer/examples/no_args.new.php diff --git a/examples/non_rpc_methods.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/non_rpc_methods.legacy.php similarity index 100% rename from examples/non_rpc_methods.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/non_rpc_methods.legacy.php diff --git a/examples/non_rpc_methods.new.php b/src/Fixers/ClientUpgradeFixer/examples/non_rpc_methods.new.php similarity index 100% rename from examples/non_rpc_methods.new.php rename to src/Fixers/ClientUpgradeFixer/examples/non_rpc_methods.new.php diff --git a/examples/optional_args.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args.legacy.php similarity index 100% rename from examples/optional_args.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args.legacy.php diff --git a/examples/optional_args.new.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args.new.php similarity index 100% rename from examples/optional_args.new.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args.new.php diff --git a/examples/optional_args_array_keyword.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args_array_keyword.legacy.php similarity index 100% rename from examples/optional_args_array_keyword.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args_array_keyword.legacy.php diff --git a/examples/optional_args_array_keyword.new.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args_array_keyword.new.php similarity index 100% rename from examples/optional_args_array_keyword.new.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args_array_keyword.new.php diff --git a/examples/optional_args_variable.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args_variable.legacy.php similarity index 100% rename from examples/optional_args_variable.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args_variable.legacy.php diff --git a/examples/optional_args_variable.new.php b/src/Fixers/ClientUpgradeFixer/examples/optional_args_variable.new.php similarity index 100% rename from examples/optional_args_variable.new.php rename to src/Fixers/ClientUpgradeFixer/examples/optional_args_variable.new.php diff --git a/examples/required_and_optional_args.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/required_and_optional_args.legacy.php similarity index 100% rename from examples/required_and_optional_args.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/required_and_optional_args.legacy.php diff --git a/examples/required_and_optional_args.new.php b/src/Fixers/ClientUpgradeFixer/examples/required_and_optional_args.new.php similarity index 100% rename from examples/required_and_optional_args.new.php rename to src/Fixers/ClientUpgradeFixer/examples/required_and_optional_args.new.php diff --git a/examples/required_args.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/required_args.legacy.php similarity index 100% rename from examples/required_args.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/required_args.legacy.php diff --git a/examples/required_args.new.php b/src/Fixers/ClientUpgradeFixer/examples/required_args.new.php similarity index 100% rename from examples/required_args.new.php rename to src/Fixers/ClientUpgradeFixer/examples/required_args.new.php diff --git a/examples/var_typehint.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/var_typehint.legacy.php similarity index 100% rename from examples/var_typehint.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/var_typehint.legacy.php diff --git a/examples/var_typehint.new.php b/src/Fixers/ClientUpgradeFixer/examples/var_typehint.new.php similarity index 100% rename from examples/var_typehint.new.php rename to src/Fixers/ClientUpgradeFixer/examples/var_typehint.new.php diff --git a/examples/vars_defined_elsewhere.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/vars_defined_elsewhere.legacy.php similarity index 100% rename from examples/vars_defined_elsewhere.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/vars_defined_elsewhere.legacy.php diff --git a/examples/vars_defined_elsewhere.new.php b/src/Fixers/ClientUpgradeFixer/examples/vars_defined_elsewhere.new.php similarity index 100% rename from examples/vars_defined_elsewhere.new.php rename to src/Fixers/ClientUpgradeFixer/examples/vars_defined_elsewhere.new.php diff --git a/examples/vars_in_constructor.legacy.php b/src/Fixers/ClientUpgradeFixer/examples/vars_in_constructor.legacy.php similarity index 100% rename from examples/vars_in_constructor.legacy.php rename to src/Fixers/ClientUpgradeFixer/examples/vars_in_constructor.legacy.php diff --git a/examples/vars_in_constructor.new.php b/src/Fixers/ClientUpgradeFixer/examples/vars_in_constructor.new.php similarity index 100% rename from examples/vars_in_constructor.new.php rename to src/Fixers/ClientUpgradeFixer/examples/vars_in_constructor.new.php From 2f139aad3f145654449313a34377c605ad679f7e Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:21:28 -0700 Subject: [PATCH 2/7] remove contents write --- .github/workflows/doctum.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/doctum.yml b/.github/workflows/doctum.yml index 5c153c11..61a9a323 100644 --- a/.github/workflows/doctum.yml +++ b/.github/workflows/doctum.yml @@ -25,9 +25,6 @@ on: type: string description: "exclude a file from documentation" -permissions: - contents: write - jobs: docs: name: "Generate and Deploy Documentation" From b1902b59ea03db50cf14699e258be5266a080430 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:23:04 -0700 Subject: [PATCH 3/7] add exclude patterns --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 026c958a..2bc8b6e6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,6 +35,7 @@ jobs: uses: ./.github/workflows/code-standards.yml with: path: src + exclude-patterns: "Fixers/ClientUpgradeFixer/examples" code-standards-with-config: uses: ./.github/workflows/code-standards.yml From 7029b183ae155a6f28dd465332d155d9fb718fa2 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:23:44 -0700 Subject: [PATCH 4/7] fix phpstan --- .github/workflows/tests.yml | 2 +- src/Utils/Actions/RunCsFixerCommand.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2bc8b6e6..cecb2452 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: uses: ./.github/workflows/code-standards.yml with: path: src - exclude-patterns: "Fixers/ClientUpgradeFixer/examples" + exclude-patterns: '["Fixers/ClientUpgradeFixer/examples"]' code-standards-with-config: uses: ./.github/workflows/code-standards.yml diff --git a/src/Utils/Actions/RunCsFixerCommand.php b/src/Utils/Actions/RunCsFixerCommand.php index e2bd7d25..d2fe671d 100644 --- a/src/Utils/Actions/RunCsFixerCommand.php +++ b/src/Utils/Actions/RunCsFixerCommand.php @@ -65,7 +65,7 @@ protected function configure() ); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $repo = $input->getArgument('repo'); if (false === strpos($repo, '/')) { From 1f7cfdb5b8922792c298d0f9cb7a57976387d595 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:28:27 -0700 Subject: [PATCH 5/7] fix exclude patterns --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cecb2452..50cea8a3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: uses: ./.github/workflows/code-standards.yml with: path: src - exclude-patterns: '["Fixers/ClientUpgradeFixer/examples"]' + exclude-patterns: '["Fixers\/ClientUpgradeFixer\/examples"]' code-standards-with-config: uses: ./.github/workflows/code-standards.yml From 02ce01c72310ce06a8bd99a17f19c10b87941a97 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:45:03 -0700 Subject: [PATCH 6/7] add config --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 50cea8a3..8e82d0d1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,6 +35,7 @@ jobs: uses: ./.github/workflows/code-standards.yml with: path: src + config: .php-cs-fixer.default.php exclude-patterns: '["Fixers\/ClientUpgradeFixer\/examples"]' code-standards-with-config: From c64309dc408efed4018fc142098a6d784173956a Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 14 Jul 2025 14:48:26 -0700 Subject: [PATCH 7/7] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e82d0d1..636e7862 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: with: path: src config: .php-cs-fixer.default.php - exclude-patterns: '["Fixers\/ClientUpgradeFixer\/examples"]' + exclude-patterns: '["Fixers/ClientUpgradeFixer/examples"]' code-standards-with-config: uses: ./.github/workflows/code-standards.yml