From 97ceaa838a9494ca855b30ccfe06ad91261750bf Mon Sep 17 00:00:00 2001 From: dantleech Date: Thu, 5 Jun 2014 07:34:07 +0200 Subject: [PATCH 1/3] Updated composer --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 86b30f88..34f31bdb 100644 --- a/composer.json +++ b/composer.json @@ -2,13 +2,13 @@ "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", "require": { - "symfony/console": "2.3.*", - "jackalope/jackalope-doctrine-dbal": "dev-master", - "jackalope/jackalope-jackrabbit": "dev-master", - "jackalope/jackalope": "dev-master", - "phpcr/phpcr": "dev-master", - "phpcr/phpcr-utils": "dev-master", - "symfony/finder": "~2.0" + "symfony/console": "2.5.*", + "jackalope/jackalope-doctrine-dbal": "1.1.*", + "jackalope/jackalope-jackrabbit": "1.1.*", + "jackalope/jackalope": "1.1.*", + "phpcr/phpcr": "2.1.*", + "phpcr/phpcr-utils": "1.2.*", + "symfony/finder": "2.6.*" }, "require-dev": { "mockery/mockery": "0.9", From 82259e5c3b442eafba12db5583d861bf709e82a7 Mon Sep 17 00:00:00 2001 From: dantleech Date: Thu, 5 Jun 2014 08:27:00 +0200 Subject: [PATCH 2/3] Updated composer again --- composer.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 34f31bdb..2c2cacea 100644 --- a/composer.json +++ b/composer.json @@ -2,18 +2,19 @@ "name": "phpcr/phpcr-shell", "description": "Shell for PHPCR", "require": { - "symfony/console": "2.5.*", - "jackalope/jackalope-doctrine-dbal": "1.1.*", - "jackalope/jackalope-jackrabbit": "1.1.*", - "jackalope/jackalope": "1.1.*", - "phpcr/phpcr": "2.1.*", - "phpcr/phpcr-utils": "1.2.*", - "symfony/finder": "2.6.*" + "symfony/console": "~2.3", + "jackalope/jackalope-doctrine-dbal": "~1.1", + "jackalope/jackalope-jackrabbit": "~1.1", + "jackalope/jackalope": "~1.1", + "phpcr/phpcr": "~2.1", + "phpcr/phpcr-utils": "~1.2", + "symfony/finder": "~2.3" }, + "minimum-stability": "dev", "require-dev": { "mockery/mockery": "0.9", - "symfony/process": "2.3.*", - "symfony/filesystem": "2.3.*", + "symfony/process": "~2.3", + "symfony/filesystem": "~2.3", "phpunit/phpunit": "~3.7.28", "behat/behat": "~2.5", "phpspec/phpspec": "2.0" From 481112f8b6b1924a2e4902932b3db6fa2aaa72c5 Mon Sep 17 00:00:00 2001 From: dantleech Date: Thu, 5 Jun 2014 08:53:18 +0200 Subject: [PATCH 3/3] Fixed phpspec test --- spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php b/spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php index 3cba40e1..fa74842c 100644 --- a/spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php +++ b/spec/PHPCR/Shell/Event/CommandExceptionEventSpec.php @@ -5,6 +5,7 @@ use PhpSpec\ObjectBehavior; use Prophecy\Argument; use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Input\InputInterface; class CommandExceptionEventSpec extends ObjectBehavior { @@ -15,9 +16,10 @@ function it_is_initializable() function let( \Exception $exception, + InputInterface $input, OutputInterface $output ) { - $this->beConstructedWith($exception, $output); + $this->beConstructedWith($exception, $input, $output); } function it_should_provide_access_to_event_parameters(