Code optimization

ADmad · Nov 5, 2019 · 0510942 · 0510942
1 parent f50a698
commit 0510942
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/View/Helper/GlideHelper.php b/src/View/Helper/GlideHelper.php
@@ -43,6 +43,28 @@ class GlideHelper extends Helper
      */
     protected $_urlBuilder;
 
+    /**
+     * Webroot.
+     *
+     * @var bool
+     */
+    protected $_webroot;
+
+    /**
+     * Initialize hook
+     *
+     * @param array $config Config
+     * @return void
+     */
+    public function initialize(array $config)
+    {
+        if (method_exists($this->_View, 'getRequest')) {
+            $this->_webroot = $this->_View->getRequest()->getAttribute('webroot');
+        } else {
+            $this->_webroot = $this->request->getAttribute('webroot');
+        }
+    }
+
     /**
      * Creates a formatted IMG element.
      *
@@ -81,11 +103,7 @@ public function url($path, array $params = [])
         }
         $url = $this->urlBuilder()->getUrl($path, $params);
         if ($base && strpos($url, 'http') !== 0) {
-            if (method_exists($this->getView(), 'getRequest')) {
-                $url = $this->getView()->getRequest()->getAttribute('webroot') . ltrim($url, '/');
-            } else {
-                $url = $this->request->getAttribute('webroot') . ltrim($url, '/');
-            }
+            $url = $this->_webroot . ltrim($url, '/');
         }
 
         return $url;

diff --git a/tests/TestCase/View/Helper/GlideHelperTest.php b/tests/TestCase/View/Helper/GlideHelperTest.php
@@ -29,6 +29,7 @@ public function testUrl()
         } else {
             $this->helper->request = $this->helper->request->withAttribute('webroot', '/subfolder/');
         }
+        $this->helper->initialize([]);
 
         $result = $this->helper->url('logo.png', ['w' => 100]);
         $this->assertEquals('/subfolder/images/logo.png?w=100', $result);