cs fixes

Author: HeahDude

CHANGELOG.md

@@ -4,10 +4,12 @@ CHANGELOG
 3.1.0
 -----
  * deprecated passing objects as URI attributes to the ESI and SSI renderers
- * Added a `LegacyArgumentResolver` with `getArguments()` and the corresponding interface `ArgumentResolverInterface`
- * Deprecated `ControllerResolver::getArguments()`, which uses the `LegacyArgumentResolver` as BC layer by extending it
- * The `HttpKernel` now accepts an additional argument for an `ArgumentResolverInterface`
- * Added the `ArgumentResolver` which features an extension point to resolve arguments in a more dynamic way
+ * added `Symfony\Component\HttpKernel\Controller\LegacyArgumentResolver`
+ * deprecated `ControllerResolver::getArguments()`
+ * made `ControllerResolver` extend the `LegacyArgumentResolver` for BC
+ * added `Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface`
+ * added `Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface` as argument to `HttpKernel`
+ * added `Symfony\Component\HttpKernel\Controller\ArgumentResolver`
 
 3.0.0
 -----

Controller/ArgumentResolver.php

@@ -15,7 +15,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactoryInterface;
 
 /**
- * Responsible for the resolving of arguments passed to an action.
+ * Responsible for resolving the arguments passed to an action.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */

Controller/ArgumentResolverInterface.php

@@ -14,7 +14,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * An ArgumentResolverInterface implementation knows how to determine the
+ * An ArgumentResolverInterface instance knows how to determine the
  * arguments for a specific action.
  *
  * @author Fabien Potencier <fabien@symfony.com>
@@ -29,7 +29,7 @@ interface ArgumentResolverInterface
      *
      * @return array An array of arguments to pass to the controller
      *
-     * @throws \RuntimeException When value for argument given is not provided
+     * @throws \RuntimeException When no value could be provided for a required argument
      */
     public function getArguments(Request $request, $controller);
 }

Controller/ArgumentValueResolver/ArgumentFromAttributeResolver.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
- * Grabs a non-variadic value from the request and returns it.
+ * Yields a non-variadic argument's value from the request attributes.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */

Controller/ArgumentValueResolver/DefaultArgumentValueResolver.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
- * Returns the default value defined in the action signature if present and no value has been given.
+ * Yields the default value defined in the action signature when no value has been given.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */

Controller/ArgumentValueResolver/RequestResolver.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
- * Supports the same instance as the request object passed along.
+ * Yields the same instance as the request object passed along.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */
@@ -27,7 +27,7 @@ final class RequestResolver implements ArgumentValueResolverInterface
      */
     public function supports(Request $request, ArgumentMetadata $argument)
     {
-        return $argument->getType() === Request::class || is_subclass_of($request, $argument->getType());
+        return $argument->getType() === Request::class || is_subclass_of(Request::class, $argument->getType());
     }
 
     /**

Controller/ArgumentValueResolver/VariadicArgumentValueResolver.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
 /**
- * Grabs the variadic value from the request and returns it.
+ * Yields a variadic argument's values from the request attributes.
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */

Controller/ArgumentValueResolverInterface.php

@@ -22,7 +22,7 @@
 interface ArgumentValueResolverInterface
 {
     /**
-     * Whether this resolver can resolve can resolve the value for the given ArgumentMetadata.
+     * Whether this resolver can resolve the value for the given ArgumentMetadata.
      *
      * @param Request          $request
      * @param ArgumentMetadata $argument
@@ -34,8 +34,6 @@ public function supports(Request $request, ArgumentMetadata $argument);
     /**
      * Yield the possible value(s).
      *
-     * An implementation must yield at least one value.
-     *
      * @param Request          $request
      * @param ArgumentMetadata $argument
      *

Controller/ControllerResolver.php

@@ -85,7 +85,7 @@ public function getController(Request $request)
     /**
      * {@inheritdoc}
      *
-     * @deprecated this method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface or extend the LegacyArgumentResolver instead.
+     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface or extend the LegacyArgumentResolver instead.
      */
     public function getArguments(Request $request, $controller)
     {
@@ -95,7 +95,7 @@ public function getArguments(Request $request, $controller)
     }
 
     /**
-     * @deprecated this method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface or extend the LegacyArgumentResolver instead.
+     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface or extend the LegacyArgumentResolver instead.
      */
     protected function doGetArguments(Request $request, $controller, array $parameters)
     {

Controller/LegacyArgumentResolver.php

@@ -27,7 +27,7 @@ class LegacyArgumentResolver implements ArgumentResolverInterface
      */
     public function getArguments(Request $request, $controller)
     {
-        // only trigger the deprecation notice if actually used, the ControllerResolver still extends this for BC reasons
+        // only trigger the deprecation notice if actually used, the ControllerResolver still extends it for BC
         @trigger_error(sprintf('The %s class is deprecated since 3.1 and will be removed in 4.0. Please use the %s instead.', __CLASS__, ArgumentResolver::class), E_USER_DEPRECATED);
 
         if (is_array($controller)) {

Controller/TraceableControllerResolver.php

@@ -38,7 +38,7 @@ public function __construct(ControllerResolverInterface $resolver, Stopwatch $st
         $this->stopwatch = $stopwatch;
         $this->argumentResolver = $argumentResolver;
 
-        // required for BC reasons
+        // BC
         if (null === $this->argumentResolver) {
             $this->argumentResolver = $resolver;
         }

ControllerMetadata/ArgumentMetadataFactory.php

@@ -34,7 +34,7 @@ public function createArgumentMetadata($controller)
         }
 
         foreach ($reflection->getParameters() as $param) {
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param), $this->isVariadic($param), $this->hasDefaulValue($param), $this->getDefaulValue($param));
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param), $this->isVariadic($param), $this->hasDefaultValue($param), $this->getDefaultValue($param));
         }
 
         return $arguments;
@@ -59,7 +59,7 @@ private function isVariadic(\ReflectionParameter $parameter)
      *
      * @return bool
      */
-    private function hasDefaulValue(\ReflectionParameter $parameter)
+    private function hasDefaultValue(\ReflectionParameter $parameter)
     {
         return $parameter->isDefaultValueAvailable();
     }
@@ -71,9 +71,9 @@ private function hasDefaulValue(\ReflectionParameter $parameter)
      *
      * @return mixed|null
      */
-    private function getDefaulValue(\ReflectionParameter $parameter)
+    private function getDefaultValue(\ReflectionParameter $parameter)
     {
-        return $this->hasDefaulValue($parameter) ? $parameter->getDefaultValue() : null;
+        return $this->hasDefaultValue($parameter) ? $parameter->getDefaultValue() : null;
     }
 
     /**