cs-fix

chubbyphp · Nov 4, 2019 · 56411a0 · 56411a0
1 parent d09f5bc
commit 56411a0
Show file tree

Hide file tree

Showing 70 changed files with 48 additions and 805 deletions.
diff --git a/.php_cs b/.php_cs
@@ -24,12 +24,13 @@ return PhpCsFixer\Config::create()
         'method_chaining_indentation' => false,
         'no_php4_constructor' => true,
         'ordered_interfaces' => true,
-        'php_unit_dedicate_assert' => true,
         'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_dedicate_assert' => true,
         'php_unit_expectation' => true,
         'php_unit_mock' => true,
         'php_unit_namespaced' => true,
         'php_unit_no_expectation_annotation' => true,
+        'single_line_throw' => false,
         'ternary_to_null_coalescing' => true,
         'void_return' => true,
     ])

diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
     "require-dev": {
         "chubbyphp/chubbyphp-mock": "^1.4.2",
         "doctrine/common": "^2.7",
-        "friendsofphp/php-cs-fixer": "^2.15.3",
+        "friendsofphp/php-cs-fixer": "^2.16",
         "infection/infection": "^0.14.2",
         "mavimo/phpstan-junit": "^0.2.3",
         "nunomaduro/phpinsights": "^1.9",
         "php-coveralls/php-coveralls": "^2.1",
         "phploc/phploc": "^5.0",
         "phpstan/extension-installer": "^1.0.3",
         "phpstan/phpstan": "^0.11.19",
-        "phpunit/phpunit": "^8.4.1",
+        "phpunit/phpunit": "^8.4.2",
         "pimple/pimple": "^3.2.3",
         "psr/container": "^1.0",
         "symfony/config": "^2.8|^3.4|^4.2",

diff --git a/src/Accessor/MethodAccessor.php b/src/Accessor/MethodAccessor.php
@@ -13,9 +13,6 @@ final class MethodAccessor implements AccessorInterface
      */
     private $property;
 
-    /**
-     * @param string $property
-     */
     public function __construct(string $property)
     {
         $this->property = $property;

diff --git a/src/Accessor/PropertyAccessor.php b/src/Accessor/PropertyAccessor.php
@@ -14,9 +14,6 @@ final class PropertyAccessor implements AccessorInterface
      */
     private $property;
 
-    /**
-     * @param string $property
-     */
     public function __construct(string $property)
     {
         $this->property = $property;
@@ -71,8 +68,6 @@ function ($property) {
 
     /**
      * @param object $object
-     *
-     * @return string
      */
     private function getClass($object): string
     {

diff --git a/src/Decoder/Decoder.php b/src/Decoder/Decoder.php
@@ -25,22 +25,14 @@ public function __construct(array $decoderTypes)
         }
     }
 
-    /**
-     * @return array
-     */
     public function getContentTypes(): array
     {
         return array_keys($this->decoderTypes);
     }
 
     /**
-     * @param string $data
-     * @param string $contentType
-     *
      * @throws DeserializerLogicException
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data, string $contentType): array
     {
@@ -51,9 +43,6 @@ public function decode(string $data, string $contentType): array
         throw DeserializerLogicException::createMissingContentType($contentType);
     }
 
-    /**
-     * @param TypeDecoderInterface $decoderType
-     */
     private function addTypeDecoder(TypeDecoderInterface $decoderType): void
     {
         $this->decoderTypes[$decoderType->getContentType()] = $decoderType;

diff --git a/src/Decoder/DecoderInterface.php b/src/Decoder/DecoderInterface.php
@@ -15,13 +15,8 @@ interface DecoderInterface
     public function getContentTypes(): array;
 
     /**
-     * @param string $data
-     * @param string $contentType
-     *
      * @throws DeserializerLogicException
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data, string $contentType): array;
 }
diff --git a/src/Decoder/JsonTypeDecoder.php b/src/Decoder/JsonTypeDecoder.php
@@ -8,20 +8,13 @@
 
 final class JsonTypeDecoder implements TypeDecoderInterface
 {
-    /**
-     * @return string
-     */
     public function getContentType(): string
     {
         return 'application/json';
     }
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array
     {

diff --git a/src/Decoder/JsonxTypeDecoder.php b/src/Decoder/JsonxTypeDecoder.php
@@ -23,9 +23,6 @@ final class JsonxTypeDecoder implements TypeDecoderInterface
      */
     private $contentType;
 
-    /**
-     * @param string $contentType
-     */
     public function __construct(string $contentType = 'application/x-jsonx')
     {
         if ('application/x-jsonx' === $contentType) {
@@ -38,20 +35,13 @@ public function __construct(string $contentType = 'application/x-jsonx')
         $this->contentType = $contentType;
     }
 
-    /**
-     * @return string
-     */
     public function getContentType(): string
     {
         return $this->contentType;
     }
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array
     {
@@ -65,8 +55,6 @@ public function decode(string $data): array
     }
 
     /**
-     * @param \DOMNode $node
-     *
      * @return array|bool|string|int|float|null
      */
     private function decodeNode(\DOMNode $node)
@@ -102,11 +90,6 @@ private function decodeNode(\DOMNode $node)
         throw DeserializerRuntimeException::createNotParsable($this->getContentType());
     }
 
-    /**
-     * @param \DOMNode $node
-     *
-     * @return array
-     */
     private function decodeObjectNode(\DOMNode $node): array
     {
         $data = [];
@@ -121,11 +104,6 @@ private function decodeObjectNode(\DOMNode $node): array
         return $data;
     }
 
-    /**
-     * @param \DOMNode $node
-     *
-     * @return array
-     */
     private function decodeArrayNode(\DOMNode $node): array
     {
         $data = [];
@@ -140,29 +118,17 @@ private function decodeArrayNode(\DOMNode $node): array
         return $data;
     }
 
-    /**
-     * @param \DOMNode $node
-     *
-     * @return bool
-     */
     private function decodeBooleanNode(\DOMNode $node): bool
     {
         return 'true' === $node->nodeValue;
     }
 
-    /**
-     * @param \DOMNode $node
-     *
-     * @return string
-     */
     private function decodeStringNode(\DOMNode $node): string
     {
         return html_entity_decode($node->nodeValue, ENT_COMPAT | ENT_XML1, 'UTF-8');
     }
 
     /**
-     * @param \DOMNode $node
-     *
      * @return int|float
      */
     private function decodeNumberNode(\DOMNode $node)

diff --git a/src/Decoder/TypeDecoderInterface.php b/src/Decoder/TypeDecoderInterface.php
@@ -8,17 +8,10 @@
 
 interface TypeDecoderInterface
 {
-    /**
-     * @return string
-     */
     public function getContentType(): string;
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array;
 }
diff --git a/src/Decoder/UrlEncodedTypeDecoder.php b/src/Decoder/UrlEncodedTypeDecoder.php
@@ -8,20 +8,13 @@
 
 final class UrlEncodedTypeDecoder implements TypeDecoderInterface
 {
-    /**
-     * @return string
-     */
     public function getContentType(): string
     {
         return 'application/x-www-form-urlencoded';
     }
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array
     {
@@ -35,11 +28,6 @@ public function decode(string $data): array
         return $this->fixValues($rawData);
     }
 
-    /**
-     * @param array $rawData
-     *
-     * @return array
-     */
     private function fixValues(array $rawData): array
     {
         $data = [];
@@ -55,8 +43,6 @@ private function fixValues(array $rawData): array
     }
 
     /**
-     * @param string $value
-     *
      * @return mixed
      */
     private function fixValue(string $value)

diff --git a/src/Decoder/XmlTypeDecoder.php b/src/Decoder/XmlTypeDecoder.php
@@ -11,20 +11,13 @@
  */
 final class XmlTypeDecoder implements TypeDecoderInterface
 {
-    /**
-     * @return string
-     */
     public function getContentType(): string
     {
         return 'application/xml';
     }
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array
     {
@@ -37,11 +30,6 @@ public function decode(string $data): array
         return $this->transformType($document->getElementsByTagName('object')->item(0));
     }
 
-    /**
-     * @param \DOMElement $node
-     *
-     * @return array
-     */
     private function transformType(\DOMElement $node): array
     {
         $data = [];
@@ -84,8 +72,6 @@ private function transformType(\DOMElement $node): array
     }
 
     /**
-     * @param \DOMElement $node
-     *
      * @return string|int
      */
     private function getKey(\DOMElement $node)
@@ -103,8 +89,6 @@ private function getKey(\DOMElement $node)
     }
 
     /**
-     * @param \DOMElement $node
-     *
      * @return bool|string
      */
     private function getValue(\DOMElement $node)

diff --git a/src/Decoder/YamlTypeDecoder.php b/src/Decoder/YamlTypeDecoder.php
@@ -10,20 +10,13 @@
 
 final class YamlTypeDecoder implements TypeDecoderInterface
 {
-    /**
-     * @return string
-     */
     public function getContentType(): string
     {
         return 'application/x-yaml';
     }
 
     /**
-     * @param string $data
-     *
      * @throws DeserializerRuntimeException
-     *
-     * @return array
      */
     public function decode(string $data): array
     {

diff --git a/src/Denormalizer/CallbackFieldDenormalizer.php b/src/Denormalizer/CallbackFieldDenormalizer.php
@@ -13,20 +13,14 @@ final class CallbackFieldDenormalizer implements FieldDenormalizerInterface
      */
     private $callback;
 
-    /**
-     * @param callable $callback
-     */
     public function __construct(callable $callback)
     {
         $this->callback = $callback;
     }
 
     /**
-     * @param string                       $path
-     * @param object                       $object
-     * @param mixed                        $value
-     * @param DenormalizerContextInterface $context
-     * @param DenormalizerInterface|null   $denormalizer
+     * @param object $object
+     * @param mixed  $value
      *
      * @throws DeserializerRuntimeException
      */