Merge branch 'hotfix/3.5.1'

factorial-io · Aug 4, 2020 · 3731b0c · 3731b0c
2 parents 76c6e6d + 57c38b5
commit 3731b0c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git 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/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
 }
diff --git 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",

diff --git 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';