refactor: code quality

Cecilapp · Dec 27, 2023 · b8a87ae · b8a87ae
1 parent 35a9af1
commit b8a87ae
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/src/Generator/ExternalBody.php b/src/Generator/ExternalBody.php
@@ -29,7 +29,7 @@ class ExternalBody extends AbstractGenerator implements GeneratorInterface
     public function generate(): void
     {
         $filteredPages = $this->builder->getPages()->filter(function (Page $page) {
-            return null !== $page->getVariable('external');
+            return $page->getVariable('external') !== null;
         });
 
         /** @var Page $page */

diff --git a/src/Generator/Homepage.php b/src/Generator/Homepage.php
@@ -44,6 +44,7 @@ public function generate(): void
             // collects all pages
             $subPages = $this->builder->getPages()->filter(function (Page $page) use ($language) {
                 return $page->getType() == Type::PAGE->value
+                    && $page->getVariable('published') === true
                     && $page->isVirtual() === false
                     && $page->getVariable('exclude') !== true
                     && $page->getVariable('language') == $language;

diff --git a/src/Generator/Pagination.php b/src/Generator/Pagination.php
@@ -41,7 +41,7 @@ public function generate(): void
                 return;
             }
             $pages = $page->getPages()->filter(function (Page $page) {
-                return $page->getVariable('published');
+                return $page->getVariable('published') === true;
             });
             // if no sub-pages: by-pass
             if ($pages === null) {

diff --git a/src/Generator/Redirect.php b/src/Generator/Redirect.php
@@ -26,7 +26,8 @@ class Redirect extends AbstractGenerator implements GeneratorInterface
     public function generate(): void
     {
         $filteredPages = $this->builder->getPages()->filter(function (Page $page) {
-            return $page->getVariable('redirect') !== null && $page->getVariable('layout') != 'redirect';
+            return $page->getVariable('redirect') !== null
+                && $page->getVariable('layout') != 'redirect';
         });
 
         /** @var Page $page */

diff --git a/src/Renderer/Site.php b/src/Renderer/Site.php
@@ -149,7 +149,10 @@ public function getPages(): \Cecil\Collection\Page\Collection
     {
         return $this->builder->getPages()->filter(function (CollectionPage $page) {
             // We should fix case of virtual pages without language
-            if ($page->getVariable('language') === null && $this->language == $this->config->getLanguageDefault()) {
+            if (
+                $page->getVariable('language') === null
+                && $this->language == $this->config->getLanguageDefault()
+            ) {
                 return true;
             }
 

diff --git a/src/Step/Menus/Create.php b/src/Step/Menus/Create.php
@@ -136,7 +136,7 @@ protected function createMenusFromPages(): void
     {
         $filteredPages = $this->builder->getPages()->filter(function (Page $page) {
             return $page->hasVariable('menu')
-                && $page->getVariable('published')
+                && $page->getVariable('published') === true
                 && \in_array($page->getVariable('language', $this->config->getLanguageDefault()), array_column($this->config->getLanguages(), 'code'));
         });
 

diff --git a/tests/fixtures/website/generators/Cecil/Generator/TitleReplace.php b/tests/fixtures/website/generators/Cecil/Generator/TitleReplace.php
@@ -26,7 +26,7 @@ class TitleReplace extends AbstractGenerator implements GeneratorInterface
     public function generate(): void
     {
         $filteredPages = $this->builder->getPages()->filter(function (Page $page) {
-            return null !== $page->getVariable('title');
+            return $page->getVariable('title') !== null;
         });
 
         /** @var Page $page */