@@ -60,8 +60,7 @@ |
||
60 | 60 | $real = $request->getRequestUri(); |
61 | 61 | |
62 | 62 | $expected = 'homepage' == $page->getSlug() ? |
63 | - $this->get('piedweb.page_canonical')->generatePathForHomepage() : |
|
64 | - $this->get('piedweb.page_canonical')->generatePathForPage($page->getRealSlug()); |
|
63 | + $this->get('piedweb.page_canonical')->generatePathForHomepage() : $this->get('piedweb.page_canonical')->generatePathForPage($page->getRealSlug()); |
|
65 | 64 | |
66 | 65 | if ($real != $expected) { |
67 | 66 | return [$request->getBasePath().$expected, 301]; |
@@ -21,7 +21,9 @@ |
||
21 | 21 | public function getH1($elseTitle = false): ?string |
22 | 22 | { |
23 | 23 | if ($elseTitle) { |
24 | - return ShortCodeConverter::do($this->h1 ?? $this->title ?? '', $this->getLocale()); |
|
24 | + return ShortCodeConverter::do { |
|
25 | + ($this->h1 ?? $this->title ?? '', $this->getLocale()); |
|
26 | + } |
|
25 | 27 | } |
26 | 28 | |
27 | 29 | return $this->h1; |
@@ -4,11 +4,13 @@ |
||
4 | 4 | |
5 | 5 | class ShortCodeConverter |
6 | 6 | { |
7 | - public static function do($string, $locale = null) |
|
7 | + public static function do { |
|
8 | + ($string, $locale = null) |
|
8 | 9 | { |
9 | 10 | //var_dump($string); exit; |
10 | 11 | if ($locale) { |
11 | 12 | setlocale(LC_TIME, self::convertLocale($locale)); |
13 | + } |
|
12 | 14 | } |
13 | 15 | |
14 | 16 | //$string = preg_replace('/date\([\'"]?([a-z% ]+)[\'"]?\)/i', |
@@ -123,7 +123,7 @@ |
||
123 | 123 | |
124 | 124 | $this->eventDispatcher->addListener( |
125 | 125 | KernelEvents::TERMINATE, |
126 | - function () use ($media) { |
|
126 | + function() use ($media) { |
|
127 | 127 | $this->cacheGenerator->generateCache($media); |
128 | 128 | } |
129 | 129 | ); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $pathWebP = $this->projectDir.'/public/'.$media->getRelativeDir().'/'.$filter.'/'.$media->getSlug().'.webp'; |
119 | 119 | $webPConverterOptions = self::$webPConverterOptions; |
120 | 120 | |
121 | - $this->pool->add(function () use ($pathJpg, $pathWebP, $webPConverterOptions, $filter) { |
|
121 | + $this->pool->add(function() use ($pathJpg, $pathWebP, $webPConverterOptions, $filter) { |
|
122 | 122 | // took 46s (vs 43s) to add liip generation in async |
123 | 123 | //exec($projectDir.'/bin/console liip:imagine:cache:resolve "'.$path.'" --force --filter='.$filter |
124 | 124 | //.' >/dev/null 2>&1 &'); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $source = $this->projectDir.$media->getPath(); |
133 | 133 | //self::createWebPStatic($destination, $source); |
134 | 134 | |
135 | - $this->pool->add(function () use ($destination, $source) { |
|
135 | + $this->pool->add(function() use ($destination, $source) { |
|
136 | 136 | self::createWebPStatic($destination, $source); |
137 | 137 | }); |
138 | 138 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $columnFields = [ |
62 | 62 | 'admin.page.state.label' => ['createdAt', 'metaRobots'], |
63 | 63 | 'admin.page.permanlien.label' => ['host', 'slug', 'parentPage'], |
64 | - 'admin.page.extended.label' => ['expand' => true, 'fields' => ['mainImage', 'name', 'title', 'excrept']], |
|
64 | + 'admin.page.extended.label' => ['expand' => true, 'fields' => ['mainImage', 'name', 'title', 'excrept']], |
|
65 | 65 | 'admin.page.translations.label' => ['locale', 'translations'], |
66 | 66 | 'admin.page.otherProperties.label' => ['expand' => true, 'fields' => ['otherProperties']], |
67 | 67 | 'admin.page.images.label' => ['images'], |
@@ -138,7 +138,7 @@ |
||
138 | 138 | 'help_html' => true, |
139 | 139 | 'help' => 'admin.page.translations.help', |
140 | 140 | 'btn_add' => false, |
141 | - 'to_string_callback' => function ($entity) { |
|
141 | + 'to_string_callback' => function($entity) { |
|
142 | 142 | return $entity->getLocale() |
143 | 143 | ? $entity->getLocale().' ('.$entity->getSlug().')' |
144 | 144 | : $entity->getSlug(); // switch for getLocale |