Skip to content

Commit e4e5c39

Browse files
author
epriestley
committed
Merge __init_env__.php into __init_script__.php
Summary: There are currently two files, but all scripts require both of them, which is clearly silly. In the longer term I want to rewrite all of this init stuff to be more structured (e.g., merge webroot/index.php and __init_script__ better) but this reduces the surface area of the ad-hoc "include files" API we have now, at least. Test Plan: - Grepped for __init_env__.php (no hits) - Ran a unit test (to test unit changes) - Ran a daemon (to test daemon changes) Reviewers: jungejason, nh, tuomaspelkonen, aran Reviewed By: jungejason CC: aran, jungejason Differential Revision: 976
1 parent ceceb47 commit e4e5c39

18 files changed

+35
-20
lines changed

‎scripts/__init_script__.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,36 @@
3333
// NOTE: This is dangerous in general, but we know we're in a script context and
3434
// are not vulnerable to CSRF.
3535
AphrontWriteGuard::allowDangerousUnguardedWrites(true);
36+
37+
$include_path = ini_get('include_path');
38+
ini_set('include_path', $include_path.':'.dirname(__FILE__).'/../../');
39+
40+
require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
41+
42+
$env = isset($_SERVER['PHABRICATOR_ENV'])
43+
? $_SERVER['PHABRICATOR_ENV']
44+
: getenv('PHABRICATOR_ENV');
45+
if (!$env) {
46+
echo "Define PHABRICATOR_ENV before running this script.\n";
47+
exit(1);
48+
}
49+
50+
$conf = phabricator_read_config_file($env);
51+
$conf['phabricator.env'] = $env;
52+
53+
phutil_require_module('phabricator', 'infrastructure/env');
54+
PhabricatorEnv::setEnvConfig($conf);
55+
56+
phutil_load_library('arcanist/src');
57+
58+
foreach (PhabricatorEnv::getEnvConfig('load-libraries') as $library) {
59+
phutil_load_library($library);
60+
}
61+
62+
PhutilErrorHandler::initialize();
63+
PhabricatorEventEngine::initialize();
64+
65+
$tz = PhabricatorEnv::getEnvConfig('phabricator.timezone');
66+
if ($tz) {
67+
date_default_timezone_set($tz);
68+
}

‎scripts/celerity_mapper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575

7676

7777
require_once dirname(__FILE__).'/__init_script__.php';
78-
require_once dirname(__FILE__).'/__init_env__.php';
7978

8079
if ($argc != 2) {
8180
$self = basename($argv[0]);

‎scripts/crossref/generate_php_symbols.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'console');
2524
phutil_require_module('phutil', 'parser/xhpast/bin');

‎scripts/crossref/import_project_symbols.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
if ($argc !== 2) {
2524
echo phutil_console_format(

‎scripts/daemon/phabricator_daemon_launcher.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phabricator', 'infrastructure/daemon/control');
2524
$control = new PhabricatorDaemonControl();

‎scripts/mail/mail_handler.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
$root = dirname(dirname(dirname(__FILE__)));
2525
require_once $root.'/scripts/__init_script__.php';
26-
require_once $root.'/scripts/__init_env__.php';
2726
require_once $root.'/externals/mimemailparser/MimeMailParser.class.php';
2827

2928
phutil_require_module(

‎scripts/repository/rebuild_summaries.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'symbols');
2524
PhutilSymbolLoader::loadClass('PhabricatorRepository');

‎scripts/repository/reparse.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'console');
2524

‎scripts/repository/test_connection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'console');
2524
phutil_require_module('phutil', 'future/exec');

‎scripts/search/index_one_commit.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
if (empty($argv[1])) {
2524
echo "usage: index_one_commit.php <commit_name>\n";

‎scripts/search/reindex_all_users.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
$users = id(new PhabricatorUser())->loadAll();
2524
echo "Indexing ".count($users)." users";

‎scripts/search/reindex_everything.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
// TODO: Get rid of this script eventually, once this stuff is better-formalized
2524
// in Timeline consumers.

‎scripts/search/reindex_maniphest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
ini_set('memory_limit', -1);
2524
$tasks = id(new ManiphestTask())->loadAll();

‎scripts/sql/upgrade_schema.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'console');
2524
phutil_require_module('phabricator', 'infrastructure/setup/sql');

‎scripts/user/account_admin.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
22-
require_once $root.'/scripts/__init_env__.php';
2322

2423
phutil_require_module('phutil', 'console');
2524
phutil_require_module('phutil', 'future/exec');

‎src/infrastructure/daemon/base/PhabricatorDaemon.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ protected function willRun() {
3030

3131
$phabricator = phutil_get_library_root('phabricator');
3232
$root = dirname($phabricator);
33-
require_once $root.'/scripts/__init_env__.php';
34-
35-
// Daemons may perform writes.
36-
AphrontWriteGuard::allowDangerousUnguardedWrites(true);
33+
require_once $root.'/scripts/__init_script__.php';
3734
}
3835
}

‎src/infrastructure/daemon/base/__init__.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
phutil_require_module('phabricator', 'aphront/console/plugin/errorlog/api');
1010
phutil_require_module('phabricator', 'aphront/console/plugin/event/api');
11-
phutil_require_module('phabricator', 'aphront/writeguard');
1211

1312
phutil_require_module('phutil', 'daemon/base');
1413
phutil_require_module('phutil', 'moduleutils');

‎src/infrastructure/testing/testcase/PhabricatorTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private function getComputedConfiguration() {
4444

4545
protected function willRunTests() {
4646
$root = dirname(phutil_get_library_root('phabricator'));
47-
require_once $root.'/scripts/__init_env__.php';
47+
require_once $root.'/scripts/__init_script__.php';
4848

4949
$config = $this->getComputedConfiguration();
5050

0 commit comments

Comments
 (0)