Make require for own autoload.php optional.

Our own autoload will be present if we run composer for this module itself. However, if it was installed via SSP's composer-module-installer, then the dependencies will be in the global autoload.php which is already loaded.
OpenConextApps · Sep 1, 2015 · 962d385 · 962d385
1 parent 75f8c38
commit 962d385
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/Auth/Process/AttributeAddVootGroups.php b/lib/Auth/Process/AttributeAddVootGroups.php
@@ -1,6 +1,10 @@
 <?php
 
-require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+// Conditionally include composer autoload file;
+// we don't need it if installed with SSP's composer-module-installer.
+if ( file_exists(dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php') ) {
+    require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+}
 
 /**
  * Filter to add group membership to attributes from VOOT provider.

diff --git a/www/callback.php b/www/callback.php
@@ -1,6 +1,10 @@
 <?php
 
-require_once dirname(__DIR__) . '/vendor/autoload.php';
+// Conditionally include composer autoload file;
+// we don't need it if installed with SSP's composer-module-installer.
+if ( file_exists(dirname(__DIR__) . '/vendor/autoload.php') ) {
+    require_once dirname(__DIR__) . '/vendor/autoload.php';
+}
 
 if (!array_key_exists('state', $_REQUEST)) {
         throw new SimpleSAML_Error_BadRequest('Missing required state query parameter.');