change ProxyPackages and ProxyUrlRewriteListener to inject the ProxyUrlMatcher object instead of ProxyUrlCollection

Author: iteman

src/Asset/ProxyPackages.php

@@ -12,7 +12,6 @@
 
 namespace PHPMentors\ProxyURLRewriteBundle\Asset;
 
-use PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlCollection;
 use PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlMatcher;
 use Symfony\Component\Asset\Packages;
 use Symfony\Component\Routing\Generator\UrlGenerator;
@@ -27,16 +26,20 @@
 class ProxyPackages extends Packages
 {
     /**
-     * @var ProxyUrlCollection
+     * @var ProxyUrlMatcher
+     *
+     * @since Property available since Release 1.1.0
      */
-    private $proxyUrlCollection;
+    private $proxyUrlMatcher;
 
     /**
-     * @param ProxyUrlCollection $proxyUrlCollection
+     * @param ProxyUrlMatcher $proxyUrlMatcher
+     *
+     * @since Method available since Release 1.1.0
      */
-    public function setProxyUrlCollection(ProxyUrlCollection $proxyUrlCollection)
+    public function setProxyUrlMatcher(ProxyUrlMatcher $proxyUrlMatcher)
     {
-        $this->proxyUrlCollection = $proxyUrlCollection;
+        $this->proxyUrlMatcher = $proxyUrlMatcher;
     }
 
     /**
@@ -56,8 +59,7 @@ public function getUrl($path, $packageName = null)
             return $url;
         }
 
-        $urlMatcher = new ProxyUrlMatcher($this->proxyUrlCollection);
-        $matchedProxyUrl = $urlMatcher->match($url);
+        $matchedProxyUrl = $this->proxyUrlMatcher->match($url);
         if ($matchedProxyUrl === null) {
             return $url;
         }

src/EventListener/ProxyUrlRewriteListener.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2014 KUBO Atsuhiro <[email protected]>,
+ * Copyright (c) 2014-2015 KUBO Atsuhiro <[email protected]>,
  * All rights reserved.
  *
  * This file is part of PHPMentorsProxyURLRewriteBundle.
@@ -12,7 +12,6 @@
 
 namespace PHPMentors\ProxyURLRewriteBundle\EventListener;
 
-use PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlCollection;
 use PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlMatcher;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -21,21 +20,25 @@
 class ProxyUrlRewriteListener
 {
     /**
-     * @var ProxyUrlCollection
+     * @var ProxyUrlMatcher
+     *
+     * @since Property available since Release 1.1.0
      */
-    private $proxyUrlCollection;
+    private $proxyUrlMatcher;
 
     /**
      * @var RouterInterface
      */
     private $router;
 
     /**
-     * @param ProxyUrlCollection $proxyUrlCollection
+     * @param ProxyUrlMatcher $proxyUrlMatcher
+     *
+     * @since Method available since Release 1.1.0
      */
-    public function setProxyUrlCollection(ProxyUrlCollection $proxyUrlCollection)
+    public function setProxyUrlMatcher(ProxyUrlMatcher $proxyUrlMatcher)
     {
-        $this->proxyUrlCollection = $proxyUrlCollection;
+        $this->proxyUrlMatcher = $proxyUrlMatcher;
     }
 
     /**
@@ -52,8 +55,7 @@ public function setRouter(RouterInterface $router)
     public function onKernelRequest(GetResponseEvent $event)
     {
         if ($event->getRequestType() == HttpKernelInterface::MASTER_REQUEST) {
-            $urlMatcher = new ProxyUrlMatcher($this->proxyUrlCollection);
-            $matchedProxyUrl = $urlMatcher->match($this->router->getContext()->getPathInfo());
+            $matchedProxyUrl = $this->proxyUrlMatcher->match($this->router->getContext()->getPathInfo());
             if ($matchedProxyUrl !== null) {
                 $this->router->getContext()->setBaseUrl($matchedProxyUrl->getPath().$this->router->getContext()->getBaseUrl());
 

src/Resources/config/services.xml

@@ -6,12 +6,13 @@
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrl</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url_collection.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlCollection</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url_factory.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlFactory</parameter>
+    <parameter key="phpmentors_proxy_url_rewrite.proxy_url_matcher.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlMatcher</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url_rewrite_listener.class">PHPMentors\ProxyURLRewriteBundle\EventListener\ProxyUrlRewriteListener</parameter>
   </parameters>
   <services>
     <service id="phpmentors_proxy_url_rewrite.proxy_packages" class="%phpmentors_proxy_url_rewrite.proxy_packages.class%" public="false">
-      <call method="setProxyUrlCollection">
-        <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_collection"/>
+      <call method="setProxyUrlMatcher">
+        <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_matcher"/>
       </call>
     </service>
     <service id="phpmentors_proxy_url_rewrite.proxy_asset_extension" class="%phpmentors_proxy_url_rewrite.proxy_asset_extension.class%" public="false"/>
@@ -20,9 +21,12 @@
     </service>
     <service id="phpmentors_proxy_url_rewrite.proxy_url_collection" class="%phpmentors_proxy_url_rewrite.proxy_url_collection.class%" public="false"/>
     <service id="phpmentors_proxy_url_rewrite.proxy_url_factory" class="%phpmentors_proxy_url_rewrite.proxy_url_factory.class%" public="false"/>
+    <service id="phpmentors_proxy_url_rewrite.proxy_url_matcher" class="%phpmentors_proxy_url_rewrite.proxy_url_matcher.class%" public="false">
+      <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_collection"/>
+    </service>
     <service id="phpmentors_proxy_url_rewrite.proxy_url_rewrite_listener" class="%phpmentors_proxy_url_rewrite.proxy_url_rewrite_listener.class%">
-      <call method="setProxyUrlCollection">
-        <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_collection"/>
+      <call method="setProxyUrlMatcher">
+        <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_matcher"/>
       </call>
       <call method="setRouter">
         <argument type="service" id="router"/>