From 7360787e9e3ff0f6a4cfc75bec95631a7ba028e7 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Thu, 22 Dec 2016 15:28:43 +0200
Subject: [PATCH] MAGETWO-62491: [PR] Delivery of stories (sprint 3)
---
app/code/Magento/Config/Model/Placeholder/Environment.php | 2 +-
.../Config/Test/Unit/Model/Placeholder/EnvironmentTest.php | 7 +++++--
lib/internal/Magento/Framework/Crontab/CrontabManager.php | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/code/Magento/Config/Model/Placeholder/Environment.php b/app/code/Magento/Config/Model/Placeholder/Environment.php
index 961a29e7b24..b5c1c6be89c 100644
--- a/app/code/Magento/Config/Model/Placeholder/Environment.php
+++ b/app/code/Magento/Config/Model/Placeholder/Environment.php
@@ -71,6 +71,6 @@ class Environment implements PlaceholderInterface
*/
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);
}
}
diff --git a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
index a4557503921..6d1113a7750 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
@@ -84,8 +84,8 @@ class EnvironmentTest extends \PHPUnit_Framework_TestCase
public function testIsApplicable($placeholder, $expected)
{
$this->assertSame(
- $this->model->isApplicable($placeholder),
- $expected
+ $expected,
+ $this->model->isApplicable($placeholder)
);
}
@@ -98,6 +98,9 @@ class EnvironmentTest extends \PHPUnit_Framework_TestCase
[Environment::PREFIX . 'TEST', true],
['TEST', false],
[Environment::PREFIX . 'TEST_test', true],
+ [Environment::PREFIX . '-:A', false],
+ [Environment::PREFIX . '_A', false],
+ [Environment::PREFIX . 'A@#$', false]
];
}
}
diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
index a60bd9d2cb5..2b597b8eb63 100644
--- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php
+++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
@@ -192,7 +192,7 @@ class CrontabManager implements CrontabManagerInterface
{
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')
);
}
}
--
GitLab