From f6bc6b27ce781146d470bc320679f175717f557b Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Wed, 18 Feb 2015 13:58:22 +0200
Subject: [PATCH] MAGETWO-31059: Integration tests with fatals, code under test
and framework adaptation
- MAGETWO-33055: Check up CI builds
---
.htaccess | 4 ++++
.../Magento/Catalog/Model/Product/Attribute/Backend/Sku.php | 2 +-
app/code/Magento/Cookie/Model/Config/Backend/Domain.php | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.htaccess b/.htaccess
index f1ef8719ba1..bd75f903967 100644
--- a/.htaccess
+++ b/.htaccess
@@ -170,6 +170,10 @@
</IfModule>
+<IfModule mod_env.c>
+ SetEnv MAGE_MODE "developer"
+</IfModule>
+
############################################
## By default allow all access
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
index 728cd250923..3da70506427 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
@@ -55,7 +55,7 @@ class Sku extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
}
if ($this->string->strlen($object->getSku()) > self::SKU_MAX_LENGTH) {
- throw new \Magento\Framework\Model\Exception(__('SKU length should be %1 characters maximum.', self::SKU_MAX_LENGTH));
+ throw new \Magento\Framework\Model\Exception((string)__('SKU length should be %1 characters maximum.', self::SKU_MAX_LENGTH));
}
return true;
}
diff --git a/app/code/Magento/Cookie/Model/Config/Backend/Domain.php b/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
index 2ef0961665d..6bbb307f39a 100644
--- a/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
+++ b/app/code/Magento/Cookie/Model/Config/Backend/Domain.php
@@ -48,7 +48,7 @@ class Domain extends \Magento\Framework\App\Config\Value
// Empty value is treated valid and will be handled when read the value out
if (!empty($value) && !$this->configValidator->isValid($value)) {
$msg = __('Invalid domain name: ' . join('; ', $this->configValidator->getMessages()));
- throw new \Magento\Framework\Model\Exception($msg);
+ throw new \Magento\Framework\Model\Exception((string)$msg);
}
}
}
--
GitLab