Update the changelog and the language files (see #2161)

Description ----------- - Commits ------- fd3e7d1 Update the changelog and the language files 9eb9dc9 Fix Psalm
contao · Aug 18, 2020 · 5a25b1d · 5a25b1d
1 parent 80eebf7
commit 5a25b1d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 This project adheres to [Semantic Versioning].
 
+## [4.10.0] (2020-08-18)
+
 ## [4.10.0-RC4] (2020-08-14)
 
 **Fixed issues:**
@@ -130,6 +132,7 @@ This project adheres to [Semantic Versioning].
 - [#1458] Always set host and language when generating the navigation menu ([aschempp])
 
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
+[4.10.0]: https://github.com/contao/contao/releases/tag/4.10.0
 [4.10.0-RC4]: https://github.com/contao/contao/releases/tag/4.10.0-RC4
 [4.10.0-RC3]: https://github.com/contao/contao/releases/tag/4.10.0-RC3
 [4.10.0-RC2]: https://github.com/contao/contao/releases/tag/4.10.0-RC2

diff --git a/calendar-bundle/src/Resources/contao/languages/it/tl_calendar_events.xlf b/calendar-bundle/src/Resources/contao/languages/it/tl_calendar_events.xlf
@@ -91,7 +91,7 @@
       </trans-unit>
       <trans-unit id="tl_calendar_events.location.0">
         <source>Location name</source>
-        <target>Nome della località</target>
+        <target>Luogo</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events.location.1">
         <source>Here you can enter the name of the event location.</source>

diff --git a/core-bundle/src/Config/Loader/PhpFileLoader.php b/core-bundle/src/Config/Loader/PhpFileLoader.php
@@ -20,9 +20,9 @@
  */
 class PhpFileLoader extends Loader
 {
-    public function load($file, $type = null): string
+    public function load($resource, $type = null): string
     {
-        [$code, $namespace] = $this->parseFile((string) $file);
+        [$code, $namespace] = $this->parseFile((string) $resource);
 
         $code = $this->stripLegacyCheck($code);
 

diff --git a/core-bundle/src/Config/Loader/XliffFileLoader.php b/core-bundle/src/Config/Loader/XliffFileLoader.php
@@ -36,9 +36,9 @@ public function __construct(string $projectDir, bool $addToGlobals = false)
         $this->addToGlobals = $addToGlobals;
     }
 
-    public function load($file, $type = null): string
+    public function load($resource, $type = null): string
     {
-        return $this->convertXlfToPhp((string) $file, $type ?: 'en');
+        return $this->convertXlfToPhp((string) $resource, $type ?: 'en');
     }
 
     public function supports($resource, $type = null): bool

diff --git a/core-bundle/src/Crawl/Monolog/CrawlCsvLogHandler.php b/core-bundle/src/Crawl/Monolog/CrawlCsvLogHandler.php
@@ -36,7 +36,7 @@ public function setFilterSource(string $filterSource): self
         return $this;
     }
 
-    protected function streamWrite($resource, array $record): void
+    protected function streamWrite($stream, array $record): void
     {
         if (!isset($record['context']['source'])) {
             return;
@@ -49,11 +49,11 @@ protected function streamWrite($resource, array $record): void
         /** @var CrawlUri|null $crawlUri */
         $crawlUri = $record['context']['crawlUri'] ?? null;
 
-        $stat = fstat($resource);
+        $stat = fstat($stream);
         $size = $stat['size'];
 
         if (0 === $size) {
-            fputcsv($resource, [
+            fputcsv($stream, [
                 'Time',
                 'Source',
                 'URI',
@@ -74,6 +74,6 @@ protected function streamWrite($resource, array $record): void
             preg_replace('/\r\n|\n|\r/', ' ', $record['message']),
         ];
 
-        fputcsv($resource, $columns);
+        fputcsv($stream, $columns);
     }
 }
diff --git a/core-bundle/src/DependencyInjection/Security/ContaoLoginFactory.php b/core-bundle/src/DependencyInjection/Security/ContaoLoginFactory.php
@@ -76,7 +76,7 @@ protected function getListenerId(): string
         return 'contao.security.authentication_listener';
     }
 
-    protected function createEntryPoint($container, $id, $config, $defaultEntryPoint): string
+    protected function createEntryPoint($container, $id, $config, $defaultEntryPointId): string
     {
         return 'contao.security.entry_point';
     }

diff --git a/core-bundle/src/Resources/contao/config/constants.php b/core-bundle/src/Resources/contao/config/constants.php
@@ -10,7 +10,7 @@
 
 // Core version
 define('VERSION', '4.10');
-define('BUILD', '0-RC4');
+define('BUILD', '0');
 define('LONG_TERM_SUPPORT', false);
 
 // Link constants

diff --git a/psalm.xml b/psalm.xml
@@ -19,4 +19,12 @@
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
         <pluginClass class="Weirdan\DoctrinePsalmPlugin\Plugin"/>
     </plugins>
+    <issueHandlers>
+        <!-- TODO: Remove this again once https://github.com/symfony/symfony/pull/37869 has been fixed -->
+        <ParamNameMismatch>
+            <errorLevel type="suppress">
+                <file name="core-bundle/src/DependencyInjection/Security/ContaoLoginFactory.php"/>
+            </errorLevel>
+        </ParamNameMismatch>
+    </issueHandlers>
 </psalm>