From a758f3242123b394a0835b471599d1a51a5d29ca Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Fri, 11 Jan 2013 18:57:24 +0100
Subject: [PATCH] Fix CS

---
 Command/BuildCommand.php                   |  2 --
 DataFixtures/Loader/AbstractDataLoader.php | 16 ++++++++--------
 Form/BaseAbstractType.php                  |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Command/BuildCommand.php b/Command/BuildCommand.php
index 9fd62a1..ee84632 100644
--- a/Command/BuildCommand.php
+++ b/Command/BuildCommand.php
@@ -11,8 +11,6 @@
 namespace Propel\PropelBundle\Command;
 
 use Propel\PropelBundle\Command\AbstractCommand;
-use Propel\PropelBundle\Command\ModelBuildCommand;
-use Propel\PropelBundle\Command\SqlBuildCommand;
 
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/DataFixtures/Loader/AbstractDataLoader.php b/DataFixtures/Loader/AbstractDataLoader.php
index 3125cd0..d43160e 100644
--- a/DataFixtures/Loader/AbstractDataLoader.php
+++ b/DataFixtures/Loader/AbstractDataLoader.php
@@ -117,9 +117,9 @@ abstract class AbstractDataLoader extends AbstractDataHandler implements DataLoa
         $this->deletedClasses[] = $class;
 
         // Remove ancestors data
-        if(false !== ($parentClass = get_parent_class(get_parent_class($class)))) {
+        if (false !== ($parentClass = get_parent_class(get_parent_class($class)))) {
             $reflectionClass = new \ReflectionClass($parentClass);
-            if(!$reflectionClass->isAbstract()) {
+            if (!$reflectionClass->isAbstract()) {
                 $this->deleteClassData($parentClass);
             }
         }
@@ -237,21 +237,21 @@ abstract class AbstractDataLoader extends AbstractDataHandler implements DataLoa
     /**
      * Save a reference to the specified object (and its ancestors) before loading them.
      *
-     * @param string     $class  Class name of passed object
-     * @param string     $key    Key identifying specified object
-     * @param BaseObject $obj    A Propel object
+     * @param string     $class Class name of passed object
+     * @param string     $key   Key identifying specified object
+     * @param BaseObject $obj   A Propel object
      */
     protected function saveParentReference($class, $key, &$obj)
     {
-        if(method_exists($obj, 'getPrimaryKey')) {
+        if (method_exists($obj, 'getPrimaryKey')) {
 
             $this->object_references[$class.'_'.$key] = $obj;
 
             // Get parent (schema ancestor) of parent (Propel base class) in case of inheritance
-            if(false !== ($parentClass = get_parent_class(get_parent_class($class)))) {
+            if (false !== ($parentClass = get_parent_class(get_parent_class($class)))) {
 
                 $reflectionClass = new \ReflectionClass($parentClass);
-                if(!$reflectionClass->isAbstract()) {
+                if (!$reflectionClass->isAbstract()) {
                     $parentObj = new $parentClass;
                     $parentObj->fromArray($obj->toArray());
                     $this->saveParentReference($parentClass, $key, $parentObj);
diff --git a/Form/BaseAbstractType.php b/Form/BaseAbstractType.php
index 26fd39b..bae9d20 100644
--- a/Form/BaseAbstractType.php
+++ b/Form/BaseAbstractType.php
@@ -11,7 +11,7 @@ abstract class BaseAbstractType extends AbstractType
         'name' => '',
     );
 
-    function __construct($mergeOptions = null)
+    public function __construct($mergeOptions = null)
     {
         if ($mergeOptions) {
             $this->mergeOptions($mergeOptions);