Merge pull request #91 from weirdan/remove-allow_phpstorm_generics

Fixes #90
psalm · Feb 9, 2023 · a3e187d · a3e187d
2 parents 46759bf + 1562b51
commit a3e187d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/includes/script.php b/includes/script.php
@@ -22,7 +22,6 @@
     'memoize_method_calls': 'Memoize simple method calls',
     'check_throws': 'Check for <code>@throws</code> docblock',
     'restrict_return_types': 'Force return types to be as tight as possible',
-    'allow_phpstorm_generics': 'Allow PHPStorm generic annotations (e.g. Traversable|string[])',
     'use_phpdoc_without_magic_call': 'Use PHPDoc methods and properties without magic call.',
 };
 

diff --git a/src/OnlineChecker.php b/src/OnlineChecker.php
@@ -200,7 +200,6 @@ private static function getPsalmConfig(array $settings, bool $fix_file, string $
         $config->check_for_throws_docblock = $settings['check_throws'] ?? true;
         $config->remember_property_assignments_after_call = $settings['memoize_properties'] ?? true;;
         $config->memoize_method_calls = $settings['memoize_method_calls'] ?? false;
-        $config->allow_phpstorm_generics = $settings['allow_phpstorm_generics'] ?? false;
         $config->use_phpdoc_method_without_magic_or_parent = $settings['use_phpdoc_without_magic_call'] ?? false;
         $config->use_phpdoc_property_without_magic_or_parent = $settings['use_phpdoc_without_magic_call'] ?? false;
         $config->ignore_internal_nullable_issues = !($settings['strict_internal_functions'] ?? false);

diff --git a/views/add_code.php b/views/add_code.php
@@ -77,7 +77,6 @@
     'check_throws',
     'strict_internal_functions',
     'restrict_return_types',
-    'allow_phpstorm_generics',
     'use_phpdoc_without_magic_call',
 ];
 

diff --git a/views/article.php b/views/article.php
@@ -53,7 +53,7 @@
 <?php endif ?>
 <h1><?= Muglug\Blog\AltHeadingParser::preventOrphans($article->title) ?></h1>
 <p class="meta">
-    <?= date('F j, Y', strtotime($article->date)) ?> by <?= $article->author ?> - 
+    <?= date('F j, Y', strtotime($article->date)) ?> by <?= $article->author ?> -
     <?php if ($article->canonical): ?>
         <a href="<?= $article->canonical ?>">original article</a>
     <?php else: ?>
@@ -83,7 +83,6 @@
     'memoize_method_calls': false,
     'check_throws': false,
     'strict_internal_functions': false,
-    'allow_phpstorm_generics': false,
     'use_phpdoc_without_magic_call': false,
 };
 
@@ -199,7 +198,7 @@ function (code_element) {
 		const container = document.createElement('div');
 		const textarea = document.createElement('textarea');
 		textarea.value = code_element.innerText;
-	
+
 		container.appendChild(textarea);
 		container.className = 'cm_inline_container';
 

diff --git a/views/index.php b/views/index.php
@@ -57,7 +57,6 @@ function takesAnInt(int $i) {
     'check_throws': false,
     'strict_internal_functions': false,
     'restrict_return_types': false,
-    'allow_phpstorm_generics': false,
     'use_phpdoc_without_magic_call': false,
 };
 </script>

diff --git a/views/snippet.php b/views/snippet.php
@@ -51,7 +51,6 @@
     'check_throws',
     'strict_internal_functions',
     'restrict_return_types',
-    'allow_phpstorm_generics',
     'use_phpdoc_without_magic_call',
 ];