From 2fd9080a6ba87358b2ad361d241af6e414d59625 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 9 Mar 2017 10:16:38 +0000
Subject: [PATCH 1/2] Add support for adding stuff to local.settings.php and
 solr settings

(cherry picked from commit b140a3188c303c86bc1ee2d859b743990209868b)
---
 src/Stacks/Drupal.php     | 6 ++++++
 src/Stacks/StacksBase.php | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/Stacks/Drupal.php b/src/Stacks/Drupal.php
index f4ea3b6..632b1d1 100644
--- a/src/Stacks/Drupal.php
+++ b/src/Stacks/Drupal.php
@@ -88,9 +88,15 @@ protected function ensureLocalSettings() {
 
         // Replace template variables.
         $localSettings = file_get_contents(Platform::sharedDir() . '/settings.local.php');
+        if (file_exists(Platform::rootDir() . '/.platform-project.local.settings.php')) {
+            $additional_settings = file_get_contents(Platform::rootDir() . '/.platform-project.local.settings.php');
+            $additional_settings = str_replace("<?php\n", '', $additional_settings);
+            $localSettings .= $additional_settings;
+        }
         $localSettings = str_replace('{{ salt }}', hash('sha256', serialize($_SERVER)), $localSettings);
         $localSettings = str_replace('{{ container_name }}', $this->containerName, $localSettings);
         $localSettings = str_replace('{{ redis_container_name }}', $this->redisContainerName, $localSettings);
+        $localSettings = str_replace('{{ solr_container_name }}', $this->solrContainerName, $localSettings);
         $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
         $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
         file_put_contents(Platform::sharedDir() . '/settings.local.php', $localSettings);
diff --git a/src/Stacks/StacksBase.php b/src/Stacks/StacksBase.php
index be345b3..c6807f4 100644
--- a/src/Stacks/StacksBase.php
+++ b/src/Stacks/StacksBase.php
@@ -25,6 +25,11 @@ abstract class StacksBase  implements StackTypeInterface {
      */
     protected $redisContainerName;
 
+    /**
+     * @var string
+     */
+    protected $solrContainerName;
+
     protected $version;
 
     protected $fs;
@@ -39,5 +44,6 @@ public function __construct()
         $this->projectTld    = Platform::projectTld();
         $this->containerName = Compose::getContainerName(Platform::projectName(), 'mariadb');
         $this->redisContainerName = PlatformServiceConfig::hasRedis() ? Compose::getContainerName(Platform::projectName(), 'redis') : '';
+        $this->solrContainerName = PlatformServiceConfig::hasSolr() ? Compose::getContainerName(Platform::projectName(), 'solr') : '';
     }
 }

From 5ab40d0c1e8a8396cc63752ea44609e6808a2874 Mon Sep 17 00:00:00 2001
From: alexpott <alex.a.pott@gmail.com>
Date: Wed, 22 Mar 2017 13:52:49 +0000
Subject: [PATCH 2/2] Update Drupal.php

---
 src/Stacks/Drupal.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Stacks/Drupal.php b/src/Stacks/Drupal.php
index e2766bc..bd889ee 100644
--- a/src/Stacks/Drupal.php
+++ b/src/Stacks/Drupal.php
@@ -96,7 +96,6 @@ protected function ensureLocalSettings() {
         $localSettings = str_replace('{{ salt }}', hash('sha256', serialize($_SERVER)), $localSettings);
         $localSettings = str_replace('{{ container_name }}', $this->containerName, $localSettings);
         $localSettings = str_replace('{{ redis_container_name }}', $this->redisContainerName, $localSettings);
-        $localSettings = str_replace('{{ solr_container_name }}', $this->solrContainerName, $localSettings);
         $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
         $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
         file_put_contents(Platform::sharedDir() . '/settings.local.php', $localSettings);