General code improvements based on sensiolabs analysis.

src/Clastic/AliasBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/AliasBundle/Controller/AliasController.php

@@ -10,7 +10,7 @@
 namespace Clastic\AliasBundle\Controller;
 
 use Clastic\AliasBundle\Entity\Alias;
-use Clastic\AliasBundle\Form\AliasType;
+use Clastic\AliasBundle\Form\AliasFormType;
 use Clastic\BackofficeBundle\Controller\AbstractModuleController;
 use Clastic\NodeBundle\Node\NodeReferenceInterface;
 use Symfony\Component\Form\Form;
@@ -49,7 +49,7 @@ protected function getListTemplate()
      */
     protected function buildForm($data)
     {
-        return $this->createForm(new AliasType(), $data);
+        return $this->createForm(new AliasFormType(), $data);
     }
 
     /**

src/Clastic/AliasBundle/Form/AliasType.php → src/Clastic/AliasBundle/Form/Type/AliasFormType.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Clastic\AliasBundle\Form;
+namespace Clastic\AliasBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -16,7 +16,7 @@
 /**
  * @author Dries De Peuter <dries@nousefreak.be>
  */
-class AliasType extends AbstractType
+class AliasFormType extends AbstractType
 {
     /**
      * @param FormBuilderInterface $builder

src/Clastic/AliasBundle/Tests/Unit/Form/AliasFormTest.php

@@ -10,6 +10,8 @@
 namespace Clastic\AliasBundle\Tests\Unit\Form;
 
 use Clastic\AliasBundle\Entity\Alias;
+use Clastic\AliasBundle\Form\Type\AliasFormType;
+use Clastic\AliasBundle\Form\TypeAliasFormType;
 use Clastic\AliasBundle\Form\AliasType;
 use Clastic\BackofficeBundle\Form\Type\TabsTabActionsType;
 use Clastic\BackofficeBundle\Form\Type\TabsTabType;
@@ -54,7 +56,7 @@ public function testFormAlias()
             ),
         );
 
-        $type = new AliasType();
+        $type = new AliasFormType();
         $form = $this->factory->create($type, new Alias());
 
         // submit the data to the form directly
@@ -72,7 +74,7 @@ public function testFormEmpty()
     {
         $formData = array();
 
-        $type = new AliasType();
+        $type = new AliasFormType();
         $form = $this->factory->create($type, new Alias());
 
         // submit the data to the form directly

src/Clastic/BackofficeBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/BackofficeBundle/Controller/AbstractModuleController.php

@@ -9,7 +9,7 @@
 
 namespace Clastic\BackofficeBundle\Controller;
 
-use Clastic\BackofficeBundle\Form\DeleteType;
+use Clastic\BackofficeBundle\Form\Type\DeleteFormType;
 use Clastic\CoreBundle\Module\ModuleInterface;
 use Clastic\CoreBundle\Module\SubmoduleInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -176,7 +176,7 @@ public function deleteAction($id, Request $request)
         $breadcrumbs = $this->buildBreadcrumbs($this->getType());
         $breadcrumbs->addItem(sprintf('Delete "%s"', $this->resolveDataTitle($data)));
 
-        $form = $this->createForm(new DeleteType(), array(
+        $form = $this->createForm(new DeleteFormType(), array(
             'id' => $data->getId(),
             'title' => $title,
         ));

src/Clastic/BackofficeBundle/Form/DeleteType.php → src/Clastic/BackofficeBundle/Form/Type/DeleteFormType.php

@@ -7,17 +7,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Clastic\BackofficeBundle\Form;
+namespace Clastic\BackofficeBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * DeleteType
+ * DeleteForm
  *
  * @author Dries De Peuter <dries@nousefreak.be>
  */
-class DeleteType extends AbstractType
+class DeleteFormType extends AbstractType
 {
     /**
      * {@inheritdoc}

src/Clastic/BackofficeBundle/Form/SettingsType.php → src/Clastic/BackofficeBundle/Form/Type/SettingsFormType.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Clastic\BackofficeBundle\Form;
+namespace Clastic\BackofficeBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -17,7 +17,7 @@
  *
  * @author Dries De Peuter <dries@nousefreak.be>
  */
-class SettingsType extends AbstractType
+class SettingsFormType extends AbstractType
 {
     /**
      * {@inheritdoc}

src/Clastic/BackofficeBundle/Resources/config/services.xml

@@ -14,7 +14,7 @@
         <parameter key="clastic.backoffice.type.entity_hidden.class">Clastic\BackofficeBundle\Form\Type\EntityHiddenType</parameter>
         <parameter key="clastic.backoffice.type.entity_multi_select.class">Clastic\BackofficeBundle\Form\Type\EntityMultiSelectType</parameter>
         <parameter key="clastic.backoffice.type.tree.class">Clastic\BackofficeBundle\Form\Type\TreeType</parameter>
-        <parameter key="clastic.backoffice.type.settings.class">Clastic\BackofficeBundle\Form\SettingsType</parameter>
+        <parameter key="clastic.backoffice.type.settings.class">Clastic\BackofficeBundle\Form\Type\SettingsFormType</parameter>
         <parameter key="clastic.backoffice.type.fieldset.class">Clastic\BackofficeBundle\Form\Type\FieldsetType</parameter>
         <parameter key="clastic.backoffice.type.link.class">Clastic\BackofficeBundle\Form\Type\LinkType</parameter>
         <parameter key="clastic.backoffice.node.form_build.class">Clastic\BackofficeBundle\EventListener\NodeFormBuildListener</parameter>

src/Clastic/BackofficeBundle/composer.json

@@ -24,4 +24,4 @@
         "psr-4": { "Clastic\\BackofficeBundle\\": "" }
     },
     "minimum-stability": "dev"
-}
+}

src/Clastic/BlockBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/BlockBundle/Controller/BlockController.php

@@ -11,7 +11,7 @@
 
 use Clastic\BackofficeBundle\Controller\AbstractModuleController;
 use Clastic\BlockBundle\Entity\Block;
-use Clastic\BlockBundle\Form\BlockType;
+use Clastic\BlockBundle\Form\Type\BlockFormType;
 use Clastic\NodeBundle\Node\NodeReferenceInterface;
 use Symfony\Component\Form\Form;
 
@@ -45,7 +45,7 @@ protected function getListTemplate()
      */
     protected function buildForm($data)
     {
-        return $this->createForm(new BlockType(), $data);
+        return $this->createForm(new BlockFormType(), $data);
     }
 
     /**

src/Clastic/BlockBundle/Form/BlockType.php → src/Clastic/BlockBundle/Form/Type/BlockFormType.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Clastic\BlockBundle\Form;
+namespace Clastic\BlockBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -18,7 +18,7 @@
  *
  * @author Dries De Peuter <dries@nousefreak.be>
  */
-class BlockType extends AbstractType
+class BlockFormType extends AbstractType
 {
     /**
      * @param FormBuilderInterface $builder

src/Clastic/BlogBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/CoreBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/FrontBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/FrontBundle/composer.json

@@ -16,4 +16,4 @@
         "psr-4": { "Clastic\\FrontBundle\\": "" }
     },
     "minimum-stability": "dev"
-}
+}

src/Clastic/GeneratorBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/GeneratorBundle/Generator/ModuleGenerator.php

@@ -11,7 +11,6 @@
 
 use Sensio\Bundle\GeneratorBundle\Generator\Generator;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
@@ -21,18 +20,6 @@
  */
 class ModuleGenerator extends Generator
 {
-    private $filesystem;
-
-    /**
-     * Constructor.
-     *
-     * @param Filesystem $filesystem A Filesystem instance
-     */
-    public function __construct(Filesystem $filesystem)
-    {
-        $this->filesystem = $filesystem;
-    }
-
     /**
      * @param BundleInterface $bundle
      * @param string          $module

src/Clastic/GeneratorBundle/composer.json

@@ -16,4 +16,4 @@
         "psr-4": { "Clastic\\GeneratorBundle\\": "" }
     },
     "minimum-stability": "dev"
-}
+}

src/Clastic/MediaBundle/.gitignore

@@ -1,3 +1,3 @@
 vendor/
 composer.lock
-phpunit.xml
+phpunit.xml

src/Clastic/MediaBundle/Controller/MediaController.php

@@ -11,7 +11,7 @@
 
 use Clastic\BackofficeBundle\Controller\AbstractModuleController;
 use Clastic\MediaBundle\Entity\File;
-use Clastic\MediaBundle\Form\FileType;
+use Clastic\MediaBundle\Form\Type\FileFormType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -41,7 +41,7 @@ public function listAction(Request $request)
         $this->buildBreadcrumbs($this->getType());
 
         $file = new File();
-        $form = $this->createForm(new FileType(), $file);
+        $form = $this->createForm(new FileFormType(), $file);
 
         $form->handleRequest($request);
 
@@ -70,15 +70,15 @@ public function listAction(Request $request)
      */
     protected function resolveData($id)
     {
-        // TODO: Implement resolveData() method.
+        return null;
     }
 
     /**
      * @return string
      */
     protected function getListTemplate()
     {
-        // TODO: Implement getListTemplate() method.
+        return null;
     }
 
     /**
@@ -88,7 +88,7 @@ protected function getListTemplate()
      */
     protected function buildForm($data)
     {
-        // TODO: Implement buildForm() method.
+        return null;
     }
 
     /**
@@ -98,14 +98,14 @@ protected function buildForm($data)
      */
     protected function resolveDataTitle($data)
     {
-        // TODO: Implement resolveDataTitle() method.
+        return null;
     }
 
     /**
      * @return string
      */
     protected function getEntityName()
     {
-        // TODO: Implement getEntityName() method.
+        return null;
     }
 }

src/Clastic/MediaBundle/ElFinder/ElFinderEvent.php

@@ -28,4 +28,12 @@ public function __construct(array $data)
     {
         $this->data = $data;
     }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
 }

src/Clastic/MediaBundle/Entity/Directory.php

@@ -124,4 +124,12 @@ public function getChildren()
     {
         return $this->children;
     }
+
+    /**
+     * @return ArrayCollection
+     */
+    public function getFiles()
+    {
+        return $this->files;
+    }
 }

src/Clastic/MediaBundle/EventListener/FileListener.php

@@ -21,6 +21,19 @@
  */
 class FileListener implements EventSubscriber
 {
+    /**
+     * @var string
+     */
+    private $kernelDir;
+
+    /**
+     * @param string $kernelDir
+     */
+    public function __construct($kernelDir)
+    {
+        $this->kernelDir = $kernelDir;
+    }
+
     /**
      * Returns an array of events this subscriber wants to listen to.
      *
@@ -142,6 +155,6 @@ protected function getUploadRootDir()
     {
         // the absolute directory path where uploaded
         // documents should be saved
-        return __DIR__.'/../../../../web/'.$this->getUploadDir();
+        return $this->kernelDir . '/../web/'.$this->getUploadDir();
     }
 }

src/Clastic/MediaBundle/Form/FileType.php → src/Clastic/MediaBundle/Form/Type/FileFormType.php

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Clastic\MediaBundle\Form;
+namespace Clastic\MediaBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -16,7 +16,7 @@
 /**
  * @author Dries De Peuter <dries@nousefreak.be>
  */
-class FileType extends AbstractType
+class FileFormType extends AbstractType
 {
     /**
      * @param FormBuilderInterface $builder