fix tests + fix property filter

object-calisthenics · Mar 10, 2017 · 2b9449f · 2b9449f
1 parent 09d6d64
commit 2b9449f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git 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
@@ -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
@@ -71,7 +71,7 @@
     <rule ref="ObjectCalisthenics.Classes.ForbiddenPublicProperty">
         <properties>
             <property name="filesToBeSkipped" type="array"
-                value="ForbiddenPublicPropertySniff.php,ClassElementLengthSniff.php,FunctionNameLengthSniff.php,AbstractDataStructureLengthSniff.php,MaxNestingLevelSniff.php,FunctionLengthSniff.php,ConstantNameLengthSniff.php,ClassNameLengthSniff.php,VariableNameLengthSniff.php,MethodPerClassLimitSniff.php,PropertyPerClassLimitSniff.php,InstancePropertyPerClassLimitSniff.php"
+                value="ForbiddenPublicPropertySniff.php,ClassElementLengthSniff.php,FunctionNameLengthSniff.php,AbstractDataStructureLengthSniff.php,MaxNestingLevelSniff.php,FunctionLengthSniff.php,ConstantNameLengthSniff.php,ClassNameLengthSniff.php,VariableNameLengthSniff.php,MethodPerClassLimitSniff.php,PropertyPerClassLimitSniff.php,InstancePropertyPerClassLimitSniff.php,OneObjectOperatorPerLineSniff.php"
             />
         </properties>
     </rule>

diff --git 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;
 }