From 34c9207ce91fee659ecc1a87ed4308f7ade921fd Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Fri, 1 Feb 2019 13:40:21 +0000 Subject: [PATCH] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- flextype/Shortcodes.php | 4 ++-- flextype/parsers/FrontmatterParser.php | 8 ++++--- site/plugins/admin/classes/EntriesManager.php | 24 +++++++++---------- site/plugins/admin/views/partials/tail.php | 16 +++++++++---- .../views/templates/content/entries/add.php | 2 +- .../templates/extends/templates/edit.php | 2 +- .../views/templates/system/settings/list.php | 2 +- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 77346fcf..11ad824f 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -164,8 +164,8 @@ class Shortcodes { ($s->getParameter('width')) and $attributes['width'] = $s->getParameter('width'); ($s->getParameter('height')) and $attributes['height'] = $s->getParameter('height'); ($s->getParameter('class')) and $attributes['class'] = $s->getParameter('class'); - ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); - ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); + ($s->getParameter('id')) and $attributes['id'] = $s->getParameter('id'); + ($s->getParameter('alt')) and $attributes['alt'] = $s->getParameter('alt'); return Images::getImage($s->getParameter('path'), $params, $attributes); }); diff --git a/flextype/parsers/FrontmatterParser.php b/flextype/parsers/FrontmatterParser.php index 00bd813e..78aa090d 100644 --- a/flextype/parsers/FrontmatterParser.php +++ b/flextype/parsers/FrontmatterParser.php @@ -26,10 +26,12 @@ class FrontmatterParser { */ public static function parse(string $content) : array { - $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL.ltrim($content)); + $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL . ltrim($content)); - if (count($parts) < 3) return ['matter' => [], 'body' => $content]; + if (count($parts) < 3) { + return ['matter' => [], 'body' => $content]; + } - return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL.'---'.PHP_EOL, array_slice($parts, 2))]; + return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2))]; } } diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index d2b5d9ad..cb13178b 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -83,12 +83,12 @@ class EntriesManager // Create a entry! if (Filesystem::write( $file, - '---'."\n". - YamlParser::encode(array_replace_recursive($frontmatter, $_frontmatter)). - '---'."\n" + '---' . "\n" . + YamlParser::encode(array_replace_recursive($frontmatter, $_frontmatter)) . + '---' . "\n" )) { Notification::set('success', __('admin_message_entry_created')); - Http::redirect(Http::getBaseUrl().'/admin/entries/?entry='.Http::post('parent_entry')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); } } } else { @@ -176,13 +176,13 @@ class EntriesManager if (Filesystem::write( PATH['entries'] . '/' . Http::post('entry') . '/entry.html', - '---'."\n". - $frontmatter."\n". - '---'."\n". + '---' . "\n" . + $frontmatter . "\n" . + '---' . "\n" . $content )) { Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries?entry='.implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); + Http::redirect(Http::getBaseUrl() . '/admin/entries?entry=' . implode('/', array_slice(explode("/", Http::get('entry')), 0, -1))); } } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); @@ -294,13 +294,13 @@ class EntriesManager Filesystem::write( PATH['entries'] . '/' . Http::get('entry') . '/entry.html', - '---'."\n". - $frontmatter."\n". - '---'."\n". + '---' . "\n" . + $frontmatter . "\n" . + '---' . "\n" . $content ); Notification::set('success', __('admin_message_entry_changes_saved')); - Http::redirect(Http::getBaseUrl().'/admin/entries/edit?entry='.Http::get('entry')); + Http::redirect(Http::getBaseUrl() . '/admin/entries/edit?entry=' . Http::get('entry')); } } diff --git a/site/plugins/admin/views/partials/tail.php b/site/plugins/admin/views/partials/tail.php index 6cb9aaec..640c0a16 100755 --- a/site/plugins/admin/views/partials/tail.php +++ b/site/plugins/admin/views/partials/tail.php @@ -5,12 +5,18 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets - + - - + + @@ -147,7 +153,8 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets mode: "yaml", - + mode: "application/x-httpd-php", indentWithTabs: false, @@ -185,4 +192,5 @@ use Flextype\Component\{Http\Http, Event\Event, Registry\Registry, Assets\Assets diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php index e00581a3..a6beccdd 100644 --- a/site/plugins/admin/views/templates/content/entries/add.php +++ b/site/plugins/admin/views/templates/content/entries/add.php @@ -17,7 +17,7 @@ Themes::view('admin/views/partials/navbar') 'attributes' => ['class' => 'navbar-item'] ], 'entries_add' => [ - 'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry'), + 'link' => Http::getBaseUrl() . '/admin/entries/add?entry=' . Http::get('entry'), 'title' => __('admin_create_new_entry'), 'attributes' => ['class' => 'navbar-item active'] ] diff --git a/site/plugins/admin/views/templates/extends/templates/edit.php b/site/plugins/admin/views/templates/extends/templates/edit.php index 567c6790..f4e2ac89 100644 --- a/site/plugins/admin/views/templates/extends/templates/edit.php +++ b/site/plugins/admin/views/templates/extends/templates/edit.php @@ -12,7 +12,7 @@ Themes::view('admin/views/partials/head')->display(); Themes::view('admin/views/partials/navbar') ->assign('links', [ 'template' => [ - 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type='.$type, + 'link' => Http::getBaseUrl() . '/admin/templates/edit?template=' . Http::get('template') . '&type=' . $type, 'title' => __('admin_template'), 'attributes' => ['class' => 'navbar-item active'] ] diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php index 77741c4a..5aa0c2a4 100644 --- a/site/plugins/admin/views/templates/system/settings/list.php +++ b/site/plugins/admin/views/templates/system/settings/list.php @@ -19,7 +19,7 @@ Themes::view('admin/views/partials/navbar') 'attributes' => ['class' => 'js-save-form-submit float-right btn'] ], 'settings_clear_cache' => [ - 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(), + 'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token=' . Token::generate(), 'title' => __('admin_clear_cache'), 'attributes' => ['class' => 'float-right btn'] ]