From e4a3438d55c8ed204ba79cede459fe6adbc501f8 Mon Sep 17 00:00:00 2001
From: Eliseu Amaro <mail@eliseuama.ro>
Date: Sat, 22 Jan 2022 19:16:35 +0000
Subject: [PATCH] [CORE][I18n] Fixing 'file_get_contents(): Argument #1 () must
 be of type string, Symfony\Component\Finder\SplFileInfo given' error by using
 Symfony's Finder to iterate through existing files

---
 .../Collection/templates/collection/notes.html.twig   |  8 ++++++--
 composer.lock                                         |  8 ++++----
 plugins/Favourite/Controller/Favourite.php            |  2 +-
 public/assets/default_theme/css/pages/feeds.css       |  8 +++++++-
 src/Core/I18n/TransExtractor.php                      | 11 +++++++----
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/components/Collection/templates/collection/notes.html.twig b/components/Collection/templates/collection/notes.html.twig
index 21796807f8..cda2adcfb0 100644
--- a/components/Collection/templates/collection/notes.html.twig
+++ b/components/Collection/templates/collection/notes.html.twig
@@ -16,9 +16,9 @@
     {% if notes is defined %}
         <header class="feed-header">
             {% if page_title is defined %}
-                <h1 class="heading-no-margin">{{ page_title | trans }}</h1>
+                <span class="section-title">{{ page_title | trans }}</span>
             {% else %}
-                <h3 class="heading-no-margin">{{ 'Notes' | trans }}</h3>
+                <span class="section-title">{{ 'Notes' | trans }}</span>
             {% endif %}
             <nav class="feed-actions">
                 <details class="feed-actions-details">
@@ -50,6 +50,10 @@
                     {% endblock current_note %}
                 {% endfor %}
             </section>
+        {% else %}
+            <section class="feed h-feed hfeed notes" tabindex="0" role="feed">
+                <span>{% trans %}No notes here...{% endtrans %}</span>
+            </section>
         {% endif %}
     {% endif %}
 {% endblock body %}
diff --git a/composer.lock b/composer.lock
index 5508147eb9..420e1e68e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12582,12 +12582,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cac291fde5db3a668d39700e4af63b67ed220c53"
+                "reference": "649dea45d6490e93a80cdb543c13b28468b6d133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cac291fde5db3a668d39700e4af63b67ed220c53",
-                "reference": "cac291fde5db3a668d39700e4af63b67ed220c53",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/649dea45d6490e93a80cdb543c13b28468b6d133",
+                "reference": "649dea45d6490e93a80cdb543c13b28468b6d133",
                 "shasum": ""
             },
             "require": {
@@ -12639,7 +12639,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T08:16:01+00:00"
+            "time": "2022-01-22T10:13:49+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/plugins/Favourite/Controller/Favourite.php b/plugins/Favourite/Controller/Favourite.php
index 75f16ad100..f2294c6b6d 100644
--- a/plugins/Favourite/Controller/Favourite.php
+++ b/plugins/Favourite/Controller/Favourite.php
@@ -175,7 +175,7 @@ class Favourite extends FeedController
 
         return [
             '_template'  => 'collection/notes.html.twig',
-            'page_title' => 'Favourites feed.',
+            'page_title' => 'Favourites',
             'notes'      => $notes,
         ];
     }
diff --git a/public/assets/default_theme/css/pages/feeds.css b/public/assets/default_theme/css/pages/feeds.css
index a0bd73f3e7..afbffab846 100644
--- a/public/assets/default_theme/css/pages/feeds.css
+++ b/public/assets/default_theme/css/pages/feeds.css
@@ -133,7 +133,13 @@
 
 .feed-header {
     display: flex;
-    margin-bottom: var(--m);
+    margin-top: var(--s);
+    margin-bottom: var(--s);
+    align-items: center;
+}
+
+.feed-header .section-title {
+    font-size: 1.383rem;
 }
 
 .feed-header .feed-actions {
diff --git a/src/Core/I18n/TransExtractor.php b/src/Core/I18n/TransExtractor.php
index f1d1f59a48..04ee67aa19 100644
--- a/src/Core/I18n/TransExtractor.php
+++ b/src/Core/I18n/TransExtractor.php
@@ -95,7 +95,7 @@ class TransExtractor extends AbstractFileExtractor implements ExtractorInterface
     /**
      * Prefix for new found message.
      */
-    private string $prefix = '';
+    private string $prefix = ' ';
 
     /**
      * {@inheritDoc}
@@ -106,10 +106,13 @@ class TransExtractor extends AbstractFileExtractor implements ExtractorInterface
             return;
         }
 
-        $files = $this->extractFiles($dir);
-        foreach ($files as $file) {
-            $this->parseTokens(token_get_all(file_get_contents($file)), $catalog, $file);
+        // Find all files in the current directory
+        $finder = new Finder();
+        $finder->files()->in($dir);
 
+        foreach ($finder as $file) {
+            $absoluteFilePath = $file->getRealPath();
+            $this->parseTokens(token_get_all(file_get_contents($absoluteFilePath)), $catalog, $absoluteFilePath);
             gc_mem_caches();
         }
     }