- Fix variable reuse in Template resolver (Closes #62)

- Add initial version URL resolver that passes spec tests

Author: tjwiebell

src/Resolver/Template.php

@@ -53,11 +53,11 @@ public function resolve($definition)
         $renderData     = [];
 
         if ($definition->has('provide')) {
-            foreach ($definition->get('provide') as $index => $definition) {
-                $key              = \is_int($index) ? $definition : $index;
-                $renderData[$key] = $definition instanceof Definition
+            foreach ($definition->get('provide') as $index => $provideDefinition) {
+                $key              = \is_int($index) ? $provideDefinition : $index;
+                $renderData[$key] = $provideDefinition instanceof Definition
                     ? $this->getIterator()->get('provide.' . $index)
-                    : $this->getIterator()->get($definition);
+                    : $this->getIterator()->get($provideDefinition);
             }
         }
 

src/Resolver/Url.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Upward\Resolver;
+
+use Magento\Upward\Definition;
+use Zend\Uri\UriFactory;
+
+class Url extends AbstractResolver
+{
+    public const FAKE_BASE_HOST = 'upward-fake.localhost';
+    public const FAKE_BASE_URL  = 'https://' . self::FAKE_BASE_HOST;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIndicator(): string
+    {
+        return 'baseUrl';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid(Definition $definition): bool
+    {
+        if ($definition->has('query')) {
+            $query = $this->getIterator()->get('query', $definition);
+            if (!\is_array($query)) {
+                return false;
+            }
+        }
+
+        return parent::isValid($definition);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolve($definition)
+    {
+        if (!$definition instanceof Definition) {
+            throw new \InvalidArgumentException('$definition must be an instance of ' . Definition::class);
+        }
+
+        $baseUrl = $this->getIterator()->get('baseUrl', $definition)
+            ? $this->getIterator()->get('baseUrl', $definition)
+            : self::FAKE_BASE_URL;
+        $uri = UriFactory::factory($baseUrl);
+
+        if ($definition->has('hostname')) {
+            $uri->setHost($this->getIterator()->get('hostname', $definition));
+        }
+
+        if ($definition->has('protocol')) {
+            $uri->setScheme(str_replace(':', '', $this->getIterator()->get('protocol', $definition)));
+        }
+
+        if ($definition->has('pathname')) {
+            $pathname        = $this->getIterator()->get('pathname', $definition);
+            $currentPathname = $uri->getPath();
+            if ($pathname[0] !== '/') {
+                if ($currentPathname === null) {
+                    $pathname = "/${pathname}";
+                } elseif ($currentPathname[\strlen($currentPathname) - 1] === '/') {
+                    $pathname = $currentPathname . $pathname;
+                } else {
+                    $trimmedCurrentPathname = substr($currentPathname, 0, strrpos($currentPathname, '/') + 1);
+                    $pathname               = $trimmedCurrentPathname . $pathname;
+                }
+            }
+
+            $uri->setPath($pathname);
+        }
+
+        if ($definition->has('query')) {
+            $mergedQuery = array_merge($uri->getQueryAsArray(), $this->getIterator()->get('query', $definition));
+            $uri->setQuery($mergedQuery);
+        }
+
+        if ($definition->has('port')) {
+            $uri->setPort($this->getIterator()->get('port', $definition));
+        }
+
+        if ($definition->has('username')) {
+            $userInfo = $this->getIterator()->get('username', $definition);
+            if ($definition->has('password')) {
+                $userInfo .= ':' . $this->getIterator()->get('password', $definition);
+            }
+            $uri->setUserInfo($userInfo);
+        }
+
+        $returnUrl = $uri->toString();
+
+        return $uri->getHost() === self::FAKE_BASE_HOST
+            ? str_replace(self::FAKE_BASE_URL, '', $returnUrl)
+            : $returnUrl;
+    }
+}

src/ResolverFactory.php

@@ -17,6 +17,7 @@ class ResolverFactory
     public const RESOLVER_TYPE_PROXY       = 'proxy';
     public const RESOLVER_TYPE_SERVICE     = 'service';
     public const RESOLVER_TYPE_TEMPLATE    = 'template';
+    public const RESOLVER_TYPE_URL         = 'url';
 
     /**
      * @var array map of resolver key to their class implementation
@@ -29,6 +30,7 @@ class ResolverFactory
         self::RESOLVER_TYPE_PROXY       => Resolver\Proxy::class,
         self::RESOLVER_TYPE_SERVICE     => Resolver\Service::class,
         self::RESOLVER_TYPE_TEMPLATE    => Resolver\Template::class,
+        self::RESOLVER_TYPE_URL         => Resolver\Url::class,
     ];
 
     /**