Skip to content

Commit 6da1eb1

Browse files
committed
MAGETWO-88409: Builds stabilization for PR
1 parent 4b5a0ca commit 6da1eb1

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/SchemaBuilder.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Framework\Setup\Declaration\Schema\Db;
88

9+
use Magento\Framework\Phrase;
910
use Magento\Framework\Setup\Declaration\Schema\Dto\Column;
1011
use Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory;
1112
use Magento\Framework\Setup\Declaration\Schema\Dto\Schema;
@@ -166,7 +167,7 @@ private function resolveInternalRelations(array $columns, array $data)
166167
{
167168
if (!is_array($data['column'])) {
168169
throw new Exception(
169-
__("Cannot find columns for internal index")
170+
new Phrase("Cannot find columns for internal index")
170171
);
171172
}
172173

@@ -175,7 +176,7 @@ private function resolveInternalRelations(array $columns, array $data)
175176
if (!isset($columns[$columnName])) {
176177
$tableName = isset($data['table']) ? $data['table']->getName() : '';
177178
trigger_error(
178-
__(
179+
new Phrase(
179180
'Column %1 does not exist for index/constraint %2 in table %3.',
180181
$columnName,
181182
$data['name'],

lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function applySchemaPatch($moduleName = null)
229229
$this->patchHistory->fixPatch(get_class($schemaPatch));
230230
} catch (\Exception $e) {
231231
throw new Exception(
232-
__(
232+
new Phrase(
233233
'Unable to apply patch %1 for module %2. Original exception message: %3',
234234
get_class($schemaPatch),
235235
$moduleName,
@@ -268,7 +268,7 @@ public function revertDataPatches($moduleName = null)
268268
$adapter->commit();
269269
} catch (\Exception $e) {
270270
$adapter->rollBack();
271-
throw new Exception($e->getMessage());
271+
throw new Exception(new Phrase($e->getMessage()));
272272
} finally {
273273
unset($dataPatch);
274274
}

lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/ValidationRules/ValidationRulesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Setup\Test\Unit\Model\Declaration\Schema\ValidationRules;
7+
namespace Magento\Framework\Setup\Test\Unit\Declaration\Schema\ValidationRules;
88

99
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1010
use Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex;

0 commit comments

Comments
 (0)