@@ -71,7 +71,7 @@ |
||
| 71 | 71 | try |
| 72 | 72 | { |
| 73 | 73 | $highlighted = $this->highlighter->highlight($language, $block['element']['text']['text']); |
| 74 | - $block['markup'] = "<pre><code class=\"hljs ${cssClass}\">" . $highlighted->value . '</code></pre>'; |
|
| 74 | + $block['markup'] = "<pre><code class=\"hljs ${cssclass}\">" . $highlighted->value . '</code></pre>'; |
|
| 75 | 75 | |
| 76 | 76 | // Only return the block if Highlighter knew the language and how to handle it. |
| 77 | 77 | return $block; |
@@ -152,6 +152,9 @@ discard block |
||
| 152 | 152 | }); |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | + /** |
|
| 156 | + * @param string $url |
|
| 157 | + */ |
|
| 155 | 158 | public static function normalizeUrl($url) |
| 156 | 159 | { |
| 157 | 160 | return str_replace(self::$baseUrl, '/', $url); |
@@ -163,7 +166,7 @@ discard block |
||
| 163 | 166 | * @param DynamicPageView $pageView |
| 164 | 167 | * @param $permalink |
| 165 | 168 | * |
| 166 | - * @return CollectableItem|ReadableDocument|TemplateReadyDocument|null |
|
| 169 | + * @return CollectableItem|null |
|
| 167 | 170 | */ |
| 168 | 171 | private static function getContentItem(DynamicPageView $pageView, $permalink) |
| 169 | 172 | { |
@@ -38,10 +38,12 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | private function staticPageViewController(StaticPageView $pageView, Compiler $compiler) |
| 40 | 40 | { |
| 41 | - return function () use ($pageView, $compiler) { |
|
| 41 | + return function () use ($pageView, $compiler) |
|
| 42 | + { |
|
| 42 | 43 | Service::setOption('currentTemplate', $pageView->getAbsoluteFilePath()); |
| 43 | 44 | |
| 44 | - if ($this->hasBeenTouched($pageView)) { |
|
| 45 | + if ($this->hasBeenTouched($pageView)) |
|
| 46 | + { |
|
| 45 | 47 | $pageView->readContent(); |
| 46 | 48 | } |
| 47 | 49 | |
@@ -65,7 +67,8 @@ discard block |
||
| 65 | 67 | */ |
| 66 | 68 | private function dynamicPageViewController(DynamicPageView $pageView, Compiler $compiler) |
| 67 | 69 | { |
| 68 | - return function (ServerRequestInterface $request) use ($pageView, $compiler) { |
|
| 70 | + return function (ServerRequestInterface $request) use ($pageView, $compiler) |
|
| 71 | + { |
|
| 69 | 72 | Service::setOption('currentTemplate', $pageView->getAbsoluteFilePath()); |
| 70 | 73 | |
| 71 | 74 | $contentItem = self::getContentItem($pageView, self::normalizeUrl($request->getUri()->getPath())); |
@@ -98,7 +101,8 @@ discard block |
||
| 98 | 101 | */ |
| 99 | 102 | private function repeaterPageViewController(RepeaterPageView $pageView, Compiler $compiler) |
| 100 | 103 | { |
| 101 | - return function (ServerRequestInterface $request) use ($pageView, $compiler) { |
|
| 104 | + return function (ServerRequestInterface $request) use ($pageView, $compiler) |
|
| 105 | + { |
|
| 102 | 106 | $permalinks = $pageView->getRepeaterPermalinks(); |
| 103 | 107 | $url = self::normalizeUrl($request->getUri()->getPath()); |
| 104 | 108 | |
@@ -138,7 +142,8 @@ discard block |
||
| 138 | 142 | return $this->repeaterPageViewController($pageView, $compiler); |
| 139 | 143 | |
| 140 | 144 | default: |
| 141 | - return function () { |
|
| 145 | + return function () |
|
| 146 | + { |
|
| 142 | 147 | $errMsg = 'This URL type has not yet been implemented.'; |
| 143 | 148 | |
| 144 | 149 | return new Response(501, ['Content-Type' => 'text/plain'], $errMsg); |
@@ -178,7 +183,8 @@ discard block |
||
| 178 | 183 | { |
| 179 | 184 | self::$baseUrl = $router->getBaseUrl(); |
| 180 | 185 | |
| 181 | - return \FastRoute\simpleDispatcher(function (RouteCollector $r) use ($router, $compiler) { |
|
| 186 | + return \FastRoute\simpleDispatcher(function (RouteCollector $r) use ($router, $compiler) |
|
| 187 | + { |
|
| 182 | 188 | $dispatcher = new RouteDispatcher(); |
| 183 | 189 | |
| 184 | 190 | foreach ($router->getRouteMapping() as $route => $pageView) |
@@ -43,7 +43,8 @@ |
||
| 43 | 43 | { |
| 44 | 44 | $dispatcher = RouteDispatcher::create($router, $compiler); |
| 45 | 45 | |
| 46 | - return new Server(function (ServerRequestInterface $request) use ($router, $dispatcher) { |
|
| 46 | + return new Server(function (ServerRequestInterface $request) use ($router, $dispatcher) |
|
| 47 | + { |
|
| 47 | 48 | $httpMethod = $request->getMethod(); |
| 48 | 49 | $urlPath = RouteDispatcher::normalizeUrl($request->getUri()->getPath()); |
| 49 | 50 | |