From 08f1033898738a776d3c164160f210a3f0d3558f Mon Sep 17 00:00:00 2001
From: Tom J Nowell <contact@tomjn.com>
Date: Tue, 6 Apr 2021 12:36:34 +0100
Subject: [PATCH] Improve config loading

Adds `/srv/vvv`, and improves config loading to fix some warnings and be more scalable
---
 php/blocks/main/sites.php | 56 +++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/php/blocks/main/sites.php b/php/blocks/main/sites.php
index 5cb8a82..34a0b8f 100644
--- a/php/blocks/main/sites.php
+++ b/php/blocks/main/sites.php
@@ -120,31 +120,53 @@ function display_site( $name, array $site ) : void {
 }
 
 function display_sites() : void {
-	$yaml = new Alchemy\Component\Yaml\Yaml();
-
-	$config_file = '/vagrant/config.yml';
-	if ( file_exists( '/vagrant/config.yml' ) ) {
-		$config_file = '/vagrant/config.yml';
-	} elseif ( file_exists( '/vagrant/vvv-custom.yml' ) ) {
-		$config_file = '/vagrant/vvv-custom.yml';
+	
+	$config_locations = [
+		'/srv/vvv/config.yml',
+		'/vagrant/config.yml',
+		'/vagrant/vvv-custom.yml',
+	];
+
+	$config_file = false;
+	foreach ( $config_locations as $location ) {
+		if ( is_readable( $location ) ) {
+			$config_file = $location;
+			break;
+		}
 	}
 
+	if ( false === $config_file ) {
+		echo '<p>No config file was found.</p>';
+		return;
+	}
+	
+	$yaml = new Alchemy\Component\Yaml\Yaml();
 	$data = $yaml->load( $config_file );
+
 	$provisioned_sites = [];
 	$skipped_sites = [];
-	foreach ( $data['sites'] as $name => $site ) {
-		if (
-			isset( $site['skip_provisioning'] )
-			&& ( $site['skip_provisioning'] == true )
-		) {
-			$skipped_sites[ $name ] = $site;
-		} else {
-			$provisioned_sites[ $name ] = $site;
+
+	if ( ! empty( $data['sites'] ) && is_array( $data['sites'] ) ) {
+		foreach ( $data['sites'] as $name => $site ) {
+			if (
+				isset( $site['skip_provisioning'] )
+				&& ( $site['skip_provisioning'] == true )
+			) {
+				$skipped_sites[ $name ] = $site;
+			} else {
+				$provisioned_sites[ $name ] = $site;
+			}
 		}
+	} else {
+		echo '<p>No sites were found.</p>';
 	}
 
-	foreach ( $provisioned_sites as $name => $site ) {
-		display_site( $name, $site );
+	if ( ! empty( $provisioned_sites ) ) {
+		foreach ( $provisioned_sites as $name => $site ) {
+			display_site( $name, $site );
+		}
+	} else {
+		echo '<p>There are no provisioned sites.</p>';
 	}
 
 	if ( ! empty( $skipped_sites ) ) {