@@ -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 | { |
@@ -37,8 +37,10 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | private function staticPageViewController(StaticPageView $pageView, Compiler $compiler) |
| 39 | 39 | { |
| 40 | - return function () use ($pageView, $compiler) { |
|
| 41 | - if ($this->hasBeenTouched($pageView)) { |
|
| 40 | + return function () use ($pageView, $compiler) |
|
| 41 | + { |
|
| 42 | + if ($this->hasBeenTouched($pageView)) |
|
| 43 | + { |
|
| 42 | 44 | $pageView->readContent(); |
| 43 | 45 | } |
| 44 | 46 | |
@@ -62,7 +64,8 @@ discard block |
||
| 62 | 64 | */ |
| 63 | 65 | private function dynamicPageViewController(DynamicPageView $pageView, Compiler $compiler) |
| 64 | 66 | { |
| 65 | - return function (ServerRequestInterface $request) use ($pageView, $compiler) { |
|
| 67 | + return function (ServerRequestInterface $request) use ($pageView, $compiler) |
|
| 68 | + { |
|
| 66 | 69 | $contentItem = self::getContentItem($pageView, self::normalizeUrl($request->getUri()->getPath())); |
| 67 | 70 | |
| 68 | 71 | if ($contentItem === null) |
@@ -102,7 +105,8 @@ discard block |
||
| 102 | 105 | return $this->dynamicPageViewController($pageView, $compiler); |
| 103 | 106 | |
| 104 | 107 | default: |
| 105 | - return function () { |
|
| 108 | + return function () |
|
| 109 | + { |
|
| 106 | 110 | $errMsg = 'This URL type has not yet been implemented.'; |
| 107 | 111 | |
| 108 | 112 | return new Response(501, ['Content-Type' => 'text/plain'], $errMsg); |
@@ -142,7 +146,8 @@ discard block |
||
| 142 | 146 | { |
| 143 | 147 | self::$baseUrl = $router->getBaseUrl(); |
| 144 | 148 | |
| 145 | - return \FastRoute\simpleDispatcher(function (RouteCollector $r) use ($router, $compiler) { |
|
| 149 | + return \FastRoute\simpleDispatcher(function (RouteCollector $r) use ($router, $compiler) |
|
| 150 | + { |
|
| 146 | 151 | $dispatcher = new RouteDispatcher(); |
| 147 | 152 | |
| 148 | 153 | 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 | |