src/Application.php

@@ -73,6 +73,17 @@ class Application extends BaseApplication
         parent::__construct($name, $version);
     }
 
+    /**
+     * Make configureIO public so we can run it before ->run()
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function configureIO(InputInterface $input, OutputInterface $output)
+    {
+        parent::configureIO($input, $output);
+    }
+
     /**
      * Initializes all the default commands.
      */

src/Command.php

@@ -74,7 +74,7 @@ abstract class Command extends BaseCommand
             try {
                 // Load context from context_name argument.
                 $this->context_name = $this->input->getArgument('context_name');
-                $this->context = Provision::getContext($this->context_name, $this->getProvision());
+                $this->context = $this->getProvision()->getContext($this->context_name);
             }
             catch (\Exception $e) {
 
@@ -96,7 +96,7 @@ abstract class Command extends BaseCommand
             $this->input->setArgument('context_name', $this->context_name);
 
             try {
-                $this->context = Provision::getContext($this->context_name, $this->getProvision());
+                $this->context = $this->getProvision()->getContext($this->context_name);
             }
             catch (\Exception $e) {
                 $this->context = NULL;

src/Command/SaveCommand.php

@@ -153,7 +153,7 @@ class SaveCommand extends Command
             // Check for context type service requirements.
             $exit = FALSE;
             $this->io->comment("Checking service requirements for context type {$context_type}...");
-            $reqs = Provision::checkServiceRequirements($context_type);
+            $reqs = $this->getProvision()->checkServiceRequirements($context_type);
             foreach ($reqs as $service => $available) {
                 if ($available) {
                     $this->io->successLite("Service $service: Available");
@@ -352,7 +352,7 @@ class SaveCommand extends Command
                 $contexts[$property] = $this->input->getOption($property);
                 
                 try {
-                    $context = Provision::getContext($contexts[$property]);
+                    $context = $this->getProvision()->getContext($contexts[$property]);
                 }
                 catch (\Exception $e) {
                     throw new \Exception("Context set by option --{$property} does not exist.");

src/Command/StatusCommand.php

@@ -43,6 +43,7 @@ class StatusCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->getProvision();
         
         if ($input->getArgument('context_name')) {
             $rows = [['Configuration File', $this->context->config_path]];

src/Command/VerifyCommand.php

@@ -80,7 +80,7 @@ class VerifyCommand extends Command
         }
          */
 
-        $message = $this->context->verify();
+        $message = $this->context->verifyCommand();
 
     }
 }

src/Common/ContextAwareTrait.php

+<?php
+
+namespace Aegir\Provision\Common;
+
+use Aegir\Provision\Context;
+
+trait ContextAwareTrait
+{
+    /**
+     * @var Context
+     */
+    protected $context = NULL;
+    
+    /**
+     * @param Context $context
+     *
+     * @return $this
+     */
+    public function setContext(Context $context = NULL)
+    {
+        $this->context = $context;
+        
+        return $this;
+    }
+    
+    /**
+     * @return Context
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+}

src/Common/ProcessAwareTrait.php

+<?php
+
+namespace Aegir\Provision\Common;
+
+use Aegir\Provision\Context;
+use Symfony\Component\Process\Process;
+use Twig\Node\Expression\Unary\NegUnary;
+
+trait ProcessAwareTrait
+{
+    /**
+     * @var Process
+     */
+    protected $process = NULL;
+
+//    /**
+//     * @var string
+//     */
+//    protected $command;
+
+    /**
+     * @param Process $process
+     *
+     * @return $this
+     */
+    protected function setProcess(Process $process = NULL)
+    {
+        $this->process = $process;
+        return $this;
+    }
+
+    /**
+     * @return Process
+     */
+    public function getProcess()
+    {
+        if (is_null($this->process)) {
+            $this->process = new Process($this->command);
+        }
+        return $this->process;
+
+    }
+
+    /**
+     * @param $command
+     *
+     * @return $this
+     */
+    public function setCommand($command) {
+
+        $this->command = $command;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCommand() {
+
+        return $this->command;
+    }
+
+    public function execute() {
+        $this->process->run();
+    }
+
+}

src/ConfigDefinition/ContextNodeDefinition.php

@@ -2,8 +2,7 @@
 
 namespace Aegir\Provision\ConfigDefinition;
 
-use Aegir\Provision\Application;
-use Aegir\Provision\Provision;
+use Aegir\Provision\Common\ProvisionAwareTrait;
 use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
@@ -29,6 +28,8 @@ use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
  */
 class ContextNodeDefinition extends ScalarNodeDefinition
 {
+    use ProvisionAwareTrait;
+
     protected function createNode()
     {
         /**
@@ -51,12 +52,13 @@ class ContextNodeDefinition extends ScalarNodeDefinition
      */
     public function validateContext($value)
     {
+        $this->setProvision($this->getNode()->getAttribute('provision'));
+        
         // No need to do anything else.
         // If there is no context named $value, getContext() throws an exception for us.
-        Provision::getContext($value);
 
         // If context_type is specified, Validate that the desired context is the right type.
-        if ($this->getNode()->getAttribute('context_type') && Provision::getContext($value)->type != $this->getNode()->getAttribute('context_type')) {
+        if ($this->getNode()->getAttribute('context_type') && $this->getProvision()->getContext($value)->type != $this->getNode()->getAttribute('context_type')) {
             throw new InvalidConfigurationException(strtr('The context specified for !name must be type !type.', [
                 '!name' => $this->name,
                 '!type' => $this->getNode()->getAttribute('context_type'),
@@ -70,8 +72,8 @@ class ContextNodeDefinition extends ScalarNodeDefinition
                 $this->getNode()->getAttribute('service_requirement'):
                 $path[2]
             ;
-            
-            Provision::getContext($value)->getService($service);
+    
+            $this->getProvision()->getContext($value)->getService($service);
         }
         return $value;
     }

src/Context.php

@@ -14,6 +14,7 @@ use Robo\Common\BuilderAwareTrait;
 use Robo\Contract\BuilderAwareInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Dumper;
@@ -74,17 +75,16 @@ class Context implements BuilderAwareInterface
      */
     function __construct(
         $name,
-        Provision $provision = NULL,
+        Provision $provision,
         $options = [])
     {
         $this->name = $name;
+    
+        $this->setProvision($provision);
+        $this->setBuilder($this->getProvision()->getBuilder());
+        
         $this->loadContextConfig($options);
         $this->prepareServices();
-        
-        if ($provision) {
-            $this->setProvision($provision);
-            $this->setBuilder($this->getProvision()->getBuilder());
-        }
     }
 
     /**
@@ -126,7 +126,7 @@ class Context implements BuilderAwareInterface
             $this->config = $processor->processConfiguration($this, $configs);
             
         } catch (\Exception $e) {
-            throw new \Exception(
+            throw new InvalidOptionException(
                 strtr("There is an error with the configuration for !type '!name'. Check the file !file and try again. \n \nError: !message", [
                     '!type' => $this->type,
                     '!name' => $this->name,
@@ -302,6 +302,7 @@ class Context implements BuilderAwareInterface
                     ->node($property, 'context')
                         ->isRequired()
                         ->attribute('context_type', $type)
+                        ->attribute('provision', $this->getProvision())
                     ->end()
                 ->end();
         }
@@ -332,7 +333,7 @@ class Context implements BuilderAwareInterface
 
                 // If type is empty, it's because it's in the ServerContext
                 if (empty($info['type'])) {
-                    $server = Provision::getContext($info['server']);
+                    $server = $this->getProvision()->getContext($info['server']);
                     $service_type = ucfirst($server->getService($service)->type);
                 }
                 else {
@@ -475,32 +476,33 @@ class Context implements BuilderAwareInterface
      *
      * If this context is a Service Subscriber, the provider service will be verified first.
      */
-    public function verify() {
+    public function verifyCommand() {
         $return_codes = [];
         // Run verify method on all services.
         foreach ($this->getServices() as $type => $service) {
-            $friendlyName = $service->getFriendlyName();
-
-            if ($this->isProvider()) {
-                $this->getProvision()->io()->section("Verify service: {$friendlyName}");
-                foreach ($service->verify() as $type => $verify_success) {
-                    $return_codes[] = $verify_success? 0: 1;
-                }
-            }
-            else {
-                $this->getProvision()->io()->section("Verify service: {$friendlyName} on {$service->provider->name}");
-
-                // First verify the service provider.
-                foreach ($service->verifyProvider() as $verify_part => $verify_success) {
-                    $return_codes[] = $verify_success? 0: 1;
-                }
-
-                // Then run "verify" on the subscriptions.
-                foreach ($this->getSubscription($type)->verify() as $type => $verify_success) {
-                    $return_codes[] = $verify_success? 0: 1;
-                }
-            }
+            $return_codes[] = $service->verify() ? 0 : 1;
         }
+//
+//            if ($this->isProvider()) {
+//                $this->getProvision()->io()->section("Verify service: {$friendlyName}");
+//                foreach ($service->verify() as $type => $verify_success) {
+//                    $return_codes[] = $verify_success? 0: 1;
+//                }
+//            }
+//            else {
+//                $this->getProvision()->io()->section("Verify service: {$friendlyName} on {$service->provider->name}");
+//
+//                // First verify the service provider.
+//                foreach ($service->verifyProvider() as $verify_part => $verify_success) {
+//                    $return_codes[] = $verify_success? 0: 1;
+//                }
+//
+//                // Then run "verify" on the subscriptions.
+//                foreach ($this->getSubscription($type)->verify() as $type => $verify_success) {
+//                    $return_codes[] = $verify_success? 0: 1;
+//                }
+//            }
+//        }
 
         // If any service verify failed, exit with a non-zero code.
         if (count(array_filter($return_codes))) {

src/Context/SiteContext.php

@@ -3,6 +3,7 @@
 namespace Aegir\Provision\Context;
 
 use Aegir\Provision\Application;
+use Aegir\Provision\Context;
 use Aegir\Provision\ContextSubscriber;
 use Aegir\Provision\Provision;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -46,9 +47,9 @@ class SiteContext extends ContextSubscriber implements ConfigurationInterface
         // There is no need to check if the property exists because the config system does that.
 //        $this->db_server = $application->getContext($this->properties['db_server']);
 
-        $this->platform = Provision::getContext($this->properties['platform'], $provision);
-
-
+        // Load platform context... @TODO: Automatically do this for required contexts?
+        $this->platform = $this->getProvision()->getContext($this->properties['platform']);
+    
         // Add platform http service subscription.
         $this->serviceSubscriptions['http'] = $this->platform->getSubscription('http');
         $this->serviceSubscriptions['http']->context = $this;

src/ContextSubscriber.php

@@ -93,6 +93,7 @@ class ContextSubscriber extends Context
                     ->node('server', 'context')
                         ->isRequired()
                         ->attribute('context_type', 'server')
+                        ->attribute('provision', $this->getProvision())
                     ->end()
                     ->append($this->addServiceProperties('service_subscriptions'))
                 ->end()

src/Provision.php

@@ -62,6 +62,16 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
      */
     private $commands = [];
     
+    /**
+     * @var \Aegir\Provision\Context[]
+     */
+    private $contexts = [];
+    
+    /**
+     * @var array[]
+     */
+    private $context_files = [];
+    
     /**
      * Provision constructor.
      *
@@ -79,16 +89,18 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
         
         $this
             ->setConfig($config)
-            ->setInput($input)
-            ->setOutput($output)
         ;
-        
+
         // Create Application.
         $application = new Application(self::APPLICATION_NAME, self::VERSION);
         $application
             ->setProvision($this)
-            ->setLogger($logger);
-        
+            ->setLogger($logger)
+        ;
+        $application->configureIO($input, $output);
+        $this->setInput($input);
+        $this->setOutput($output);
+
         // Create and configure container.
         $container = Robo::createDefaultContainer($input, $output, $application, $config);
         $this->setContainer($container);
@@ -104,11 +116,51 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
     
         $this->setBuilder($container->get('builder'));
         $this->setLogger($container->get('logger'));
+        
+        $this->loadAllContexts();
+    }
+    
+    /**
+     * Lookup all context yml files and load into Context classes.
+     */
+    private function loadAllContexts()
+    {
+        $folder = $this->getConfig()->get('config_path') . '/provision';
+        $finder = new \Symfony\Component\Finder\Finder();
+        $finder->files()->name("*.yml")->in($folder);
+        foreach ($finder as $file) {
+            $context_type = substr($file->getFilename(), 0, strpos($file->getFilename(), '.'));
+            $context_name = substr($file->getFilename(), strpos($file->getFilename(), '.') + 1, strlen($file->getFilename()) - strlen($context_type) - 5);
+        
+            $this->context_files[$context_name] = [
+                'name' => $context_name,
+                'type' => $context_type,
+                'file' => $file,
+            ];
+        }
+
+        // Load Context classes from files metadata.
+        foreach ($this->context_files as $context) {
+            $class = Context::getClassName($context['type']);
+            $this->contexts[$context['name']] = new $class($context['name'], $this);
+        }
+    }
+    
+    /**
+     * Loads a single context from file into $this->contexts[$name].
+     *
+     * Used to load dependant contexts that might not be instantiated yet.
+     *
+     * @param $name
+     */
+    public function loadContext($name) {
+        $class = Context::getClassName($this->context_files[$name]['type']);
+        $this->contexts[$this->context_files[$name]['name']] = new $class($this->context_files[$name]['name'], $this);
     }
     
     public function run(InputInterface $input, OutputInterface $output) {
         $status_code = $this->runner->run($input, $output);
-        
+
         return $status_code;
     }
     
@@ -186,41 +238,19 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
     }
     
     /**
-     * Load all contexts into Context objects.
+     * Return all available contexts.
      *
-     * @return array
+     * @return array|Context
      */
-    static function getAllContexts($name = '', Provision $provision = NULL) {
-        $contexts = [];
-        $config = new Config();
-        
-        $context_files = [];
-        $finder = new \Symfony\Component\Finder\Finder();
-        $finder->files()->name('*' . $name . '.yml')->in($config->get('config_path') . '/provision');
-        foreach ($finder as $file) {
-            $context_type = substr($file->getFilename(), 0, strpos($file->getFilename(), '.'));
-            $context_name = substr($file->getFilename(), strpos($file->getFilename(), '.') + 1, strlen($file->getFilename()) - strlen($context_type) - 5);
-
-            $context_files[$context_name] = [
-                'name' => $context_name,
-                'type' => $context_type,
-                'file' => $file,
-            ];
-        }
-        
-        foreach ($context_files as $context) {
-            $class = Context::getClassName($context['type']);
-            $contexts[$context['name']] = new $class($context['name'], $provision);
-        }
-        
-        if ($name && isset($contexts[$name])) {
-            return $contexts[$name];
+    public function getAllContexts($name = '') {
+        if ($name && isset($this->contexts[$name])) {
+            return $this->contexts[$name];
         }
-        elseif ($name && !isset($contexts[$name])) {
+        elseif ($name && !isset($this->contexts[$name])) {
             return NULL;
         }
         else {
-            return $contexts;
+            return $this->contexts;
         }
     }
     
@@ -231,9 +261,9 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
      * @return mixed
      * @throws \Exception
      */
-    static public function getAllServers($service = NULL) {
+    protected function getAllServers($service = NULL) {
         $servers = [];
-        $context_files = self::getAllContexts();
+        $context_files = $this->getAllContexts();
         if (empty($context_files)) {
             throw new \Exception('No server contexts found. Use `provision save` to create one.');
         }
@@ -272,14 +302,36 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
      * @return array|\Aegir\Provision\Context
      * @throws \Exception
      */
-    static public function getContext($name, Provision $provision = NULL) {
+    public function getContext($name) {
+        // Check if $name is empty.
+        if (empty($name)) {
+            throw new \Exception('Context name must not be empty.');
+        }
+        
+        // If context exists but hasn't been loaded, load it.
+        if (empty($this->contexts[$name]) && !empty($this->context_files[$name])) {
+            $this->loadContext($name);
+        }
+        
+        // Check if context still isn't found.
+        if (empty($this->contexts[$name])) {
+            throw new \Exception('Context not found with name: ' . $name);
+        }
+        return $this->contexts[$name];
+    }
+    
+    /**
+     * Look for a context file being present. This is available before Context
+     * objects are bootstrapped.
+     */
+    public function getContextFile($name) {
         if (empty($name)) {
             throw new \Exception('Context name must not be empty.');
         }
-        if (empty(Provision::getAllContexts($name, $provision))) {
+        if (empty($this->context_files[$name])) {
             throw new \Exception('Context not found with name: ' . $name);
         }
-        return Provision::getAllContexts($name, $provision);
+        return$this->context_files[$name];
     }
     
     /**
@@ -306,7 +358,7 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
      * @param $type
      * @return array
      */
-    static function checkServiceRequirements($type) {
+    public function checkServiceRequirements($type) {
         $class_name = Context::getClassName($type);
         
         // @var $context Context
@@ -315,7 +367,7 @@ class Provision implements ConfigAwareInterface, ContainerAwareInterface, Logger
         $services = [];
         foreach ($service_requirements as $service) {
             try {
-                if (empty(Provision::getAllServers($service))) {
+                if (empty($this->getAllServers($service))) {
                     $services[$service] = 0;
                 }
                 else {

src/Service.php

@@ -8,17 +8,20 @@
 
 namespace Aegir\Provision;
 
+use Aegir\Provision\Common\ContextAwareTrait;
 use Aegir\Provision\Common\ProvisionAwareTrait;
+use Psr\Log\LoggerAwareTrait;
 use Robo\Common\BuilderAwareTrait;
 use Robo\Common\OutputAdapter;
 use Robo\Contract\BuilderAwareInterface;
 
 class Service implements BuilderAwareInterface
 {
-    
     use BuilderAwareTrait;
     use ProvisionAwareTrait;
-    
+    use ContextAwareTrait;
+    use LoggerAwareTrait;
+
     public $type;
     
     public $properties;
@@ -46,7 +49,9 @@ class Service implements BuilderAwareInterface
     function __construct($service_config, Context $provider_context)
     {
         $this->provider = $provider_context;
+        $this->setContext($provider_context);
         $this->setProvision($provider_context->getProvision());
+        $this->setLogger($provider_context->getProvision()->getLogger());
         
         $this->type = $service_config['type'];
         $this->properties = $service_config['properties'];
@@ -77,30 +82,54 @@ class Service implements BuilderAwareInterface
             return "\Aegir\Provision\Service\\{$service}Service";
         }
     }
-    
-    /**
-     * React to the `provision verify` command.
-     */
-    function verify()
-    {
-        return [
-            'configuration' => $this->writeConfigurations(),
-            'service' => $this->restartService(),
-        ];
-    }
 
     /**
-     * React to `provision verify` command when run on a subscriber, to verify the service's provider.
-     *
-     * This is used to allow skipping of the service restart.
+     * React to the verify command. Passes off to the method verifySite, verifyServer, verifyPlatform.
+     * @return mixed
      */
-    function verifyProvider()
-    {
-        return [
-            'configuration' => $this->writeConfigurations(),
-        ];
+    public function verify() {
+        $method = 'verify' . ucfirst($this->getContext()->type);
+        $this->getProvision()->getLogger()->info("Running {method}", [
+            'method' => $method
+        ]);
+        return $this::$method();
     }
 
+//
+//    /**
+//     * React to the `provision verify` command.
+//     */
+//    function verifySite()
+//    {
+//        return [
+//            'configuration' => $this->writeConfigurations(),
+//            'service' => $this->restartService(),
+//        ];
+//    }
+//
+//    /**
+//     * React to the `provision verify` command.
+//     */
+//    function verifyPlatform()
+//    {
+//        return [
+//            'configuration' => $this->writeConfigurations(),
+//            'service' => $this->restartService(),
+//        ];
+//    }
+//
+//    /**
+//     * React to `provision verify` command when run on a subscriber, to verify the service's provider.
+//     *
+//     * This is used to allow skipping of the service restart.
+//     */
+//    function verifyServer()
+//    {
+//        return [
+//            'configuration' => $this->writeConfigurations(),
+//        ];
+//    }
+
     /**
      * Run the services "restart_command".
      * @return bool

src/Service/DbService.php

@@ -12,6 +12,7 @@ namespace Aegir\Provision\Service;
 
 use Aegir\Provision\Context\SiteContext;
 use Aegir\Provision\Service;
+use Aegir\Provision\ServiceInterface;
 use Aegir\Provision\ServiceSubscription;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -20,7 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface;
  *
  * @package Aegir\Provision\Service
  */
-class DbService extends Service
+class DbService extends Service implements ServiceInterface
 {
 
     const SERVICE = 'db';
@@ -89,7 +90,7 @@ class DbService extends Service
     /**
      * React to the `provision verify` command on Server contexts
      */
-    function verify() {
+    function verifyServer() {
         $this->creds = array_map('urldecode', parse_url($this->properties['master_db']));
         
         if (!isset($this->creds['port'])) {
@@ -135,11 +136,11 @@ class DbService extends Service
     /**
      * React to the `provision verify` command on subscriber contexts (sites and platforms)
      */
-    function verifySubscription(ServiceSubscription $serviceSubscription) {
-        $this->subscription = $serviceSubscription;
+    function verifySite() {
+        $this->subscription = $this->getContext()->getSubscription($this->type);
 
         // Check for database
-        $this->create_site_database($serviceSubscription->context);
+        $this->create_site_database($this->getContext());
 
         $this->creds_root = array_map('urldecode', parse_url($this->properties['master_db']));
     
@@ -169,6 +170,10 @@ class DbService extends Service
         }
     }
 
+    public function verifyPlatform() {
+
+    }
+
     /**
      * React to `provision verify` command when run on a subscriber, to verify the service's provider.
      *

src/Service/Http/HttpPhpService.php

+<?php
+/**
+ * @file
+ * The Provision HttpApacheService class.
+ *
+ * @see \Provision_Service_http_apache
+ */
+
+namespace Aegir\Provision\Service\Http;
+
+use Aegir\Provision\Robo\ProvisionCollectionBuilder;
+use Aegir\Provision\Service\Http\Apache\Configuration\PlatformConfiguration;
+use Aegir\Provision\Service\Http\Apache\Configuration\ServerConfiguration;
+use Aegir\Provision\Service\Http\Apache\Configuration\SiteConfiguration;
+use Aegir\Provision\Service\HttpService;
+use Aegir\Provision\ServiceSubscription;
+use Robo\Result;
+use Aegir\Provision\Service\Http\Php\PhpServer;
+use Symfony\Component\Process\Process;
+
+/**
+ * Class HttpPhpService
+ *
+ * @package Aegir\Provision\Service\Http
+ */
+class HttpPhpService extends HttpService
+{
+    const SERVICE_TYPE = 'php';
+    const SERVICE_TYPE_NAME = 'PHP Server';
+
+
+    public function verifyServer()
+    {
+
+        $host = $this->getContext()->getProperty('remote_host');
+        $port = $this->getProperty('http_port');
+
+        $this->getProvision()->getLogger()->info('Running server at {host}:{port}', [
+            'host' => $host,
+            'port' => $port,
+        ]);
+//
+
+        $this->getContext()->getBuilder()->build(PhpServer::class, ['port' => $port]);
+
+//        $server = new PhpServer($port);
+
+        /** @var PhpServer $server */
+        $server = $this->getContext()->getBuilder()->task(PhpServer::class, ['port' => $port]);
+
+        $server->host($host);
+        $server->dir(__DIR__ . '/Php/servertest');
+
+        $server->background();
+        $server->run();
+//
+        $pid = $server->getProcess()->getPid();
+
+        $this->getProvision()->getLogger()->info('Server started at {host}:{port} running as process {pid}', [
+            'host' => $host,
+            'port' => $port,
+            'pid' => $pid,
+        ]);
+
+
+    }
+
+    public function verifySite()
+    {
+    }
+
+    public function verifySubscription(ServiceSubscription $subscription)
+    {
+
+        print_r($subscription->context->getProperty('root'));
+        $this->application->getBuilder()->taskServer($this->getProperty('http_port'))
+            ->dir('.');;
+
+
+    }
+}

src/Service/Http/Php/PhpServer.php

+<?php
+
+namespace Aegir\Provision\Service\Http\Php;
+
+use Robo\Common\ExecCommand;
+use Robo\Common\ExecTrait;
+
+class PhpServer extends \Robo\Task\Development\PhpServer {
+
+
+    /**
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * @var string
+     */
+    protected $host = '127.0.0.1';
+
+    /**
+     * @var string
+     */
+    protected $command = 'php -S %s:%d ';
+
+    /**
+     * @param int $port
+     */
+    public function __construct($port)
+    {
+        $this->port = $port;
+
+        if (strtolower(PHP_OS) === 'linux') {
+            $this->command = 'exec php -S %s:%d ';
+        }
+    }
+
+    /**
+     * @param string $host
+     *
+     * @return $this
+     */
+    public function host($host)
+    {
+        $this->host = $host;
+        return $this;
+    }
+
+    /**
+     * @param string $path
+     *
+     * @return $this
+     */
+    public function dir($path)
+    {
+        $this->command .= "-t $path";
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCommand()
+    {
+        return sprintf($this->command, $this->host, $this->port);
+    }
+
+    public function run() {
+        $this->executeCommand($this->getCommand());
+    }
+
+    public function getProcess() {
+        return $this->process;
+    }
+
+    public function task() {
+
+    }
+}
\ No newline at end of file

src/Service/Http/Php/servertest/index.php

+<h1><?php print "It Works!";  ?></h1>
+
+<p>
+  <?php print "This page is being generated by PHP web server." ?>
+</p>

src/Service/HttpService.php

@@ -11,6 +11,7 @@ namespace Aegir\Provision\Service;
 //require_once DRUSH_BASE_PATH . '/commands/core/rsync.core.inc';
 
 use Aegir\Provision\Service;
+use Aegir\Provision\ServiceInterface;
 use Aegir\Provision\ServiceSubscription;
 use Consolidation\AnnotatedCommand\CommandFileDiscovery;
 
@@ -19,7 +20,7 @@ use Consolidation\AnnotatedCommand\CommandFileDiscovery;
  *
  * @package Aegir\Provision\Service
  */
-class HttpService extends Service {
+class HttpService extends Service implements ServiceInterface {
   const SERVICE = 'http';
   const SERVICE_NAME = 'Web Server';
 
@@ -57,7 +58,7 @@ class HttpService extends Service {
      *
      * This is used to allow skipping of the service restart.
      */
-    function verifyProvider()
+    function verifyServer()
     {
         return [
             'configuration' => $this->writeConfigurations(),
@@ -67,14 +68,18 @@ class HttpService extends Service {
     /**
      * React to the `provision verify` command on Server contexts
      */
-    function verifySubscription(ServiceSubscription $serviceSubscription) {
-        $this->subscription = $serviceSubscription;
+    function verifySite() {
+        $this->subscription = $this->getContext()->getSubscription();
         return [
-            'configuration' => $this->writeConfigurations($serviceSubscription),
+            'configuration' => $this->writeConfigurations($this->subscription),
             'service' => $this->restartService(),
         ];
     }
-//
+
+    function verifyPlatform() {
+    }
+
+    //
 //    /**
 //   * Support the ability to cloak the database credentials using environment variables.
 //   */

src/ServiceInterface.php

+<?php
+
+namespace Aegir\Provision;
+
+interface ServiceInterface
+{
+
+    /**
+     * Triggered on `provision verify` command on Site contexts.
+     */
+    public function verifySite();
+
+
+    /**
+     * Triggered on `provision verify` command on Platform contexts.
+     */
+    public function verifyPlatform();
+
+
+    /**
+     * Triggered on `provision verify` command on Site contexts.
+     */
+    public function verifyServer();
+
+}
\ No newline at end of file

src/ServiceSubscription.php

@@ -9,6 +9,7 @@
 
 namespace Aegir\Provision;
 
+use Aegir\Provision\Common\ContextAwareTrait;
 use Aegir\Provision\Common\ProvisionAwareTrait;
 
 class ServiceSubscription {
@@ -20,22 +21,23 @@ class ServiceSubscription {
    public $properties = [];
    
    use ProvisionAwareTrait;
+   use ContextAwareTrait;
   
   function __construct(
       Context $context,
       $server,
       $service_name
   ) {
-      $this->context = $context;
-      $this->server = Provision::getContext($server, $context->getProvision());
+      $this->setContext($context);
+      $this->setProvision($context->getProvision());
+
+      $this->server = $this->getProvision()->getContext($server);
       $this->service = $this->server->getService($service_name);
       $this->type = $this->server->getService($service_name)->type;
       
       if (isset($context->config['service_subscriptions'][$service_name]['properties'])) {
           $this->properties = $context->config['service_subscriptions'][$service_name]['properties'];
       }
-      
-      $this->setProvision($context->getProvision());
   }
   
   public function verify() {