@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Serve celerity resources from multiple maps
Summary: Ref T4222. Adds the map name to Celerity resource URIs, so we can serve out of any map.
Test Plan: Poked around, verified URIs have "/phabricator/" in them now.
Reviewers: btrahan, hach-que
Reviewed By: btrahan
CC: aran
Maniphest Tasks: T4222
Differential Revision: https://secure.phabricator.com/D7877
+23
-2
+1
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+1
src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+11
-1
src/infrastructure/celerity/CelerityPhabricatorResourceController.php
+11
-1
src/infrastructure/celerity/CelerityPhabricatorResourceController.php
···
12
12
13
13
private $path;
14
14
private $hash;
15
+
private $library;
15
16
16
17
public function getCelerityResourceMap() {
17
-
return CelerityResourceMap::getNamedInstance('phabricator');
18
+
return CelerityResourceMap::getNamedInstance($this->library);
18
19
}
19
20
20
21
public function willProcessRequest(array $data) {
21
22
$this->path = $data['path'];
22
23
$this->hash = $data['hash'];
24
+
$this->library = $data['library'];
23
25
}
24
26
25
27
public function processRequest() {
28
+
// Check that the resource library exists before trying to serve resources
29
+
// from it.
30
+
try {
31
+
$this->getCelerityResourceMap();
32
+
} catch (Exception $ex) {
33
+
return new Aphront400Response();
34
+
}
35
+
26
36
return $this->serveResource($this->path);
27
37
}
28
38
+9
src/infrastructure/celerity/resources/CelerityPhysicalResources.php
+9
src/infrastructure/celerity/resources/CelerityPhysicalResources.php
···
30
30
31
31
foreach ($resources_list as $resources) {
32
32
$name = $resources->getName();
33
+
34
+
if (!preg_match('/^[a-z0-9]+/', $name)) {
35
+
throw new Exception(
36
+
pht(
37
+
'Resources name "%s" is not valid; it must contain only '.
38
+
'lowercase latin letters and digits.',
39
+
$name));
40
+
}
41
+
33
42
if (empty($resources_map[$name])) {
34
43
$resources_map[$name] = $resources;
35
44
} else {
+2
-1
src/infrastructure/celerity/resources/CelerityResources.php
+2
-1
src/infrastructure/celerity/resources/CelerityResources.php