Merge pull request #3 from mtymek/use_zend_url_helper

Use UrlHelper::setBasePath instead of custom helper
mtymek · Jan 25, 2016 · 10169c5 · 10169c5
2 parents 77a7a62 + 6bcee27
commit 10169c5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 139 deletions.
diff --git a/README.md b/README.md
@@ -72,25 +72,9 @@ echo $request->getAttribute(BaseUrlMiddleware::BASE_PATH);
 
 ### Generating URLs
 
-While `BaseUrlMiddleware` fixes the routing process, all URLs generated by your application
-will likely point outside the subdirectory. `Blast\BaseUrl` comes with replacement `UrlHelper`,
-
-Here's how to enable it: 
-
-```php
-return [
-    'dependencies' => [
-        'factories' => [
-            // setup factory
-            Blast\BaseUrl\UrlHelper::class => Blast\BaseUrl\UrlHelperFactory::class,            
-        ],
-        'aliases' => [
-            // alias default UrlHelper with Blast\BaseUrl alternative
-            Zend\Expressive\Helper\UrlHelper::class => Blast\BaseUrl\UrlHelper::class,
-        ],
-    ],
-];
-```
+`BaseUrlMiddleware` is able to automatically configure `UrlHelper`, so that all URLs generated 
+by this helper will have appropriate prefix. This will be done automatically if `UrlHelper`
+is available in service container.
 
 ### Accessing assets - base path
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "phpunit/phpunit": "^4.6",
         "squizlabs/php_codesniffer": "^2.3",
         "zendframework/zend-servicemanager": "^2.6",
-        "zendframework/zend-expressive-helpers": "^1.2",
+        "zendframework/zend-expressive-helpers": "^1.4 || ^2.0",
         "zendframework/zend-diactoros": "^1.3",
         "zendframework/zend-expressive-zendviewrenderer": "^1.0"
     },

diff --git a/src/BaseUrlMiddleware.php b/src/BaseUrlMiddleware.php
@@ -4,6 +4,7 @@
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Zend\Expressive\Helper\UrlHelper;
 
 class BaseUrlMiddleware
 {
@@ -84,7 +85,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         }
 
         if ($this->urlHelper) {
-            $this->urlHelper->setBaseUrl($baseUrl);
+            $this->urlHelper->setBasePath($baseUrl);
         }
 
         if ($this->basePathHelper) {

diff --git a/src/BaseUrlMiddlewareFactory.php b/src/BaseUrlMiddlewareFactory.php
@@ -3,6 +3,7 @@
 namespace Blast\BaseUrl;
 
 use Interop\Container\ContainerInterface;
+use Zend\Expressive\Helper\UrlHelper;
 
 class BaseUrlMiddlewareFactory
 {

diff --git a/src/UrlHelper.php b/src/UrlHelper.php
diff --git a/src/UrlHelperFactory.php b/src/UrlHelperFactory.php
diff --git a/test/BaseUrlMiddlewareTest.php b/test/BaseUrlMiddlewareTest.php
@@ -4,12 +4,11 @@
 
 use Blast\BaseUrl\BasePathHelper;
 use Blast\BaseUrl\BaseUrlMiddleware;
-use Blast\BaseUrl\UrlHelper;
 use PHPUnit_Framework_TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequest;
 use Zend\Diactoros\ServerRequestFactory;
+use Zend\Expressive\Helper\UrlHelper;
 
 class BaseUrlMiddlewareTest extends PHPUnit_Framework_TestCase
 {
@@ -46,7 +45,7 @@ public function testMiddlewareInjectsUrlHelperWithBaseUrl()
         $middleware = new BaseUrlMiddleware();
 
         $urlHelper = $this->prophesize(UrlHelper::class);
-        $urlHelper->setBaseUrl('/index.php')->shouldBeCalled();
+        $urlHelper->setBasePath('/index.php')->shouldBeCalled();
         $middleware->setUrlHelper($urlHelper->reveal());
 
         $middleware($request, new Response(), function (ServerRequestInterface $request) {

diff --git a/test/UrlHelperFactoryTest.php b/test/UrlHelperFactoryTest.php
diff --git a/test/UrlHelperTest.php b/test/UrlHelperTest.php