Merge pull request #360 from symfony-cmf/styleci

dbu · web-flow · commit c715d9629b3a · 2017-02-10T16:52:30.000+01:00
cleanup styleci
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,6 +1,13 @@
 preset: symfony
 
-disabled: [phpdoc_to_comment, phpdoc_var_without_name]
+enabled:
+  - ordered_use
+  - short_array_syntax
+
+disabled:
+  - phpdoc_to_comment
+  - phpdoc_var_without_name
+  - single_line_class_definition
 
 finder:
     exclude: [var]
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
             // enable symfony-standard bundles
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -68,9 +68,9 @@ public function registerBundles()
 
             // and the app bundle
             new AppBundle\AppBundle(),
-        );
+        ];
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'])) {
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
diff --git a/app/autoload.php b/app/autoload.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /**
  * @var ClassLoader $loader
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/AppBundle/Controller/ContentController.php b/src/AppBundle/Controller/ContentController.php
@@ -11,9 +11,9 @@
 
 namespace AppBundle\Controller;
 
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Cmf\Bundle\ContentBundle\Controller\ContentController as BaseContentController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Special routes to demo the features of the Doctrine Router in the CmfRoutingBundle.
@@ -35,10 +35,10 @@ public function typeAction($contentDocument)
             throw new NotFoundHttpException('Content not found');
         }
 
-        $params = array(
+        $params = [
             'cmfMainContent' => $contentDocument,
             'info' => 'This page is rendered by <code>'.__METHOD__.'</code>. This controller was configured for this route type.',
-        );
+        ];
 
         return $this->renderResponse('demo/controller.html.twig', $params);
     }
@@ -58,10 +58,10 @@ public function classAction($contentDocument)
             throw new NotFoundHttpException('Content not found');
         }
 
-        $params = array(
+        $params = [
             'cmfMainContent' => $contentDocument,
             'info' => 'This page is rendered by <code>'.__METHOD__.'</code>. This controller will be called for content objects that are instances of <code>AppBundle\Document\DemoClassContent</code>.',
-        );
+        ];
 
         return $this->renderResponse('demo/controller.html.twig', $params);
     }
@@ -81,10 +81,10 @@ public function specialAction($contentDocument)
             throw new NotFoundHttpException('Content not found');
         }
 
-        $params = array(
+        $params = [
             'cmfMainContent' => $contentDocument,
             'info' => 'This page is rendered by <code>'.__METHOD__.'</code>. This controller was explicitely defined for the route by setting the <code>_controller</code> default.',
-        );
+        ];
 
         return $this->renderResponse('demo/controller.html.twig', $params);
     }
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
@@ -12,9 +12,9 @@
 namespace AppBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sonata\BlockBundle\Model\BlockInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
-use Sonata\BlockBundle\Model\BlockInterface;
 
 class DefaultController extends Controller
 {
@@ -27,9 +27,9 @@ class DefaultController extends Controller
      */
     public function blockAction($block)
     {
-        return $this->render('block/demo_action_block.html.twig', array(
+        return $this->render('block/demo_action_block.html.twig', [
             'block' => $block,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/AppBundle/Controller/SecurityController.php b/src/AppBundle/Controller/SecurityController.php
@@ -26,10 +26,10 @@ public function loginAction(Request $request)
         $error = $authenticationUtils->getLastAuthenticationError();
         $lastUsername = $authenticationUtils->getLastUsername();
 
-        return $this->render('security/login.html.twig', array(
+        return $this->render('security/login.html.twig', [
             'last_username' => $lastUsername,
             'error' => $error,
-        ));
+        ]);
     }
 
     /**
diff --git a/src/AppBundle/DataFixtures/PHPCR/LoadMenuData.php b/src/AppBundle/DataFixtures/PHPCR/LoadMenuData.php
@@ -11,15 +11,15 @@
 
 namespace AppBundle\DataFixtures\PHPCR;
 
-use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ODM\PHPCR\DocumentManager;
 use PHPCR\Util\NodeHelper;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
 use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu;
+use Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class LoadMenuData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
@@ -48,19 +48,19 @@ public function load(ObjectManager $manager)
         NodeHelper::createPath($session, $basepath);
         $root = $manager->find(null, $basepath);
 
-        $labels = array('en' => 'Home', 'de' => 'Start', 'fr' => 'Accueil');
+        $labels = ['en' => 'Home', 'de' => 'Start', 'fr' => 'Accueil'];
         /** @var $main Menu */
         $main = $this->createMenuNode($manager, $root, 'main', $labels, $manager->find(null, "$content_path/home"));
-        $main->setChildrenAttributes(array('class' => 'menu_main'));
+        $main->setChildrenAttributes(['class' => 'menu_main']);
 
         $this->createMenuNode($manager, $main, 'admin-item', 'Admin', null, null, 'sonata_admin_dashboard');
 
-        $projects = $this->createMenuNode($manager, $main, 'projects-item', array('en' => 'Projects', 'de' => 'Projekte', 'fr' => 'Projets'), $manager->find(null, "$content_path/projects"));
+        $projects = $this->createMenuNode($manager, $main, 'projects-item', ['en' => 'Projects', 'de' => 'Projekte', 'fr' => 'Projets'], $manager->find(null, "$content_path/projects"));
         $this->createMenuNode($manager, $projects, 'cmf-item', 'Symfony CMF', $manager->find(null, "$content_path/cmf"));
 
-        $company = $this->createMenuNode($manager, $main, 'company-item', array('en' => 'Company', 'de' => 'Firma', 'fr' => 'Entreprise'), $manager->find(null, "$content_path/company"));
-        $this->createMenuNode($manager, $company, 'team-item', array('en' => 'Team', 'de' => 'Team', 'fr' => 'Equipe'), $manager->find(null, "$content_path/team"));
-        $this->createMenuNode($manager, $company, 'more-item', array('en' => 'More', 'de' => 'Mehr', 'fr' => 'Plus'), $manager->find(null, "$content_path/more"));
+        $company = $this->createMenuNode($manager, $main, 'company-item', ['en' => 'Company', 'de' => 'Firma', 'fr' => 'Entreprise'], $manager->find(null, "$content_path/company"));
+        $this->createMenuNode($manager, $company, 'team-item', ['en' => 'Team', 'de' => 'Team', 'fr' => 'Equipe'], $manager->find(null, "$content_path/team"));
+        $this->createMenuNode($manager, $company, 'more-item', ['en' => 'More', 'de' => 'Mehr', 'fr' => 'Plus'], $manager->find(null, "$content_path/more"));
 
         $this->createMenuNode($manager, $main, 'about', 'About us', $manager->find(null, "$content_path/about"));
         $this->createMenuNode($manager, $main, 'contact', 'Contact', $manager->find(null, "$content_path/contact"));
@@ -78,15 +78,15 @@ public function load(ObjectManager $manager)
         $this->createMenuNode($manager, $publicationDemo, 'not-published', 'Not published', $manager->find(null, "$content_path/not_published"));
         $this->createMenuNode($manager, $publicationDemo, 'published-tomorrow', 'Published tomorrow', $manager->find(null, "$content_path/published_tomorrow"));
 
-        $singlelocale = $this->createMenuNode($manager, $main, 'singlelocale-item', array('en' => 'singlelocale'), $manager->find(null, "$content_path/singlelocale"));
-        $this->createMenuNode($manager, $singlelocale, 'singlelocale-sub-item', array('en' => 'singlelocale child'), $manager->find(null, "$content_path/singlelocale"));
+        $singlelocale = $this->createMenuNode($manager, $main, 'singlelocale-item', ['en' => 'singlelocale'], $manager->find(null, "$content_path/singlelocale"));
+        $this->createMenuNode($manager, $singlelocale, 'singlelocale-sub-item', ['en' => 'singlelocale child'], $manager->find(null, "$content_path/singlelocale"));
 
         $seo = $this->createMenuNode($manager, $main, 'seo', 'SEO', $manager->find(null, "$content_path/simple-seo-example"));
-        $this->createMenuNode($manager, $seo, 'simple-seo-example', array('en' => 'Seo-Simple-Content'), $manager->find(null, "$content_path/simple-seo-example"));
-        $this->createMenuNode($manager, $seo, 'demo-seo-extractor', array('en' => 'Seo-Extractor'), $manager->find(null, "$content_path/demo-seo-extractor"));
-        $this->createMenuNode($manager, $seo, 'simple-seo-property', array('en' => 'Seo-Extra-Properties'), $manager->find(null, "$content_path/simple-seo-property"));
+        $this->createMenuNode($manager, $seo, 'simple-seo-example', ['en' => 'Seo-Simple-Content'], $manager->find(null, "$content_path/simple-seo-example"));
+        $this->createMenuNode($manager, $seo, 'demo-seo-extractor', ['en' => 'Seo-Extractor'], $manager->find(null, "$content_path/demo-seo-extractor"));
+        $this->createMenuNode($manager, $seo, 'simple-seo-property', ['en' => 'Seo-Extra-Properties'], $manager->find(null, "$content_path/simple-seo-property"));
 
-        $this->createMenuNode($manager, $main, 'routing-auto-item', array('en' => 'Auto routing example', 'de' => 'Auto routing beispiel', 'fr' => 'Auto routing exemple'), $manager->find(null, "$content_path/news/RoutingAutoBundle generates routes!"));
+        $this->createMenuNode($manager, $main, 'routing-auto-item', ['en' => 'Auto routing example', 'de' => 'Auto routing beispiel', 'fr' => 'Auto routing exemple'], $manager->find(null, "$content_path/news/RoutingAutoBundle generates routes!"));
 
         $manager->flush();
     }
diff --git a/src/AppBundle/DataFixtures/PHPCR/LoadNewsData.php b/src/AppBundle/DataFixtures/PHPCR/LoadNewsData.php
@@ -11,14 +11,14 @@
 
 namespace AppBundle\DataFixtures\PHPCR;
 
+use AppBundle\Document\DemoNewsContent;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\DocumentManager;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use PHPCR\Util\NodeHelper;
-use AppBundle\Document\DemoNewsContent;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class LoadNewsData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
diff --git a/src/AppBundle/DataFixtures/PHPCR/LoadRoutingData.php b/src/AppBundle/DataFixtures/PHPCR/LoadRoutingData.php
@@ -18,9 +18,9 @@
 use PHPCR\Util\NodeHelper;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class LoadRoutingData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
 {
diff --git a/src/AppBundle/DataFixtures/PHPCR/LoadStaticPageData.php b/src/AppBundle/DataFixtures/PHPCR/LoadStaticPageData.php
@@ -11,15 +11,15 @@
 
 namespace AppBundle\DataFixtures\PHPCR;
 
+use AppBundle\Document\DemoSeoContent;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use PHPCR\Util\NodeHelper;
-use AppBundle\Document\DemoSeoContent;
 use Symfony\Cmf\Bundle\SeoBundle\Doctrine\Phpcr\SeoMetadata;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Yaml\Parser;
 
 class LoadStaticPageData implements ContainerAwareInterface, FixtureInterface, OrderedFixtureInterface
diff --git a/src/AppBundle/Document/DemoClassContent.php b/src/AppBundle/Document/DemoClassContent.php
@@ -12,8 +12,8 @@
 namespace AppBundle\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * A document that we map to a controller.
diff --git a/src/AppBundle/Document/DemoSeoContent.php b/src/AppBundle/Document/DemoSeoContent.php
@@ -13,8 +13,8 @@
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
 use Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent;
-use Symfony\Cmf\Bundle\SeoBundle\SeoAwareInterface;
 use Symfony\Cmf\Bundle\SeoBundle\Doctrine\Phpcr\SeoMetadata;
+use Symfony\Cmf\Bundle\SeoBundle\SeoAwareInterface;
 
 /**
  * That example class uses the extractors for the creation of the SeoMetadata.
diff --git a/src/AppBundle/Document/DemoTemplateContent.php b/src/AppBundle/Document/DemoTemplateContent.php
@@ -12,8 +12,8 @@
 namespace AppBundle\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * A document that we map to a template to be used with the generic content
diff --git a/src/AppBundle/EventListener/SandboxExceptionListener.php b/src/AppBundle/EventListener/SandboxExceptionListener.php
@@ -12,13 +12,13 @@
 namespace AppBundle\EventListener;
 
 use PHPCR\RepositoryException;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Exception listener that will handle not found exceptions and try to give the
@@ -75,8 +75,8 @@ public function onKernelException(GetResponseForExceptionEvent $event)
 
     public static function getSubscribedEvents()
     {
-        return array(
-            KernelEvents::EXCEPTION => array('onKernelException', 0),
-        );
+        return [
+            KernelEvents::EXCEPTION => ['onKernelException', 0],
+        ];
     }
 }
diff --git a/src/AppBundle/Security/ResourceVoter.php b/src/AppBundle/Security/ResourceVoter.php
@@ -11,8 +11,8 @@
 
 namespace AppBundle\Security;
 
-use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 class ResourceVoter implements VoterInterface
 {
diff --git a/src/AppBundle/Twig/MenuExtension.php b/src/AppBundle/Twig/MenuExtension.php
@@ -28,12 +28,12 @@ public function __construct(Helper $helper, MatcherInterface $matcher)
 
     public function getFunctions()
     {
-        return array(
-            new \Twig_SimpleFunction('app_get_current_menu_item', array($this, 'getCurrent')),
-        );
+        return [
+            new \Twig_SimpleFunction('app_get_current_menu_item', [$this, 'getCurrent']),
+        ];
     }
 
-    public function getCurrent($menu, array $path = array(), array $options = array())
+    public function getCurrent($menu, array $path = [], array $options = [])
     {
         return $this->doGetCurrent($this->helper->get($menu, $path, $options));
     }
diff --git a/tests/Functional/AdminDashboardTest.php b/tests/Functional/AdminDashboardTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2015 Symfony CMF
+ * (c) 2011-2017 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/tests/Functional/AdminTest.php b/tests/Functional/AdminTest.php
diff --git a/tests/Functional/HomepageTest.php b/tests/Functional/HomepageTest.php
diff --git a/tests/Functional/StaticPageTest.php b/tests/Functional/StaticPageTest.php
diff --git a/tests/Functional/WebTestCase.php b/tests/Functional/WebTestCase.php
diff --git a/web/app.php b/web/app.php
diff --git a/web/app_dev.php b/web/app_dev.php
diff --git a/web/config.php b/web/config.php

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`namespace AppBundle\Controller;`
`13`	`13`
`14`	`14`	`use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;`
	`15`	`+use Sonata\BlockBundle\Model\BlockInterface;`
`15`	`16`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`16`	`17`	`use Symfony\Component\HttpFoundation\Response;`
`17`		`-use Sonata\BlockBundle\Model\BlockInterface;`
`18`	`18`
`19`	`19`	`class DefaultController extends Controller`
`20`	`20`	`{`
`@@ -27,9 +27,9 @@ class DefaultController extends Controller`
`27`	`27`	`*/`
`28`	`28`	`public function blockAction($block)`
`29`	`29`	`{`
`30`		`- return $this->render('block/demo_action_block.html.twig', array(`
	`30`	`+ return $this->render('block/demo_action_block.html.twig', [`
`31`	`31`	`'block' => $block,`
`32`		`- ));`
	`32`	`+ ]);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`