From d01a30843f2cb3b5ab0d701c854f4bbc37c5406a Mon Sep 17 00:00:00 2001
From: "S.M. Ataur Rahman" <dev.ataur.rahman@gmail.com>
Date: Sat, 18 Dec 2021 11:57:20 +0600
Subject: [PATCH] Fixed ignoreTypeStats & useStrictTypes flag value detection
 for directories in config

---
 src/Psalm/Config/FileFilter.php | 17 ++-------
 tests/Config/ConfigTest.php     | 66 +++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/src/Psalm/Config/FileFilter.php b/src/Psalm/Config/FileFilter.php
index 07e8cb1a1f4..56ca9f68e7d 100644
--- a/src/Psalm/Config/FileFilter.php
+++ b/src/Psalm/Config/FileFilter.php
@@ -111,12 +111,8 @@ public static function loadFromArray(
             /** @var array $directory */
             foreach ($config['directory'] as $directory) {
                 $directory_path = (string) ($directory['name'] ?? '');
-                $ignore_type_stats = strtolower(
-                    isset($directory['ignoreTypeStats']) ? (string) $directory['ignoreTypeStats'] : ''
-                ) === 'true';
-                $declare_strict_types = strtolower(
-                    isset($directory['useStrictTypes']) ? (string) $directory['useStrictTypes'] : ''
-                ) === 'true';
+                $ignore_type_stats = (bool) ($directory['ignoreTypeStats'] ?? false);
+                $declare_strict_types = (bool) ($directory['useStrictTypes'] ?? false);
 
                 if ($directory_path[0] === '/' && DIRECTORY_SEPARATOR === '/') {
                     $prospective_directory_path = $directory_path;
@@ -350,13 +346,8 @@ public static function loadFromXMLElement(
             foreach ($e->directory as $directory) {
                 $config['directory'][] = [
                     'name' => (string) $directory['name'],
-                    'ignoreTypeStats' => strtolower(
-                        isset($directory['ignoreTypeStats']) ? (string) $directory['ignoreTypeStats'] : ''
-                    ) === 'true',
-
-                    'useStrictTypes' => strtolower(
-                        isset($directory['useStrictTypes']) ? (string) $directory['useStrictTypes'] : ''
-                    ) === 'true',
+                    'ignoreTypeStats' => strtolower((string) ($directory['ignoreTypeStats'] ?? '')) === 'true',
+                    'useStrictTypes' => strtolower((string) ($directory['useStrictTypes'] ?? '')) === 'true',
                 ];
             }
         }
diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
index 9db727e9e3d..bd037e268d1 100644
--- a/tests/Config/ConfigTest.php
+++ b/tests/Config/ConfigTest.php
@@ -1483,4 +1483,70 @@ public function pluginRegistersScannerAndAnalyzer(int $flags, ?int $expectedExce
         self::assertSame(get_class($analyzerMock), $config->getFiletypeAnalyzers()[$extension] ?? null);
         self::assertNull($expectedExceptionCode, 'Expected exception code was not thrown');
     }
+
+    public function testTypeStatsForFileReporting(): void
+    {
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                (string) getcwd(),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <projectFiles>
+                        <directory ignoreTypeStats="true" name="src/Psalm/Config" />
+                        <directory ignoreTypeStats="1" name="src/Psalm/Internal" />
+                        <directory ignoreTypeStats="true1" name="src/Psalm/Issue" />
+                        <directory ignoreTypeStats="false" name="src/Psalm/Node" />
+                        <directory ignoreTypeStats="invalid" name="src/Psalm/Plugin" />
+                        <directory ignoreTypeStats="0" name="src/Psalm/Progress" />
+                        <directory ignoreTypeStats="" name="src/Psalm/Report" />
+                        <directory name="src/Psalm/SourceControl" />
+                    </projectFiles>
+                </psalm>'
+            )
+        );
+
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertFalse($config->reportTypeStatsForFile(realpath('src/Psalm/Config') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Internal') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Issue') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Node') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Plugin') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Progress') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/Report') . '/'));
+        $this->assertTrue($config->reportTypeStatsForFile(realpath('src/Psalm/SourceControl') . '/'));
+    }
+
+    public function testStrictTypesForFileReporting(): void
+    {
+        $this->project_analyzer = $this->getProjectAnalyzerWithConfig(
+            Config::loadFromXML(
+                (string) getcwd(),
+                '<?xml version="1.0"?>
+                <psalm>
+                    <projectFiles>
+                        <directory useStrictTypes="true" name="src/Psalm/Config" />
+                        <directory useStrictTypes="1" name="src/Psalm/Internal" />
+                        <directory useStrictTypes="true1" name="src/Psalm/Issue" />
+                        <directory useStrictTypes="false" name="src/Psalm/Node" />
+                        <directory useStrictTypes="invalid" name="src/Psalm/Plugin" />
+                        <directory useStrictTypes="0" name="src/Psalm/Progress" />
+                        <directory useStrictTypes="" name="src/Psalm/Report" />
+                        <directory name="src/Psalm/SourceControl" />
+                    </projectFiles>
+                </psalm>'
+            )
+        );
+
+        $config = $this->project_analyzer->getConfig();
+
+        $this->assertTrue($config->useStrictTypesForFile(realpath('src/Psalm/Config') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Internal') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Issue') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Node') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Plugin') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Progress') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/Report') . '/'));
+        $this->assertFalse($config->useStrictTypesForFile(realpath('src/Psalm/SourceControl') . '/'));
+    }
 }