MAGETWO-62491: [PR] Delivery of stories (sprint 3)

app/code/Magento/Config/Model/Placeholder/Environment.php

@@ -59,7 +59,7 @@ class Environment implements PlaceholderInterface
      */
     public function restore($template)
     {
-        $template = str_replace(static::PREFIX, '', $template);
+        $template = preg_replace('/^' . static::PREFIX . '/', '', $template);
         $template = str_replace('__', '/', $template);
         $template = strtolower($template);
 

app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php

@@ -47,8 +47,8 @@ class EnvironmentTest extends \PHPUnit_Framework_TestCase
     public function testGenerate($path, $scope, $scopeId, $expected)
     {
         $this->assertSame(
-            $this->model->generate($path, $scope, $scopeId),
-            $expected
+            $expected,
+            $this->model->generate($path, $scope, $scopeId)
         );
     }
 
@@ -103,4 +103,29 @@ class EnvironmentTest extends \PHPUnit_Framework_TestCase
             [Environment::PREFIX . 'A@#$', false]
         ];
     }
+
+    /**
+     * @param string $template
+     * @param string $expected
+     * @dataProvider restoreDataProvider
+     */
+    public function testRestore($template, $expected)
+    {
+        $this->assertSame(
+            $expected,
+            $this->model->restore($template)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function restoreDataProvider()
+    {
+        return [
+            [Environment::PREFIX . 'TEST__CONFIG', 'test/config'],
+            [Environment::PREFIX . 'TEST__CONFIG__VALUE', 'test/config/value'],
+            [Environment::PREFIX . 'TEST__CONFIG_VALUE', 'test/config_value'],
+        ];
+    }
 }