From e19fb6a77163aff92d83032a80716b6aaed66baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Thu, 25 Apr 2024 07:13:17 +0200
Subject: [PATCH 1/4] Improve bin

---
 bin/strauss | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/bin/strauss b/bin/strauss
index 169dcba5..c18dcbbd 100755
--- a/bin/strauss
+++ b/bin/strauss
@@ -1,27 +1,29 @@
 #!/usr/bin/env php
 <?php
 call_user_func(function ($version) {
-    if( ! Phar::running() ) {
-        if (is_file($autoload = getcwd() . '/vendor/autoload.php')) {
-            require $autoload;
-        } elseif (is_file($autoload = getcwd() . '/../../autoload.php')) {
-            require $autoload;
-        }
+    $autoloaders = Phar::running() === ''
+        ? []
+        : [__DIR__ . '/../vendor/autoload.php'];
+    $autoloaders[] = getcwd() . '/vendor/autoload.php';
+    $autoloaders[] = getcwd() . '/../../autoload.php';
+    $autoloaders[] = __DIR__ . '/../vendor/autoload.php';
+    $autoloaders[] = __DIR__ . '/../../../autoload.php';
 
-        if ( is_file( $autoload = __DIR__ . '/../vendor/autoload.php' ) ) {
-            require( $autoload );
-        } elseif ( is_file( $autoload = __DIR__ . '/../../../autoload.php' ) ) {
-            require( $autoload );
-        } else {
-            fwrite( STDERR,
-                'You must set up the project dependencies, run the following commands:' . PHP_EOL .
-                'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
-                'php composer.phar install' . PHP_EOL
-            );
-            exit( 1 );
+    foreach ($autoloaders as $autoloader) {
+        if (!is_file($autoloader)) {
+            continue;
         }
-    } else {
-        include __DIR__ . '/../vendor/autoload.php';
+        require $autoloader;
+        break;
+    }
+
+    if (!class_exists(Composer\Autoload\ClassLoader::class)) {
+        fwrite(STDERR,
+            'You must set up the project dependencies, run the following commands:' . PHP_EOL
+            . 'curl -s https://getcomposer.org/installer | php' . PHP_EOL
+            . 'php composer.phar install' . PHP_EOL
+        );
+        exit(1);
     }
 
     $app = new BrianHenryIE\Strauss\Console\Application($version);

From 76905fba0ddada171a08727d35ec9b7c6b08d432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Thu, 25 Apr 2024 07:21:06 +0200
Subject: [PATCH 2/4] Update strauss

---
 bin/strauss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/strauss b/bin/strauss
index c18dcbbd..f3695431 100755
--- a/bin/strauss
+++ b/bin/strauss
@@ -17,7 +17,7 @@ call_user_func(function ($version) {
         break;
     }
 
-    if (!class_exists(Composer\Autoload\ClassLoader::class)) {
+    if (!class_exists(BrianHenryIE\Strauss\Console\Application::class)) {
         fwrite(STDERR,
             'You must set up the project dependencies, run the following commands:' . PHP_EOL
             . 'curl -s https://getcomposer.org/installer | php' . PHP_EOL

From c32cd4868d216f96d2adcff12a6048341663863a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Thu, 25 Apr 2024 07:23:29 +0200
Subject: [PATCH 3/4] Update strauss

---
 bin/strauss | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/strauss b/bin/strauss
index f3695431..8cab48ae 100755
--- a/bin/strauss
+++ b/bin/strauss
@@ -2,12 +2,15 @@
 <?php
 call_user_func(function ($version) {
     $autoloaders = Phar::running() === ''
-        ? []
-        : [__DIR__ . '/../vendor/autoload.php'];
-    $autoloaders[] = getcwd() . '/vendor/autoload.php';
-    $autoloaders[] = getcwd() . '/../../autoload.php';
-    $autoloaders[] = __DIR__ . '/../vendor/autoload.php';
-    $autoloaders[] = __DIR__ . '/../../../autoload.php';
+        ? [
+            getcwd() . '/vendor/autoload.php',
+            getcwd() . '/../../autoload.php',
+            __DIR__ . '/../vendor/autoload.php',
+            __DIR__ . '/../../../autoload.php',
+        ]
+        : [
+            __DIR__ . '/../vendor/autoload.php',
+        ];
 
     foreach ($autoloaders as $autoloader) {
         if (!is_file($autoloader)) {

From 00d0c9b6f248a3e2e04bd0080e8ec17636f9d68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Thu, 25 Apr 2024 07:24:34 +0200
Subject: [PATCH 4/4] Update phpstan.neon

---
 phpstan.neon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpstan.neon b/phpstan.neon
index e37df627..36ac5062 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,6 +2,7 @@ parameters:
     level: 7
     paths:
         - src
+        - bin/strauss
     bootstrapFiles:
         - phpstanbootstrap.php
     ignoreErrors: