allow symfony 3 components

.travis.yml

@@ -20,12 +20,15 @@ matrix:
     - php: hhvm-nightly
   include:
     - php: 5.3.3
-      env: TRANSPORT=doctrine_dbal PACKAGE_VERSION=low
+      env: TRANSPORT=doctrine_dbal COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.3.3
-      env: TRANSPORT=jackrabbit PACKAGE_VERSION=low
+      env: TRANSPORT=jackrabbit COMPOSER_FLAGS="--prefer-lowest"
+    - php: 5.6
+      env: TRANSPORT=doctrine_dbal SYMFONY="3"
 
 before_script:
   - composer self-update
+  - if [[ "$SYMFONY" == "3" ]]; then composer require symfony/symfony "3.*@dev" --no-update; fi
   - ./tests/travis_${TRANSPORT}.sh
 
 script: phpunit -c tests/phpunit_${TRANSPORT}.xml.dist

CHANGELOG.md

@@ -4,6 +4,11 @@ Changelog
 1.3.0-rc1
 ---------
 
+* **2015-07-13**: Added Symfony 3 compatibility for the console commands. If you
+                  use the commands, update your `cli-config.php` according to 
+                  `cli-config.[implementation].php.dist` to set the question
+                   helper if it is available.
+
 * **2015-07-13**: Adjusted the regular expression for locales, to allow for sublocales
                   but preventing arbitrary non alphanumeric characters.
 

cli-config.doctrine_dbal.php.dist

@@ -46,11 +46,16 @@ if (isset($argv[1])
     $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config);
 
     $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
-        'dialog' => new \Symfony\Component\Console\Helper\DialogHelper(),
         'phpcr' => new \PHPCR\Util\Console\Helper\PhpcrHelper($session),
         'phpcr_console_dumper' => new \PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper(),
         'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm),
     ));
+
+    if (class_exists('Symfony\Component\Console\Helper\QuestionHelper')) {
+        $helperSet->set(new \Symfony\Component\Console\Helper\QuestionHelper(), 'question');
+    } else {
+        $helperSet->set(new \Symfony\Component\Console\Helper\DialogHelper, 'dialog');
+    }
 } elseif (isset($argv[1]) && $argv[1] == 'jackalope:init:dbal') {
     // special case: the init command needs the db connection, but a session is impossible if the db is not yet initialized
     $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(

cli-config.jackrabbit.php.dist

@@ -44,8 +44,13 @@ $config->setMetadataDriverImpl($driver);
 $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config);
 
 $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
-    'dialog' => new \Symfony\Component\Console\Helper\DialogHelper(),
     'phpcr' => new \PHPCR\Util\Console\Helper\PhpcrHelper($session),
     'phpcr_console_dumper' => new \PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper(),
     'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm),
 ));
+
+if (class_exists('Symfony\Component\Console\Helper\QuestionHelper')) {
+    $helperSet->set(new \Symfony\Component\Console\Helper\QuestionHelper(), 'question');
+} else {
+    $helperSet->set(new \Symfony\Component\Console\Helper\DialogHelper, 'dialog');
+}

composer.json

@@ -18,17 +18,17 @@
         "doctrine/data-fixtures": "~1.0,>=1.0.0",
         "phpcr/phpcr": "~2.1.1",
         "phpcr/phpcr-implementation": "~2.1.0",
-        "phpcr/phpcr-utils": "~1.1",
+        "phpcr/phpcr-utils": "~1.2.7|~1.3",
         "doctrine/instantiator": "~1.0.1",
-        "symfony/console": "~2.3"
+        "symfony/console": "~2.3|~3.0"
     },
     "require-dev": {
-        "symfony/yaml": "~2.0",
+        "symfony/yaml": "~2.3|~3.0",
         "symfony/phpunit-bridge": "2.7.*@dev",
         "liip/rmt": "~1.1"
     },
     "suggest": {
-        "symfony/yaml": "~2.0",
+        "symfony/yaml": "~2.3|~3.0",
         "jackalope/jackalope-doctrine-dbal": "~1.1",
         "jackalope/jackalope-jackrabbit": "~1.0"
     },

tests/travis_doctrine_dbal.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 composer require jackalope/jackalope-doctrine-dbal:"~1.0" --no-update
-if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source --no-interaction; fi
-if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source --no-interaction; fi
+composer update $COMPOSER_FLAGS --prefer-source --no-interaction;
 
 SCRIPT_NAME="${0##*/}"
 SCRIPT_DIR="${0%/*}"

tests/travis_jackrabbit.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 composer require jackalope/jackalope-jackrabbit:~1.0 --no-update
-if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source --no-interaction; fi
-if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source --no-interaction; fi
+composer update $COMPOSER_FLAGS --prefer-source --no-interaction;
 
 SCRIPT_NAME="${0##*/}"
 SCRIPT_DIR="${0%/*}"