From 463346c34a8bc0425c846a5bab0df0f1bad4842f Mon Sep 17 00:00:00 2001
From: Stephan Huber <stephan@factorial.io>
Date: Tue, 4 Aug 2020 21:15:55 +0200
Subject: [PATCH 1/3] Force-include twig dependencies into phar

---
 box.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/box.json b/box.json
index 7bffbaa3..e7daa9f9 100644
--- a/box.json
+++ b/box.json
@@ -4,6 +4,9 @@
     ".env",
     "config/services.yml",
     "vendor/twig/twig/src/TwigTest.php"
+    ],
+  "directories": [
+    "vendor/twig/twig/src/Node/Expression/Test"
   ],
   "directories-bin": [
     "config/scaffold"
@@ -13,5 +16,6 @@
   ],
   "git-tag": "git_tag",
   "output": "build/phabalicious.phar",
-  "compression": "GZ"
+  "compression": "GZ",
+  "force-autodiscovery": true
 }

From 966f8dde5187968e7956d92a4e655588f72afe50 Mon Sep 17 00:00:00 2001
From: Stephan Huber <stephan@factorial.io>
Date: Tue, 4 Aug 2020 21:16:28 +0200
Subject: [PATCH 2/3] Fix a warning when running scaffold without scripts

---
 src/Scaffolder/Scaffolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Scaffolder/Scaffolder.php b/src/Scaffolder/Scaffolder.php
index aadc166b..265084f0 100644
--- a/src/Scaffolder/Scaffolder.php
+++ b/src/Scaffolder/Scaffolder.php
@@ -233,7 +233,7 @@ public function scaffold(
         $script->runScript($host_config, $context);
 
         /** @var CommandResult $result */
-        $result = $context->getResult('commandResult');
+        $result = $context->getResult('commandResult', new CommandResult(0, []));
         if ($result && $result->failed()) {
             throw new RuntimeException(sprintf(
                 "Scaffolding failed with exit-code %d\n%s",

From 57c38b529ec902ec67787fa12c1b818af4c95f31 Mon Sep 17 00:00:00 2001
From: Stephan Huber <stephan@factorial.io>
Date: Tue, 4 Aug 2020 21:45:36 +0200
Subject: [PATCH 3/3] Bump version number, update change log

---
 Changelog.md                | 7 +++++++
 src/Utilities/Utilities.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 811f312d..96ad921a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.5.1 / 2020-08-04
+
+### Fixed:
+
+  * Fix a warning when running scaffold without scripts
+  * Force-include twig dependencies when building phar
+
 ## 3.5.0 / 2020-08-04
 
 ### Fixed: 
diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php
index ad7eba7c..825a01b5 100644
--- a/src/Utilities/Utilities.php
+++ b/src/Utilities/Utilities.php
@@ -8,7 +8,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.5.0';
+    const FALLBACK_VERSION = '3.5.1';
     const COMBINED_ARGUMENTS = 'combined';
     const UNNAMED_ARGUMENTS = 'unnamedArguments';