diff --git a/Command/AbstractPropelCommand.php b/Command/AbstractCommand.php similarity index 99% rename from Command/AbstractPropelCommand.php rename to Command/AbstractCommand.php index 00d3f74..b1b3ea5 100644 --- a/Command/AbstractPropelCommand.php +++ b/Command/AbstractCommand.php @@ -25,7 +25,7 @@ use Symfony\Component\HttpKernel\Bundle\BundleInterface; * @author Fabien Potencier * @author William DURAND */ -abstract class AbstractPropelCommand extends ContainerAwareCommand +abstract class AbstractCommand extends ContainerAwareCommand { /** * Additional Phing args to add in specialized commands. diff --git a/Command/BuildCommand.php b/Command/BuildCommand.php index 67025e3..2945a94 100644 --- a/Command/BuildCommand.php +++ b/Command/BuildCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Propel\PropelBundle\Command\ModelBuildCommand; use Propel\PropelBundle\Command\SqlBuildCommand; @@ -26,7 +26,7 @@ use Symfony\Component\Console\Output\Output; * @author Fabien Potencier * @author William DURAND */ -class BuildCommand extends AbstractPropelCommand +class BuildCommand extends AbstractCommand { /** * @see Command diff --git a/Command/DatabaseCreateCommand.php b/Command/DatabaseCreateCommand.php index 7ed38fb..023d0fa 100644 --- a/Command/DatabaseCreateCommand.php +++ b/Command/DatabaseCreateCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; @@ -21,7 +21,7 @@ use Symfony\Component\Console\Input\InputOption; * * @author William DURAND */ -class DatabaseCreateCommand extends AbstractPropelCommand +class DatabaseCreateCommand extends AbstractCommand { /** * @see Command diff --git a/Command/DatabaseDropCommand.php b/Command/DatabaseDropCommand.php index ae2930a..891c6cc 100644 --- a/Command/DatabaseDropCommand.php +++ b/Command/DatabaseDropCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; @@ -21,7 +21,7 @@ use Symfony\Component\Console\Input\InputOption; * * @author William DURAND */ -class DatabaseDropCommand extends AbstractPropelCommand +class DatabaseDropCommand extends AbstractCommand { /** * @see Command diff --git a/Command/FixturesDumpCommand.php b/Command/FixturesDumpCommand.php index 7f3b939..5b8840e 100644 --- a/Command/FixturesDumpCommand.php +++ b/Command/FixturesDumpCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Propel\PropelBundle\DataFixtures\Dumper\YamlDataDumper; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; @@ -21,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface; * * @author William DURAND */ -class FixturesDumpCommand extends AbstractPropelCommand +class FixturesDumpCommand extends AbstractCommand { /** * Default fixtures directory. diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php index afe16e2..6aaebef 100644 --- a/Command/FixturesLoadCommand.php +++ b/Command/FixturesLoadCommand.php @@ -18,7 +18,7 @@ use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpKernel\Bundle\BundleInterface; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Propel\PropelBundle\DataFixtures\Loader\YamlDataLoader; use Propel\PropelBundle\DataFixtures\Loader\XmlDataLoader; @@ -27,7 +27,7 @@ use Propel\PropelBundle\DataFixtures\Loader\XmlDataLoader; * * @author William DURAND */ -class FixturesLoadCommand extends AbstractPropelCommand +class FixturesLoadCommand extends AbstractCommand { /** * Default fixtures directory. diff --git a/Command/FormGenerateCommand.php b/Command/FormGenerateCommand.php index 8e8d08c..a0e6f3f 100644 --- a/Command/FormGenerateCommand.php +++ b/Command/FormGenerateCommand.php @@ -23,7 +23,7 @@ use Symfony\Component\HttpKernel\Bundle\BundleInterface; /** * @author William DURAND */ -class FormGenerateCommand extends PropelGeneratorAwareCommand +class FormGenerateCommand extends GeneratorAwareCommand { const DEFAULT_FORM_TYPE_DIRECTORY = '/Form/Type'; diff --git a/Command/PropelGeneratorAwareCommand.php b/Command/GeneratorAwareCommand.php similarity index 96% rename from Command/PropelGeneratorAwareCommand.php rename to Command/GeneratorAwareCommand.php index 9f0c6a1..8a433f2 100644 --- a/Command/PropelGeneratorAwareCommand.php +++ b/Command/GeneratorAwareCommand.php @@ -16,7 +16,7 @@ use Symfony\Component\Console\Output\OutputInterface; /** * @author William Durand */ -abstract class PropelGeneratorAwareCommand extends AbstractPropelCommand +abstract class GeneratorAwareCommand extends AbstractCommand { /** * {@inheritdoc} diff --git a/Command/GraphvizCommand.php b/Command/GraphvizCommand.php index f64f722..871ecde 100644 --- a/Command/GraphvizCommand.php +++ b/Command/GraphvizCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -20,7 +20,7 @@ use Symfony\Component\Console\Output\OutputInterface; * * @author William DURAND */ -class GraphvizCommand extends AbstractPropelCommand +class GraphvizCommand extends AbstractCommand { /** * @see Command diff --git a/Command/MigrationGenerateDiffCommand.php b/Command/MigrationGenerateDiffCommand.php index 92f8dd1..bd15bfc 100644 --- a/Command/MigrationGenerateDiffCommand.php +++ b/Command/MigrationGenerateDiffCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -19,7 +19,7 @@ use Symfony\Component\Console\Output\OutputInterface; * * @author William DURAND */ -class MigrationGenerateDiffCommand extends AbstractPropelCommand +class MigrationGenerateDiffCommand extends AbstractCommand { /** * @see Command diff --git a/Command/MigrationMigrateCommand.php b/Command/MigrationMigrateCommand.php index f492f69..5654121 100644 --- a/Command/MigrationMigrateCommand.php +++ b/Command/MigrationMigrateCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -21,7 +21,7 @@ use Symfony\Component\Console\Output\Output; * * @author William DURAND */ -class MigrationMigrateCommand extends AbstractPropelCommand +class MigrationMigrateCommand extends AbstractCommand { /** * @see Command diff --git a/Command/MigrationStatusCommand.php b/Command/MigrationStatusCommand.php index 4889d5f..778be38 100644 --- a/Command/MigrationStatusCommand.php +++ b/Command/MigrationStatusCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -19,7 +19,7 @@ use Symfony\Component\Console\Output\OutputInterface; * * @author William DURAND */ -class MigrationStatusCommand extends AbstractPropelCommand +class MigrationStatusCommand extends AbstractCommand { /** * @see Command diff --git a/Command/ModelBuildCommand.php b/Command/ModelBuildCommand.php index 31126bd..9ddbfeb 100644 --- a/Command/ModelBuildCommand.php +++ b/Command/ModelBuildCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; @@ -21,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface; * @author Fabien Potencier * @author William DURAND */ -class ModelBuildCommand extends AbstractPropelCommand +class ModelBuildCommand extends AbstractCommand { /** * @see Command diff --git a/Command/ReverseCommand.php b/Command/ReverseCommand.php index d9f1724..c63ae04 100644 --- a/Command/ReverseCommand.php +++ b/Command/ReverseCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -22,7 +22,7 @@ use Symfony\Component\Finder\Finder; * * @author William DURAND */ -class ReverseCommand extends AbstractPropelCommand +class ReverseCommand extends AbstractCommand { /** * @see Command diff --git a/Command/SqlBuildCommand.php b/Command/SqlBuildCommand.php index 24fae5e..80acce3 100644 --- a/Command/SqlBuildCommand.php +++ b/Command/SqlBuildCommand.php @@ -18,7 +18,7 @@ use Symfony\Component\Console\Output\Output; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; /** * SqlBuildCommand. @@ -26,7 +26,7 @@ use Propel\PropelBundle\Command\AbstractPropelCommand; * @author Fabien Potencier * @author William DURAND */ -class SqlBuildCommand extends AbstractPropelCommand +class SqlBuildCommand extends AbstractCommand { /** * @see Command diff --git a/Command/SqlInsertCommand.php b/Command/SqlInsertCommand.php index 32a09db..e54bd24 100644 --- a/Command/SqlInsertCommand.php +++ b/Command/SqlInsertCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -20,7 +20,7 @@ use Symfony\Component\Console\Output\OutputInterface; * * @author William DURAND */ -class SqlInsertCommand extends AbstractPropelCommand +class SqlInsertCommand extends AbstractCommand { /** * @see Command diff --git a/Command/TableDropCommand.php b/Command/TableDropCommand.php index 755928f..f3f6342 100644 --- a/Command/TableDropCommand.php +++ b/Command/TableDropCommand.php @@ -10,7 +10,7 @@ namespace Propel\PropelBundle\Command; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; @@ -22,7 +22,7 @@ use Symfony\Component\Console\Input\InputArgument; * * @author Maxime AILLOUD */ -class TableDropCommand extends AbstractPropelCommand +class TableDropCommand extends AbstractCommand { /** * @see Command diff --git a/Tests/Command/AbstractPropelCommandTest.php b/Tests/Command/AbstractCommandTest.php similarity index 97% rename from Tests/Command/AbstractPropelCommandTest.php rename to Tests/Command/AbstractCommandTest.php index 3a3b315..3227762 100644 --- a/Tests/Command/AbstractPropelCommandTest.php +++ b/Tests/Command/AbstractCommandTest.php @@ -11,7 +11,7 @@ namespace Propel\PropelBundle\Tests\Command; use Propel\PropelBundle\Tests\TestCase; -use Propel\PropelBundle\Command\AbstractPropelCommand; +use Propel\PropelBundle\Command\AbstractCommand; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\HttpKernel\Bundle\BundleInterface; use Symfony\Component\HttpKernel\KernelInterface; @@ -19,13 +19,13 @@ use Symfony\Component\HttpKernel\KernelInterface; /** * @author William Durand */ -class AbstractPropelCommandTest extends TestCase +class AbstractCommandTest extends TestCase { protected $command; public function setUp() { - $this->command = new TestableAbstractPropelCommand('testable-command'); + $this->command = new TestableAbstractCommand('testable-command'); } public function testParseDbName() @@ -223,7 +223,7 @@ class AbstractPropelCommandTest extends TestCase } } -class TestableAbstractPropelCommand extends AbstractPropelCommand +class TestableAbstractCommand extends AbstractCommand { private $locate; diff --git a/Tests/Command/PropelGeneratorAwareCommandTest.php b/Tests/Command/GeneratorAwareCommandTest.php similarity index 86% rename from Tests/Command/PropelGeneratorAwareCommandTest.php rename to Tests/Command/GeneratorAwareCommandTest.php index 8c42ebd..ffae504 100644 --- a/Tests/Command/PropelGeneratorAwareCommandTest.php +++ b/Tests/Command/GeneratorAwareCommandTest.php @@ -10,14 +10,14 @@ namespace Propel\PropelBundle\Tests\Command; -use Propel\PropelBundle\Command\PropelGeneratorAwareCommand; +use Propel\PropelBundle\Command\GeneratorAwareCommand; use Propel\PropelBundle\Tests\TestCase; use Symfony\Component\DependencyInjection\ContainerInterface; /** * @author William Durand */ -class PropelGeneratorAwareCommandTest extends TestCase +class GeneratorAwareCommandTest extends TestCase { protected $container; @@ -31,7 +31,7 @@ class PropelGeneratorAwareCommandTest extends TestCase public function testGetDatabasesFromSchema() { - $command = new PropelGeneratorAwareCommandTestable('testable-command'); + $command = new GeneratorAwareCommandTestable('testable-command'); $command->setContainer($this->container); $databases = $command->getDatabasesFromSchema(new \SplFileInfo(__DIR__ . '/../Fixtures/schema.xml')); @@ -50,7 +50,7 @@ class PropelGeneratorAwareCommandTest extends TestCase } } -class PropelGeneratorAwareCommandTestable extends PropelGeneratorAwareCommand +class GeneratorAwareCommandTestable extends GeneratorAwareCommand { protected $container;