Skip to content

Commit 1a8e4d9

Browse files
committed
Merge pull request #51 from phpcr/removed_table_helper_clone
Removed TableHelper clone keyword
2 parents 1baf800 + b566844 commit 1a8e4d9

19 files changed

+56
-18
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
=========
33

4+
alpha-4
5+
-------
6+
7+
- [query] Always show path next to resultset
8+
49
alpha-3
510
-------
611

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use PHPCR\Shell\Config\Profile;
3131
use PHPCR\Shell\Transport\TransportRegistry;
3232
use PHPCR\Shell\Config\ProfileLoader;
33+
use PHPCR\Shell\Console\Helper\TableHelper;
3334

3435
/**
3536
* Main application for PHPCRSH
@@ -130,7 +131,8 @@ private function registerHelpers()
130131
new RepositoryHelper($phpcrHelper),
131132
new ResultFormatterHelper(),
132133
new TextHelper(),
133-
$phpcrHelper,
134+
new TableHelper(),
135+
$phpcrHelper
134136
);
135137

136138
foreach ($helpers as $helper) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function execute(InputInterface $input, OutputInterface $output)
6262
$privileges = $acm->getPrivileges($absPath);
6363
}
6464

65-
$table = clone $this->getHelper('table');
65+
$table = $this->getHelper('table')->create();
6666
$table->setHeaders(array('Name'));
6767

6868
foreach ($privileges as $privilege) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function execute(InputInterface $input, OutputInterface $output)
4747
'Session scoped?' => $lock->isSessionScoped() ? 'yes' : 'no',
4848
);
4949

50-
$table = clone $this->getHelper('table');
50+
$table = $this->getHelper('table')->create();
5151

5252
foreach ($info as $label => $value) {
5353
$table->addRow(array($label, $value));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function execute(InputInterface $input, OutputInterface $output)
3333

3434
$lockTokens = $lockManager->getLockTokens();
3535

36-
$table = clone $this->getHelper('table');
36+
$table = $this->getHelper('table')->create();
3737
$table->setHeaders(array('Token'));
3838

3939
foreach ($lockTokens as $token) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function execute(InputInterface $input, OutputInterface $output)
6161
'Locked?' => $isLocked,
6262
);
6363

64-
$table = clone $this->getHelper('table');
64+
$table = $this->getHelper('table')->create();
6565

6666
foreach ($info as $label => $value) {
6767
$table->addRow(array($label, $value));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function execute(InputInterface $input, OutputInterface $output)
5858
$this->showProperties = true;
5959
}
6060

61-
$table = clone $this->getHelper('table');
61+
$table = $this->getHelper('table')->create();
6262

6363
$this->renderNode($currentNode, $table);
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function execute(InputInterface $input, OutputInterface $output)
5252
$references['weak'] = $currentNode->getWeakReferences($name ? : null);
5353
$references['strong'] = $currentNode->getReferences($name ? : null);
5454

55-
$table = clone $this->getHelper('table');
55+
$table = $this->getHelper('table')->create();
5656
$table->setHeaders(array(
5757
'Type', 'Property', 'Node Path'
5858
));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function execute(InputInterface $input, OutputInterface $output)
3030

3131
$nodeTypes = $nodeTypeManager->getAllNodeTypes();
3232

33-
$table = clone $this->getHelper('table');
33+
$table = $this->getHelper('table')->create();
3434
$table->setHeaders(array('Name', 'Primary Item Name', 'Abstract?', 'Mixin?', 'Queryable?'));
3535

3636
foreach ($nodeTypes as $nodeType) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function execute(InputInterface $input, OutputInterface $output)
2525
$repository = $session->getRepository();
2626
$keys = $repository->getDescriptorKeys();
2727

28-
$table = clone $this->getHelper('table');
28+
$table = $this->getHelper('table')->create();
2929
$table->setHeaders(array('Key', 'Value', 'Standard?'));
3030

3131
foreach ($keys as $key) {

0 commit comments

Comments
 (0)