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

Author: Bohdan Korablov

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

@@ -71,6 +71,6 @@ public function restore($template)
      */
     public function isApplicable($placeholder)
     {
-        return 1 === preg_match('/(' . static::PREFIX . '.*[a-zA-Z_]).*/', $placeholder);
+        return 1 === preg_match('/^' . static::PREFIX . '([a-zA-Z]+)([a-zA-Z0-9_])*$/', $placeholder);
     }
 }

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

@@ -84,8 +84,8 @@ public function getGenerateDataProvider()
     public function testIsApplicable($placeholder, $expected)
     {
         $this->assertSame(
-            $this->model->isApplicable($placeholder),
-            $expected
+            $expected,
+            $this->model->isApplicable($placeholder)
         );
     }
 
@@ -98,6 +98,9 @@ public function getIsPlaceholderDataProvider()
             [Environment::PREFIX . 'TEST', true],
             ['TEST', false],
             [Environment::PREFIX . 'TEST_test', true],
+            [Environment::PREFIX . '-:A', false],
+            [Environment::PREFIX . '_A', false],
+            [Environment::PREFIX . 'A@#$', false]
         ];
     }
 }

lib/internal/Magento/Framework/Crontab/CrontabManager.php

@@ -192,7 +192,7 @@ private function checkSupportedOs()
     {
         if (stripos(PHP_OS, 'WIN') === 0) {
             throw new LocalizedException(
-                new Phrase('Your operation system is not supported, you cannot work with crontab')
+                new Phrase('Your operation system is not supported to work with this command')
             );
         }
     }