diff --git a/src/ObjectCalisthenics/Helper/PropertyFilter.php b/src/ObjectCalisthenics/Helper/PropertyFilter.php index afd5567..013c7ff 100644 --- a/src/ObjectCalisthenics/Helper/PropertyFilter.php +++ b/src/ObjectCalisthenics/Helper/PropertyFilter.php @@ -2,6 +2,8 @@ namespace ObjectCalisthenics\Helper; +use Nette\Utils\Strings; + final class PropertyFilter { /** @@ -14,7 +16,13 @@ final class PropertyFilter public static function filterOutScalarProperties(array $propertyList): array { return array_filter($propertyList, function ($property) { - return !in_array($property['type'], self::$scalarPropertyTypes, true); + foreach (self::$scalarPropertyTypes as $scalarPropertyType) { + if (Strings::startsWith($property['type'], $scalarPropertyType)) { + return false; + } + } + + return true; }); } } diff --git a/src/ObjectCalisthenics/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniff.php b/src/ObjectCalisthenics/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniff.php index 0eb0703..c76667b 100644 --- a/src/ObjectCalisthenics/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniff.php +++ b/src/ObjectCalisthenics/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniff.php @@ -38,7 +38,7 @@ final class OneObjectOperatorPerLineSniff implements Sniff private $callerTokens; /** - * mixed[] + * mixed[]. */ private $tokens; @@ -50,7 +50,7 @@ final class OneObjectOperatorPerLineSniff implements Sniff /** * @return int[] */ - public function register() : array + public function register(): array { return [T_VARIABLE]; } diff --git a/src/ObjectCalisthenics/ruleset.xml b/src/ObjectCalisthenics/ruleset.xml index 03e5b3e..860fe34 100644 --- a/src/ObjectCalisthenics/ruleset.xml +++ b/src/ObjectCalisthenics/ruleset.xml @@ -71,7 +71,7 @@ diff --git a/tests/Sniffs/CodeAnalysis/InstancePropertyPerClassLimitSniffTest.inc b/tests/Sniffs/CodeAnalysis/InstancePropertyPerClassLimitSniffTest.inc index 466bc9c..9489107 100644 --- a/tests/Sniffs/CodeAnalysis/InstancePropertyPerClassLimitSniffTest.inc +++ b/tests/Sniffs/CodeAnalysis/InstancePropertyPerClassLimitSniffTest.inc @@ -129,7 +129,17 @@ trait TestTrait trait OkTestTrait { /** - * @var array + * @var string[] */ protected $array1; + + /** + * @var string[] + */ + protected $array2; + + /** + * @var string[] + */ + protected $array3; }