update structures

Author: sasezaki

codeception.yml

@@ -3,7 +3,7 @@ paths:
     tests: tests
     output: tests/_output
     data: tests/_data
-    support: tests/_support
+    support: tests
     envs: tests/_envs
 actor_suffix: Tester
 extensions:

composer.json

@@ -12,6 +12,7 @@
     ],
     "require": {
         "php": "^7.4.0 || ^8.0 || ^8.1 || ^8.2",
+        "ext-simplexml": "*",
         "vimeo/psalm": "^5"
     },
     "require-dev": {
@@ -26,15 +27,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Sfp\\Psalm\\PsrLogPlugin\\": ["."]
+            "Sfp\\Psalm\\PsrLogPlugin\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "SfpTest\\Psalm\\PsrLogPlugin\\": [
-                "tests/_support",
-                "tests/acceptance"
-            ]
+            "SfpTest\\Psalm\\PsrLogPlugin\\": "tests"
         }
     },
     "config": {

phpcs.xml

@@ -5,7 +5,7 @@
     <arg name="colors"/>
 
     <!-- Paths to check -->
-    <file>Plugin.php</file>
+    <file>src</file>
 
     <!-- inherit rules from: -->
     <rule ref="PSR12"/>

phpunit.xml.dist

@@ -9,18 +9,14 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="." />
+        <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
         <LessSpecificReturnType errorLevel="info" />
-        <PropertyNotSetInConstructor>
-            <errorLevel type="suppress">
-                <directory name="tests" />
-            </errorLevel>
-        </PropertyNotSetInConstructor>
+        <UnnecessaryVarAnnotation errorLevel="suppress" />
     </issueHandlers>
 </psalm>

psalm.xml

@@ -6,16 +6,20 @@
 use Psalm\Plugin\PluginEntryPointInterface;
 use Psalm\Plugin\RegistrationInterface;
 
+/**
+ * @api
+ * @psalm-suppress UnusedClass
+ */
 class Plugin implements PluginEntryPointInterface
 {
     public function __invoke(RegistrationInterface $psalm, SimpleXMLElement $config = null) : void
     {
         if (isset($config->throwable) && ((bool)$config->throwable === true)) {
-            $psalm->addStubFile(__DIR__ . '/throwable-stubs/LoggerInterface.php');
-            $psalm->addStubFile(__DIR__ . '/throwable-stubs/AbstractLogger.php');
+            $psalm->addStubFile(__DIR__ . '/../throwable-stubs/LoggerInterface.php');
+            $psalm->addStubFile(__DIR__ . '/../throwable-stubs/AbstractLogger.php');
         } else {
-            $psalm->addStubFile(__DIR__ . '/stubs/LoggerInterface.php');
-            $psalm->addStubFile(__DIR__ . '/stubs/AbstractLogger.php');
+            $psalm->addStubFile(__DIR__ . '/../stubs/LoggerInterface.php');
+            $psalm->addStubFile(__DIR__ . '/../stubs/AbstractLogger.php');
         }
     }
 }

Plugin.php renamed to src/Plugin.php

@@ -2,10 +2,6 @@
 
 namespace SfpTest\Psalm\PsrLogPlugin;
 
-use Behat\Gherkin\Node\TableNode;
-use Codeception\Exception\TestRuntimeException;
-use PHPUnit\Framework\Assert;
-
 /**
  * Inherited Methods
  * @method void wantToTest($text)

tests/_support/AcceptanceTester.php renamed to tests/AcceptanceTester.php

@@ -5,10 +5,7 @@ Feature: Exception
       """
       <?xml version="1.0"?>
       <psalm>
-        <projectFiles>
-          <directory name="."/>
-          <ignoreFiles> <directory name="../../vendor"/> </ignoreFiles>
-        </projectFiles>
+        <projectFiles><directory name="."/></projectFiles>
         <plugins>
           <pluginClass class="Sfp\Psalm\PsrLogPlugin\Plugin"/>
         </plugins>