Merge pull request #50 from picamator/development

Release 5.4.2

Author: picamator

composer.json

@@ -55,7 +55,7 @@
         "captainhook/captainhook": "^5.27",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-strict-rules": "^2.0",
-        "phpunit/phpunit": "^12.4",
+        "phpunit/phpunit": "^13.0",
         "slevomat/coding-standard": "^8.24",
         "squizlabs/php_codesniffer": "^4.0",
         "symfony/validator": "^8.0",

composer.lock

@@ -15,11 +15,20 @@
     </rule>
 
     <config name="installed_paths" value="../../slevomat/coding-standard"/>
+    <rule ref="SlevomatCodingStandard.Attributes.DisallowAttributesJoining"/>
+    <rule ref="SlevomatCodingStandard.Attributes.DisallowMultipleAttributesPerLine"/>
+
     <rule ref="SlevomatCodingStandard.Classes.BackedEnumTypeSpacing"/>
     <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
     <rule ref="SlevomatCodingStandard.Classes.ConstantSpacing"/>
     <rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
 
+    <rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+        <properties>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+        </properties>
+    </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
     <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>
 
@@ -36,12 +45,14 @@
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
     <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces"/>
 
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/>
     <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
 
     <rule ref="SlevomatCodingStandard.Variables.DisallowSuperGlobalVariable"/>
     <rule ref="SlevomatCodingStandard.Variables.UnusedVariable"/>
+    <rule ref="SlevomatCodingStandard.Variables.UselessVariable"/>
 
     <rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
     <rule ref="SlevomatCodingStandard.PHP.UselessParentheses"/>
@@ -55,7 +66,12 @@
     <rule ref="SlevomatCodingStandard.ControlStructures.UselessIfConditionWithReturn"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
-    <rule ref="SlevomatCodingStandard.Complexity.Cognitive"/>
+    <rule ref="SlevomatCodingStandard.Complexity.Cognitive">
+        <properties>
+            <property name="warningThreshold" value="6"/>
+            <property name="errorThreshold" value="7"/>
+        </properties>
+    </rule>
 
     <file>bin</file>
     <file>examples</file>

phpcs.xml

@@ -4,7 +4,7 @@
          bootstrap="./vendor/autoload.php"
          colors="true"
          stderr="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
+         requireSealedMockObjects="true"
          displayDetailsOnPhpunitDeprecations="true"
          displayDetailsOnTestsThatTriggerDeprecations="true"
          displayDetailsOnTestsThatTriggerErrors="true"

phpunit.xml

@@ -4,8 +4,8 @@
 
 namespace Picamator\TransferObject\Dependency\Finder;
 
-use IteratorAggregate;
 use Countable;
+use IteratorAggregate;
 use Symfony\Component\Finder\Finder;
 use Traversable;
 

src/Dependency/Finder/FinderIterator.php

@@ -20,7 +20,7 @@ public function appendToFile(string $filename, string $content): void
 
         if ($writeResult === false) {
             throw new FileAppenderException(
-                sprintf('Failed to write content "%s" into the file "%s".', $content, $filename),
+                sprintf('Failed to write content into the file "%s".', $filename),
             );
         }
     }

src/Generated/DefinitionBuiltInTypeTransfer.php

@@ -43,7 +43,7 @@ private function closeFile($file, string $filename): void
         }
 
         throw new FileReaderException(
-            sprintf('Failed to close "%s" file.', $filename),
+            sprintf('Failed to close file "%s".', $filename),
         );
     }
 

src/Shared/Filesystem/FileAppender.php

@@ -46,14 +46,14 @@ private function getTotalBytes(string $filename): int
     {
         if (!$this->fileExists($filename)) {
             throw new FileReaderException(
-                sprintf('File "%s" is not exist.', $filename),
+                sprintf('File "%s" does not exist.', $filename),
             );
         }
 
         $fileSize = $this->filesize($filename);
         if ($fileSize === 0) {
             throw new FileReaderException(
-                sprintf('File size "%s" is empty.', $filename),
+                sprintf('File "%s" is empty.', $filename),
             );
         }
 

src/Shared/Filesystem/FileReader.php

@@ -79,7 +79,7 @@ private function getConstantReflection(string $constantName, string $attributeNa
         $firstReflectionAttribute = $reflectionAttributes[0] ?? null;
         if ($firstReflectionAttribute === null) {
             throw new AttributeTransferException(
-                \sprintf('Constant\'s "%s" attribute "%s" not found.', $constantName, $attributeName),
+                \sprintf('Attribute "%s" not found for constant "%s".', $constantName, $attributeName),
             );
         }