Make if-package return false for softly-deployed packages

vassilmladenov · meta-codesync[bot] · commit 32f696c3e9a8 · 2025-11-18T09:58:21.000-08:00
Summary: With this change, we will no longer evaluate the `package foo` expression (HH\package_exists) to true for packages that are soft in the deployment. This has consequences for __RequirePackage, which is an invariant over packages.

Reviewed By: sinancepel

Differential Revision: D87010928

fbshipit-source-id: 2121377c3841899b7c97d8ffb683b08d8c5a266d
diff --git a/hphp/runtime/base/package.cpp b/hphp/runtime/base/package.cpp
@@ -206,9 +206,9 @@ bool PackageInfo::implPackageExists(const StringData* package) const {
   if (!activeDeployment) return packages().contains(package->toCppString());
   switch (activeDeployment->getDeployKind(package->toCppString())) {
     case DeployKind::Hard:
-    case DeployKind::Soft:
     case DeployKind::HardOrSoft:
       return true;
+    case DeployKind::Soft:
     case DeployKind::NotDeployed:
       return false;
   }
diff --git a/hphp/test/slow/packages-v2/deployment/basic-1.php.expectf-repo b/hphp/test/slow/packages-v2/deployment/basic-1.php.expectf-repo
@@ -2,6 +2,11 @@ f [fromPackages] basic-1.php
 f [fromPackages] basic-2.php
 f [fromPackages] basic-3.php
 f [fromPackages] basic-4.php
+f [fromPackages] if-package-2.php
+f [fromPackages] if-package-3.php
+f [fromPackages] if-package-4.php
+f [fromPackages] if-package-5.php
+f [fromPackages] if-package.php
 f [fromPackages] prod/foo.inc.php
 f [fromPackages] prod/internal_prod/zap.inc.php
 f [fromPackagesSoft] prod/qux.inc.php
diff --git a/hphp/test/slow/packages-v2/deployment/basic-2.php.expect-repo b/hphp/test/slow/packages-v2/deployment/basic-2.php.expect-repo
@@ -2,6 +2,11 @@ f [fromPackages] basic-1.php
 f [fromPackages] basic-2.php
 f [fromPackages] basic-3.php
 f [fromPackages] basic-4.php
+f [fromPackages] if-package-2.php
+f [fromPackages] if-package-3.php
+f [fromPackages] if-package-4.php
+f [fromPackages] if-package-5.php
+f [fromPackages] if-package.php
 f [fromPackages] prod/foo.inc.php
 f [fromPackages] prod/intern/bar.inc.php
 f [fromPackages] prod/internal_prod/zap.inc.php
diff --git a/hphp/test/slow/packages-v2/deployment/basic-3.php.expectf-repo b/hphp/test/slow/packages-v2/deployment/basic-3.php.expectf-repo
@@ -2,6 +2,11 @@ f [fromPackages] basic-1.php
 f [fromPackages] basic-2.php
 f [fromPackages] basic-3.php
 f [fromPackages] basic-4.php
+f [fromPackages] if-package-2.php
+f [fromPackages] if-package-3.php
+f [fromPackages] if-package-4.php
+f [fromPackages] if-package-5.php
+f [fromPackages] if-package.php
 f [fromPackages] prod/foo.inc.php
 f [fromPackages] prod/internal_prod/zap.inc.php
 f [fromPackagesSoft] prod/qux.inc.php
diff --git a/hphp/test/slow/packages-v2/deployment/basic-4.php.expect-repo b/hphp/test/slow/packages-v2/deployment/basic-4.php.expect-repo
@@ -2,6 +2,11 @@ f [fromPackages] basic-1.php
 f [fromPackages] basic-2.php
 f [fromPackages] basic-3.php
 f [fromPackages] basic-4.php
+f [fromPackages] if-package-2.php
+f [fromPackages] if-package-3.php
+f [fromPackages] if-package-4.php
+f [fromPackages] if-package-5.php
+f [fromPackages] if-package.php
 f [fromPackages] prod/foo.inc.php
 f [fromPackages] prod/internal_prod/zap.inc.php
 f [fromPackagesSoft] prod/qux.inc.php
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-2.php b/hphp/test/slow/packages-v2/deployment/if-package-2.php
@@ -0,0 +1,6 @@
+<?hh
+
+<<__EntryPoint>>
+function if_package_undef(): void {
+  var_dump(package undef);
+}
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-2.php.expect b/hphp/test/slow/packages-v2/deployment/if-package-2.php.expect
@@ -0,0 +1 @@
+bool(false)
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-2.php.hphp_opts b/hphp/test/slow/packages-v2/deployment/if-package-2.php.hphp_opts
@@ -0,0 +1,2 @@
+-vRuntime.Eval.ActiveDeployment="my-prod"
+--dir=__DIR__
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-3.php b/hphp/test/slow/packages-v2/deployment/if-package-3.php
@@ -0,0 +1,6 @@
+<?hh
+
+<<__EntryPoint>>
+function if_package_not_deployed(): void {
+  var_dump(package intern);
+}
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-3.php.expect b/hphp/test/slow/packages-v2/deployment/if-package-3.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-3.php.expect-repo b/hphp/test/slow/packages-v2/deployment/if-package-3.php.expect-repo
@@ -0,0 +1 @@
+bool(false)
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-3.php.hphp_opts b/hphp/test/slow/packages-v2/deployment/if-package-3.php.hphp_opts
@@ -0,0 +1,2 @@
+-vRuntime.Eval.ActiveDeployment="my-prod"
+--dir=__DIR__
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-4.php b/hphp/test/slow/packages-v2/deployment/if-package-4.php
@@ -0,0 +1,6 @@
+<?hh
+
+<<__EntryPoint>>
+function if_package_deployed(): void {
+  var_dump(package prod);
+}
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-4.php.expect b/hphp/test/slow/packages-v2/deployment/if-package-4.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-4.php.hphp_opts b/hphp/test/slow/packages-v2/deployment/if-package-4.php.hphp_opts
@@ -0,0 +1,2 @@
+-vRuntime.Eval.ActiveDeployment="my-intern"
+--dir=__DIR__
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-5.php b/hphp/test/slow/packages-v2/deployment/if-package-5.php
@@ -0,0 +1,6 @@
+<?hh
+
+<<__EntryPoint>>
+function if_package_trivial(): void {
+  var_dump(package prod);
+}
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-5.php.expect b/hphp/test/slow/packages-v2/deployment/if-package-5.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/packages-v2/deployment/if-package-5.php.hphp_opts b/hphp/test/slow/packages-v2/deployment/if-package-5.php.hphp_opts
@@ -0,0 +1,2 @@
+-vRuntime.Eval.ActiveDeployment="my-prod"
+--dir=__DIR__
diff --git a/hphp/test/slow/packages-v2/deployment/if-package.php b/hphp/test/slow/packages-v2/deployment/if-package.php
@@ -0,0 +1,11 @@
+<?hh
+
+<<__EntryPoint>>
+function if_package_soft(): void {
+  if (package softprod) {
+    echo "Can see softprod\n";
+  } else {
+    echo "Cannot see softprod\n";
+  }
+  quz();
+}
diff --git a/hphp/test/slow/packages-v2/deployment/if-package.php.expect b/hphp/test/slow/packages-v2/deployment/if-package.php.expect
@@ -0,0 +1,2 @@
+Can see softprod
+I am in softprod
diff --git a/hphp/test/slow/packages-v2/deployment/if-package.php.expectf-repo b/hphp/test/slow/packages-v2/deployment/if-package.php.expectf-repo
@@ -0,0 +1,4 @@
+Cannot see softprod
+
+Warning: File %s/packages-v2/deployment/softprod/quz.inc.php is soft-deployed, but its unit was merged in %s/packages-v2/deployment/if-package.php on line 10
+I am in softprod
diff --git a/hphp/test/slow/packages-v2/deployment/if-package.php.hphp_opts b/hphp/test/slow/packages-v2/deployment/if-package.php.hphp_opts
@@ -0,0 +1,2 @@
+-vRuntime.Eval.ActiveDeployment="my-prod"
+--dir=__DIR__
diff --git a/hphp/test/slow/packages-v2/deployment/if-package.php.nomultireq b/hphp/test/slow/packages-v2/deployment/if-package.php.nomultireq
diff --git a/hphp/test/slow/packages-v2/requirepackage/PACKAGES.toml b/hphp/test/slow/packages-v2/requirepackage/PACKAGES.toml
@@ -1,7 +1,7 @@
 [packages]
 
 [packages.foo]
-include_paths = [ "//basic.php", "//noactivedeploytement.php" ]
+include_paths = [ "//basic.php", "//basic-soft.php", "//noactivedeploytement.php" ]
 
 [packages.bar]
 
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic-soft.php b/hphp/test/slow/packages-v2/requirepackage/basic-soft.php
@@ -0,0 +1,13 @@
+<?hh
+// package foo
+
+// ERROR - package softbar is soft-deployed in the same deployment as package foo
+<<__RequirePackage("softbar")>>
+function a(): void {
+  var_dump("in a");
+}
+
+<<__EntryPoint>>
+function basic_soft(): void {
+  a();
+}
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.expect b/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.expect
@@ -0,0 +1 @@
+string(4) "in a"
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.expectf-repo b/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.expectf-repo
@@ -0,0 +1,8 @@
+f [fromPackages] basic-soft.php
+f [fromPackages] basic.php
+Fatal error: Uncaught exception 'HH\InvariantException' with message 'Package softbar should be loaded' in %s/requirepackage/basic-soft.php:5
+Stack trace:
+#0 %s/requirepackage/basic-soft.php(5): HH\invariant_violation()
+#1 %s/requirepackage/basic-soft.php(12): a()
+#2 (): basic_soft()
+#3 {main}
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.hphp_opts b/hphp/test/slow/packages-v2/requirepackage/basic-soft.php.hphp_opts
@@ -0,0 +1,3 @@
+-vRuntime.Eval.ActiveDeployment="my-prod"
+--dir=__DIR__
+--report-files-in-build=/dev/stdout
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic.php b/hphp/test/slow/packages-v2/requirepackage/basic.php
@@ -9,12 +9,6 @@ static function bar() : void {
   }
 }
 
