deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed a few inconcistencies

Browse source
This commit is contained in:
Kévin Gomez 2013-12-15 14:04:11 +00:00
commit b9ceee8abd
6 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/FormGenerateCommand.php
View file

@ -203,9 +203,9 @@ EOT
'propel.builder.queryinheritancestub.class' => ModelBuildCommand::DEFAULT_QUERY_INHERITANCE_STUB_BUILDER,
'propel.builder.tablemap.class' => ModelBuildCommand::DEFAULT_TABLEMAP_BUILDER,
'propel.builder.pluralizer.class' => ModelBuildCommand::DEFAULT_PLURALIZER,
'propel.disableIdentifierQuoting' => !false,
'propel.disableIdentifierQuoting' => true,
'propel.packageObjectModel' => true,
'propel.namespace.autoPackage' => !false,
'propel.namespace.autoPackage' => true,
'propel.addGenericAccessors' => true,
'propel.addGenericMutators' => true,
'propel.addSaveMethod' => true,

2
Command/MigrationStatusCommand.php
View file

@ -42,7 +42,7 @@ class MigrationStatusCommand extends WrappedCommand
*/
protected function createSubCommandInstance()
{
return new \Propel\Generator\Command\MigrationStatusCommand();
return new BaseMigrationCommand();
}
/**

2
Command/MigrationUpCommand.php
View file

@ -42,7 +42,7 @@ class MigrationUpCommand extends WrappedCommand
*/
protected function createSubCommandInstance()
{
return new \Propel\Generator\Command\MigrationUpCommand();
return new BaseMigrationCommand();
}
/**

6
Command/ModelBuildCommand.php
View file

@ -14,6 +14,8 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Propel\Generator\Command\ModelBuildCommand as BaseModelBuildCommand;
/**
* @author Kévin Gomez <contact@kevingomez.fr>
*/
@ -40,7 +42,7 @@ class ModelBuildCommand extends WrappedCommand
*/
protected function createSubCommandInstance()
{
return new \Propel\Generator\Command\ModelBuildCommand();
return new BaseModelBuildCommand();
}
/**
@ -48,7 +50,7 @@ class ModelBuildCommand extends WrappedCommand
*/
protected function getSubCommandArguments(InputInterface $input)
{
$outputDir = realpath($this->getApplication()->getKernel()->getRootDir().'/../');
$outputDir = $this->getApplication()->getKernel()->getRootDir().'/../';
return array(
'--output-dir' => $outputDir,

11
Form/BaseAbstractType.php
View file

@ -1,10 +1,21 @@
<?php
/**
* This file is part of the PropelBundle package.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @license MIT License
*/
namespace Propel\PropelBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
/**
* @author William DURAND <william.durand1@gmail.com>
*/
abstract class BaseAbstractType extends AbstractType
{
protected $options = array(

14
Tests/Fixtures/Column.php
View file

@ -37,13 +37,13 @@ class Column
}
switch ($this->type) {
case PropelColumnTypes::CHAR:
case PropelColumnTypes::VARCHAR:
case PropelColumnTypes::LONGVARCHAR:
case PropelColumnTypes::BLOB:
case PropelColumnTypes::CLOB:
case PropelColumnTypes::CLOB_EMU:
return true;
case PropelColumnTypes::CHAR:
case PropelColumnTypes::VARCHAR:
case PropelColumnTypes::LONGVARCHAR:
case PropelColumnTypes::BLOB:
case PropelColumnTypes::CLOB:
case PropelColumnTypes::CLOB_EMU:
return true;
}
return false;