VhostTemplate - Rename template to defaultTemplate

amp-cli · Jul 25, 2017 · 0c3bce0 · 0c3bce0
1 parent 4dc5aa9
commit 0c3bce0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/app/defaults/services.yml b/app/defaults/services.yml
@@ -135,7 +135,7 @@ services:
     class: Amp\Httpd\VhostTemplate
     calls:
       - [setTemplateEngine, ['@template.engine']]
-      - [setTemplate, ['%apache_tpl%']]
+      - [setDefaultTemplate, ['%apache_tpl%']]
       - [setDir, ['%apache_dir%']]
       - [setLogDir, ['%log_dir%']]
       - [setPerm, ['@perm']]
@@ -147,7 +147,7 @@ services:
     class: Amp\Httpd\VhostTemplate
     calls:
       - [setTemplateEngine, ['@template.engine']]
-      - [setTemplate, ['%apache24_tpl%']]
+      - [setDefaultTemplate, ['%apache24_tpl%']]
       - [setDir, ['%apache_dir%']]
       - [setLogDir, ['%log_dir%']]
       - [setPerm, ['@perm']]
@@ -159,7 +159,7 @@ services:
     class: Amp\Httpd\VhostTemplate
     calls:
       - [setTemplateEngine, ['@template.engine']]
-      - [setTemplate, ['%nginx_tpl%']]
+      - [setDefaultTemplate, ['%nginx_tpl%']]
       - [setDir, ['%nginx_dir%']]
       - [setLogDir, ['%log_dir%']]
       - [setPerm, ['@perm']]

diff --git a/src/Amp/Httpd/VhostTemplate.php b/src/Amp/Httpd/VhostTemplate.php
@@ -28,7 +28,7 @@ class VhostTemplate implements HttpdInterface {
   /**
    * @var string, name of the template file
    */
-  private $template;
+  private $defaultTemplate;
 
   /**
    * @var EngineInterface
@@ -72,7 +72,7 @@ public function createVhost($root, $url) {
     $parameters['url'] = $url;
     $parameters['include_vhost_file'] = '';
     $parameters['log_dir'] = $this->getLogDir();
-    $content = $this->getTemplateEngine()->render($this->getTemplate(), $parameters);
+    $content = $this->getTemplateEngine()->render($this->getDefaultTemplate(), $parameters);
     $this->fs->dumpFile($this->createFilePath($root, $url), $content);
 
     $this->setupLogDir();
@@ -212,19 +212,18 @@ public function setSharedPorts($httpd_shared_ports) {
     $this->httpd_shared_ports = $httpd_shared_ports;
   }
 
-
   /**
    * @param string $template
    */
-  public function setTemplate($template) {
-    $this->template = $template;
+  public function setDefaultTemplate($template) {
+    $this->defaultTemplate = $template;
   }
 
   /**
    * @return string
    */
-  public function getTemplate() {
-    return $this->template;
+  public function getDefaultTemplate() {
+    return $this->defaultTemplate;
   }
 
   /**