Merge branch 'main' into issue-4690

acquia · Aug 22, 2023 · e0c1e00 · e0c1e00
2 parents d17bd16 + c0ce4b8
commit e0c1e00
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -1,19 +1,23 @@
 {
     "name": "acquia/blt",
-    "type": "composer-plugin",
     "description": "BLT",
+    "license": "GPL-2.0-only",
+    "type": "composer-plugin",
     "keywords": [
         "drupal",
         "deployment",
         "automation",
         "template"
     ],
-    "license": "GPL-2.0-only",
     "authors": [
         {
             "name": "Matthew Grasmick"
         }
     ],
+    "support": {
+        "issues": "https://github.com/acquia/blt/issues",
+        "docs": "https://docs.acquia.com/blt/"
+    },
     "require": {
         "php": ">=7.4",
         "ext-json": "*",
@@ -37,17 +41,30 @@
         "symfony/yaml": "^4.4 || ^5 || ^6",
         "webmozart/path-util": "^2.3"
     },
-    "conflict": {
-        "acquia/blt-behat": "<=1.0.0"
-    },
     "require-dev": {
         "acquia/coding-standards": "^2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "squizlabs/php_codesniffer": "^3.6"
     },
+    "conflict": {
+        "acquia/blt-behat": "<=1.0.0"
+    },
     "suggest": {
         "davereid/drush-acquia-hook-invoke": "dev-master"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "autoload": {
+        "psr-4": {
+            "Acquia\\Blt\\": "src/",
+            "Acquia\\Blt\\Tests\\": "tests/phpunit/src/",
+            "Acquia\\Blt\\Tests\\Robo\\": "tests/phpunit/Robo/"
+        }
+    },
+    "bin": [
+        "bin/blt",
+        "bin/blt.bat"
+    ],
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
@@ -65,22 +82,5 @@
         },
         "class": "Acquia\\Blt\\Composer\\Plugin",
         "phpcodesniffer-search-depth": "4"
-    },
-    "autoload": {
-        "psr-4": {
-            "Acquia\\Blt\\": "src/",
-            "Acquia\\Blt\\Tests\\": "tests/phpunit/src/",
-            "Acquia\\Blt\\Tests\\Robo\\": "tests/phpunit/Robo/"
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "bin": [
-        "bin/blt",
-        "bin/blt.bat"
-    ],
-    "support": {
-        "issues": "https://github.com/acquia/blt/issues",
-        "docs": "https://docs.acquia.com/blt/"
     }
 }
diff --git a/src/Robo/Config/BltConfig.php b/src/Robo/Config/BltConfig.php
@@ -11,6 +11,13 @@
  */
 class BltConfig extends Config {
 
+  /**
+   * Expander.
+   *
+   * @var \Grasmash\YamlExpander\YamlExpander
+   */
+  protected $expander;
+
   /**
    * Config Constructor.
    *

diff --git a/src/Update/Updater.php b/src/Update/Updater.php
@@ -86,6 +86,34 @@ class Updater {
    */
   protected $cloudHooksAlreadyUpdated = FALSE;
 
+  /**
+   * Project Local Yml Filepath.
+   *
+   * @var string
+   */
+  protected $projectLocalYmlFilepath;
+
+  /**
+   * Project Yml Filepath.
+   *
+   * @var string
+   */
+  protected $projectYmlFilepath;
+
+  /**
+   * Template Composer Json Filepath.
+   *
+   * @var string
+   */
+  protected $templateComposerJsonFilepath;
+
+  /**
+   * Update Class Name.
+   *
+   * @var string
+   */
+  protected $updateClassName;
+
   /**
    * Updater constructor.
    *