Use new APIs

dantleech · dantleech · commit 4cd1349786ca · 2016-08-23T14:53:04.000+01:00
diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
     },
     "minimum-stability": "stable",
     "require-dev": {
-        "symfony/symfony": "~2.6|~3.0",
-        "phpunit/phpunit": "~3.7.28",
+        "symfony/symfony": "~3.0",
+        "phpunit/phpunit": "~4.0",
         "behat/behat": "~3.0",
         "phpspec/phpspec": "3.0",
         "jackalope/jackalope-doctrine-dbal": "~1.1",
diff --git a/src/PHPCR/Shell/Console/Application/ShellApplication.php b/src/PHPCR/Shell/Console/Application/ShellApplication.php
@@ -272,7 +272,7 @@ protected function getDefaultCommand()
      *
      * {@inheritDoc}
      */
-    public function renderException($exception, $output)
+    public function renderException(\Exception $exception, OutputInterface $output)
     {
         $output->writeln(sprintf('<exception>%s</exception>', $exception->getMessage()));
     }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/AccessControlPrivilegeListCommand.php b/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) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/LockInfoCommand.php b/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));
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/LockTokenListCommand.php b/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) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeInfoCommand.php b/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));
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php b/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) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeReferencesCommand.php b/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',
             ));
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeTypeListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeTypeListCommand.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 NodeTypeListCommand extends BasePhpcrCommand
 {
@@ -40,7 +41,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $nodeTypes = $nodeTypeManager->getAllNodeTypes();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Name', 'Primary Item Name', 'Abstract?', 'Mixin?', 'Queryable?'));
 
         foreach ($nodeTypes as $nodeType) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/RepositoryDescriptorListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/RepositoryDescriptorListCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class RepositoryDescriptorListCommand extends BasePhpcrCommand
 {
@@ -34,7 +35,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $repository = $session->getRepository();
         $keys = $repository->getDescriptorKeys();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Key', 'Value', 'Standard?'));
 
         foreach ($keys as $key) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/RetentionHoldListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/RetentionHoldListCommand.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 RetentionHoldListCommand extends BasePhpcrCommand
 {
@@ -39,7 +40,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $absPath = $input->getArgument('absPath');
 
         $holds = $retentionManager->getHolds($absPath);
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Name'));
 
         foreach ($holds as $hold) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/SessionInfoCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/SessionInfoCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class SessionInfoCommand extends BasePhpcrCommand
 {
@@ -45,7 +46,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $attribute = $session->getAttribute($attributeName);
         }
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Key', 'Value'));
 
         foreach ($info as $key => $value) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/SessionNamespaceListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/SessionNamespaceListCommand.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class SessionNamespaceListCommand extends BasePhpcrCommand
 {
@@ -31,7 +32,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $session = $this->get('phpcr.session');
         $prefixes = $session->getNamespacePrefixes();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Prefix', 'URI'));
 
         foreach ($prefixes as $prefix) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.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 VersionHistoryCommand extends BasePhpcrCommand
 {
@@ -34,7 +35,7 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->get('phpcr.session');
         $nodeHelper = $this->get('helper.node');
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
 
         $path = $input->getArgument('path');
         $workspace = $session->getWorkspace();
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/WorkspaceListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/WorkspaceListCommand.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 WorkspaceListCommand extends BasePhpcrCommand
 {
@@ -44,7 +45,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $workspace = $session->getWorkspace();
         $availableWorkspaces = $workspace->getAccessibleWorkspaceNames();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Name'));
         foreach ($availableWorkspaces as $availableWorkspace) {
             if ($availableWorkspace == $workspace->getName()) {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/WorkspaceNamespaceListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/WorkspaceNamespaceListCommand.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class WorkspaceNamespaceListCommand extends BasePhpcrCommand
 {
@@ -34,7 +35,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $prefixes = $namespaceRegistry->getPrefixes();
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Prefix', 'URI'));
 
         foreach ($prefixes as $prefix) {
diff --git a/src/PHPCR/Shell/Console/Command/Shell/AliasListCommand.php b/src/PHPCR/Shell/Console/Command/Shell/AliasListCommand.php
@@ -14,6 +14,7 @@
 use PHPCR\Shell\Console\Command\BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class AliasListCommand extends BaseCommand
 {
@@ -32,7 +33,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $config = $this->get('config.manager');
         $aliases = $config->getConfig('alias');
 
-        $table = $this->get('helper.table')->create();
+        $table = new Table($output);
         $table->setHeaders(array('Alias', 'Command'));
 
         foreach ($aliases as $alias => $command) {
diff --git a/src/PHPCR/Shell/Console/Command/Shell/ProfileShowCommand.php b/src/PHPCR/Shell/Console/Command/Shell/ProfileShowCommand.php
@@ -14,6 +14,7 @@
 use PHPCR\Shell\Console\Command\BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Helper\Table;
 
 class ProfileShowCommand extends BaseCommand
 {
@@ -38,7 +39,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('');
         foreach ($profile->toArray() as $domain => $config) {
             $output->writeln('<comment>' . $domain . '</comment>');
-            $table = $this->get('helper.table')->create();
+            $table = new Table($output);
             $table->setHeaders(array('Key', 'Value'));
 
             foreach ($config as $key => $value) {
diff --git a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
@@ -18,6 +18,7 @@
 use PHPCR\NodeInterface;
 use PHPCR\PropertyInterface;
 use PHPCR\Shell\Config\Config;
+use PHPCR\Shell\Console\Helper\Table;
 
 /**
  * Provide methods for formatting PHPCR objects
@@ -27,13 +28,11 @@
 class ResultFormatterHelper extends Helper
 {
     protected $textHelper;
-    protected $tableHelper;
     protected $config;
 
-    public function __construct(TextHelper $textHelper, TableHelper $tableHelper, Config $config)
+    public function __construct(TextHelper $textHelper, Config $config)
     {
         $this->textHelper = $textHelper;
-        $this->tableHelper = $tableHelper;
         $this->config = $config;
     }
 
@@ -66,7 +65,7 @@ public function getPropertyTypeName($typeInteger)
      */
     public function formatQueryResult(QueryResultInterface $result, OutputInterface $output, $elapsed)
     {
-        $table = $this->tableHelper->create();
+        $table = new Table($output);
         $table->setHeaders(array_merge(array(
             'Path',
             'Index',
diff --git a/src/PHPCR/Shell/Console/Helper/Table.php b/src/PHPCR/Shell/Console/Helper/Table.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PHPCR\Shell\Console\Helper;
+
+use Symfony\Component\Console\Helper\Table as OriginalTable;
+
+class Table extends OriginalTable
+{
+    private $nbRows = 0;
+
+    public function addRow($row)
+    {
+        $this->nbRows++;
+        parent::addRow($row);
+    }
+
+    public function getNumberOfRows()
+    {
+        return $this->nbRows;
+    }
+}
diff --git a/src/PHPCR/Shell/Console/Helper/TableHelper.php b/src/PHPCR/Shell/Console/Helper/TableHelper.php
diff --git a/src/PHPCR/Shell/DependencyInjection/Container.php b/src/PHPCR/Shell/DependencyInjection/Container.php
diff --git a/src/PHPCR/Shell/PhpcrShell.php b/src/PHPCR/Shell/PhpcrShell.php
diff --git a/src/PHPCR/Shell/Subscriber/ProfileLoaderSubscriber.php b/src/PHPCR/Shell/Subscriber/ProfileLoaderSubscriber.php

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ protected function getDefaultCommand()`
`272`	`272`	`*`
`273`	`273`	`* {@inheritDoc}`
`274`	`274`	`*/`
`275`		`- public function renderException($exception, $output)`
	`275`	`+ public function renderException(\Exception $exception, OutputInterface $output)`
`276`	`276`	`{`
`277`	`277`	`$output->writeln(sprintf('<exception>%s</exception>', $exception->getMessage()));`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use Symfony\Component\Console\Input\InputArgument;`
`17`	`17`	`use Symfony\Component\Console\Input\InputOption;`
`18`	`18`	`use PHPCR\RepositoryInterface;`
	`19`	`+use PHPCR\Shell\Console\Helper\Table;`
`19`	`20`
`20`	`21`	`class AccessControlPrivilegeListCommand extends BasePhpcrCommand`
`21`	`22`	`{`
`@@ -65,7 +66,7 @@ public function execute(InputInterface $input, OutputInterface $output)`
`65`	`66`	`$privileges = $acm->getPrivileges($absPath);`
`66`	`67`	`}`
`67`	`68`
`68`		`- $table = $this->get('helper.table')->create();`
	`69`	`+ $table = new Table($output);`
`69`	`70`	`$table->setHeaders(array('Name'));`
`70`	`71`
`71`	`72`	`foreach ($privileges as $privilege) {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`use PHPCR\ItemNotFoundException;`
`21`	`21`	`use PHPCR\PropertyInterface;`
`22`	`22`	`use PHPCR\NodeInterface;`
	`23`	`+use PHPCR\Shell\Console\Helper\Table;`
`23`	`24`
`24`	`25`	`class NodeListCommand extends BasePhpcrCommand`
`25`	`26`	`{`
`@@ -116,7 +117,7 @@ public function execute(InputInterface $input, OutputInterface $output)`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`foreach ($nodes as $node) {`
`119`		`- $table = $this->get('helper.table')->create();`
	`120`	`+ $table = new Table($output);`
`120`	`121`	`$this->renderNode($node, $table, array(), $filter);`
`121`	`122`
`122`	`123`	`if ($table->getNumberOfRows() > 0) {`