[QA] Add StructArmed to QA (#677)

samsonasik · web-flow · commit 635e5f1fdbf7 · 2026-05-24T21:13:01.000+02:00
* [QA] Add StructArmed to QA

* final touch: add structarmed.php to .gitattributes
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,4 @@ stubs export-ignore
 tests export-ignore
 rules-tests export-ignore
 rector.php export-ignore
+structarmed.php export-ignore
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -36,6 +36,10 @@ jobs:
                         name: 'Tests'
                         run: vendor/bin/phpunit
 
+                    -
+                        name: 'Run StructArmed'
+                        run: vendor/bin/structarmed analyze
+
         name: ${{ matrix.actions.name }}
         runs-on: ubuntu-latest
         timeout-minutes: 10
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
         "php": ">=8.3"
     },
     "require-dev": {
+        "boundwize/structarmed": "^0.7.7",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1.38",
         "phpstan/phpstan-deprecation-rules": "^2.0",
diff --git a/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php b/rules-tests/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector/ReplaceTestFunctionPrefixWithAttributeRectorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CodeQuality\Rector\ClassMethod\ReplaceTestFunctionPrefixWithAttributeRector;
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\ClassMethod\ReplaceTestFunctionPrefixWithAttributeRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
 
-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
 use PHPUnit\Framework\TestCase;
 
 final class AssertMakeEmpty extends TestCase
@@ -25,7 +25,7 @@ final class AssertMakeEmpty extends TestCase
 
 namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
 
-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
 use PHPUnit\Framework\TestCase;
 
 final class AssertMakeEmpty extends TestCase
@@ -38,7 +38,7 @@ final class AssertMakeEmpty extends TestCase
             $someObject = new SomeTypeObject();
         }
 
-        $this->assertNotInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);
+        $this->assertNotInstanceOf(\Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);
     }
 }
 
diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php b/rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Source/SomeTypeObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;
 
 class SomeTypeObject
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_abstract_class.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;
 
 final class RespectParentAbstractClass extends AnotherAbstractClass
 {
@@ -20,7 +20,7 @@ final class RespectParentAbstractClass extends AnotherAbstractClass
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;
 
 final class RespectParentAbstractClass extends AnotherAbstractClass
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Fixture/respect_parent_data_provider.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
 
 final class RespectParentDataProvider extends AbstractClassWithDataProvider
 {
@@ -18,7 +18,7 @@ final class RespectParentDataProvider extends AbstractClassWithDataProvider
 
 namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;
 
-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AbstractClassWithDataProvider;
 
 final class RespectParentDataProvider extends AbstractClassWithDataProvider
 {
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AbstractClassWithDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/AnotherAbstractClass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source;
+namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/SomeClassToMock.php b/rules-tests/PHPUnit100/Rector/Class_/PublicDataProviderClassMethodRector/Source/SomeClassToMock.php
diff --git a/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CachedAdapter.php b/rules-tests/PHPUnit60/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector/Source/CachedAdapter.php
diff --git a/structarmed.php b/structarmed.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Boundwize\StructArmed\Architecture;
+use Boundwize\StructArmed\Preset\Preset;
+
+return Architecture::define()
+    ->withPreset(Preset::PSR4());
diff --git a/tests/Issues/AnnotationParsing/AnnotationParsingTest.php b/tests/Issues/AnnotationParsing/AnnotationParsingTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPUnit\Tests\Issues\WrongAnnotation;
+namespace Rector\PHPUnit\Tests\Issues\AnnotationParsing;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;`
`4`	`4`
`5`		`-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;`
	`5`	`+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;`
`6`	`6`	`use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`	`8`	`final class AssertMakeEmpty extends TestCase`
`@@ -25,7 +25,7 @@ final class AssertMakeEmpty extends TestCase`
`25`	`25`
`26`	`26`	`namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;`
`27`	`27`
`28`		`-use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;`
	`28`	`+use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;`
`29`	`29`	`use PHPUnit\Framework\TestCase;`
`30`	`30`
`31`	`31`	`final class AssertMakeEmpty extends TestCase`
`@@ -38,7 +38,7 @@ final class AssertMakeEmpty extends TestCase`
`38`	`38`	`$someObject = new SomeTypeObject();`
`39`	`39`	`}`
`40`	`40`
`41`		`- $this->assertNotInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);`
	`41`	`+ $this->assertNotInstanceOf(\Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;`
	`3`	`+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source;`
`4`	`4`
`5`	`5`	`class SomeTypeObject`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;`
`4`	`4`
`5`		`-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;`
	`5`	`+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;`
`6`	`6`
`7`	`7`	`final class RespectParentAbstractClass extends AnotherAbstractClass`
`8`	`8`	`{`
`@@ -20,7 +20,7 @@ final class RespectParentAbstractClass extends AnotherAbstractClass`
`20`	`20`
`21`	`21`	`namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Fixture;`
`22`	`22`
`23`		`-use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector\Source\AnotherAbstractClass;`
	`23`	`+use Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector\Source\AnotherAbstractClass;`
`24`	`24`
`25`	`25`	`final class RespectParentAbstractClass extends AnotherAbstractClass`
`26`	`26`	`{`