move psalm integration to integration directory (#125)

azjezz · Feb 16, 2021 · 78289a1 · 78289a1
1 parent 434da8e
commit 78289a1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -22,18 +22,16 @@ The goal of Psl is to provide a consistent, centralized, well-typed set of APIs
 
 declare(strict_types=1);
 
-use Psl\Arr;
-use Psl\Str;
+use Psl\{Dict, Str, Vec};
 
 /**
  * @psalm-param iterable<?int> $codes
  */
 function foo(iterable $codes): string
 {
-    /** @var list<int> $codes */
-    $codes = Arr\filter_nulls($codes);
-    /** @var list<string> $chars */
-    $chars = Arr\map($codes, fn(int $code): string => Str\chr($code));
+    $codes = Vec\filter_nulls($codes);
+
+    $chars = Dict\map($codes, fn(int $code): string => Str\chr($code));
 
     return Str\join($chars, ', ');
 }
@@ -61,7 +59,7 @@ To enable the Psalm plugin, add the `Psl\Internal\Psalm\Plugin` class to your ps
    ...
    <plugins>
       ...
-      <pluginClass class="Psl\Internal\Psalm\Plugin"/>
+      <pluginClass class="Psl\Integration\Psalm\Plugin" />
    </plugins>
 </psalm>
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Psl\\": "src/Psl"
+            "Psl\\": "src/Psl",
+            "Psl\\Integration\\": "integration"
         },
         "files": [
             "src/bootstrap.php"
@@ -64,7 +65,11 @@
     },
     "extra": {
         "psalm": {
-            "pluginClass": "Psl\\Internal\\Psalm\\Plugin"
+            "pluginClass": "Psl\\Integration\\Psalm\\Plugin"
+        },
+        "thanks": {
+            "name": "hhvm/hsl",
+            "url": "https://github.com/hhvm/hsl"
         }
     }
 }
diff --git a/...ndler/ShapeFunctionReturnTypeProvider.php → ...ndler/ShapeFunctionReturnTypeProvider.php b/...ndler/ShapeFunctionReturnTypeProvider.php → ...ndler/ShapeFunctionReturnTypeProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Psl\Internal\Psalm\EventHandler;
+namespace Psl\Integration\Psalm\EventHandler;
 
 use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
 use Psalm\Plugin\EventHandler\FunctionReturnTypeProviderInterface;

diff --git a/src/Psl/Internal/Psalm/Plugin.php → integration/Psalm/Plugin.php b/src/Psl/Internal/Psalm/Plugin.php → integration/Psalm/Plugin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Psl\Internal\Psalm;
+namespace Psl\Integration\Psalm;
 
 use Psalm\Plugin\PluginEntryPointInterface;
 use Psalm\Plugin\RegistrationInterface;

diff --git a/psalm.xml b/psalm.xml
@@ -17,6 +17,7 @@
 >
     <projectFiles>
         <directory name="src" />
+        <directory name="integration" />
         <ignoreFiles>
             <directory name="vendor" />
             <file name="src/bootstrap.php"/>
@@ -56,6 +57,6 @@
     </issueHandlers>
 
     <plugins>
-        <pluginClass class="Psl\Internal\Psalm\Plugin"/>
+        <pluginClass class="Psl\Integration\Psalm\Plugin"/>
     </plugins>
 </psalm>