cs cleanup

Admin/PageAdmin.php

@@ -17,7 +17,6 @@
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
 use Symfony\Cmf\Bundle\RoutingBundle\Admin\RouteAdmin;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
-use Symfony\Component\Form\FormBuilder;
 
 class PageAdmin extends RouteAdmin
 {

CmfSimpleCmsBundle.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

DependencyInjection/CmfSimpleCmsExtension.php

@@ -9,15 +9,12 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\FileLocator;
 

DependencyInjection/Configuration.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

Doctrine/Phpcr/Page.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr;
 
-use Doctrine\Common\Collections\Collection;
 use LogicException;
 use Knp\Menu\NodeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -273,8 +272,8 @@ public function getExtras()
      * without needing to extend the document class.
      *
      * @param array $extras a flat key-value hashmap. The values are cast to
-     *      string as PHPCR stores multivalue data with only one data type for
-     *      all values.
+     *                      string as PHPCR stores multivalue data with only
+     *                      one data type for all values.
      */
     public function setExtras($extras)
     {
@@ -456,7 +455,7 @@ public function getAdditionalInfoBlock()
      * be a container block in order to be able to add several blocks.
      *
      * @param BlockInterface $block must be persistable through cascade by the
-     *      persistence layer.
+     *                              persistence layer.
      */
     public function setAdditionalInfoBlock($block)
     {

Initializer/HomepageInitializer.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Initializer;
 
 use PHPCR\Util\NodeHelper;

Migrator/Phpcr/Page.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Migrator\Phpcr;
 
 use Symfony\Component\Yaml\Parser;

Tests/Functional/Doctrine/Phpcr/PageTest.php

@@ -9,8 +9,7 @@
  * file that was distributed with this source code.
  */
 
-
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Functional\Migrator\Phpcr;
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Functional\Doctrine\Phpcr;
 
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;

Tests/Functional/Migrator/Phpcr/PageTest.php

@@ -9,14 +9,24 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Functional\Migrator\Phpcr;
 
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Functional\Doctrine\Phpcr;
-
+use Doctrine\ODM\PHPCR\DocumentManager;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+use Symfony\Cmf\Bundle\SimpleCmsBundle\Migrator\Phpcr\Page;
 
 class PageTest extends BaseTestCase
 {
+    /**
+     * @var Page
+     */
+    private $migrator;
+
+    /**
+     * @var DocumentManager
+     */
+    private $dm;
+
     public function setUp()
     {
         $this->db('PHPCR')->createTestNode();

Tests/Resources/DataFixtures/Phpcr/LoadPageData.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Resources\DataFixtures\Phpcr;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;

Tests/Resources/app/AppKernel.php

@@ -10,7 +10,7 @@ public function configure()
         $this->requireBundleSets(array(
             'default',
             'phpcr_odm',
-            'sonata_admin',
+            'sonata_admin_phpcr',
         ));
 
         $this->addBundles(array(

Tests/Unit/DependencyInjection/CmfSimpleCmsExtensionTest.php

@@ -9,12 +9,10 @@
  * file that was distributed with this source code.
  */
 
-
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\DependencyInjection;
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Unit\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection\CmfSimpleCmsExtension;
-use Symfony\Component\DependencyInjection\Reference;
 
 class CmfSimpleCmsExtensionTest extends AbstractExtensionTestCase
 {

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -9,8 +9,7 @@
  * file that was distributed with this source code.
  */
 
-
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\DependencyInjection;
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Unit\DependencyInjection;
 
 use Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection\CmfSimpleCmsExtension;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection\Configuration;

Tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Unit\DependencyInjection;
 
 use Symfony\Cmf\Component\Testing\Unit\XmlSchemaTestCase;
@@ -38,4 +37,3 @@ public function testSchema()
         $this->assertSchemaAcceptsXml($xmlFiles, $this->schemaPath);
     }
 }
-

Tests/Unit/Doctrine/Phpcr/PageTest.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\Unit\Doctrine\Phpcr;
 
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;

Tests/WebTest/Admin/PageAdminTest.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\WebTest\Admin;
 
 use Symfony\Bundle\FrameworkBundle\Client;

Tests/WebTest/TestApp/HttpStatusCodeTest.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-
 namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Tests\WebTest\TestApp;
 
 use Symfony\Bundle\FrameworkBundle\Client;