Replaced PrepareWorkspaceEvent with WorkspaceEvent

src/Deployment/Strategy/RemoteInstallStrategy.php

@@ -9,7 +9,7 @@
 use Accompli\EventDispatcher\Event\HostEvent;
 use Accompli\EventDispatcher\Event\InstallReleaseEvent;
 use Accompli\EventDispatcher\Event\PrepareReleaseEvent;
-use Accompli\EventDispatcher\Event\PrepareWorkspaceEvent;
+use Accompli\EventDispatcher\Event\WorkspaceEvent;
 use Exception;
 
 /**
@@ -37,10 +37,10 @@ public function install($version, $stage = null)
             try {
                 $this->eventDispatcher->dispatch(AccompliEvents::CREATE_CONNECTION, new HostEvent($host));
 
-                $prepareWorkspaceEvent = new PrepareWorkspaceEvent($host);
-                $this->eventDispatcher->dispatch(AccompliEvents::PREPARE_WORKSPACE, $prepareWorkspaceEvent);
+                $workspaceEvent = new WorkspaceEvent($host);
+                $this->eventDispatcher->dispatch(AccompliEvents::PREPARE_WORKSPACE, $workspaceEvent);
 
-                $workspace = $prepareWorkspaceEvent->getWorkspace();
+                $workspace = $workspaceEvent->getWorkspace();
                 if ($workspace instanceof Workspace) {
                     $prepareReleaseEvent = new PrepareReleaseEvent($workspace, $version);
                     $this->eventDispatcher->dispatch(AccompliEvents::PREPARE_RELEASE, $prepareReleaseEvent);

src/Task/CreateWorkspaceTask.php

@@ -5,11 +5,10 @@
 use Accompli\AccompliEvents;
 use Accompli\Deployment\Workspace;
 use Accompli\EventDispatcher\Event\LogEvent;
-use Accompli\EventDispatcher\Event\PrepareWorkspaceEvent;
+use Accompli\EventDispatcher\Event\WorkspaceEvent;
 use Accompli\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LogLevel;
 use RuntimeException;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
  * CreateWorkspaceTask.
@@ -78,11 +77,11 @@ public function __construct($releasesDirectory = 'releases/', $dataDirectory = '
     /**
      * Constructs a new Workspace instance and sets the Workspace on the event.
      *
-     * @param PrepareWorkspaceEvent $event
-     * @param string                $eventName
-     * @param EventDispatcher       $eventDispatcher
+     * @param WorkspaceEvent           $event
+     * @param string                   $eventName
+     * @param EventDispatcherInterface $eventDispatcher
      */
-    public function onPrepareWorkspaceConstructWorkspaceInstance(PrepareWorkspaceEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
+    public function onPrepareWorkspaceConstructWorkspaceInstance(WorkspaceEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
         $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Creating Workspace.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_IN_PROGRESS)));
 
