Fixed tests

Author: nibra

composer.json

@@ -22,7 +22,8 @@
     "greencape/php-versions": "@dev",
     "symfony/yaml": "^3.2",
     "greencape/joomla-cli": "^0.1.0",
-    "alchemy/zippy": "^0.4.4"
+    "alchemy/zippy": "^0.4.4",
+    "ext-simplexml": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7"

src/ServerConfig.php

@@ -38,7 +38,7 @@ class ServerConfig
 		'joomla.version'      => "latest",
 		'memcached.enabled'   => "0",
 		'memcached.port'      => "11211",
-		'memcached.version'	  => "latest",
+		'memcached.version'   => "latest",
 		'meta.description'    => "Test installation",
 		'meta.keywords'       => "",
 		'meta.showAuthor'     => "1",
@@ -64,16 +64,18 @@ class ServerConfig
 		'server.type'         => "nginx",
 		'session.handler'     => "database",
 		'session.lifetime'    => "15",
-		'network.name'		  => "joomla",
-		'selenium.no'		  => "1",
-		'selenium.version'	  => "latest",
-		'extension.path'	  => "../../../weblinks/"
+		'network.name'        => "joomla",
+		'selenium.no'         => "1",
+		'selenium.version'    => "latest",
+		'extension.path'      => "../../../weblinks/"
 	];
 
 	/**
 	 * ServerConfig constructor.
 	 */
-	public function __construct() {}
+	public function __construct()
+	{
+	}
 
 	/**
 	 * @param $filename string $filename The path to the configuration file.
@@ -110,15 +112,15 @@ public function loadFromConfig($config, $path)
 	/**
 	 * Read the configuration
 	 *
-	 * @param   string $filename The path to the configuration file.
+	 * @param string $filename The path to the configuration file.
 	 *
 	 * @return  string[]
 	 */
 	private function read($filename)
 	{
 		$config = [];
 
-		$xml = simplexml_load_file($filename);
+		$xml = simplexml_load_string(file_get_contents($filename));
 
 		foreach ($xml->attributes() as $key => $attribute)
 		{
@@ -159,7 +161,7 @@ public function getDomain()
 	/**
 	 * Get a configuration value
 	 *
-	 * @param   string $key The key
+	 * @param string $key The key
 	 *
 	 * @return  string  The value
 	 */

src/Service/AbstractService.php

@@ -66,7 +66,7 @@ public function addService(Service $service)
 	public function getSetup()
 	{
 		$setup = [];
-		foreach ($this->services as $service)
+		foreach ((array) $this->services as $service)
 		{
 			$setup = array_merge($setup, $service->getSetup());
 		}
@@ -81,7 +81,7 @@ public function getSetup()
 	 */
 	public function prepare()
 	{
-		foreach ($this->services as $service)
+		foreach ((array) $this->services as $service)
 		{
 			$service->prepare();
 		}

src/Service/Apache.php

@@ -27,7 +27,7 @@ public function getSetup()
 	{
 		$config = $this->configs[0];
 
-		$name               = 'apache-' . $this->version . '-' . $config->getVersion('joomla');
+		$name               = 'apache-' . $this->version;
 		$dockerPath         = $this->dockyard . '/docker/' . $name;
 		$this->setup[$name] = [
 			'build'       => 'docker/' . $name,
@@ -65,8 +65,7 @@ public function getSetup()
 	 */
 	public function prepare()
 	{
-		$dockerPath = $this->dockyard . '/docker/apache-' . $this->version . "-" .
-							$this->configs[0]->getVersion('joomla');
+		$dockerPath = $this->dockyard . '/docker/apache-' . $this->version;
 
 		$this->createDockerfile($dockerPath, __DIR__ . '/docker/apache');
 		$this->createVhosts($dockerPath);

src/Service/Joomla.php

@@ -275,7 +275,7 @@ protected function getDockerPath($config)
 	{
 		$path    = $config->get('host.dockyard') . '/docker';
 		$server  = $config->get('server.type');
-		$version = $server == 'apache' ? $config->getVersion('php') . '-' . $config->getVersion('joomla') : $config->getVersion('server');
+		$version = $server === 'apache' ? $config->getVersion('php') : $config->getVersion('server');
 
 		return "$path/$server-$version";
 	}

tests-container/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+require_once 'vendor/autoload.php';

tests/Service/ApacheTest.php

@@ -42,6 +42,9 @@ public function testServiceSetupIsGeneratedAsAnArraySuitableForDockerCompose()
 				'environment' => [
 					'VIRTUAL_HOST' => 'j25-mysqli.dev',
 				],
+				'networks' => [
+					'joomla',
+				],
 			],
 		];
 

tests/Service/MySqlTest.php

@@ -40,6 +40,9 @@ public function testServiceSetupIsGeneratedAsAnArraySuitableForDockerCompose()
 					'MYSQL_USER'          => 'sqladmin',
 					'MYSQL_PASSWORD'      => 'sqladmin',
 				],
+				'networks' => [
+					'joomla',
+				],
 			],
 		];
 

tests/Service/PostgreSqlTest.php

@@ -52,7 +52,7 @@ public function testFilesystemIsSetUp()
 		$this->service->prepare();
 
 		$this->assertFileContains(
-			'dockyard/postgresql-latest/joomla3.sql',
+			'dockyard/postgresql-latest/00-joomla3.sql',
 			[
 				'CREATE DATABASE "joomla3" OWNER "sqladmin"',
 			]