Apply PHP-CS-Fixer changes

Author: mpdude

Handler/EmbeddedShortcodeHandler.php

@@ -2,6 +2,7 @@
 
 namespace Webfactory\ShortcodeBundle\Handler;
 
+use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -32,11 +33,9 @@ class EmbeddedShortcodeHandler
     private $requestStack;
 
     /**
-     * @param FragmentHandler $fragmentHandler
      * @param string          $controllerName
      * @param string          $renderer
      * @param LoggerInterface $logger
-     * @param RequestStack    $requestStack
      */
     public function __construct(
         FragmentHandler $fragmentHandler,
@@ -53,8 +52,6 @@ public function __construct(
     }
 
     /**
-     * @param ShortcodeInterface $shortcode
-     *
      * @return string|null
      */
     public function __invoke(ShortcodeInterface $shortcode)
@@ -78,21 +75,9 @@ public function __invoke(ShortcodeInterface $shortcode)
                 ),
                 $this->renderer
             );
-        } catch (\InvalidArgumentException $exception) {
+        } catch (InvalidArgumentException $exception) {
             if ('esi' === $this->renderer) {
-                throw new \InvalidArgumentException(
-                    'An InvalidArgumentException occured while trying to render the shortcode '
-                    .$shortcode->getShortcodeText().'. You\'ve probably tried to use the ESI rendering  strategy for '
-                    .'your shortcodes while handling a request that contained non-scalar values as part of URI '
-                    .'attributes. This can happen e.g. when using Param Converters for your original controller '
-                    .'action, as the request (containing the conversion result) is automatically passed to the call of '
-                    .'the shortcode controller to allow context sensitive shortcodes. You could use '
-                    .'Webfactory\ShortcodeBundle\Handler\EmbeddedShortcodeHandler.inline as parent in your '
-                    .'shortcode\'s service defintion, so that the inline instead of ESI rendering strategy will be '
-                    .'used.',
-                    0,
-                    $exception
-                );
+                throw new InvalidArgumentException('An InvalidArgumentException occured while trying to render the shortcode '.$shortcode->getShortcodeText().'. You\'ve probably tried to use the ESI rendering  strategy for '.'your shortcodes while handling a request that contained non-scalar values as part of URI '.'attributes. This can happen e.g. when using Param Converters for your original controller '.'action, as the request (containing the conversion result) is automatically passed to the call of '.'the shortcode controller to allow context sensitive shortcodes. You could use '.'Webfactory\ShortcodeBundle\Handler\EmbeddedShortcodeHandler.inline as parent in your '.'shortcode\'s service defintion, so that the inline instead of ESI rendering strategy will be '.'used.', 0, $exception);
             }
 
             throw $exception;

Handler/RemoveWrappingParagraphElementsEventHandler.php

@@ -12,9 +12,6 @@
  */
 final class RemoveWrappingParagraphElementsEventHandler
 {
-    /**
-     * @param ReplaceShortcodesEvent $event
-     */
     public function __invoke(ReplaceShortcodesEvent $event)
     {
         /* The text still containing shortcodes */

Tests/DependencyInjection/Compiler/ShortcodeCompilerPassTest.php

@@ -3,6 +3,7 @@
 namespace Webfactory\ShortcodeBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -19,7 +20,7 @@ final class ShortcodeCompilerPassTest extends TestCase
      */
     private $compilerPass;
 
-    /** @var ContainerBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ContainerBuilder|PHPUnit_Framework_MockObject_MockObject */
     private $containerBuilder;
 
     protected function setUp(): void

Tests/Fixtures/TestKernel.php

@@ -53,8 +53,6 @@ public function getLogDir(): string
      *
      *     $routes->import('config/routing.yml');
      *     $routes->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
-     *
-     * @param RouteCollectionBuilder $routes
      */
     protected function configureRoutes(RouteCollectionBuilder $routes): void
     {

Tests/Functional/ShortcodeFacadeTest.php

@@ -6,6 +6,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
+use Twig_Environment;
 
 final class ShortcodeFacadeTest extends KernelTestCase
 {
@@ -93,7 +94,7 @@ private function renderTwigTemplate(string $templateCode, array $context = []):
         /** @var $container ContainerInterface */
         $container = static::$kernel->getContainer();
 
-        /** @var \Twig_Environment $twig */
+        /** @var Twig_Environment $twig */
         $twig = $container->get('twig');
         $template = $twig->createTemplate($templateCode);
 

Tests/Functional/ShortcodeTest.php

@@ -2,6 +2,8 @@
 
 namespace Webfactory\ShortcodeBundle\Tests\Functional;
 
+use PHPUnit_Framework_ExpectationFailedException;
+use PHPUnit_Framework_IncompleteTestError;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Client;
 use Symfony\Component\DomCrawler\Crawler;
@@ -24,9 +26,7 @@ protected function setUp(): void
         parent::setUp();
 
         if ('' === $this->getShortcodeToTest() || null === $this->getShortcodeToTest()) {
-            throw new \PHPUnit_Framework_IncompleteTestError(
-                'Albeit being a '.__CLASS__.', '.\get_called_class().' does not define a shortcode to test.'
-            );
+            throw new PHPUnit_Framework_IncompleteTestError('Albeit being a '.__CLASS__.', '.static::class.' does not define a shortcode to test.');
         }
 
         static::bootKernel();
@@ -45,8 +45,6 @@ protected function getRenderedExampleHtml(?array $customParameters = null): stri
 
     /**
      * @param array|string|null $customParameters use of strings is deprecated, use array instead.
-     *
-     * @return Crawler
      */
     protected function crawlRenderedExample(/*array*/ $customParameters = null): Crawler
     {
@@ -57,19 +55,14 @@ protected function crawlRenderedExample(/*array*/ $customParameters = null): Cra
 
         $crawlerOnRenderedExample = $crawlerOnRenderedExamplePage->filter('#rendered-example');
         if (0 === $crawlerOnRenderedExample->count()) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(
-                'No rendered example found for shortcode "'.$this->shortcode.'"'
-            );
+            throw new PHPUnit_Framework_ExpectationFailedException('No rendered example found for shortcode "'.$this->shortcode.'"');
         }
 
         return $crawlerOnRenderedExample;
     }
 
     /**
-     * @param int               $expectedStatusCode
-     * @param array|string|null $customParameters   use of strings is deprecated, use array instead.
-     *
-     * @return Crawler
+     * @param array|string|null $customParameters use of strings is deprecated, use array instead.
      */
     protected function assertHttpStatusCodeWhenCrawlingRenderedExample(
         int $expectedStatusCode,

Twig/ShortcodeExtension.php

@@ -2,7 +2,6 @@
 
 namespace Webfactory\ShortcodeBundle\Twig;
 
-use Thunder\Shortcode\EventContainer\EventContainer;
 use Thunder\Shortcode\Processor\Processor;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;

WebfactoryShortcodeBundle.php

@@ -2,8 +2,8 @@
 
 namespace Webfactory\ShortcodeBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Webfactory\ShortcodeBundle\DependencyInjection\Compiler\ShortcodeCompilerPass;
 
 /**