Add method phpweb\News\NewsHandler::getNewsByYear()

MauricioFauth · MauricioFauth · commit 3066201a64c6 · 2025-07-06T21:39:00.000-03:00
diff --git a/archive/2015.php b/archive/2015.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), ["conferences", "cfp", "frontpage", "nofrontpage"], 500, 2015);
+print_news((new NewsHandler())->getNewsByYear(2015), ["conferences", "cfp", "frontpage", "nofrontpage"], 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2016.php b/archive/2016.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), ["conferences", "cfp", "frontpage", "nofrontpage"], 500, 2016);
+print_news((new NewsHandler())->getNewsByYear(2016), ["conferences", "cfp", "frontpage", "nofrontpage"], 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2017.php b/archive/2017.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2017);
+print_news((new NewsHandler())->getNewsByYear(2017), null, 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2018.php b/archive/2018.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2018);
+print_news((new NewsHandler())->getNewsByYear(2018), null, 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2019.php b/archive/2019.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2019);
+print_news((new NewsHandler())->getNewsByYear(2019), null, 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2020.php b/archive/2020.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2020);
+print_news((new NewsHandler())->getNewsByYear(2020), null, 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2021.php b/archive/2021.php
@@ -18,7 +18,7 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2021);
+print_news((new NewsHandler())->getNewsByYear(2021), null, 500);
 
 /* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2022.php b/archive/2022.php
@@ -18,5 +18,5 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2022);
+print_news((new NewsHandler())->getNewsByYear(2022), null, 500);
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2023.php b/archive/2023.php
@@ -18,5 +18,5 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2023);
+print_news((new NewsHandler())->getNewsByYear(2023), null, 500);
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2024.php b/archive/2024.php
@@ -18,5 +18,5 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2024);
+print_news((new NewsHandler())->getNewsByYear(2024), null, 500);
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/archive/2025.php b/archive/2025.php
@@ -18,5 +18,5 @@
 
 <?php
 
-print_news((new NewsHandler())->getPregeneratedNews(), null, 500, 2025);
+print_news((new NewsHandler())->getNewsByYear(2025), null, 500);
 site_footer(['elephpants' => true, 'sidebar' => $SIDEBAR_DATA]);
diff --git a/include/layout.inc b/include/layout.inc
@@ -347,7 +347,7 @@ function news_archive_sidebar(): void
 }
 
 // Print news
-function print_news($news, $dog, $max = 5, $onlyyear = null, $return = false) {
+function print_news($news, $dog, $max = 5, $return = false) {
     $retval = [];
     $count = 0;
     $news = $news ?: []; // default to empty array (if no news)
@@ -392,10 +392,6 @@ function print_news($news, $dog, $max = 5, $onlyyear = null, $return = false) {
         $published = substr($item["published"], 0, 10);
         $nixtimestamp = strtotime($published);
         $newsdate = date("d M Y", $nixtimestamp);
-        if ($onlyyear && date("Y", $nixtimestamp) != $onlyyear) {
-            $count--;
-            continue;
-        }
 
         if ($return) {
             $retval[] = [
diff --git a/src/News/NewsHandler.php b/src/News/NewsHandler.php
@@ -4,6 +4,10 @@
 
 namespace phpweb\News;
 
+use DateTimeImmutable;
+
+use function array_filter;
+use function array_values;
 use function is_array;
 
 final class NewsHandler
@@ -58,6 +62,15 @@ public function getConferences(): array
         return $conferences;
     }
 
+    /** @return list<array> */
+    public function getNewsByYear(int $year): array
+    {
+        return array_values(array_filter(
+            $this->getPregeneratedNews(),
+            static fn (array $entry): bool => (int) (new DateTimeImmutable($entry['published']))->format('Y') === $year,
+        ));
+    }
+
     public function getPregeneratedNews(): array
     {
         $NEWS_ENTRIES = null;
diff --git a/tests/Unit/News/NewsHandlerTest.php b/tests/Unit/News/NewsHandlerTest.php
@@ -4,6 +4,7 @@
 
 namespace News;
 
+use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use phpweb\News\NewsHandler;
@@ -36,6 +37,15 @@ public function testGetConferences(): void
         }
     }
 
+    public function testGetNewsByYear(): void
+    {
+        $news = (new NewsHandler())->getNewsByYear(2018);
+        self::assertNotEmpty($news);
+        foreach ($news as $entry) {
+            self::assertSame('2018', (new DateTimeImmutable($entry['published']))->format('Y'));
+        }
+    }
+
     public function testGetFrontPageNews(): void
     {
         $frontPage = (new NewsHandler())->getFrontPageNews();
