Merge pull request #180 from phpcr/allow_3_0

Allow Symfony 3.0

Author: dantleech

.travis.yml

@@ -5,13 +5,12 @@ env:
     - BEHAT_SUITE=embedded
     - BEHAT_SUITE=cli
 
-
 php:
-    - 5.4
+    - 5.6
 
 before_script:
     - composer self-update
-    - composer require "symfony/symfony" "2.6.*" --no-update
+    - composer require "symfony/symfony" "~2.8" --no-update
     - composer install
     - bash tests/bin/travis_jackrabbit.sh
 

composer.json

@@ -2,28 +2,25 @@
     "name": "phpcr/phpcr-shell",
     "description": "Shell for PHPCR",
     "require": {
-        "symfony/console": "~2.4",
+        "symfony/console": "~2.8|~3.0",
         "jackalope/jackalope": "~1.1",
         "phpcr/phpcr": "~2.1",
         "phpcr/phpcr-utils": "~1.2",
-        "symfony/finder": "~2.3",
-        "symfony/serializer": "~2.3",
-        "symfony/yaml": "~2.3",
-        "symfony/dependency-injection": "~2.3",
-        "symfony/expression-language": "~2.4",
+        "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",
         "dantleech/glob-finder": "~1.0"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require-dev": {
-        "symfony/symfony": "2.6",
-        "symfony/process": "~2.4",
-        "symfony/filesystem": "~2.4",
-        "phpunit/phpunit": "~3.7.28",
-        "behat/behat": "~3.0.0",
-        "phpspec/phpspec": "2.0",
+        "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",
-        "jackalope/jackalope-fs": "dev-master"
+        "jackalope/jackalope-jackrabbit": "~1.1"
     },
     "suggest": {
         "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal",

spec/PHPCR/Shell/Console/Helper/ResultFormatterHelperSpec.php

@@ -20,11 +20,10 @@ class ResultFormatterHelperSpec extends ObjectBehavior
 {
     public function let(
         TextHelper $textHelper,
-        TableHelper $tableHelper,
         Config $config
     )
     {
-        $this->beConstructedWith($textHelper, $tableHelper, $config);
+        $this->beConstructedWith($textHelper, $config);
     }
 
     public function it_is_initializable()

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -267,16 +267,6 @@ protected function getDefaultCommand()
         return 'shell:path:show';
     }
 
-    /**
-     * Render an exception to the console
-     *
-     * {@inheritDoc}
-     */
-    public function renderException($exception, $output)
-    {
-        $output->writeln(sprintf('<exception>%s</exception>', $exception->getMessage()));
-    }
-
     /**
      * Wrap the add method and do not register commands which are unsupported by
      * the current transport.

src/PHPCR/Shell/Console/Command/Phpcr/AccessControlPrivilegeListCommand.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use PHPCR\RepositoryInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class AccessControlPrivilegeListCommand extends BasePhpcrCommand
 {
@@ -65,7 +66,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $privileges = $acm->getPrivileges($absPath);
         }
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Name'));
 
         foreach ($privileges as $privilege) {

src/PHPCR/Shell/Console/Command/Phpcr/LockInfoCommand.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use PHPCR\RepositoryInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class LockInfoCommand extends BasePhpcrCommand
 {
@@ -55,7 +56,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             'Session scoped?' => $lock->isSessionScoped() ? 'yes' : 'no',
         );
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
 
         foreach ($info as $label => $value) {
             $table->addRow(array($label, $value));

src/PHPCR/Shell/Console/Command/Phpcr/LockTokenListCommand.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use PHPCR\RepositoryInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class LockTokenListCommand extends BasePhpcrCommand
 {
@@ -41,7 +42,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $lockTokens = $lockManager->getLockTokens();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Token'));
 
         foreach ($lockTokens as $token) {

src/PHPCR/Shell/Console/Command/Phpcr/NodeInfoCommand.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\Shell\Console\Helper\Table;
 
 class NodeInfoCommand extends BasePhpcrCommand
 {
@@ -75,7 +76,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             );
 
             $output->writeln('<path>' . $node->getPath() . '</path>');
-            $table = $this->get('helper.table')->create();
+            $table = new Table($output);
 
             foreach ($info as $label => $value) {
                 $table->addRow(array($label, $value));

src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php

@@ -20,6 +20,7 @@
 use PHPCR\ItemNotFoundException;
 use PHPCR\PropertyInterface;
 use PHPCR\NodeInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class NodeListCommand extends BasePhpcrCommand
 {
@@ -116,7 +117,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         foreach ($nodes as $node) {
-            $table = $this->get('helper.table')->create();
+            $table = new Table($output);
             $this->renderNode($node, $table, array(), $filter);
 
             if ($table->getNumberOfRows() > 0) {

src/PHPCR/Shell/Console/Command/Phpcr/NodeReferencesCommand.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\Shell\Console\Helper\Table;
 
 class NodeReferencesCommand extends BasePhpcrCommand
 {
@@ -32,7 +33,7 @@ protected function configure()
 If the <info>name</info> parameter is null then all referring REFERENCES are returned
 regardless of name.
 HERE
-        );
+    );
     }
 
     public function execute(InputInterface $input, OutputInterface $output)
@@ -52,7 +53,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $references['weak'] = $node->getWeakReferences($name ?: null);
             $references['strong'] = $node->getReferences($name ?: null);
 
-            $table = $this->get('helper.table')->create();
+            $table = new Table($output);
             $table->setHeaders(array(
                 'Path', 'Property', 'Type',
             ));