Merge pull request #200 from wachterjohannes/symfony-4-support

Symfony 4 support

Author: dbu

.travis.yml

@@ -1,20 +1,72 @@
 language: php
 
-env:
-    - BEHAT_SUITE=standalone
-    - BEHAT_SUITE=embedded
-    - BEHAT_SUITE=cli
-
-php:
-    - 5.6
-    - 7.0
-    - 7.1
-    - 7.2
+matrix:
+  include:
+    - php: 5.6
+      env:
+        - PREFER="--prefer-lowest"
+        - BEHAT_SUITE=standalone
+        - SYMFONY_VERSION=^2.8
+    - php: 5.6
+      env:
+        - PREFER="--prefer-lowest"
+        - BEHAT_SUITE=embedded
+        - SYMFONY_VERSION=^3.0
+    - php: 5.6
+      env:
+        - PREFER="--prefer-lowest"
+        - BEHAT_SUITE=cli
+        - SYMFONY_VERSION=^3.0
+    - php: 7.0
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=standalone
+        - SYMFONY_VERSION=^2.8
+    - php: 7.0
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=embedded
+        - SYMFONY_VERSION=^3.0
+    - php: 7.0
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=cli
+        - SYMFONY_VERSION=^3.0
+    - php: 7.1
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=standalone
+        - SYMFONY_VERSION=^2.8
+    - php: 7.1
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=embedded
+        - SYMFONY_VERSION=^3.4
+    - php: 7.1
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=cli
+        - SYMFONY_VERSION=^4.0
+    - php: 7.2
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=standalone
+        - SYMFONY_VERSION=^2.8
+    - php: 7.2
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=embedded
+        - SYMFONY_VERSION=^3.0
+    - php: 7.2
+      env:
+        - PREFER=""
+        - BEHAT_SUITE=cli
+        - SYMFONY_VERSION=^4.0
 
 before_script:
     - composer self-update
-    - composer require "symfony/symfony" "~2.8" --no-update
-    - composer install
+    - composer require "symfony/symfony" "$SYMFONY_VERSION" --no-update
+    - composer update $PREFER
     - bash tests/bin/travis_jackrabbit.sh
 
 script: 

composer.json

@@ -3,25 +3,24 @@
     "description": "Shell for PHPCR",
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/console": "~2.8|~3.0",
+        "symfony/console": "~2.8|~3.0|~4.0",
         "jackalope/jackalope": "~1.1",
         "phpcr/phpcr": "~2.1",
-        "phpcr/phpcr-utils": "~1.2",
-        "symfony/finder": "~2.8|~3.0",
-        "symfony/serializer": "~2.8|~3.0",
-        "symfony/yaml": "~2.8|~3.0",
-        "symfony/dependency-injection": "~2.8|~3.0",
-        "symfony/expression-language": "~2.8|~3.0",
+        "phpcr/phpcr-utils": "~1.2", 
+        "symfony/finder": "~2.8|~3.0|~4.0",
+        "symfony/serializer": "~2.8|~3.0|~4.0",
+        "symfony/yaml": "~2.8|~3.0|~4.0",
+        "symfony/dependency-injection": "~2.8|~3.0|~4.0",
+        "symfony/expression-language": "~2.8|~3.0|~4.0",
         "dantleech/glob-finder": "~1.0"
     },
-    "minimum-stability": "stable",
     "require-dev": {
-        "symfony/symfony": "~2.8|~3.0",
-        "phpunit/phpunit": "~4.0",
-        "behat/behat": "~3.0",
-        "phpspec/phpspec": "3.0",
-        "jackalope/jackalope-doctrine-dbal": "~1.1",
-        "jackalope/jackalope-jackrabbit": "~1.1"
+        "symfony/symfony": "~2.8|~3.0|~4.0",
+        "phpunit/phpunit": "~5.7",
+        "behat/behat": "~3.1",
+        "phpspec/phpspec": "~3.2|~4.0",
+        "jackalope/jackalope-doctrine-dbal": "~1.2",
+        "jackalope/jackalope-jackrabbit": "~1.2"
     },
     "suggest": {
         "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal",

src/PHPCR/Shell/Resources/config.dist/alias.yml

@@ -49,7 +49,6 @@ checkin: version:checkin
 ci: version:checkin
 co: version:checkout
 checkout: version:checkout
-cp: version:checkpoint
 checkpoint: version:checkpoint
 vhist: version:history
 versions: version:history