PSR12 code style

yann-eugone · yann-eugone · commit 4bda90d657ea · 2020-06-25T22:27:22.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-/phpunit.xml
-composer.lock
+/.idea/
 /vendor/
-/build/
-.idea/
-docker-compose.yml
+/.phpcs-cache
+/composer.lock
+/docker-compose.yml
+/phpunit.xml
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "symfony/twig-bundle": "^4.4",
         "symfony/validator": "^4.4",
         "twig/twig": "^2.0",
-        "phpspec/prophecy-phpunit": "^2.0"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "suggest": {
         "symfony/framework-bundle": "Integrate with Symfony Framework",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+
+    <arg name="basepath" value="."/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+    <arg name="extensions" value="php"/>
+
+    <rule ref="PSR12"/>
+
+    <file>src/</file>
+
+    <rule ref="Generic.PHP.ForbiddenFunctions">
+        <properties>
+            <property name="forbiddenFunctions" type="array" value="dump=>null,var_dump=>null,die=>null"/>
+        </properties>
+    </rule>
+
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,7 @@
          processIsolation="false"
          stopOnFailure="false"
          colors="true"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
         >
 
     <testsuites>
diff --git a/src/AbstractTranslatedEnum.php b/src/AbstractTranslatedEnum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/ConfigurableEnum.php b/src/ConfigurableEnum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/ConfigurableTranslatedEnum.php b/src/ConfigurableTranslatedEnum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/ConstantExtractor.php b/src/ConstantExtractor.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/ConstantListEnum.php b/src/ConstantListEnum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/ConstantListTranslatedEnum.php b/src/ConstantListTranslatedEnum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/DependencyInjection/CompilerPass/TaggedEnumCollectorCompilerPass.php b/src/DependencyInjection/CompilerPass/TaggedEnumCollectorCompilerPass.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\DependencyInjection\CompilerPass;
 
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\DependencyInjection;
 
diff --git a/src/DependencyInjection/EnumExtension.php b/src/DependencyInjection/EnumExtension.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\DependencyInjection;
 
diff --git a/src/EnumInterface.php b/src/EnumInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/EnumRegistry.php b/src/EnumRegistry.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/EnumWithClassAsNameTrait.php b/src/EnumWithClassAsNameTrait.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
diff --git a/src/Exception/CannotExtractConstantsException.php b/src/Exception/CannotExtractConstantsException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Exception;
 
diff --git a/src/Exception/DuplicatedEnumException.php b/src/Exception/DuplicatedEnumException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Exception;
 
diff --git a/src/Exception/InvalidEnumException.php b/src/Exception/InvalidEnumException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Exception;
 
diff --git a/src/Exception/InvalidTranslatePatternException.php b/src/Exception/InvalidTranslatePatternException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Exception;
 
diff --git a/src/Form/Extension/EnumTypeGuesser.php b/src/Form/Extension/EnumTypeGuesser.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Form\Extension;
 
diff --git a/src/Form/Type/EnumType.php b/src/Form/Type/EnumType.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Form\Type;
 
diff --git a/src/Twig/Extension/EnumExtension.php b/src/Twig/Extension/EnumExtension.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Twig\Extension;
 
diff --git a/src/Validator/Constraints/Enum.php b/src/Validator/Constraints/Enum.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Validator\Constraints;
 
diff --git a/src/Validator/Constraints/EnumValidator.php b/src/Validator/Constraints/EnumValidator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle\Validator\Constraints;
 
@@ -32,7 +34,7 @@ public function __construct(EnumRegistry $enumRegistry)
     public function validate($value, Constraint $constraint): void
     {
         if (!$constraint instanceof Enum) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Enum');
+            throw new UnexpectedTypeException($constraint, __NAMESPACE__ . '\Enum');
         }
 
         $constraint->choices  = null;
diff --git a/src/YokaiEnumBundle.php b/src/YokaiEnumBundle.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Yokai\EnumBundle;
 
@@ -18,7 +20,7 @@ class YokaiEnumBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         $container
-            ->addCompilerPass(new TaggedEnumCollectorCompilerPass)
+            ->addCompilerPass(new TaggedEnumCollectorCompilerPass())
         ;
     }
 
@@ -27,6 +29,6 @@ public function build(ContainerBuilder $container): void
      */
     public function getContainerExtension(): EnumExtension
     {
-        return new EnumExtension;
+        return new EnumExtension();
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`processIsolation="false"`
`9`	`9`	`stopOnFailure="false"`
`10`	`10`	`colors="true"`
`11`		`- bootstrap="tests/bootstrap.php"`
	`11`	`+ bootstrap="vendor/autoload.php"`
`12`	`12`	`>`
`13`	`13`
`14`	`14`	`<testsuites>`