Fix coding standard

mpdude · mpdude · commit 77e944b9b5d5 · 2020-02-04T15:01:33.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
-# IDE
-/.idea/
+vendor/
+composer.lock
+.php_cs.cache
 
-# Composer
-/vendor/
-/composer.lock
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,20 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@PHPUnit48Migration:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'fopen_flags' => false,
+        'ordered_imports' => true,
+        'protected_to_private' => false,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in([__DIR__])
+            ->exclude([])
+    )
+;
diff --git a/Controller/PassthruController.php b/Controller/PassthruController.php
@@ -13,7 +13,6 @@
 
 class PassthruController extends Controller
 {
-
     /**
      * @Legacy\Dispatch
      * @Legacy\Passthru
diff --git a/DependencyInjection/Compiler/CollectFilterPass.php b/DependencyInjection/Compiler/CollectFilterPass.php
@@ -14,19 +14,18 @@
 
 class CollectFilterPass implements CompilerPassInterface
 {
-
     public function process(ContainerBuilder $container)
     {
         $kernelEventListenerDefinition = $container->getDefinition('webfactory_legacy_integration.kernel_event_listener');
 
         foreach ($container->findTaggedServiceIds('webfactory_legacy_integration.filter') as $id => $tags) {
-            $kernelEventListenerDefinition->addMethodCall('addFilter', array(
-                new Reference($id)
-            ));
+            $kernelEventListenerDefinition->addMethodCall('addFilter', [
+                new Reference($id),
+            ]);
         }
-        
+
         if ($container->findTaggedServiceIds('webfactory.integration.filter')) {
-            throw new \RuntimeException("The webfactory.integration.filter tag has been renamed to webfactory_legacy_integration.filter already back 1.0.23. Please update your DIC configuration, and sorry for the hassle.");
+            throw new \RuntimeException('The webfactory.integration.filter tag has been renamed to webfactory_legacy_integration.filter already back 1.0.23. Please update your DIC configuration, and sorry for the hassle.');
         }
     }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('parsingMode')
                     ->isRequired()
                     ->validate()
-                        ->ifNotInArray(array('html5', 'xhtml10'))
+                        ->ifNotInArray(['html5', 'xhtml10'])
                         ->thenInvalid('Invalid parsing mode (choose html5 or xhtm10)')
                 ->end();
 
diff --git a/DependencyInjection/WebfactoryLegacyIntegrationExtension.php b/DependencyInjection/WebfactoryLegacyIntegrationExtension.php
@@ -10,21 +10,19 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class WebfactoryLegacyIntegrationExtension extends Extension
 {
-
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
         $container->setParameter('webfactory_legacy_integration.legacy_application_bootstrap_file', $config['legacyApplicationBootstrapFile']);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
         switch (@$config['parsingMode']) {
diff --git a/EventListener/LegacyApplicationDispatchingEventListener.php b/EventListener/LegacyApplicationDispatchingEventListener.php
@@ -17,15 +17,14 @@
 
 class LegacyApplicationDispatchingEventListener
 {
-
     protected $container;
     protected $reader;
     protected $stopwatch;
 
     /**
      * @var Filter[]
      */
-    protected $filters = array();
+    protected $filters = [];
 
     public function __construct(ContainerInterface $container, Reader $reader)
     {
@@ -40,7 +39,7 @@ public function addFilter(Filter $filter)
 
     public function onKernelController(FilterControllerEvent $event)
     {
-        if (!is_array($controller = $event->getController())) {
+        if (!\is_array($controller = $event->getController())) {
             return;
         }
 
@@ -56,7 +55,6 @@ public function onKernelController(FilterControllerEvent $event)
         }
 
         if ($dispatch) {
-
             $response = $this->getLegacyApplication()->handle($event->getRequest(), $event->getRequestType(), false);
 
             foreach ($this->filters as $filter) {
@@ -76,4 +74,3 @@ protected function getLegacyApplication()
         return $this->container->get('webfactory_legacy_integration.legacy_application');
     }
 }
-
diff --git a/Integration/Annotation/Filter.php b/Integration/Annotation/Filter.php
@@ -17,7 +17,6 @@
  */
 class Filter implements Factory
 {
-
     protected $class;
     protected $service;
 
@@ -29,24 +28,29 @@ public function __construct($values)
         if (isset($values['service'])) {
             $this->service = $values['service'];
         }
-        if (!$this->class && !$this->service)
+        if (!$this->class && !$this->service) {
             throw new \Exception('Parameter "class" or "service" is missing in Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter.');
+        }
     }
 
     public function createFilter(Container $container)
     {
         if ($class = $this->class) {
-            if (!class_exists($class))
-                throw new \Exception('Unknown class ' . $class . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');
+            if (!class_exists($class)) {
+                throw new \Exception('Unknown class '.$class.' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');
+            }
             $filter = new $class();
         }
         if ($service = $this->service) {
-            if (!$container->has($service))
-                throw new \Exception('Unknown service ' . $service . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');
+            if (!$container->has($service)) {
+                throw new \Exception('Unknown service '.$service.' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');
+            }
             $filter = $container->get($service);
         }
-        if (!$filter instanceof FilterInterface)
-            throw new \Exception("Class " . get_class($filter) . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation is not a Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter.');
+        if (!$filter instanceof FilterInterface) {
+            throw new \Exception('Class '.\get_class($filter).' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation is not a Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter.');
+        }
+
         return $filter;
     }
 }
diff --git a/Integration/Annotation/IgnoreHeader.php b/Integration/Annotation/IgnoreHeader.php
@@ -17,13 +17,12 @@
  */
 class IgnoreHeader implements Factory
 {
-
     protected $header;
 
     public function __construct(array $values)
     {
         $this->header = array_shift($values);
-        if (!is_string($this->header)) {
+        if (!\is_string($this->header)) {
             throw new \Exception("Please define a header with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\IgnoreHeader annotation.");
         }
     }
diff --git a/Integration/Annotation/IgnoreRedirect.php b/Integration/Annotation/IgnoreRedirect.php
@@ -17,7 +17,6 @@
  */
 class IgnoreRedirect implements Factory
 {
-
     public function createFilter(Container $container)
     {
         return new IgnoreRedirectFilter();
diff --git a/Integration/Annotation/KeepCookies.php b/Integration/Annotation/KeepCookies.php
@@ -15,8 +15,8 @@ class KeepCookies
 {
     public $value;
 
-    public function shouldKeep($name) {
-        return $this->value === null || in_array($name, $this->value);
+    public function shouldKeep($name)
+    {
+        return null === $this->value || \in_array($name, $this->value);
     }
-
 }
diff --git a/Integration/Annotation/KeepHeaders.php b/Integration/Annotation/KeepHeaders.php
@@ -15,7 +15,8 @@ class KeepHeaders
 {
     public $value;
 
-    public function shouldKeep($name) {
-        return $this->value === null || in_array($name, $this->value);
+    public function shouldKeep($name)
+    {
+        return null === $this->value || \in_array($name, $this->value);
     }
 }
diff --git a/Integration/Annotation/Passthru.php b/Integration/Annotation/Passthru.php
@@ -17,7 +17,6 @@
  */
 class Passthru implements Factory
 {
-
     public function createFilter(Container $container)
     {
         return new PassthruLegacyResponseFilter();
diff --git a/Integration/BootstrapFileKernelAdaptor.php b/Integration/BootstrapFileKernelAdaptor.php
@@ -13,7 +13,6 @@
 
 class BootstrapFileKernelAdaptor implements HttpKernelInterface
 {
-
     protected $file;
 
     public function __construct($filename)
@@ -24,10 +23,11 @@ public function __construct($filename)
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
         $file = $this->file;
+
         return LegacyCaptureResponseFactory::create(function () use ($file, $request) {
-            $status = include($file);
-            
-            if ($status != 1) {
+            $status = include $file;
+
+            if (1 != $status) {
                 return $status;
             }
         });
diff --git a/Integration/Filter.php b/Integration/Filter.php
@@ -13,6 +13,5 @@
 
 interface Filter
 {
-
     public function filter(FilterControllerEvent $event, Response $response);
 }
diff --git a/Integration/Filter/ControllerAnnotations.php b/Integration/Filter/ControllerAnnotations.php
@@ -16,7 +16,6 @@
 
 class ControllerAnnotations implements FilterInterface
 {
-
     protected $reader;
     protected $container;
 
@@ -28,7 +27,7 @@ public function __construct(Reader $reader, Container $container)
 
     public function filter(FilterControllerEvent $event, Response $response)
     {
-        if (!is_array($controller = $event->getController())) {
+        if (!\is_array($controller = $event->getController())) {
             return;
         }
 
@@ -38,8 +37,9 @@ public function filter(FilterControllerEvent $event, Response $response)
         foreach ($this->reader->getMethodAnnotations($method) as $annotation) {
             if ($annotation instanceof Factory) {
                 $annotation->createFilter($this->container)->filter($event, $response);
-                if ($event->isPropagationStopped())
+                if ($event->isPropagationStopped()) {
                     break;
+                }
             }
         }
     }
diff --git a/Integration/Filter/Factory.php b/Integration/Filter/Factory.php
@@ -12,6 +12,5 @@
 
 interface Factory
 {
-
     public function createFilter(Container $container);
 }
diff --git a/Integration/Filter/IgnoreHeader.php b/Integration/Filter/IgnoreHeader.php
@@ -12,7 +12,6 @@
 
 class IgnoreHeader extends PassthruLegacyResponseFilter
 {
-
     protected $header;
 
     /**
diff --git a/Integration/Filter/IgnoreRedirect.php b/Integration/Filter/IgnoreRedirect.php
@@ -17,7 +17,6 @@
  */
 class IgnoreRedirect extends PassthruLegacyResponseFilter
 {
-
     protected function check(Response $response)
     {
         return $response->isRedirect();
diff --git a/Integration/Filter/KeepCookiesAndHeadersFilter.php b/Integration/Filter/KeepCookiesAndHeadersFilter.php
@@ -38,7 +38,7 @@ public function __construct(Reader $reader)
 
     public function filter(FilterControllerEvent $event, Response $response)
     {
-        if (!is_array($controller = $event->getController())) {
+        if (!\is_array($controller = $event->getController())) {
             return;
         }
 
@@ -50,7 +50,7 @@ public function filter(FilterControllerEvent $event, Response $response)
         foreach ($this->reader->getMethodAnnotations($method) as $annotation) {
             if ($annotation instanceof KeepHeaders) {
                 $this->keepHeadersAnnotation = $annotation;
-            } else if ($annotation instanceof KeepCookies) {
+            } elseif ($annotation instanceof KeepCookies) {
                 $this->keepCookiesAnnotation = $annotation;
             }
         }
diff --git a/Integration/Filter/PassthruLegacyResponseFilter.php b/Integration/Filter/PassthruLegacyResponseFilter.php
@@ -21,7 +21,6 @@
  */
 class PassthruLegacyResponseFilter implements FilterInterface
 {
-
     public function filter(FilterControllerEvent $event, Response $response)
     {
         if ($this->check($response)) {
diff --git a/Integration/LegacyApplication.php b/Integration/LegacyApplication.php
@@ -14,7 +14,6 @@
 
 class LegacyApplication implements HttpKernelInterface
 {
-
     /** @var Response */
     protected $response;
 
@@ -28,10 +27,11 @@ public function setLegacyKernel(HttpKernelInterface $kernel)
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-        if ($this->response === null) {
+        if (null === $this->response) {
             // Dispatch legacy application only once.
             $this->response = $this->legacyKernel->handle($request, $type, $catch);
         }
+
         return $this->response;
     }
 
@@ -44,7 +44,7 @@ public function isDispatched()
     public function getResponse()
     {
         if (null === $this->response) {
-            throw new LegacyIntegrationException("The legacy application has not been started or has not generated a response. Maybe the @Dispatch annotation is missing for the current controller?");
+            throw new LegacyIntegrationException('The legacy application has not been started or has not generated a response. Maybe the @Dispatch annotation is missing for the current controller?');
         }
 
         return $this->response;
diff --git a/Integration/LegacyCaptureResponseFactory.php b/Integration/LegacyCaptureResponseFactory.php
@@ -30,14 +30,14 @@ private static function runLegacyAndCaptureResponse($legacyExecutionCallback)
     {
         ob_start();
         try {
-            $statusCode = call_user_func($legacyExecutionCallback);
+            $statusCode = \call_user_func($legacyExecutionCallback);
             $content = ob_get_contents();
         } finally {
             ob_end_clean();
         }
 
-        if ($statusCode === null) {
-            if (function_exists('http_response_code')) {
+        if (null === $statusCode) {
+            if (\function_exists('http_response_code')) {
                 $statusCode = http_response_code();
             } else {
                 $statusCode = 200;
diff --git a/Integration/ResponseCaptureHelper.php b/Integration/ResponseCaptureHelper.php
diff --git a/Integration/XPathHelper.php b/Integration/XPathHelper.php
diff --git a/Integration/XPathHelperFactory.php b/Integration/XPathHelperFactory.php
diff --git a/Twig/Extension.php b/Twig/Extension.php
diff --git a/WebfactoryLegacyIntegrationBundle.php b/WebfactoryLegacyIntegrationBundle.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`class PassthruController extends Controller`
`15`	`15`	`{`
`16`		`-`
`17`	`16`	`/**`
`18`	`17`	`* @Legacy\Dispatch`
`19`	`18`	`* @Legacy\Passthru`
Original file line number	Diff line number	Diff line change
`@@ -14,19 +14,18 @@`
`14`	`14`
`15`	`15`	`class CollectFilterPass implements CompilerPassInterface`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`public function process(ContainerBuilder $container)`
`19`	`18`	`{`
`20`	`19`	`$kernelEventListenerDefinition = $container->getDefinition('webfactory_legacy_integration.kernel_event_listener');`
`21`	`20`
`22`	`21`	`foreach ($container->findTaggedServiceIds('webfactory_legacy_integration.filter') as $id => $tags) {`
`23`		`- $kernelEventListenerDefinition->addMethodCall('addFilter', array(`
`24`		`- new Reference($id)`
`25`		`- ));`
	`22`	`+ $kernelEventListenerDefinition->addMethodCall('addFilter', [`
	`23`	`+ new Reference($id),`
	`24`	`+ ]);`
`26`	`25`	`}`
`27`		`-`
	`26`	`+`
`28`	`27`	`if ($container->findTaggedServiceIds('webfactory.integration.filter')) {`
`29`		`- throw new \RuntimeException("The webfactory.integration.filter tag has been renamed to webfactory_legacy_integration.filter already back 1.0.23. Please update your DIC configuration, and sorry for the hassle.");`
	`28`	`+ throw new \RuntimeException('The webfactory.integration.filter tag has been renamed to webfactory_legacy_integration.filter already back 1.0.23. Please update your DIC configuration, and sorry for the hassle.');`
`30`	`29`	`}`
`31`	`30`	`}`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,14 @@`
`17`	`17`
`18`	`18`	`class LegacyApplicationDispatchingEventListener`
`19`	`19`	`{`
`20`		`-`
`21`	`20`	`protected $container;`
`22`	`21`	`protected $reader;`
`23`	`22`	`protected $stopwatch;`
`24`	`23`
`25`	`24`	`/**`
`26`	`25`	`* @var Filter[]`
`27`	`26`	`*/`
`28`		`- protected $filters = array();`
	`27`	`+ protected $filters = [];`
`29`	`28`
`30`	`29`	`public function __construct(ContainerInterface $container, Reader $reader)`
`31`	`30`	`{`
`@@ -40,7 +39,7 @@ public function addFilter(Filter $filter)`
`40`	`39`
`41`	`40`	`public function onKernelController(FilterControllerEvent $event)`
`42`	`41`	`{`
`43`		`- if (!is_array($controller = $event->getController())) {`
	`42`	`+ if (!\is_array($controller = $event->getController())) {`
`44`	`43`	`return;`
`45`	`44`	`}`
`46`	`45`
`@@ -56,7 +55,6 @@ public function onKernelController(FilterControllerEvent $event)`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`if ($dispatch) {`
`59`		`-`
`60`	`58`	`$response = $this->getLegacyApplication()->handle($event->getRequest(), $event->getRequestType(), false);`
`61`	`59`
`62`	`60`	`foreach ($this->filters as $filter) {`
`@@ -76,4 +74,3 @@ protected function getLegacyApplication()`
`76`	`74`	`return $this->container->get('webfactory_legacy_integration.legacy_application');`
`77`	`75`	`}`
`78`	`76`	`}`
`79`		`-`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`*/`
`18`	`18`	`class Filter implements Factory`
`19`	`19`	`{`
`20`		`-`
`21`	`20`	`protected $class;`
`22`	`21`	`protected $service;`
`23`	`22`
`@@ -29,24 +28,29 @@ public function __construct($values)`
`29`	`28`	`if (isset($values['service'])) {`
`30`	`29`	`$this->service = $values['service'];`
`31`	`30`	`}`
`32`		`- if (!$this->class && !$this->service)`
	`31`	`+ if (!$this->class && !$this->service) {`
`33`	`32`	`throw new \Exception('Parameter "class" or "service" is missing in Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter.');`
	`33`	`+ }`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function createFilter(Container $container)`
`37`	`37`	`{`
`38`	`38`	`if ($class = $this->class) {`
`39`		`- if (!class_exists($class))`
`40`		`- throw new \Exception('Unknown class ' . $class . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');`
	`39`	`+ if (!class_exists($class)) {`
	`40`	`+ throw new \Exception('Unknown class '.$class.' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');`
	`41`	`+ }`
`41`	`42`	`$filter = new $class();`
`42`	`43`	`}`
`43`	`44`	`if ($service = $this->service) {`
`44`		`- if (!$container->has($service))`
`45`		`- throw new \Exception('Unknown service ' . $service . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');`
	`45`	`+ if (!$container->has($service)) {`
	`46`	`+ throw new \Exception('Unknown service '.$service.' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation.');`
	`47`	`+ }`
`46`	`48`	`$filter = $container->get($service);`
`47`	`49`	`}`
`48`		`- if (!$filter instanceof FilterInterface)`
`49`		`- throw new \Exception("Class " . get_class($filter) . ' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation is not a Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter.');`
	`50`	`+ if (!$filter instanceof FilterInterface) {`
	`51`	`+ throw new \Exception('Class '.\get_class($filter).' configured with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Filter annotation is not a Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter.');`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`return $filter;`
`51`	`55`	`}`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,12 @@`
`17`	`17`	`*/`
`18`	`18`	`class IgnoreHeader implements Factory`
`19`	`19`	`{`
`20`		`-`
`21`	`20`	`protected $header;`
`22`	`21`
`23`	`22`	`public function __construct(array $values)`
`24`	`23`	`{`
`25`	`24`	`$this->header = array_shift($values);`
`26`		`- if (!is_string($this->header)) {`
	`25`	`+ if (!\is_string($this->header)) {`
`27`	`26`	`throw new \Exception("Please define a header with the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\IgnoreHeader annotation.");`
`28`	`27`	`}`
`29`	`28`	`}`