Merge remote-tracking branch 'ogresCE/MAGETWO-48217-public-prs' into PR_Branch

Author: mazhalai

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php

@@ -27,11 +27,10 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
             'varnish' => $this->getVarnishVersion()
         ];
 
-        $url = $this->getUrl("*/PageCache/exportVarnishConfig", $params);
         $data = [
             'id' => 'system_full_page_cache_varnish_export_button_version' . $this->getVarnishVersion(),
-            'label' => __('Export VCL for Varnish ') . $this->getVarnishVersion(),
-            'onclick' => "setLocation('" . $url . "')",
+            'label' => $this->_getLabel(),
+            'onclick' => "setLocation('" . $this->_getUrl($params) . "')",
         ];
 
         $html = $buttonBlock->setData($data)->toHtml();
@@ -49,13 +48,20 @@ public function getVarnishVersion()
     }
 
     /**
-     * Return PageCache TTL value from config
-     * to avoid saving empty field
+     * @return \Magento\Framework\Phrase
+     */
+    protected function _getLabel()
+    {
+        return  __('Export VCL for Varnish %1', $this->getVarnishVersion());
+    }
+
+    /**
+     * @param array $params
      *
      * @return string
      */
-    public function getTtlValue()
+    protected function _getUrl($params = [])
     {
-        return $this->_scopeConfig->getValue(\Magento\PageCache\Model\Config::XML_PAGECACHE_TTL);
+        return $this->getUrl('*/PageCache/exportVarnishConfig', $params);
     }
 }

lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php

@@ -347,37 +347,22 @@ public function getElementHtml()
         $html = '';
         $htmlId = $this->getHtmlId();
 
-        if (($beforeElementHtml = $this->getBeforeElementHtml())) {
-            $html .= '<label class="addbefore" for="' .
-                $htmlId .
-                '">' .
-                $beforeElementHtml .
-                '</label>';
+        $beforeElementHtml = $this->getBeforeElementHtml();
+        if ($beforeElementHtml) {
+            $html .= '<label class="addbefore" for="' . $htmlId . '">' . $beforeElementHtml . '</label>';
         }
 
-        $html .= '<input id="' .
-            $htmlId .
-            '" name="' .
-            $this->getName() .
-            '" ' .
-            $this->_getUiId() .
-            ' value="' .
-            $this->getEscapedValue() .
-            '" ' .
-            $this->serialize(
-                $this->getHtmlAttributes()
-            ) . '/>';
-
-        if (($afterElementJs = $this->getAfterElementJs())) {
+        $html .= '<input id="' . $htmlId . '" name="' . $this->getName() . '" ' . $this->_getUiId() . ' value="' .
+            $this->getEscapedValue() . '" ' . $this->serialize($this->getHtmlAttributes()) . '/>';
+
+        $afterElementJs = $this->getAfterElementJs();
+        if ($afterElementJs) {
             $html .= $afterElementJs;
         }
 
-        if (($afterElementHtml = $this->getAfterElementHtml())) {
-            $html .= '<label class="addafter" for="' .
-                $htmlId .
-                '">' .
-                $afterElementHtml .
-                '</label>';
+        $afterElementHtml = $this->getAfterElementHtml();
+        if ($afterElementHtml) {
+            $html .= '<label class="addafter" for="' . $htmlId . '">' . $afterElementHtml . '</label>';
         }
 
         return $html;

lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Filesystem\Test\Unit\Driver;
+
+use Magento\Framework\Filesystem\Driver\File;
+
+class FileTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var string Result of file_get_contents() function */
+    public static $fileGetContents;
+
+    /** @var bool Result of file_put_contents() function */
+    public static $filePutContents;
+
+    public function setUp()
+    {
+        self::$fileGetContents = '';
+        self::$filePutContents = true;
+    }
+
+    /**
+     * @dataProvider dataProviderForTestGetAbsolutePath
+     */
+    public function testGetAbsolutePath($basePath, $path, $expected)
+    {
+        $file = new File();
+        $this->assertEquals($expected, $file->getAbsolutePath($basePath, $path));
+    }
+    
+    public function dataProviderForTestGetAbsolutePath()
+    {
+        return [
+            ['/root/path/', 'sub', '/root/path/sub'],
+            ['/root/path/', '/sub', '/root/path/sub'],
+            ['/root/path/', '../sub', '/root/path/../sub'],
+            ['/root/path/', '/root/path/sub', '/root/path/root/path/sub'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataProviderForTestGetRelativePath
+     */
+    public function testGetRelativePath($basePath, $path, $expected)
+    {
+        $file = new File();
+        $this->assertEquals($expected, $file->getRelativePath($basePath, $path));
+    }
+
+    public function dataProviderForTestGetRelativePath()
+    {
+        return [
+            ['/root/path/', 'sub', 'sub'],
+            ['/root/path/', '/sub', '/sub'],
+            ['/root/path/', '/root/path/sub', 'sub'],
+            ['/root/path/sub', '/root/path/other', '/root/path/other'],
+        ];
+    }
+}

pub/errors/processorFactory.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Error;
 
-require_once __DIR__ . '/../../app/bootstrap.php';
+require_once realpath(__DIR__) . '/../../app/bootstrap.php';
 require_once 'processor.php';
 
 /**

pub/index.php

@@ -10,7 +10,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 try {
-    require __DIR__ . '/../app/bootstrap.php';
+    require realpath(__DIR__) . '/../app/bootstrap.php';
 } catch (\Exception $e) {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">

pub/static.php

@@ -6,7 +6,7 @@
  * See COPYING.txt for license details.
  */
 
-require __DIR__ . '/../app/bootstrap.php';
+require realpath(__DIR__) . '/../app/bootstrap.php';
 $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER);
 /** @var \Magento\Framework\App\StaticResource $app */
 $app = $bootstrap->createApplication('Magento\Framework\App\StaticResource');