Merge pull request #13 from chirimoya/symfony-4-support

Symfony 4 support

Author: dantleech

.travis.yml

@@ -1,20 +1,35 @@
-language: php
-
-php:
-  - 5.6
-  - 7.0
+sudo: false
 
 env:
-  - SYMFONY_VERSION=2.8.*
-  - SYMFONY_VERSION=3.0.*
-  - SYMFONY_VERSION=dev-master
+  global:
+    - KERNEL_CLASS=DTL\\Bundle\\PhpcrMigrations\\Tests\\Resources\\App\\AppKernel
+
+matrix:
+  include:
+    - language: php
+      php: 7.1
+      env:
+        - SYMFONY_VERSION=2.8.*
+
+    - language: php
+      php: 7.1
+      env:
+        - SYMFONY_VERSION=3.4.*
+
+    - language: php
+      php: 7.2
+      env:
+        - SYMFONY_VERSION=4.0.*
+
+    - language: php
+      php: 7.2
+      env:
+        - SYMFONY_VERSION=4.1.*
 
 before_script:
+  - phpenv config-add travis.php.ini
+  - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION}
   - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
-script: phpunit
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master
+script: vendor/bin/phpunit

Resources/config/services.xml

@@ -4,12 +4,12 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="phpcr_migrations.version_storage" class="PHPCR\Migrations\VersionStorage" public="false">
+        <service id="phpcr_migrations.version_storage" class="PHPCR\Migrations\VersionStorage">
             <argument type="service" id="doctrine_phpcr.default_session" />
             <argument>%phpcr_migrations.version_node_name%</argument>
         </service>
 
-        <service id="phpcr_migrations.version_finder" class="PHPCR\Migrations\VersionFinder" public="false">
+        <service id="phpcr_migrations.version_finder" class="PHPCR\Migrations\VersionFinder">
             <argument>%phpcr_migrations.paths%</argument>
         </service>
 
@@ -19,19 +19,19 @@
             <argument type="service" id="doctrine_phpcr.session" />
         </service>
 
-        <service id="phpcr_migrations.command.status" class="DTL\Bundle\PhpcrMigrations\Command\StatusCommand">
+        <service id="phpcr_migrations.command.status" class="DTL\Bundle\PhpcrMigrations\Command\StatusCommand" public="true">
             <argument type="service" id="phpcr_migrations.version_storage" />
             <argument type="service" id="phpcr_migrations.version_finder" />
             <tag name="console.command" />
         </service>
 
-        <service id="phpcr_migrations.command.migrate" class="DTL\Bundle\PhpcrMigrations\Command\MigrateCommand">
+        <service id="phpcr_migrations.command.migrate" class="DTL\Bundle\PhpcrMigrations\Command\MigrateCommand" public="true">
             <argument type="service" id="phpcr_migrations.migrator_factory" />
             <argument type="service" id="service_container" />
             <tag name="console.command" />
         </service>
 
-        <service id="phpcr_migrations.command.initialize" class="DTL\Bundle\PhpcrMigrations\Command\InitializeCommand">
+        <service id="phpcr_migrations.command.initialize" class="DTL\Bundle\PhpcrMigrations\Command\InitializeCommand" public="true">
             <argument type="service" id="phpcr_migrations.migrator_factory" />
             <tag name="console.command" />
         </service>

Tests/Resources/app/AppKernel.php renamed to Tests/Resources/App/AppKernel.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+namespace DTL\Bundle\PhpcrMigrations\Tests\Resources\App;
+
 use DTL\Bundle\PhpcrMigrations\PhpcrMigrationsBundle;
 use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\OneTestBundle\OneTestBundle;
 use DTL\Bundle\PhpcrMigrations\Tests\Resources\Bundle\TwoTestBundle\TwoTestBundle;

Tests/Resources/app/config/config.yml renamed to Tests/Resources/App/config/config.yml

@@ -9,13 +9,17 @@
         }
     ],
     "require": {
-        "phpcr/phpcr-migrations": "^1.0",
+        "phpcr/phpcr-migrations": "^1.1",
         "phpcr/phpcr-implementation": "^2.1",
-        "doctrine/phpcr-bundle": "^1.2"
+        "doctrine/phpcr-bundle": "^1.3 || ^2.0"
     },
     "require-dev": {
-        "symfony/symfony": "~2.8 || ~3.0",
-        "symfony-cmf/testing": "~1.3"
+        "symfony/symfony": "~2.8 || ~3.4 || ~4.0",
+        "symfony-cmf/testing": "~2.1",
+        "phpunit/phpunit": "~5.7"
+    },
+    "conflict": {
+        "symfony/symfony": "3.4.15"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -22,7 +22,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Resources/app" />
+        <server name="KERNEL_CLASS" value="DTL\Bundle\PhpcrMigrations\Tests\Resources\App\AppKernel" />
     </php>
 
 </phpunit>

phpunit.xml.dist

@@ -0,0 +1 @@
+memory_limit = 2048M