Merge pull request #460 from sonata-project/analysis-8wpan2

Apply fixes from StyleCI
sonata-project · Jul 14, 2017 · 338bd3f · 338bd3f
2 parents ff47375 + 1959d1a
commit 338bd3f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php b/DependencyInjection/SonataDoctrinePHPCRAdminExtension.php
@@ -12,13 +12,13 @@
 namespace Sonata\DoctrinePHPCRAdminBundle\DependencyInjection;
 
 use Sonata\AdminBundle\DependencyInjection\AbstractSonataAdminExtension;
+use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Configuration as ResourceConfiguration;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Configuration as ResourceConfiguration;
 
 /**
  * SonataAdminBundleExtension.
@@ -87,25 +87,6 @@ public function getNamespace()
         return 'http://sonata-project.org/schema/dic/doctrine_phpcr_admin';
     }
 
-    /**
-     * Set the document tree parameters and configuration.
-     *
-     * @param array            $config
-     * @param ContainerBuilder $container
-     */
-    private function loadDocumentTree($config, ContainerBuilder $container)
-    {
-        $configuration = array(
-            'routing_defaults' => $config['routing_defaults'],
-            'repository_name' => $config['repository_name'],
-            'sortable_by' => $config['sortable_by'],
-            'move' => true,
-            'reorder' => true,
-        );
-
-        $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.configuration', $configuration);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -140,4 +121,23 @@ public function prepend(ContainerBuilder $container)
 
         $container->prependExtensionConfig('sonata_doctrine_phpcr_admin', $sonataConfig);
     }
+
+    /**
+     * Set the document tree parameters and configuration.
+     *
+     * @param array            $config
+     * @param ContainerBuilder $container
+     */
+    private function loadDocumentTree($config, ContainerBuilder $container)
+    {
+        $configuration = array(
+            'routing_defaults' => $config['routing_defaults'],
+            'repository_name' => $config['repository_name'],
+            'sortable_by' => $config['sortable_by'],
+            'move' => true,
+            'reorder' => true,
+        );
+
+        $container->setParameter('sonata_admin_doctrine_phpcr.tree_block.configuration', $configuration);
+    }
 }
diff --git a/Tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php b/Tests/DependencyInjection/SonataDoctrinePHPCRAdminExtensionTest.php
@@ -13,7 +13,6 @@
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Sonata\DoctrinePHPCRAdminBundle\DependencyInjection\SonataDoctrinePHPCRAdminExtension;
-use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\CmfResourceExtension;
 
 class SonataDoctrinePHPCRAdminExtensionTest extends AbstractExtensionTestCase
 {
@@ -46,10 +45,10 @@ public function testDocumentTreeDefaultValues()
 
     public function testPrependDefaultRepositoryName()
     {
-        $this->container->setParameter('kernel.bundles', ['CmfResourceBundle']);
+        $this->container->setParameter('kernel.bundles', array('CmfResourceBundle'));
         $this->container->getExtensionConfig('sonata_doctrine_phpcr_admin');
         $this->container->prependExtensionConfig('sonata_doctrine_phpcr_admin', array('document_tree' => array()));
-        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' =>'default'));
+        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' => 'default'));
 
         $this->container->getExtension('sonata_doctrine_phpcr_admin')->prepend($this->container);
 
@@ -69,23 +68,23 @@ public function testPrependDefaultRepositoryName()
      */
     public function testPrependDefaultRepositoryNameThrowsOnNonExistingResourceBundle()
     {
-        $this->container->setParameter('kernel.bundles', []);
+        $this->container->setParameter('kernel.bundles', array());
         $this->container->getExtensionConfig('sonata_doctrine_phpcr_admin');
         $this->container->prependExtensionConfig('sonata_doctrine_phpcr_admin', array('document_tree' => array()));
-        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' =>'default'));
+        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' => 'default'));
 
         $this->container->getExtension('sonata_doctrine_phpcr_admin')->prepend($this->container);
     }
 
     public function testPrependDefaultRepositoryNameKeepsCustomNames()
     {
-        $this->container->setParameter('kernel.bundles', ['CmfResourceBundle']);
+        $this->container->setParameter('kernel.bundles', array('CmfResourceBundle'));
         $this->container->getExtensionConfig('sonata_doctrine_phpcr_admin');
         $this->container->prependExtensionConfig(
             'sonata_doctrine_phpcr_admin',
             array('document_tree' => array('repository_name' => 'custom'))
         );
-        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' =>'default'));
+        $this->container->prependExtensionConfig('cmf_resource', array('default_repository' => 'default'));
 
         $this->container->getExtension('sonata_doctrine_phpcr_admin')->prepend($this->container);