Merge pull request #15 from alexander-schranz/feature/symfony-5-compatibility

Add compatibility for symfony 5 and specify required symfony packages

Author: dantleech

.gitignore

@@ -2,3 +2,6 @@ Tests/Resources/app/cache
 Tests/Resources/app/logs
 composer.lock
 vendor
+.phpunit.result.cache
+Tests/Resources/App/var/cache
+Tests/Resources/App/var/logs

.travis.yml

@@ -10,36 +10,56 @@ matrix:
       php: 5.6
       env:
         - SYMFONY_VERSION=2.8.*
+        - MONOLOG_VERSION=^1.0
 
     - language: php
       php: 5.6
       env:
         - SYMFONY_VERSION=3.4.*
+        - MONOLOG_VERSION=^1.0
 
     - language: php
       php: 7.0
       env:
         - SYMFONY_VERSION=3.4.*
+        - MONOLOG_VERSION=^1.0
 
     - language: php
       php: 7.1
       env:
         - SYMFONY_VERSION=4.0.*
+        - MONOLOG_VERSION=^1.0
 
     - language: php
       php: 7.2
       env:
         - SYMFONY_VERSION=4.0.*
+        - MONOLOG_VERSION=^1.0
 
     - language: php
       php: 7.2
       env:
         - SYMFONY_VERSION=4.1.*
+        - MONOLOG_VERSION=^1.0
+
+    - language: php
+      php: 7.3
+      env:
+        - SYMFONY_VERSION=4.4.*
+        - MONOLOG_VERSION=^1.0
+
+    - language: php
+      php: 7.4
+      env:
+        - SYMFONY_VERSION=5.0.*
+        - MONOLOG_VERSION=^2.0
 
 before_script:
   - phpenv config-add travis.php.ini
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION}
+  - composer require monolog/monolog:${MONOLOG_VERSION} --no-update
+  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+  - composer update -o
   - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: vendor/bin/phpunit
+script: vendor/bin/simple-phpunit

Command/InitializeCommand.php

@@ -43,5 +43,7 @@ public function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $this->factory->getMigrator()->initialize();
+
+        return 0;
     }
 }

Command/MigrateCommand.php

@@ -82,5 +82,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         $migrator->migrate($to, $output);
+
+        return 0;
     }
 }

Command/StatusCommand.php

@@ -77,6 +77,8 @@ public function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('<info>No migrations have been executed</info>');
         }
+
+        return 0;
     }
 
     private function getDate($versionName)

DependencyInjection/Configuration.php

@@ -23,8 +23,15 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $treeBuilder->root('phpcr_migrations')
+        $treeBuilder = new TreeBuilder('phpcr_migrations');
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $root = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $root = $treeBuilder->root('phpcr_migrations');
+        }
+
+        $root
             ->children()
                 ->scalarNode('version_node_name')->defaultValue('jcr:versions')->end()
                 ->arrayNode('paths')

Tests/Functional/MigrateCommandTest.php

@@ -32,7 +32,7 @@ public function testUpgradeTo()
         $tester = $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201401011300'));
         $display = $tester->getDisplay();
 
-        $this->assertContains('Upgrading 1 version', $display);
+        $this->assertStringContainsString('Upgrading 1 version', $display);
 
         $versionNodes = $this->session->getNode('/jcr:migrations')->getNodes();
         $this->assertCount(1, $versionNodes);
@@ -47,7 +47,7 @@ public function testUpgradeRevertTo()
         $tester = $this->executeCommand('phpcr_migrations.command.migrate', array('to' => '201501011200'));
         $display = $tester->getDisplay();
 
-        $this->assertContains('Reverting 3 version', $display);
+        $this->assertStringContainsString('Reverting 3 version', $display);
 
         $versionNodes = $this->session->getNode('/jcr:migrations')->getNodes();
         $this->assertCount(2, $versionNodes);

Tests/Functional/StatusCommandTest.php

@@ -21,7 +21,7 @@ public function testShowAll()
         $tester = $this->executeCommand('phpcr_migrations.command.status', array());
         $display = $tester->getDisplay();
 
-        $this->assertContains('No migrations have been executed', $display);
+        $this->assertStringContainsString('No migrations have been executed', $display);
     }
 
     /**
@@ -33,6 +33,6 @@ public function testShowCurrentVersion()
         $tester = $this->executeCommand('phpcr_migrations.command.status', array());
         $display = $tester->getDisplay();
 
-        $this->assertContains('201501011500', $display);
+        $this->assertStringContainsString('201501011500', $display);
     }
 }

Tests/Resources/App/AppKernel.php

@@ -46,4 +46,12 @@ protected function prepareContainer(ContainerBuilder $container)
         parent::prepareContainer($container);
         $container->setParameter('cmf_testing.bundle_fqn', 'DTL\Bundle\PhpcrMigrations\PhpcrMigrationsBundle');
     }
+
+    protected function getKernelParameters()
+    {
+        $kernelParameters = parent::getKernelParameters();
+        $kernelParameters['kernel.root_dir'] = $this->getKernelDir();
+
+        return $kernelParameters;
+    }
 }