fixes for HHVM 4.29+

jjergus · jjergus · commit 20b292e78a50 · 2019-10-24T15:46:32.000-07:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/build/AbstractMarkdownRenderBuildStep.php b/src/build/AbstractMarkdownRenderBuildStep.php
@@ -57,9 +57,9 @@ private function parseSingleRenderResult(string $line): ?string {
       return null;
     }
     Log::v('-');
-    list($_in, $out) = \explode(' -> ', $line);
-    // $in still has 'OK] ' prefix, but we don't need it now anyway
-    return $out;
+    $parts = \explode(' -> ', $line);
+    // $parts[0] still has 'OK] ' prefix, but we don't need it now anyway
+    return $parts[1];
   }
 
   public static function getOutputFileName(string $input): string {
diff --git a/src/site/controllers/HTTP404Controller.php b/src/site/controllers/HTTP404Controller.php
@@ -118,7 +118,7 @@ protected function getNotFoundMessage(): XHPRoot {
     $parts = explode('/', $path);
 
     if (count($parts) === 2) {
-      list($_, $id) = $parts;
+      $id = $parts[1];
       $url = $this->getSuggestedUrl($id);
       if ($url !== null) {
         return (
diff --git a/src/site/controllers/WebController.php b/src/site/controllers/WebController.php
@@ -36,7 +36,7 @@ public function __construct(
     ImmMap<string, string> $parameters,
     private ServerRequestInterface $request,
   ) {
-    $combined_params = $parameters->toMap();
+    $combined_params = new Map($parameters);
     foreach ($request->getQueryParams() as $key => $value) {
       if (is_array($value)) {
         continue;

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ private function parseSingleRenderResult(string $line): ?string {`
`57`	`57`	`return null;`
`58`	`58`	`}`
`59`	`59`	`Log::v('-');`
`60`		`- list($_in, $out) = \explode(' -> ', $line);`
`61`		`- // $in still has 'OK] ' prefix, but we don't need it now anyway`
`62`		`- return $out;`
	`60`	`+ $parts = \explode(' -> ', $line);`
	`61`	`+ // $parts[0] still has 'OK] ' prefix, but we don't need it now anyway`
	`62`	`+ return $parts[1];`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public static function getOutputFileName(string $input): string {`