Merge pull request #213 from ruudvanderweijde/master

Add method_exists to avoid fatal error Fixes #207 Fixes #217
doctrine · Nov 1, 2017 · a9e5063 · a9e5063
2 parents f10dda4 + a74cd8e
commit a9e5063
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -56,7 +56,7 @@ public static function configureMigrations(ContainerInterface $container, Config
             $configuration->registerMigrationsFromDirectory($configuration->getMigrationsDirectory());
         }
 
-        if (!$configuration->getCustomTemplate()) {
+        if (method_exists($configuration, 'getCustomTemplate') && !$configuration->getCustomTemplate()) {
             $configuration->setCustomTemplate($container->getParameter('doctrine_migrations.custom_template'));
         }
 

diff --git a/Tests/Command/DoctrineCommandTest.php b/Tests/Command/DoctrineCommandTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Doctrine\Bundle\MigrationsBundle\Tests\DependencyInjection;
+
+use Doctrine\Bundle\MigrationsBundle\Command\DoctrineCommand;
+use Doctrine\DBAL\Migrations\Configuration\Configuration;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+class DoctrineCommandTest extends \PHPUnit\Framework\TestCase
+{
+    public function testConfigureMigrations()
+    {
+        $configurationMock = $this->getMockBuilder('Doctrine\DBAL\Migrations\Configuration\Configuration')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $configurationMock->method('getMigrations')
+            ->willReturn(array());
+
+        DoctrineCommand::configureMigrations($this->getContainer(), $configurationMock);
+    }
+
+    private function getContainer()
+    {
+        return new ContainerBuilder(new ParameterBag(array(
+            'doctrine_migrations.dir_name' => __DIR__.'/../../',
+            'doctrine_migrations.namespace' => 'test',
+            'doctrine_migrations.name' => 'test',
+            'doctrine_migrations.table_name' => 'test',
+            'doctrine_migrations.organize_migrations' => Configuration::VERSIONS_ORGANIZATION_BY_YEAR,
+        )));
+    }
+}
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "doctrine/migrations": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "^4.8.36"
     },
     "autoload": {
         "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" }