diff options
Diffstat (limited to 'devel/phabricator/files')
| -rw-r--r-- | devel/phabricator/files/patch-scripts_celerity_install__merge.sh | 8 | ||||
| -rw-r--r-- | devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php | 20 |
2 files changed, 28 insertions, 0 deletions
diff --git a/devel/phabricator/files/patch-scripts_celerity_install__merge.sh b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh new file mode 100644 index 000000000000..2d0644e038f9 --- /dev/null +++ b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh @@ -0,0 +1,8 @@ +--- scripts/celerity/install_merge.sh.orig 2020-05-19 10:53:29 UTC ++++ scripts/celerity/install_merge.sh +@@ -6,4 +6,4 @@ echo "resources/celerity/map.php merge=celerity" \ + git config merge.celerity.name "Celerity Mapper" + + git config merge.celerity.driver \ +- 'php $GIT_DIR/../bin/celerity map' ++ '%%PHP_CMD%% $GIT_DIR/../bin/celerity map' diff --git a/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php b/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php new file mode 100644 index 000000000000..939ee4915ed1 --- /dev/null +++ b/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php @@ -0,0 +1,20 @@ +--- src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php.orig 2020-05-19 10:51:50 UTC ++++ src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php +@@ -11,7 +11,7 @@ final class PhabricatorStorageFixtureScopeGuard extend + $this->name = $name; + + execx( +- 'php %s upgrade --force --namespace %s', ++ '%%PHP_CMD%% %s upgrade --force --namespace %s', + $this->getStorageBinPath(), + $this->name); + +@@ -30,7 +30,7 @@ final class PhabricatorStorageFixtureScopeGuard extend + PhabricatorLiskDAO::closeAllConnections(); + + execx( +- 'php %s destroy --force --namespace %s', ++ '%%PHP_CMD%% %s destroy --force --namespace %s', + $this->getStorageBinPath(), + $this->name); + } |