Page MenuHomePhabricator
Files F14072753

D17364.diff
No OneTemporary
Actions

D17364.diff
View Options

diff --git a/src/cache/PhutilAPCKeyValueCache.php b/src/cache/PhutilAPCKeyValueCache.php
--- a/src/cache/PhutilAPCKeyValueCache.php
+++ b/src/cache/PhutilAPCKeyValueCache.php
@@ -90,7 +90,7 @@
return $this;
}
- private static function isAPCU() {
+ private static function isAPCu() {
return function_exists('apcu_fetch');
}
diff --git a/src/cache/PhutilKeyValueCacheStack.php b/src/cache/PhutilKeyValueCacheStack.php
--- a/src/cache/PhutilKeyValueCacheStack.php
+++ b/src/cache/PhutilKeyValueCacheStack.php
@@ -68,7 +68,7 @@
* @task config
*/
public function setNextTTL($ttl) {
- $this->ttl = $ttl;
+ $this->nextTTL = $ttl;
return $this;
}
diff --git a/src/filesystem/Filesystem.php b/src/filesystem/Filesystem.php
--- a/src/filesystem/Filesystem.php
+++ b/src/filesystem/Filesystem.php
@@ -384,7 +384,7 @@
* Get the last modified time of a file
*
* @param string Path to file
- * @return Time last modified
+ * @return int Time last modified
*
* @task file
*/
diff --git a/src/future/aws/PhutilAWSException.php b/src/future/aws/PhutilAWSException.php
--- a/src/future/aws/PhutilAWSException.php
+++ b/src/future/aws/PhutilAWSException.php
@@ -4,6 +4,7 @@
private $httpStatus;
private $requestID;
+ private $params;
public function __construct($http_status, array $params) {
$this->httpStatus = $http_status;
diff --git a/src/future/exec/PhutilSignalRouter.php b/src/future/exec/PhutilSignalRouter.php
--- a/src/future/exec/PhutilSignalRouter.php
+++ b/src/future/exec/PhutilSignalRouter.php
@@ -69,7 +69,8 @@
throw new PhutilAggregateException(
pht(
'Signal handlers raised exceptions while handling "%s".',
- phutil_get_signal_name($signo)));
+ phutil_get_signal_name($signo)),
+ $exceptions);
}
switch ($signo) {
diff --git a/src/future/http/status/HTTPFutureParseResponseStatus.php b/src/future/http/status/HTTPFutureParseResponseStatus.php
--- a/src/future/http/status/HTTPFutureParseResponseStatus.php
+++ b/src/future/http/status/HTTPFutureParseResponseStatus.php
@@ -4,6 +4,8 @@
const ERROR_MALFORMED_RESPONSE = 1;
+ private $rawResponse;
+
public function __construct($code, $raw_response) {
$this->rawResponse = $raw_response;
parent::__construct($code);
diff --git a/src/internationalization/PhutilNumber.php b/src/internationalization/PhutilNumber.php
--- a/src/internationalization/PhutilNumber.php
+++ b/src/internationalization/PhutilNumber.php
@@ -5,8 +5,9 @@
private $value;
private $decimals = 0;
- public function __construct($value) {
+ public function __construct($value, $decimals = 0) {
$this->value = $value;
+ $this->decimals = $decimals;
}
public function getNumber() {
diff --git a/src/markup/engine/PhutilRemarkupEngine.php b/src/markup/engine/PhutilRemarkupEngine.php
--- a/src/markup/engine/PhutilRemarkupEngine.php
+++ b/src/markup/engine/PhutilRemarkupEngine.php
@@ -293,7 +293,7 @@
$rule->didMarkupText();
}
- return $this->restoreText(idx($dict, 'output'), $this->isTextMode());
+ return $this->restoreText(idx($dict, 'output'));
}
public function restoreText($text) {

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 21, 9:35 PM (2 m, 46 s)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6772407
Default Alt Text
D17364.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility