Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix CS

  • Loading branch information...
commit a758f3242123b394a0835b471599d1a51a5d29ca 1 parent 9faeb85
@willdurand willdurand authored
View
2  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;
View
16 DataFixtures/Loader/AbstractDataLoader.php
@@ -117,9 +117,9 @@ protected function deleteClassData($class)
$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 @@ protected function loadDataFromArray($data = null)
/**
* 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);
View
2  Form/BaseAbstractType.php
@@ -11,7 +11,7 @@
'name' => '',
);
- function __construct($mergeOptions = null)
+ public function __construct($mergeOptions = null)
{
if ($mergeOptions) {
$this->mergeOptions($mergeOptions);
Please sign in to comment.
Something went wrong with that request. Please try again.