Update code style

Bukashk0zzz · Jan 31, 2019 · 1728ca1 · 1728ca1
1 parent 13cf61c
commit 1728ca1
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 166 deletions.
diff --git a/Annotation/FilterAnnotation.php b/Annotation/FilterAnnotation.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Annotation;
 
@@ -47,9 +39,11 @@ public function __construct(array $parameters)
             $this->setFilter($parameters['filter']);
         }
 
-        if (\array_key_exists('options', $parameters)) {
-            $this->setOptions($parameters['options']);
+        if (!\array_key_exists('options', $parameters)) {
+            return;
         }
+
+        $this->setOptions($parameters['options']);
     }
 
     /**

diff --git a/Bukashk0zzzFilterBundle.php b/Bukashk0zzzFilterBundle.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle;
 

diff --git a/DependencyInjection/Bukashk0zzzFilterExtension.php b/DependencyInjection/Bukashk0zzzFilterExtension.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\DependencyInjection;
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\DependencyInjection;
 

diff --git a/EventListener/FilterSubscriber.php b/EventListener/FilterSubscriber.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\EventListener;
 

diff --git a/Form/EventListener/FilterListener.php b/Form/EventListener/FilterListener.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Form\EventListener;
 

diff --git a/Form/Extension/FormTypeExtension.php b/Form/Extension/FormTypeExtension.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Form\Extension;
 

diff --git a/Service/Filter.php b/Service/Filter.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Service;
 
@@ -46,18 +38,23 @@ public function filterEntity($object): void
         }
 
         $reflectionClass = ClassUtils::newReflectionClass(\get_class($object));
+
         foreach ($reflectionClass->getProperties() as $property) {
             foreach ($this->annotationReader->getPropertyAnnotations($property) as $annotation) {
-                if ($annotation instanceof FilterAnnotation) {
-                    $property->setAccessible(true);
-                    $value = $property->getValue($object);
+                if (!($annotation instanceof FilterAnnotation)) {
+                    continue;
+                }
 
-                    if ($value) {
-                        $filter = $annotation->getFilter();
-                        $options = $annotation->getOptions();
-                        $property->setValue($object, $this->getZendInstance($filter, $options)->filter($value));
-                    }
+                $property->setAccessible(true);
+                $value = $property->getValue($object);
+
+                if (!$value) {
+                    continue;
                 }
+
+                $filter = $annotation->getFilter();
+                $options = $annotation->getOptions();
+                $property->setValue($object, $this->getZendInstance($filter, $options)->filter($value));
             }
         }
     }
@@ -74,6 +71,7 @@ protected function getZendInstance(string $class, ?array $options): FilterInterf
         $filter = new $class();
 
         $abstractFilterClass = AbstractFilter::class;
+
         if (!$filter instanceof $abstractFilterClass) {
             throw new \InvalidArgumentException("Filter class must extend $abstractFilterClass: $class");
         }

diff --git a/Tests/Annotation/FilterTest.php b/Tests/Annotation/FilterTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Annotation;
 

diff --git a/Tests/DependencyInjection/Bukashk0zzzFilterExtensionTest.php b/Tests/DependencyInjection/Bukashk0zzzFilterExtensionTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the Bukashk0zzzFilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\DependencyInjection;
 

diff --git a/Tests/EventListener/FilterSubscriberTest.php b/Tests/EventListener/FilterSubscriberTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\EventListener;
 
@@ -77,11 +69,9 @@ public function testSubscription(): void
      */
     private function mockEvent(string $eventType): \PHPUnit_Framework_MockObject_MockObject
     {
-        $lifeCycleEvent = $this->createPartialMock(
+        return $this->createPartialMock(
             '\Doctrine\ORM\Event\\'.$eventType,
             ['getEntityManager', 'getEntity', 'getEntityChangeSet']
         );
-
-        return $lifeCycleEvent;
     }
 }
diff --git a/Tests/Fixtures/BadUser.php b/Tests/Fixtures/BadUser.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Fixtures;
 

diff --git a/Tests/Fixtures/User.php b/Tests/Fixtures/User.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Fixtures;
 

diff --git a/Tests/Fixtures/UserType.php b/Tests/Fixtures/UserType.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Fixtures;
 

diff --git a/Tests/Form/AbstractFormTypeExtension.php b/Tests/Form/AbstractFormTypeExtension.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Form;
 

diff --git a/Tests/Form/FormTypeExtensionBadTest.php b/Tests/Form/FormTypeExtensionBadTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Form;
 

diff --git a/Tests/Form/FormTypeExtensionTest.php b/Tests/Form/FormTypeExtensionTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Form;
 

diff --git a/Tests/Form/FormTypeExtensionWithoutFilterTest.php b/Tests/Form/FormTypeExtensionWithoutFilterTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Form;
 

diff --git a/Tests/Service/FilterTest.php b/Tests/Service/FilterTest.php
@@ -1,12 +1,4 @@
 <?php declare(strict_types = 1);
-/*
- * This file is part of the FilterBundle
- *
- * (c) Denis Golubovskiy <bukashk0zzz@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 
 namespace Bukashk0zzz\FilterBundle\Tests\Service;
 

diff --git a/ruleset.xml b/ruleset.xml
@@ -20,7 +20,16 @@
         <exclude name="SlevomatCodingStandard.Namespaces.UseOnlyWhitelistedNamespaces"/>
         <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation.NonFullyQualifiedClassName"/>
         <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
-        <exclude name="SlevomatCodingStandard.Files.TypeNameMatchesFileName"/>
+        <exclude name="SlevomatCodingStandard.Files.TypeNameMatchesFileName.NoMatchBetweenTypeNameAndFileName"/>
+        <exclude name="SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectLinesCountBetweenDifferentAnnotationsTypes"/>
+        <exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment.MultiLinePropertyComment"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.DisallowShortTernaryOperator.DisallowedShortTernaryOperator"/>
+        <exclude name="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators.DisallowedPreIncrementOperator"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.NewWithoutParentheses.UselessParentheses"/>
+        <exclude name="SlevomatCodingStandard.Classes.TraitUseSpacing.IncorrectLinesCountBeforeFirstUse"/>
+        <exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
@@ -60,9 +69,14 @@
         <severity>0</severity>
     </rule>
 
+    <rule ref="Zend.NamingConventions.ValidVariableName.MemberVarContainsNumbers">
+        <severity>0</severity>
+    </rule>
+
     <arg name="colors"/>
     <arg name="encoding" value="utf-8"/>
     <arg name="extensions" value="php"/>
+    <arg name="parallel" value="128" />
 
     <exclude-pattern>vendor/</exclude-pattern>