From a06726a54a95005764aeb3c5c2c0f79ac65ccfe7 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Sat, 14 Nov 2026 05:18:05 +0100 Subject: [PATCH] php: corpus targets live in php/private/quality, no core/quality fixtures loads in rule-set files (part of #12606) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hws3L7Tg4oUvpSvuYD --- php/BUILD.bazel | 19 +------------------ php/private/BUILD.bazel | 14 +------------- php/private/lock/BUILD.bazel | 15 +-------------- php/private/quality/BUILD.bazel | 22 ++++++++++++++++++++++ php/private/toolchain/BUILD.bazel | 14 +------------- tools/ci/BUILD.bazel | 3 --- tools/ci/rule_set_loads_allowlist.txt | 5 +---- 7 files changed, 27 insertions(+), 65 deletions(-) diff --git a/php/BUILD.bazel b/php/BUILD.bazel index 72a93176b8..dc08d669ef 100644 --- a/php/BUILD.bazel +++ b/php/BUILD.bazel @@ -1,6 +1,5 @@ -load("@rules_dx//core/quality:fixtures.bzl", "real_source_target") - exports_files([ + "BUILD.bazel", "README.md", "defs.bzl", "extensions.bzl", @@ -8,22 +7,6 @@ exports_files([ "pins.json", ]) -real_source_target( - name = "corpus_markdown", - markdown_srcs = ["README.md"], - tags = ["corpus"], -) - -real_source_target( - name = "corpus_starlark", - starlark_srcs = [ - "BUILD.bazel", - "defs.bzl", - "extensions.bzl", - ], - tags = ["corpus"], -) - filegroup( name = "module_srcs", srcs = glob([ diff --git a/php/private/BUILD.bazel b/php/private/BUILD.bazel index 5ca4758198..ec07f898a0 100644 --- a/php/private/BUILD.bazel +++ b/php/private/BUILD.bazel @@ -2,7 +2,6 @@ load("//core:conformance.bzl", "dx_wrapper_contract_tests") load("//core:defs.bzl", "expect_contains", "expect_equal", "expect_true", "label_string") load("//core:entry.bzl", "dx_entry_quality_srcs", "dx_infer_main", "dx_main_candidates") -load("//core/quality:fixtures.bzl", "real_source_target") load(":defs.bzl", "PHP_COMPATIBLE_WITH", "PHP_DEFERRED_SKIP_TAGS", "PHP_SOURCE_SPECS") load(":php.bzl", "PHP_SOURCE_EXTS", "autoloader_suffix", "coverage_descriptor", "env_flag", "ini_flags", "launcher_descriptor", "lit", "rf", "rf_prefixed", "runfiles_path") @@ -13,6 +12,7 @@ package(default_visibility = [ ]) exports_files([ + "BUILD.bazel", "BenchTest.php", "defs.bzl", "patches/pcov_user_opcode_handlers.patch", @@ -208,18 +208,6 @@ dx_wrapper_contract_tests( file_classes = ["php"], ) -real_source_target( - name = "corpus_starlark", - starlark_srcs = [ - "BUILD.bazel", - "defs.bzl", - "php.bzl", - "providers.bzl", - "pcov.BUILD.bazel", - ], - tags = ["corpus"], -) - filegroup( name = "module_srcs", srcs = glob([ diff --git a/php/private/lock/BUILD.bazel b/php/private/lock/BUILD.bazel index 3e5b00e492..9cde9ac2f7 100644 --- a/php/private/lock/BUILD.bazel +++ b/php/private/lock/BUILD.bazel @@ -1,20 +1,7 @@ -load("//core/quality:fixtures.bzl", "real_source_target") - package(default_visibility = ["//visibility:private"]) -real_source_target( - name = "corpus_starlark", - starlark_srcs = [ - "BUILD.bazel", - "hub.bzl", - "repo.bzl", - ], - tags = ["corpus"], - visibility = ["//tools/ci:__pkg__"], -) - exports_files( - ["hub.bzl"], + ["BUILD.bazel", "hub.bzl", "repo.bzl"], visibility = ["//:__subpackages__"], ) diff --git a/php/private/quality/BUILD.bazel b/php/private/quality/BUILD.bazel index 634969f69e..4e4dd30bbf 100644 --- a/php/private/quality/BUILD.bazel +++ b/php/private/quality/BUILD.bazel @@ -12,12 +12,34 @@ exports_files([ "php_tools.bzl", ]) +real_source_target( + name = "corpus_markdown", + markdown_srcs = ["//php:README.md"], + tags = ["corpus"], +) + real_source_target( name = "corpus_starlark", starlark_srcs = [ "BUILD.bazel", "php.bzl", "php_tools.bzl", + "//php:BUILD.bazel", + "//php:defs.bzl", + "//php:extensions.bzl", + "//php/private:BUILD.bazel", + "//php/private:defs.bzl", + "//php/private:pcov.BUILD.bazel", + "//php/private:php.bzl", + "//php/private:providers.bzl", + "//php/private/lock:BUILD.bazel", + "//php/private/lock:hub.bzl", + "//php/private/lock:repo.bzl", + "//php/private/toolchain:BUILD.bazel", + "//php/private/toolchain:cells.bzl", + "//php/private/toolchain:extensions.bzl", + "//php/private/toolchain:php.bzl", + "//php/private/toolchain:repos.bzl", ], tags = ["corpus"], ) diff --git a/php/private/toolchain/BUILD.bazel b/php/private/toolchain/BUILD.bazel index 78baf484a2..b77a4ec765 100644 --- a/php/private/toolchain/BUILD.bazel +++ b/php/private/toolchain/BUILD.bazel @@ -1,10 +1,10 @@ load("@rules_dx//php:defs.bzl", "php_library") -load("//core/quality:fixtures.bzl", "real_source_target") load(":cells.bzl", "PHP_CELLS", "cell_settings", "unsupported_value") package(default_visibility = ["//visibility:public"]) exports_files([ + "BUILD.bazel", "cells.bzl", "php.bzl", "repos.bzl", @@ -23,18 +23,6 @@ toolchain_type(name = "toolchain_type") toolchain_type(name = "exec_toolchain_type") -real_source_target( - name = "corpus_starlark", - starlark_srcs = [ - "BUILD.bazel", - "cells.bzl", - "php.bzl", - "repos.bzl", - "extensions.bzl", - ], - tags = ["corpus"], -) - php_library( name = "toolchain", srcs = ["version_check.php"], diff --git a/tools/ci/BUILD.bazel b/tools/ci/BUILD.bazel index 10189b5432..8fed6cc548 100644 --- a/tools/ci/BUILD.bazel +++ b/tools/ci/BUILD.bazel @@ -643,7 +643,6 @@ rust_test( "//perl/private:corpus_starlark", "//perl/private/quality:corpus_starlark", "//perl/tests:corpus_starlark", - "//php/private:corpus_starlark", "//php/private/quality:corpus_starlark", "//powershell/private:corpus_starlark", "//powershell/private/quality:corpus_starlark", @@ -998,8 +997,6 @@ rust_test( "//ocaml/tests:corpus_starlark", "//perl/private/lock:corpus_starlark", "//perl/private/tools/lock:corpus_starlark", - "//php/private/lock:corpus_starlark", - "//php/private/toolchain:corpus_starlark", "//php/private/tools/lock:corpus_starlark", "//php/tests:corpus_starlark", "//powershell/private/lock:corpus_starlark", diff --git a/tools/ci/rule_set_loads_allowlist.txt b/tools/ci/rule_set_loads_allowlist.txt index 98c051117d..23dea65cc5 100644 --- a/tools/ci/rule_set_loads_allowlist.txt +++ b/tools/ci/rule_set_loads_allowlist.txt @@ -7,12 +7,9 @@ lua/private/lua.bzl foreign-load 1 lua/private/runtime/BUILD.bazel foreign-load 2 lua/private/toolchain/BUILD.bazel foreign-load 2 lua/private/toolchain/extensions.bzl foreign-load 1 -php/BUILD.bazel foreign-load 1 -php/private/BUILD.bazel foreign-load 4 +php/private/BUILD.bazel foreign-load 3 php/private/defs.bzl foreign-load 5 -php/private/lock/BUILD.bazel foreign-load 1 php/private/php.bzl foreign-load 1 -php/private/toolchain/BUILD.bazel foreign-load 1 qt/BUILD.bazel foreign-load 1 qt/private/BUILD.bazel foreign-load 5 qt/private/archive.bzl foreign-load 1