@@ -100,13 +99,13 @@ public function onPrepareWorkspaceConstructWorkspaceInstance(PrepareWorkspaceEve
     /**
      * Creates the workspace directories when not already existing.
      *
-     * @param PrepareWorkspaceEvent $event
-     * @param string                $eventName
-     * @param EventDispatcher       $eventDispatcher
+     * @param WorkspaceEvent           $event
+     * @param string                   $eventName
+     * @param EventDispatcherInterface $eventDispatcher
      *
      * @throws RuntimeException
      */
-    public function onPrepareWorkspaceCreateWorkspace(PrepareWorkspaceEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
+    public function onPrepareWorkspaceCreateWorkspace(WorkspaceEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
     {
         $workspace = $event->getWorkspace();
         $connection = $this->ensureConnection($workspace->getHost());

tests/Deployment/Strategy/RemoteInstallStrategyTest.php

@@ -9,7 +9,7 @@
 use Accompli\EventDispatcher\Event\HostEvent;
 use Accompli\EventDispatcher\Event\InstallReleaseEvent;
 use Accompli\EventDispatcher\Event\PrepareReleaseEvent;
-use Accompli\EventDispatcher\Event\PrepareWorkspaceEvent;
+use Accompli\EventDispatcher\Event\WorkspaceEvent;
 use PHPUnit_Framework_TestCase;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -84,7 +84,7 @@ public function testInstallDispatchesEventsSuccessfully()
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_WORKSPACE),
-                        $this->callback(array($this, 'provideDispatchCallbackForPrepareWorkspaceEvent')),
+                        $this->callback(array($this, 'provideDispatchCallbackForWorkspaceEvent')),
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_RELEASE),
@@ -139,7 +139,7 @@ public function testInstallDispatchesEventsSuccessfullyForMultipleHosts()
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_WORKSPACE),
-                        $this->callback(array($this, 'provideDispatchCallbackForPrepareWorkspaceEvent')),
+                        $this->callback(array($this, 'provideDispatchCallbackForWorkspaceEvent')),
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_RELEASE),
@@ -165,7 +165,7 @@ public function testInstallDispatchesEventsSuccessfullyForMultipleHosts()
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_WORKSPACE),
-                        $this->callback(array($this, 'provideDispatchCallbackForPrepareWorkspaceEvent')),
+                        $this->callback(array($this, 'provideDispatchCallbackForWorkspaceEvent')),
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_RELEASE),
@@ -225,7 +225,7 @@ public function testInstallDispatchesEventsSuccessfullyUntillAfterPrepareWorkspa
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_WORKSPACE),
-                        $this->callback(array($this, 'provideDispatchCallbackForPrepareWorkspaceEvent')),
+                        $this->callback(array($this, 'provideDispatchCallbackForWorkspaceEvent')),
                     ),
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_RELEASE),
@@ -282,7 +282,7 @@ public function testInstallDispatchesEventsSuccessfullyUntillAfterPrepareRelease
                     array(
                         $this->equalTo(AccompliEvents::PREPARE_WORKSPACE),
                         $this->callback(function ($event) {
-                            return ($event instanceof PrepareWorkspaceEvent);
+                            return ($event instanceof WorkspaceEvent);
                         }),
                     ),
                     array(
@@ -309,15 +309,15 @@ public function testInstallDispatchesEventsSuccessfullyUntillAfterPrepareRelease
      *
      * @return bool
      */
-    public function provideDispatchCallbackForPrepareWorkspaceEvent(Event $event)
+    public function provideDispatchCallbackForWorkspaceEvent(Event $event)
     {
         $workspaceMock = $this->getMockBuilder('Accompli\Deployment\Workspace')
                 ->setConstructorArgs(array($event->getHost()))
                 ->getMock();
 
         $event->setWorkspace($workspaceMock);
 
-        return ($event instanceof PrepareWorkspaceEvent);
+        return ($event instanceof WorkspaceEvent);
     }
 
     /**

tests/Task/CreateWorkspaceTaskTest.php

@@ -3,9 +3,10 @@
 namespace Accompli\Test;
 
 use Accompli\AccompliEvents;
-use Accompli\EventDispatcher\Event\PrepareWorkspaceEvent;
+use Accompli\EventDispatcher\Event\WorkspaceEvent;
 use Accompli\Task\CreateWorkspaceTask;
 use PHPUnit_Framework_TestCase;
+use RuntimeException;
 
 /**
  * CreateWorkspaceTaskTest.
@@ -50,7 +51,7 @@ public function testConstructWithArguments()
     }
 
     /**
-     * Tests if CreateWorkspaceTask::onPrepareWorkspaceConstructWorkspaceInstance constructs a new Workspace instance and sets it on the PrepareWorkspaceEvent.
+     * Tests if CreateWorkspaceTask::onPrepareWorkspaceConstructWorkspaceInstance constructs a new Workspace instance and sets it on the WorkspaceEvent.
      *
      * @depends testConstruct
      */
@@ -63,7 +64,7 @@ public function testOnPrepareWorkspaceConstructWorkspaceInstance()
                 ->disableOriginalConstructor()
                 ->getMock();
 
-        $event = new PrepareWorkspaceEvent($hostMock);
+        $event = new WorkspaceEvent($hostMock);
 
         $task = new CreateWorkspaceTask();
         $task->onPrepareWorkspaceConstructWorkspaceInstance($event, AccompliEvents::PREPARE_WORKSPACE, $eventDispatcherMock);
@@ -98,7 +99,7 @@ public function testOnPrepareWorkspaceCreateWorkspaceThrowsRuntimeExceptionOnIna
         $hostMock->expects($this->once())->method('hasConnection')->willReturn(true);
         $hostMock->expects($this->once())->method('getConnection')->willReturn($connectionAdapterMock);
 
-        $event = new PrepareWorkspaceEvent($hostMock);
+        $event = new WorkspaceEvent($hostMock);
 
         $task = new CreateWorkspaceTask();
         $task->onPrepareWorkspaceConstructWorkspaceInstance($event, AccompliEvents::PREPARE_WORKSPACE, $eventDispatcherMock);
@@ -133,7 +134,7 @@ public function testOnPrepareWorkspaceCreateWorkspace()
         $hostMock->expects($this->once())->method('hasConnection')->willReturn(true);
         $hostMock->expects($this->once())->method('getConnection')->willReturn($connectionAdapterMock);
 
-        $event = new PrepareWorkspaceEvent($hostMock);
+        $event = new WorkspaceEvent($hostMock);
 
         $task = new CreateWorkspaceTask();
         $task->onPrepareWorkspaceConstructWorkspaceInstance($event, AccompliEvents::PREPARE_WORKSPACE, $eventDispatcherMock);
@@ -166,7 +167,7 @@ public function testOnPrepareWorkspaceCreateWorkspaceFailure()
         $hostMock->expects($this->once())->method('hasConnection')->willReturn(true);
         $hostMock->expects($this->once())->method('getConnection')->willReturn($connectionAdapterMock);
 
-        $event = new PrepareWorkspaceEvent($hostMock);
+        $event = new WorkspaceEvent($hostMock);
 
         $task = new CreateWorkspaceTask();
         $task->onPrepareWorkspaceConstructWorkspaceInstance($event, AccompliEvents::PREPARE_WORKSPACE, $eventDispatcherMock);
@@ -194,7 +195,7 @@ public function testOnPrepareWorkspaceCreateWorkspaceExists()
         $hostMock->expects($this->once())->method('hasConnection')->willReturn(true);
         $hostMock->expects($this->once())->method('getConnection')->willReturn($connectionAdapterMock);
 
-        $event = new PrepareWorkspaceEvent($hostMock);
+        $event = new WorkspaceEvent($hostMock);
 
         $task = new CreateWorkspaceTask();
         $task->onPrepareWorkspaceConstructWorkspaceInstance($event, AccompliEvents::PREPARE_WORKSPACE, $eventDispatcherMock);