Fixed phpspec tests

dantleech · dantleech · commit 0ae0b3c09c23 · 2014-12-11T22:35:03.000+01:00
diff --git a/spec/PHPCR/Shell/Config/ConfigManagerSpec.php b/spec/PHPCR/Shell/Config/ConfigManagerSpec.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace spec\PHPCR\Shell\Console\Helper;
+namespace spec\PHPCR\Shell\Config;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ConfigHelperSpec extends ObjectBehavior
+class ConfigManagerSpec extends ObjectBehavior
 {
     function let(
         Filesystem $filesystem
@@ -17,7 +17,7 @@ function let(
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('PHPCR\Shell\Console\Helper\ConfigHelper');
+        $this->shouldHaveType('PHPCR\Shell\Config\ConfigManager');
     }
 
     function it_should_have_a_method_to_get_the_users_config_directory()
@@ -34,7 +34,7 @@ function it_should_be_able_to_parse_a_config_file_and_return_the_config_as_an_ar
         putenv('PHPCRSH_HOME=' . $dir);
         $filesystem->exists(Argument::any())->willReturn(true);
 
-        $config = $this->getConfig('alias')->shouldReturn(array(
+        $this->getConfig('alias')->shouldReturn(array(
             'foobar' => 'barfoo',
             'barfoo' => 'foobar',
         ));
diff --git a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php
@@ -4,19 +4,19 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use PHPCR\Shell\Console\Helper\ConfigHelper;
+use PHPCR\Shell\Config\ConfigManager;
 use PHPCR\Shell\Config\Profile;
 use Symfony\Component\Filesystem\Filesystem;
 
 class ProfileLoaderSpec extends ObjectBehavior
 {
     function let(
-        ConfigHelper $configHelper,
+        ConfigManager $configManager,
         Filesystem $filesystem
     )
     {
-        $configHelper->getConfigDir()->willReturn(__DIR__);
-        $this->beConstructedWith($configHelper, $filesystem);
+        $configManager->getConfigDir()->willReturn(__DIR__);
+        $this->beConstructedWith($configManager, $filesystem);
     }
 
     function it_is_initializable()
diff --git a/spec/PHPCR/Shell/Config/fixtures/config/alias.yml b/spec/PHPCR/Shell/Config/fixtures/config/alias.yml
diff --git a/spec/PHPCR/Shell/Console/Application/EmbeddedApplicationSpec.php b/spec/PHPCR/Shell/Console/Application/EmbeddedApplicationSpec.php
@@ -5,6 +5,7 @@
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PHPCR\Shell\Console\Application\EmbeddedApplication;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class EmbeddedApplicationSpec extends ObjectBehavior
 {
diff --git a/spec/PHPCR/Shell/Console/Application/ShellApplicationSpec.php b/spec/PHPCR/Shell/Console/Application/ShellApplicationSpec.php
@@ -4,6 +4,8 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPCR\Shell\Console\Application\EmbeddedApplication;
 
 class ShellApplicationSpec extends ObjectBehavior
 {
diff --git a/spec/PHPCR/Shell/Console/Helper/RepositoryHelperSpec.php b/spec/PHPCR/Shell/Console/Helper/RepositoryHelperSpec.php
@@ -5,14 +5,14 @@
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PHPCR\RepositoryInterface;
-use PHPCR\Shell\Console\Helper\PhpcrHelper;
+use PHPCR\Shell\Phpcr\SessionManager;
 
 class RepositoryHelperSpec extends ObjectBehavior
 {
     function let(
-        PhpcrHelper $phpcrHelper
+        SessionManager $sessionManager
     ) {
-        $this->beConstructedWith($phpcrHelper);
+        $this->beConstructedWith($sessionManager);
     }
 
     function it_is_initializable()
@@ -21,10 +21,10 @@ function it_is_initializable()
     }
 
     function it_provides_a_method_to_say_if_a_descriptor_exists_or_not(
-        PhpcrHelper $phpcrHelper,
+        SessionManager $sessionManager,
         RepositoryInterface $repository
     ) {
-        $phpcrHelper->getRepository()->willReturn($repository);
+        $sessionManager->getRepository()->willReturn($repository);
         $repository->getDescriptorKeys()->willReturn(array(
             'foo', 'bar'
         ));
diff --git a/spec/PHPCR/Shell/Console/Helper/ResultFormatterHelperSpec.php b/spec/PHPCR/Shell/Console/Helper/ResultFormatterHelperSpec.php
@@ -5,14 +5,16 @@
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PHPCR\Shell\Console\Helper\TextHelper;
+use PHPCR\Shell\Console\Helper\TableHelper;
 
 class ResultFormatterHelperSpec extends ObjectBehavior
 {
     function let(
-        TextHelper $textHelper
+        TextHelper $textHelper,
+        TableHelper $tableHelper
     )
     {
-        $this->beConstructedWith($textHelper);
+        $this->beConstructedWith($textHelper, $tableHelper);
     }
 
     function it_is_initializable()
diff --git a/spec/PHPCR/Shell/Phpcr/SessionManagerSpec.php b/spec/PHPCR/Shell/Phpcr/SessionManagerSpec.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace spec\PHPCR\Shell\Console\Helper;
+namespace spec\PHPCR\Shell\Phpcr;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use PHPCR\Shell\Config\Profile;
 use PHPCR\Shell\Transport\TransportRegistryInterface;
 
-class PhpcrHelperSpec extends ObjectBehavior
+class SessionManagerSpec extends ObjectBehavior
 {
     function let(
         Profile $profile,
@@ -18,6 +18,6 @@ function let(
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('PHPCR\Shell\Console\Helper\PhpcrHelper');
+        $this->shouldHaveType('PHPCR\Shell\Phpcr\SessionManager');
     }
 }
diff --git a/spec/PHPCR/Shell/Subscriber/AliasSubscriberSpec.php b/spec/PHPCR/Shell/Subscriber/AliasSubscriberSpec.php
@@ -4,7 +4,7 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use PHPCR\Shell\Console\Helper\ConfigHelper;
+use PHPCR\Shell\Config\ConfigManager;
 use PHPCR\Shell\Console\Input\StringInput;
 use PHPCR\Shell\Event\CommandPreRunEvent;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -17,13 +17,10 @@ function it_is_initializable()
     }
 
     function let(
-        HelperSet $helperSet,
-        ConfigHelper $config
+        ConfigManager $config
     ) {
-        $helperSet->get('config')->willReturn($config);
-
         $this->beConstructedWith(
-            $helperSet
+            $config
         );
 
         $config->getConfig('alias')->willReturn(array(
@@ -34,7 +31,6 @@ function let(
 
     function it_should_convert_an_aliased_input_into_a_real_command_input(
         CommandPreRunEvent $event,
-        ConfigHelper $config,
         StringInput $input
     ) {
         $event->getInput()->willReturn($input);
@@ -49,7 +45,6 @@ function it_should_convert_an_aliased_input_into_a_real_command_input(
 
     function it_should_ommit_missing_arguments(
         CommandPreRunEvent $event,
-        ConfigHelper $config,
         StringInput $input
     ) {
         $event->getInput()->willReturn($input);
diff --git a/src/PHPCR/Shell/Config/ConfigManager.php b/src/PHPCR/Shell/Config/ConfigManager.php
@@ -72,7 +72,6 @@ public function getConfigDir()
         if ($home) {
             return $home;
         }
-
         // handle windows ..
         if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
             if (!getenv('APPDATA')) {
diff --git a/src/PHPCR/Shell/Console/Application/EmbeddedApplication.php b/src/PHPCR/Shell/Console/Application/EmbeddedApplication.php
@@ -3,6 +3,7 @@
 namespace PHPCR\Shell\Console\Application;
 
 use PHPCR\Shell\Subscriber;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Subclass of the full ShellApplication for running as an EmbeddedApplication
@@ -25,9 +26,9 @@ class EmbeddedApplication extends ShellApplication
      *
      * @param string $mode
      */
-    public function __construct($mode)
+    public function __construct(ContainerInterface $container, $mode)
     {
-        parent::__construct(SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
+        parent::__construct($container, SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
         $this->mode = $mode;
         $this->setAutoExit(false);
     }
diff --git a/src/PHPCR/Shell/Console/Application/ShellApplication.php b/src/PHPCR/Shell/Console/Application/ShellApplication.php
@@ -30,6 +30,7 @@
 use PHPCR\Shell\Transport\TransportRegistry;
 use PHPCR\Shell\Config\ProfileLoader;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
  * Main application for PHPCRSH
@@ -63,7 +64,7 @@ class ShellApplication extends Application
     public function __construct($container)
     {
         parent::__construct(SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
-        $this->dispatcher = $container->get('event.dispatcher');
+        $this->dispatcher = $container->get('event.dispatcher') ? : new EventDispatcher();
         $this->setDispatcher($this->dispatcher);
         $this->container = $container;
     }

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,19 @@`
`4`	`4`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`	`6`	`use Prophecy\Argument;`
`7`		`-use PHPCR\Shell\Console\Helper\ConfigHelper;`
	`7`	`+use PHPCR\Shell\Config\ConfigManager;`
`8`	`8`	`use PHPCR\Shell\Config\Profile;`
`9`	`9`	`use Symfony\Component\Filesystem\Filesystem;`
`10`	`10`
`11`	`11`	`class ProfileLoaderSpec extends ObjectBehavior`
`12`	`12`	`{`
`13`	`13`	`function let(`
`14`		`- ConfigHelper $configHelper,`
	`14`	`+ ConfigManager $configManager,`
`15`	`15`	`Filesystem $filesystem`
`16`	`16`	`)`
`17`	`17`	`{`
`18`		`- $configHelper->getConfigDir()->willReturn(__DIR__);`
`19`		`- $this->beConstructedWith($configHelper, $filesystem);`
	`18`	`+ $configManager->getConfigDir()->willReturn(__DIR__);`
	`19`	`+ $this->beConstructedWith($configManager, $filesystem);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`function it_is_initializable()`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`	`6`	`use Prophecy\Argument;`
`7`	`7`	`use PHPCR\Shell\Console\Application\EmbeddedApplication;`
	`8`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
`8`	`9`
`9`	`10`	`class EmbeddedApplicationSpec extends ObjectBehavior`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`	`6`	`use Prophecy\Argument;`
	`7`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
	`8`	`+use PHPCR\Shell\Console\Application\EmbeddedApplication;`
`7`	`9`
`8`	`10`	`class ShellApplicationSpec extends ObjectBehavior`
`9`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,16 @@`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`	`6`	`use Prophecy\Argument;`
`7`	`7`	`use PHPCR\Shell\Console\Helper\TextHelper;`
	`8`	`+use PHPCR\Shell\Console\Helper\TableHelper;`
`8`	`9`
`9`	`10`	`class ResultFormatterHelperSpec extends ObjectBehavior`
`10`	`11`	`{`
`11`	`12`	`function let(`
`12`		`- TextHelper $textHelper`
	`13`	`+ TextHelper $textHelper,`
	`14`	`+ TableHelper $tableHelper`
`13`	`15`	`)`
`14`	`16`	`{`
`15`		`- $this->beConstructedWith($textHelper);`
	`17`	`+ $this->beConstructedWith($textHelper, $tableHelper);`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`function it_is_initializable()`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace spec\PHPCR\Shell\Console\Helper;`
	`3`	`+namespace spec\PHPCR\Shell\Phpcr;`
`4`	`4`
`5`	`5`	`use PhpSpec\ObjectBehavior;`
`6`	`6`	`use Prophecy\Argument;`
`7`	`7`	`use PHPCR\Shell\Config\Profile;`
`8`	`8`	`use PHPCR\Shell\Transport\TransportRegistryInterface;`
`9`	`9`
`10`		`-class PhpcrHelperSpec extends ObjectBehavior`
	`10`	`+class SessionManagerSpec extends ObjectBehavior`
`11`	`11`	`{`
`12`	`12`	`function let(`
`13`	`13`	`Profile $profile,`
`@@ -18,6 +18,6 @@ function let(`
`18`	`18`
`19`	`19`	`function it_is_initializable()`
`20`	`20`	`{`
`21`		`- $this->shouldHaveType('PHPCR\Shell\Console\Helper\PhpcrHelper');`
	`21`	`+ $this->shouldHaveType('PHPCR\Shell\Phpcr\SessionManager');`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ public function getConfigDir()`
`72`	`72`	`if ($home) {`
`73`	`73`	`return $home;`
`74`	`74`	`}`
`75`		`-`
`76`	`75`	`// handle windows ..`
`77`	`76`	`if (defined('PHP_WINDOWS_VERSION_MAJOR')) {`
`78`	`77`	`if (!getenv('APPDATA')) {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace PHPCR\Shell\Console\Application;`
`4`	`4`
`5`	`5`	`use PHPCR\Shell\Subscriber;`
	`6`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
`6`	`7`
`7`	`8`	`/**`
`8`	`9`	`* Subclass of the full ShellApplication for running as an EmbeddedApplication`
`@@ -25,9 +26,9 @@ class EmbeddedApplication extends ShellApplication`
`25`	`26`	`*`
`26`	`27`	`* @param string $mode`
`27`	`28`	`*/`
`28`		`- public function __construct($mode)`
	`29`	`+ public function __construct(ContainerInterface $container, $mode)`
`29`	`30`	`{`
`30`		`- parent::__construct(SessionApplication::APP_NAME, SessionApplication::APP_VERSION);`
	`31`	`+ parent::__construct($container, SessionApplication::APP_NAME, SessionApplication::APP_VERSION);`
`31`	`32`	`$this->mode = $mode;`
`32`	`33`	`$this->setAutoExit(false);`
`33`	`34`	`}`