Merge pull request #225 from symfony-cmf/analysis-q279wP

wouterj · web-flow · commit ed15470bb1c9 · 2017-01-29T17:42:32.000+01:00
Apply fixes from StyleCI
diff --git a/src/CmfCoreBundle.php b/src/CmfCoreBundle.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\AddPublishedVotersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class CmfCoreBundle extends Bundle
 {
diff --git a/src/DependencyInjection/CmfCoreExtension.php b/src/DependencyInjection/CmfCoreExtension.php
@@ -12,14 +12,14 @@
 namespace Symfony\Cmf\Bundle\CoreBundle\DependencyInjection;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class CmfCoreExtension extends Extension implements PrependExtensionInterface
 {
diff --git a/src/DependencyInjection/Compiler/AddPublishedVotersPass.php b/src/DependencyInjection/Compiler/AddPublishedVotersPass.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds all configured publish voters to the access decision manager used for
diff --git a/src/EventListener/PublishWorkflowListener.php b/src/EventListener/PublishWorkflowListener.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\EventListener;
 
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
+use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
-use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * A request listener that makes sure only published routes and content can be
diff --git a/src/Form/Type/CheckboxUrlLabelFormType.php b/src/Form/Type/CheckboxUrlLabelFormType.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Form\Type;
 
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Form type for rendering a checkbox with a label that can contain links to
diff --git a/src/PublishWorkflow/Voter/PublishTimePeriodVoter.php b/src/PublishWorkflow/Voter/PublishTimePeriodVoter.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\Voter;
 
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodReadInterface;
 
 /**
  * Workflow voter for the PublishTimePeriodReadInterface.
diff --git a/src/PublishWorkflow/Voter/PublishableVoter.php b/src/PublishWorkflow/Voter/PublishableVoter.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\Voter;
 
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableReadInterface;
 
 /**
  * Workflow voter for the PublishableReadInterface.
diff --git a/src/Security/Authorization/Voter/PublishedVoter.php b/src/Security/Authorization/Voter/PublishedVoter.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Security\Authorization\Voter;
 
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 
 /**
  * This is a security voter registered with the Symfony security system that
diff --git a/src/Templating/Helper/CmfHelper.php b/src/Templating/Helper/CmfHelper.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Templating\Helper;
 
-use PHPCR\Util\PathHelper;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Translation\MissingTranslationException;
+use PHPCR\Util\PathHelper;
+use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Templating\Helper\Helper;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
+use Symfony\Component\Templating\Helper\Helper;
 
 /**
  * Provides CMF helper functions.
diff --git a/tests/Functional/DependencyInjection/CmfCoreExtensionTest.php b/tests/Functional/DependencyInjection/CmfCoreExtensionTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\CmfCoreExtension;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\AlwaysPublishedWorkflowChecker;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class CmfCoreExtensionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php b/tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Form;
 
-use Symfony\Bridge\Twig\Form\TwigRenderer;
 use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Bridge\Twig\Form\TwigRenderer;
+use Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader;
+use Symfony\Cmf\Bundle\CoreBundle\Form\Type\CheckboxUrlLabelFormType;
 use Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\DataFixture\LoadRouteData;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\CoreBundle\Form\Type\CheckboxUrlLabelFormType;
-use Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class CheckboxUrlLabelFormTypeTest extends BaseTestCase
 {
diff --git a/tests/Functional/PublishWorkflow/PublishWorkflowTest.php b/tests/Functional/PublishWorkflow/PublishWorkflowTest.php
@@ -14,10 +14,10 @@
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
+use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\SecurityContextInterface;
-use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 
 class PublishWorkflowTest extends BaseTestCase
 {
diff --git a/tests/Resources/DataFixture/LoadRouteData.php b/tests/Resources/DataFixture/LoadRouteData.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\DataFixture;
 
-use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
-use Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\Document\Content;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\Document\Generic;
+use Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\Document\Content;
+use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
 /**
  * Fixtures class for test data.
diff --git a/tests/Resources/Document/Content.php b/tests/Resources/Document/Content.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\Document;
 
-use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 
 /**
  * @PHPCRODM\Document(referenceable=true)
diff --git a/tests/Resources/Document/RouteAware.php b/tests/Resources/Document/RouteAware.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\Document;
 
-use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 
 /**
  * @PHPCRODM\Document()
diff --git a/tests/Resources/app/config/config.php b/tests/Resources/app/config/config.php
@@ -15,6 +15,6 @@
 $loader->import(__DIR__.'/cmf_core.yml');
 $loader->import(__DIR__.'/cmf_routing.yml');
 
-$container->loadFromExtension('framework', array(
+$container->loadFromExtension('framework', [
     'csrf_protection' => true,
-));
+]);
diff --git a/tests/Unit/Form/CheckboxUrlLabelFormTypeTest.php b/tests/Unit/Form/CheckboxUrlLabelFormTypeTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\Form;
 
+use Symfony\Cmf\Bundle\CoreBundle\Form\Type\CheckboxUrlLabelFormType;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
-use Symfony\Cmf\Bundle\CoreBundle\Form\Type\CheckboxUrlLabelFormType;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouterInterface;
 
diff --git a/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php
@@ -136,7 +136,7 @@ public function testUnsupportedClass()
 
     public function testNonClassSubject()
     {
-        $result = $this->voter->vote($this->token, array(1, 2, 3), array(PublishWorkflowChecker::VIEW_ATTRIBUTE));
+        $result = $this->voter->vote($this->token, [1, 2, 3], [PublishWorkflowChecker::VIEW_ATTRIBUTE]);
         $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
     }
 }
diff --git a/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php
@@ -104,7 +104,7 @@ public function testUnsupportedClass()
 
     public function testNonClassSubject()
     {
-        $result = $this->voter->vote($this->token, array(1, 2, 3), array(PublishWorkflowChecker::VIEW_ATTRIBUTE));
+        $result = $this->voter->vote($this->token, [1, 2, 3], [PublishWorkflowChecker::VIEW_ATTRIBUTE]);
         $this->assertEquals(VoterInterface::ACCESS_ABSTAIN, $result);
     }
 }
diff --git a/tests/Unit/Templating/Helper/CmfHelperTest.php b/tests/Unit/Templating/Helper/CmfHelperTest.php
@@ -198,7 +198,7 @@ public function testFindManyIgnoreWorkflow()
             ->method('isGranted')
         ;
 
-        $this->assertEquals(array($documentA, $documentB), $this->extension->findMany(array('/foo', '/bar'), false, false, null));
+        $this->assertEquals([$documentA, $documentB], $this->extension->findMany(['/foo', '/bar'], false, false, null));
     }
 
     public function testFindManyLimitOffset()
@@ -211,9 +211,9 @@ public function testFindManyLimitOffset()
             ->will($this->onConsecutiveCalls($documentA, $documentB, $documentA, $documentB, $documentA, $documentB))
         ;
 
-        $this->assertEquals(array($documentA), $this->extension->findMany(array('/foo', 'bar'), 1, false, null));
-        $this->assertEquals(array($documentB), $this->extension->findMany(array('/foo', 'bar'), false, 1, null));
-        $this->assertEquals(array($documentB), $this->extension->findMany(array('/foo', 'bar'), 1, 1, null));
+        $this->assertEquals([$documentA], $this->extension->findMany(['/foo', 'bar'], 1, false, null));
+        $this->assertEquals([$documentB], $this->extension->findMany(['/foo', 'bar'], false, 1, null));
+        $this->assertEquals([$documentB], $this->extension->findMany(['/foo', 'bar'], 1, 1, null));
     }
 
     /**
@@ -232,7 +232,7 @@ public function testFindManyNoWorkflow()
             ->will($this->returnValue($documentA))
         ;
 
-        $extension->findMany(array('/foo', '/bar'), false, false);
+        $extension->findMany(['/foo', '/bar'], false, false);
     }
 
     public function testIsPublished()
@@ -281,7 +281,7 @@ public function testIsLinkable()
         $content
             ->expects($this->once())
             ->method('getRoutes')
-            ->will($this->returnValue(array($route)))
+            ->will($this->returnValue([$route]))
         ;
         $this->assertTrue($this->extension->isLinkable($content));
     }
@@ -303,10 +303,10 @@ public function testGetLocalesFor()
         $this->manager->expects($this->once())
             ->method('getLocalesFor')
             ->with($document)
-            ->will($this->returnValue(array('en', 'de')))
+            ->will($this->returnValue(['en', 'de']))
         ;
 
-        $this->assertEquals(array('en', 'de'), $this->extension->getLocalesFor('/foo'));
+        $this->assertEquals(['en', 'de'], $this->extension->getLocalesFor('/foo'));
     }
 
     public function testGetLocalesForMissingTranslationException()
diff --git a/tests/Unit/Twig/Extension/CmfExtensionTest.php b/tests/Unit/Twig/Extension/CmfExtensionTest.php
@@ -48,32 +48,32 @@ public function testFunctions($methodName, array $methodArguments, $helperMethod
 
         $helperMethodMock = $this->cmfHelper->expects($this->once())->method($helperMethod);
         if ($helperArguments) {
-            call_user_func_array(array($helperMethodMock, 'with'), $helperArguments);
+            call_user_func_array([$helperMethodMock, 'with'], $helperArguments);
         }
 
-        call_user_func_array(array($this->cmfExtension, $methodName), $methodArguments);
+        call_user_func_array([$this->cmfExtension, $methodName], $methodArguments);
     }
 
     public function getFunctionsData()
     {
-        return array(
-            array('isPublished', array('document1')),
-            array('isLinkable', array('document1')),
-            array('getChild', array('parent', 'name')),
-            array('getChildren', array('parent', true), 'getChildren', array('parent', true, false, null, false, null)),
-            array('getPrev', array('current'), 'getPrev', array('current', null, null, false, null)),
-            array('getNext', array('current'), 'getNext', array('current', null, null, false, null)),
-            array('find', array('/cms/simple')),
-            array('findTranslation', array('/cms/simple', 'en')),
-            array('findMany', array(array('/cms/simple')), 'findMany', array(array('/cms/simple'), false, false, false, null)),
-            array('getDescendants', array('parent', 2)),
-            array('getNodeName', array('document1')),
-            array('getParentPath', array('document1')),
-            array('getPath', array('document1')),
-            array('getLocalesFor', array('document1'), 'getLocalesFor', array('document1', false)),
-            array('getPrevLinkable', array('document1'), 'getPrevLinkable', array('document1', null, null, false)),
-            array('getNextLinkable', array('document1'), 'getNextLinkable', array('document1', null, null, false)),
-            array('getLinkableChildren', array('document1'), 'getLinkableChildren', array('document1', false, false, null, false, null)),
-        );
+        return [
+            ['isPublished', ['document1']],
+            ['isLinkable', ['document1']],
+            ['getChild', ['parent', 'name']],
+            ['getChildren', ['parent', true], 'getChildren', ['parent', true, false, null, false, null]],
+            ['getPrev', ['current'], 'getPrev', ['current', null, null, false, null]],
+            ['getNext', ['current'], 'getNext', ['current', null, null, false, null]],
+            ['find', ['/cms/simple']],
+            ['findTranslation', ['/cms/simple', 'en']],
+            ['findMany', [['/cms/simple']], 'findMany', [['/cms/simple'], false, false, false, null]],
+            ['getDescendants', ['parent', 2]],
+            ['getNodeName', ['document1']],
+            ['getParentPath', ['document1']],
+            ['getPath', ['document1']],
+            ['getLocalesFor', ['document1'], 'getLocalesFor', ['document1', false]],
+            ['getPrevLinkable', ['document1'], 'getPrevLinkable', ['document1', null, null, false]],
+            ['getNextLinkable', ['document1'], 'getNextLinkable', ['document1', null, null, false]],
+            ['getLinkableChildren', ['document1'], 'getLinkableChildren', ['document1', false, false, null, false, null]],
+        ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Bundle\CoreBundle;`
`13`	`13`
`14`		`-use Symfony\Component\HttpKernel\Bundle\Bundle;`
`15`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`14`	`use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\Compiler\AddPublishedVotersPass;`
	`15`	`+use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`16`	`+use Symfony\Component\HttpKernel\Bundle\Bundle;`
`17`	`17`
`18`	`18`	`class CmfCoreBundle extends Bundle`
`19`	`19`	`{`