From 94f1c5e979ca79980e8f793be54f15261c0be3e5 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 26 Dec 2013 15:56:35 +0100 Subject: [PATCH] adjust to phpcr-utils cli cleanup --- bin/phpcrodm.php | 14 ++++++++++---- cli-config.doctrine_dbal.php.dist | 7 +++++-- cli-config.jackrabbit.php.dist | 5 ++++- cli-config.midgard_mysql.php.dist | 5 ++++- cli-config.midgard_sqlite.php.dist | 5 ++++- composer.json | 6 +++--- .../Tools/Console/Command/InfoDoctrineCommand.php | 2 +- .../Tools/Console/Helper/DocumentManagerHelper.php | 12 +++--------- tests/travis_doctrine_dbal.sh | 2 +- tests/travis_jackrabbit.sh | 2 +- 10 files changed, 36 insertions(+), 24 deletions(-) diff --git a/bin/phpcrodm.php b/bin/phpcrodm.php index fc1dd38e8..583bb82a9 100755 --- a/bin/phpcrodm.php +++ b/bin/phpcrodm.php @@ -39,17 +39,23 @@ $cli->setCatchExceptions(true); $cli->setHelperSet($helperSet); $cli->addCommands(array( - new \PHPCR\Util\Console\Command\WorkspaceCreateCommand(), new \PHPCR\Util\Console\Command\NodeDumpCommand(), + new \PHPCR\Util\Console\Command\NodeMoveCommand(), + new \PHPCR\Util\Console\Command\NodeRemoveCommand(), + new \PHPCR\Util\Console\Command\NodesUpdateCommand(), + new \PHPCR\Util\Console\Command\NodeTouchCommand(), + new \PHPCR\Util\Console\Command\NodeTypeListCommand(), + new \PHPCR\Util\Console\Command\NodeTypeRegisterCommand(), + new \PHPCR\Util\Console\Command\WorkspaceCreateCommand(), + new \PHPCR\Util\Console\Command\WorkspaceDeleteCommand(), new \PHPCR\Util\Console\Command\WorkspaceExportCommand(), new \PHPCR\Util\Console\Command\WorkspaceImportCommand(), new \PHPCR\Util\Console\Command\WorkspaceListCommand(), new \PHPCR\Util\Console\Command\WorkspacePurgeCommand(), new \PHPCR\Util\Console\Command\WorkspaceQueryCommand(), - new \PHPCR\Util\Console\Command\NodeTypeRegisterCommand(), - new \Doctrine\ODM\PHPCR\Tools\Console\Command\RegisterSystemNodeTypesCommand(), - new \Doctrine\ODM\PHPCR\Tools\Console\Command\InfoDoctrineCommand(), new \Doctrine\ODM\PHPCR\Tools\Console\Command\DumpQueryBuilderReferenceCommand(), + new \Doctrine\ODM\PHPCR\Tools\Console\Command\InfoDoctrineCommand(), + new \Doctrine\ODM\PHPCR\Tools\Console\Command\RegisterSystemNodeTypesCommand(), )); if (isset($extraCommands) && ! empty($extraCommands)) { $cli->addCommands($extraCommands); diff --git a/cli-config.doctrine_dbal.php.dist b/cli-config.doctrine_dbal.php.dist index 3c2814149..1e3987a99 100644 --- a/cli-config.doctrine_dbal.php.dist +++ b/cli-config.doctrine_dbal.php.dist @@ -46,9 +46,12 @@ if (isset($argv[1]) $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config); $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array( - 'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm) + '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), )); -} else if (isset($argv[1]) && $argv[1] == 'jackalope:init:dbal') { +} 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( 'connection' => new \Jackalope\Tools\Console\Helper\DoctrineDbalHelper($dbConn) diff --git a/cli-config.jackrabbit.php.dist b/cli-config.jackrabbit.php.dist index 1260e8e0a..4d8703c71 100644 --- a/cli-config.jackrabbit.php.dist +++ b/cli-config.jackrabbit.php.dist @@ -44,5 +44,8 @@ $config->setMetadataDriverImpl($driver); $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config); $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array( - 'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm) + '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), )); diff --git a/cli-config.midgard_mysql.php.dist b/cli-config.midgard_mysql.php.dist index d9fa417c4..71025b60d 100644 --- a/cli-config.midgard_mysql.php.dist +++ b/cli-config.midgard_mysql.php.dist @@ -40,5 +40,8 @@ $config->setMetadataDriverImpl($driver); $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config); $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array( - 'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm) + '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), )); diff --git a/cli-config.midgard_sqlite.php.dist b/cli-config.midgard_sqlite.php.dist index fd10951bf..305fec8ae 100644 --- a/cli-config.midgard_sqlite.php.dist +++ b/cli-config.midgard_sqlite.php.dist @@ -37,5 +37,8 @@ $config->setMetadataDriverImpl($driver); $dm = \Doctrine\ODM\PHPCR\DocumentManager::create($session, $config); $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array( - 'dm' => new \Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper(null, $dm) + '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), )); diff --git a/composer.json b/composer.json index 1551d5d46..3b43de822 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php": ">=5.3.3", "doctrine/common": "~2.4.0", "phpcr/phpcr-implementation": "~2.1.0", - "phpcr/phpcr-utils": "~1.0.0" + "phpcr/phpcr-utils": "~1.1.0" }, "require-dev": { "symfony/yaml": "~2.0", @@ -23,8 +23,8 @@ }, "suggest":{ "symfony/yaml": "~2.0", - "jackalope/jackalope-doctrine-dbal": "~1.0.0", - "jackalope/jackalope-jackrabbit": "~1.0.0" + "jackalope/jackalope-doctrine-dbal": "~1.0", + "jackalope/jackalope-jackrabbit": "~1.0" }, "autoload": { "psr-0": { "Doctrine\\ODM\\PHPCR": "lib/" } diff --git a/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/InfoDoctrineCommand.php b/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/InfoDoctrineCommand.php index 628c8828d..3d77ae318 100644 --- a/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/InfoDoctrineCommand.php +++ b/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/InfoDoctrineCommand.php @@ -37,7 +37,7 @@ protected function configure() ->setName('doctrine:phpcr:mapping:info') ->setDescription('Shows basic information about all mapped documents') ->setHelp(<<doctrine:mapping:info shows basic information about which +The doctrine:phpcr:mapping:info shows basic information about which documents exist and possibly if their mapping information contains errors or not. diff --git a/lib/Doctrine/ODM/PHPCR/Tools/Console/Helper/DocumentManagerHelper.php b/lib/Doctrine/ODM/PHPCR/Tools/Console/Helper/DocumentManagerHelper.php index 05dc48880..972a9cae1 100644 --- a/lib/Doctrine/ODM/PHPCR/Tools/Console/Helper/DocumentManagerHelper.php +++ b/lib/Doctrine/ODM/PHPCR/Tools/Console/Helper/DocumentManagerHelper.php @@ -21,15 +21,14 @@ use Symfony\Component\Console\Helper\Helper; use Doctrine\ODM\PHPCR\DocumentManager; +use PHPCR\Util\Console\Helper\PhpcrHelper; use PHPCR\SessionInterface; /** * Helper class to make DocumentManager available to console command */ -class DocumentManagerHelper extends Helper +class DocumentManagerHelper extends PhpcrHelper { - protected $session; - /** * @var DocumentManager */ @@ -46,8 +45,8 @@ public function __construct(SessionInterface $session = null, DocumentManager $d if (!$session && $dm) { $session = $dm->getPhpcrSession(); } + parent::__construct($session); - $this->session = $session; $this->dm = $dm; } @@ -56,11 +55,6 @@ public function getDocumentManager() return $this->dm; } - public function getSession() - { - return $this->session; - } - public function getName() { return 'phpcr'; diff --git a/tests/travis_doctrine_dbal.sh b/tests/travis_doctrine_dbal.sh index bc5e605bc..20d7c7952 100755 --- a/tests/travis_doctrine_dbal.sh +++ b/tests/travis_doctrine_dbal.sh @@ -1,6 +1,6 @@ #!/bin/bash -composer require jackalope/jackalope-doctrine-dbal:1.0.0-RC4 --no-update +composer require jackalope/jackalope-doctrine-dbal:~1.0 --no-update composer update --prefer-source SCRIPT_NAME="${0##*/}" diff --git a/tests/travis_jackrabbit.sh b/tests/travis_jackrabbit.sh index 33114d325..cc6c90e54 100755 --- a/tests/travis_jackrabbit.sh +++ b/tests/travis_jackrabbit.sh @@ -1,6 +1,6 @@ #!/bin/bash -composer require jackalope/jackalope-jackrabbit:1.0.0-RC3 --no-update +composer require jackalope/jackalope-jackrabbit:~1.0 --no-update composer update --prefer-source SCRIPT_NAME="${0##*/}"