-// OK - package softbar is soft-deployed in the same deployment as package foo
-<<__RequirePackage("softbar")>>
-function a(): void {
-  var_dump("in a");
-}
-
 <<__RequirePackage("bat")>>
 // ERROR - package bat is not deployed in the same deployment as package foo
 function b(): void {
@@ -25,6 +19,5 @@ function b(): void {
 <<__Entrypoint>>
 function main(): void {
   A::bar();
-  a();
   b();
 }
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic.php.expect b/hphp/test/slow/packages-v2/requirepackage/basic.php.expect
@@ -0,0 +1,2 @@
+string(9) "in A::bar"
+string(4) "in b"
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic.php.expectf b/hphp/test/slow/packages-v2/requirepackage/basic.php.expectf
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic.php.expectf-repo b/hphp/test/slow/packages-v2/requirepackage/basic.php.expectf-repo
@@ -1,6 +1,10 @@
+f [fromPackages] basic-soft.php
 f [fromPackages] basic.php
 string(9) "in A::bar"
-string(4) "in a"
 
-Fatal error: Uncaught exception 'HH\InvariantException' with message 'Package bat should be loaded' in %s
-%A
+Fatal error: Uncaught exception 'HH\InvariantException' with message 'Package bat should be loaded' in %s/requirepackage/basic.php:12
+Stack trace:
+#0 %s/requirepackage/basic.php(12): HH\invariant_violation()
+#1 %s/requirepackage/basic.php(22): b()
+#2 (): main()
+#3 {main}
diff --git a/hphp/test/slow/packages-v2/requirepackage/basic.php.opts b/hphp/test/slow/packages-v2/requirepackage/basic.php.opts
diff --git a/hphp/test/slow/packages-v2/requirepackage/noactivedeployement.php.expect-repo b/hphp/test/slow/packages-v2/requirepackage/noactivedeployement.php.expect-repo
@@ -1,5 +1,6 @@
+f [fromIncludedDir] basic-soft.php
 f [fromIncludedDir] basic.php
 f [fromIncludedDir] noactivedeployement.php
 string(10) "in A1::bar"
 string(5) "in a1"
-string(5) "in b1"
+string(5) "in b1"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-vRuntime.Eval.ActiveDeployment="my-prod"`
	`2`	`+--dir=__DIR__`