fix: add support for different vendor directory locations

carlalexander · carlalexander · commit 69fa9ee18274 · 2020-12-02T14:26:32.000-05:00
diff --git a/config/services.yml b/config/services.yml
@@ -28,10 +28,10 @@ services:
       tags: ['subscriber']
 
   GuzzleHttp\:
-    resource: '../vendor/guzzlehttp/guzzle/src'
+    resource: '%vendor_directory%/guzzlehttp/guzzle/src'
     exclude:
-      - '../vendor/guzzlehttp/guzzle/src/functions.php'
-      - '../vendor/guzzlehttp/guzzle/src/functions_include.php'
+      - '%vendor_directory%/guzzlehttp/guzzle/src/functions.php'
+      - '%vendor_directory%/guzzlehttp/guzzle/src/functions_include.php'
 
   Ymir\Cli\:
     lazy: true
@@ -86,4 +86,4 @@ services:
         - '@Ymir\Cli\Deployment\StartAndMonitorDeploymentStep'
 
   Symfony\Component\Filesystem\:
-    resource: '../vendor/symfony/filesystem'
+    resource: '%vendor_directory%/symfony/filesystem'
diff --git a/ymir b/ymir
@@ -15,13 +15,29 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Ymir\Cli\Application;
 
-require __DIR__.'/vendor/autoload.php';
+/**
+ * Determine vendor directory.
+ */
+$vendorDirectory = '';
+
+if (file_exists(__DIR__.'/../../autoload.php')) {
+    $vendorDirectory = __DIR__.'/../..';
+} elseif (file_exists(__DIR__.'/vendor/autoload.php')) {
+    $vendorDirectory = __DIR__.'/vendor';
+}
+
+if (empty($vendorDirectory)) {
+    throw new \RuntimeException('Unable to find vendor directory');
+}
+
+require $vendorDirectory.'/autoload.php';
 
 $container = new ContainerBuilder();
 
 // Load manual parameters
 $container->setParameter('application_directory', __DIR__);
 $container->setParameter('home_directory', rtrim(getenv('HOME'), '/'));
+$container->setParameter('vendor_directory', $vendorDirectory);
 $container->setParameter('working_directory', rtrim(getcwd(), '/'));
 $container->setParameter('ymir_api_url', getenv('YMIR_API_URL') ?: 'https://ymirapp.com/api');
 
