Page MenuHomePhabricator
Files F15380917

D18159.id43706.diff
No OneTemporary
Actions

D18159.id43706.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2329,6 +2329,7 @@
'PhabricatorChatLogEvent' => 'applications/chatlog/storage/PhabricatorChatLogEvent.php',
'PhabricatorChatLogQuery' => 'applications/chatlog/query/PhabricatorChatLogQuery.php',
'PhabricatorChunkedFileStorageEngine' => 'applications/files/engine/PhabricatorChunkedFileStorageEngine.php',
+ 'PhabricatorClassConfigType' => 'applications/config/type/PhabricatorClassConfigType.php',
'PhabricatorClusterConfigOptions' => 'applications/config/option/PhabricatorClusterConfigOptions.php',
'PhabricatorClusterDatabasesConfigOptionType' => 'infrastructure/cluster/config/PhabricatorClusterDatabasesConfigOptionType.php',
'PhabricatorClusterException' => 'infrastructure/cluster/exception/PhabricatorClusterException.php',
@@ -7575,6 +7576,7 @@
),
'PhabricatorChatLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhabricatorChunkedFileStorageEngine' => 'PhabricatorFileStorageEngine',
+ 'PhabricatorClassConfigType' => 'PhabricatorTextConfigType',
'PhabricatorClusterConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorClusterDatabasesConfigOptionType' => 'PhabricatorConfigJSONOptionType',
'PhabricatorClusterException' => 'Exception',
diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
--- a/src/applications/config/controller/PhabricatorConfigEditController.php
+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
@@ -350,20 +350,6 @@
case 'set':
$set_value = array_fill_keys($request->getStrList('value'), true);
break;
- case 'class':
- if (!class_exists($value)) {
- $e_value = pht('Invalid');
- $errors[] = pht('Class does not exist.');
- } else {
- $base = $option->getBaseClass();
- if (!is_subclass_of($value, $base)) {
- $e_value = pht('Invalid');
- $errors[] = pht('Class is not of valid type.');
- } else {
- $set_value = $value;
- }
- }
- break;
default:
$json = json_decode($value, true);
if ($json === null && strtolower($value) != 'null') {
@@ -409,8 +395,6 @@
} else {
$type = $option->getType();
switch ($type) {
- case 'class':
- return $value;
case 'set':
return implode("\n", nonempty(array_keys($value), array()));
default:
@@ -440,21 +424,6 @@
} else {
$type = $option->getType();
switch ($type) {
- case 'class':
- $symbols = id(new PhutilSymbolLoader())
- ->setType('class')
- ->setAncestorClass($option->getBaseClass())
- ->setConcreteOnly(true)
- ->selectSymbolsWithoutLoading();
- $names = ipull($symbols, 'name', 'name');
- asort($names);
- $names = array(
- '' => pht('(Use Default)'),
- ) + $names;
-
- $control = id(new AphrontFormSelectControl())
- ->setOptions($names);
- break;
case 'set':
$control = id(new AphrontFormTextAreaControl())
->setCaption(pht('Separate values with newlines or commas.'));
diff --git a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
--- a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
+++ b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
@@ -72,9 +72,6 @@
} else {
$type = $option->getType();
switch ($type) {
- case 'class':
- $value = (string)$value;
- break;
default:
$value = json_decode($value, true);
if (!is_array($value)) {
diff --git a/src/applications/config/option/PhabricatorApplicationConfigOptions.php b/src/applications/config/option/PhabricatorApplicationConfigOptions.php
--- a/src/applications/config/option/PhabricatorApplicationConfigOptions.php
+++ b/src/applications/config/option/PhabricatorApplicationConfigOptions.php
@@ -43,21 +43,6 @@
}
switch ($option->getType()) {
- case 'class':
- $symbols = id(new PhutilSymbolLoader())
- ->setType('class')
- ->setAncestorClass($option->getBaseClass())
- ->setConcreteOnly(true)
- ->selectSymbolsWithoutLoading();
- $names = ipull($symbols, 'name', 'name');
- if (empty($names[$value])) {
- throw new PhabricatorConfigValidationException(
- pht(
- "Option '%s' value must name a class extending '%s'.",
- $option->getKey(),
- $option->getBaseClass()));
- }
- break;
case 'set':
$valid = true;
if (!is_array($value)) {
diff --git a/src/applications/config/type/PhabricatorClassConfigType.php b/src/applications/config/type/PhabricatorClassConfigType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/config/type/PhabricatorClassConfigType.php
@@ -0,0 +1,76 @@
+<?php
+
+final class PhabricatorClassConfigType
+ extends PhabricatorTextConfigType {
+
+ const TYPEKEY = 'class';
+
+ public function validateStoredValue(
+ PhabricatorConfigOption $option,
+ $value) {
+
+ if (!is_string($value)) {
+ throw $this->newException(
+ pht(
+ 'Option "%s" is of type "%s", but the configured value is not '.
+ 'a string.',
+ $option->getKey(),
+ $this->getTypeKey()));
+ }
+
+ $base = $option->getBaseClass();
+ $map = $this->getClassOptions($option);
+
+ try {
+ $ok = class_exists($value);
+ } catch (Exception $ex) {
+ $ok = false;
+ }
+
+ if (!$ok) {
+ throw $this->newException(
+ pht(
+ 'Option "%s" is of type "%s", but the configured value is not the '.
+ 'name of a known class. Valid selections are: %s.',
+ $option->getKey(),
+ $this->getTypeKey(),
+ implode(', ', array_keys($map))));
+ }
+
+ if (!isset($map[$value])) {
+ throw $this->newException(
+ pht(
+ 'Option "%s" is of type "%s", but the current value ("%s") is not '.
+ 'a known, concrete subclass of base class "%s". Valid selections '.
+ 'are: %s.',
+ $option->getKey(),
+ $this->getTypeKey(),
+ $value,
+ $base,
+ implode(', ', array_keys($map))));
+ }
+ }
+
+ protected function newControl(PhabricatorConfigOption $option) {
+ $map = array(
+ '' => pht('(Use Default)'),
+ ) + $this->getClassOptions($option);
+
+ return id(new AphrontFormSelectControl())
+ ->setOptions($map);
+ }
+
+ private function getClassOptions(PhabricatorConfigOption $option) {
+ $symbols = id(new PhutilSymbolLoader())
+ ->setType('class')
+ ->setAncestorClass($option->getBaseClass())
+ ->setConcreteOnly(true)
+ ->selectSymbolsWithoutLoading();
+
+ $map = ipull($symbols, 'name', 'name');
+ asort($map);
+
+ return $map;
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 4:59 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7683690
Default Alt Text
D18159.id43706.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility