Skip to content

Commit 42c0c0e

Browse files
author
epriestley
committed
Remove or correct various "phabricator/" references to "libphutil"
Summary: Ref T13395. "libphutil/" was stripped for parts, but some documentation still references it. This is mostly minor corrections, but: - Removes "Javelin at Facebook", long obsolete. - Removes "php FPM warmup", which was always a prototype and is obsoleted by PHP preloading in recent PHP. Test Plan: `grep` / reading Maniphest Tasks: T13395 Differential Revision: https://secure.phabricator.com/D21624
1 parent 30d58de commit 42c0c0e

31 files changed

+83
-261
lines changed

scripts/fpm/warmup.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

scripts/install/update_phabricator.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ set -x
99
# to work without modifications.
1010

1111
# NOTE: This script assumes you are running it from a directory which contains
12-
# arcanist/, libphutil/, and phabricator/.
12+
# arcanist/ and phabricator/.
1313

1414
ROOT=`pwd` # You can hard-code the path here instead.
1515

1616
### UPDATE WORKING COPIES ######################################################
1717

18-
cd $ROOT/libphutil
19-
git pull
20-
2118
cd $ROOT/arcanist
2219
git pull
2320

src/applications/conduit/controller/PhabricatorConduitController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private function buildPHPExample(
156156

157157
$parts = array();
158158

159-
$libphutil_path = 'path/to/libphutil/src/__phutil_library_init__.php';
159+
$libphutil_path = 'path/to/arcanist/support/init/init-script.php';
160160

161161
$parts[] = '<?php';
162162
$parts[] = "\n\n";

src/applications/repository/storage/PhabricatorRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ public function getRemoteProtocol() {
11511151
/**
11521152
* Get a parsed object representation of the repository's remote URI..
11531153
*
1154-
* @return wild A @{class@libphutil:PhutilURI}.
1154+
* @return wild A @{class@arcanist:PhutilURI}.
11551155
* @task uri
11561156
*/
11571157
public function getRemoteURIObject() {

src/docs/contributor/adding_new_classes.diviner

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ available by looking at all of the subclasses of
2121
@{class@phabricator:PhabricatorApplication}. It
2222
discovers available workflows in `arc` by looking at all of the subclasses of
2323
@{class@arcanist:ArcanistWorkflow}. It discovers available locales
24-
by looking at all of the subclasses of @{class@libphutil:PhutilLocale}.
24+
by looking at all of the subclasses of @{class@arcanist:PhutilLocale}.
2525

2626
This pattern holds in many cases, so you can often add functionality by adding
2727
new classes with no other work. Phabricator will automatically discover and
@@ -49,8 +49,8 @@ This is intended as a quick way to add small pieces of functionality, test new
4949
features, or get started on a larger project. Extending Phabricator like this
5050
imposes a small performance penalty compared to using a library.
5151

52-
This directory exists in all libphutil libraries, so you can find similar
53-
directories in `arcanist/src/extensions/` and `libphutil/src/extensions/`.
52+
This directory exists in all libphutil libraries, so you can find a similar
53+
directory in `arcanist/src/extensions/`.
5454

5555
For example, to add a new application, create a file like this one and add it
5656
to `phabricator/src/extensions/`.
@@ -171,8 +171,8 @@ performing static analysis.
171171
NOTE: If Phabricator isn't located next to your custom library, specify a
172172
path which actually points to the `phabricator/` directory.
173173

174-
You do not need to declare dependencies on `arcanist` or `libphutil`,
175-
since `arc liberate` automatically loads them.
174+
You do not need to declare dependencies on `arcanist`, since `arc liberate`
175+
automatically loads them.
176176

177177
Finally, edit your Phabricator config to tell it to load your library at
178178
runtime, by adding it to `load-libraries`:
@@ -206,17 +206,17 @@ This will automatically regenerate the static map of the library.
206206
What You Can Extend And Invoke
207207
==============================
208208

209-
libphutil, Arcanist and Phabricator are strict about extensibility of classes
210-
and visibility of methods and properties. Most classes are marked `final`, and
209+
Arcanist and Phabricator are strict about extensibility of classes and
210+
visibility of methods and properties. Most classes are marked `final`, and
211211
methods have the minimum required visibility (protected or private). The goal
212212
of this strictness is to make it clear what you can safely extend, access, and
213213
invoke, so your code will keep working as the upstream changes.
214214

215215
IMPORTANT: We'll still break APIs frequently. The upstream does not support
216216
extension development, and none of these APIs are stable.
217217

218-
When developing libraries to work with libphutil, Arcanist and Phabricator, you
219-
should respect method and property visibility.
218+
When developing libraries to work with Arcanist and Phabricator, you should
219+
respect method and property visibility.
220220

221221
If you want to add features but can't figure out how to do it without changing
222222
Phabricator code, here are some approaches you may be able to take:

src/docs/contributor/bug_reports.diviner

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ Before you file a report, here are some common solutions to problems:
4747
issues to be fixed in less than 24 hours, so even if you've updated recently
4848
you should update again. If you aren't sure how to update, see the next
4949
section.
50-
- **Update Libraries**: Make sure `libphutil/`, `arcanist/` and
51-
`phabricator/` are all up to date. Users often update `phabricator/` but
52-
forget to update `arcanist/` or `libphutil/`. When you update, make sure you
53-
update all three libraries.
50+
- **Update Libraries**: Make sure `arcanist/` and `phabricator/` are all up
51+
to date. Users often update `phabricator/` but forget to update `arcanist/`.
52+
When you update, make sure you update all three libraries.
5453
- **Restart Apache or PHP-FPM**: Phabricator uses caches which don't get
5554
reset until you restart Apache or PHP-FPM. After updating, make sure you
5655
restart.

src/docs/contributor/contrib_intro.diviner

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@title Contributor Introduction
22
@group contrib
33

4-
Introduction to contributing to Phabricator, Arcanist and libphutil.
4+
Introduction to contributing to Phabricator and Arcanist.
55

66
Overview
77
========

src/docs/contributor/contributing_code.diviner

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ outside of our comfort zone.
212212
Writing and Submitting Patches
213213
==================
214214

215-
To actually submit a patch, run `arc diff` in `phabricator/`, `arcanist/`, or
216-
`libphutil/`. When executed in these directories, `arc` should automatically
217-
talk to the upstream install. You can add `epriestley` as a reviewer.
215+
To actually submit a patch, run `arc diff` in `phabricator/` or `arcanist/`.
216+
When executed in these directories, `arc` should automatically talk to the
217+
upstream install. You can add `epriestley` as a reviewer.
218218

219219
You should read the relevant coding convention documents before you submit a
220220
change. If you're a new contributor, you don't need to worry about this too

src/docs/contributor/general_coding_standards.diviner

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@group standards
33

44
This document is a general coding standard for contributing to Phabricator,
5-
Arcanist, libphutil and Diviner.
5+
Arcanist, and Diviner.
66

77
= Overview =
88

@@ -136,7 +136,7 @@ handling and makes it easier to get right than wrong:
136136
Filesystem::writeFile('file.bak', $data); // Best
137137
do_something_dangerous();
138138

139-
See @{article@libphutil:Command Execution} for details on the APIs used in this
139+
See @{article@arcanist:Command Execution} for details on the APIs used in this
140140
example.
141141

142142
= Documentation, Comments and Formatting =

src/docs/contributor/internationalization.diviner

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For instructions on adding new classes, see
4444
Writing Translatable Code
4545
=========================
4646

47-
Strings are marked for translation with @{function@libphutil:pht}.
47+
Strings are marked for translation with @{function@arcanist:pht}.
4848

4949
The `pht()` function takes a string (and possibly some parameters) and returns
5050
the translated version of that string in the current viewer's locale, if a
@@ -68,7 +68,7 @@ the major rules are:
6868
- Use parameters to create strings containing user names, object names, etc.
6969
- Translate full sentences, not sentence fragments.
7070
- Let the translation framework handle plural rules.
71-
- Use @{class@libphutil:PhutilNumber} for numbers.
71+
- Use @{class@arcanist:PhutilNumber} for numbers.
7272
- Let the translation framework handle subject gender rules.
7373
- Translate all human-readable text, even exceptions and error messages.
7474

@@ -323,7 +323,7 @@ pronouns (like "he" and "she") but there are more complex rules in other
323323
languages, and languages like Czech also require verb agreement.
324324

325325
When a parameter refers to a gendered person, pass an object which implements
326-
@{interface@libphutil:PhutilPerson} to `pht()` so translators can provide
326+
@{interface@arcanist:PhutilPerson} to `pht()` so translators can provide
327327
gendered translation variants.
328328

329329
```lang=php
@@ -361,8 +361,8 @@ all human-readable text. This rule is unambiguous and easy to follow.
361361
In cases where similar error or exception text is often repeated, it is
362362
probably appropriate to define an exception for that category of error rather
363363
than write the text out repeatedly, anyway. Two examples are
364-
@{class@libphutil:PhutilInvalidStateException} and
365-
@{class@libphutil:PhutilMethodNotImplementedException}, which mostly exist to
364+
@{class@arcanist:PhutilInvalidStateException} and
365+
@{class@arcanist:PhutilMethodNotImplementedException}, which mostly exist to
366366
produce a consistent message about a common error state in a convenient way.
367367

368368
There are a handful of error strings in the codebase which may be used before

0 commit comments

Comments
 (0)