Skip to content

Commit e4e904e

Browse files
authored
Merge revert_pr_24682 into 2.4-develop-prs
2 parents edf757a + 5c23618 commit e4e904e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

app/code/Magento/Eav/etc/db_schema.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,6 @@
486486
referenceColumn="attribute_id" onDelete="CASCADE"/>
487487
<constraint xsi:type="foreign" referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID" table="eav_attribute_label"
488488
column="store_id" referenceTable="store" referenceColumn="store_id" onDelete="CASCADE"/>
489-
<constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_STORE_ID_UNIQUE">
490-
<column name="store_id"/>
491-
<column name="attribute_id"/>
492-
</constraint>
493489
<index referenceId="EAV_ATTRIBUTE_LABEL_STORE_ID" indexType="btree">
494490
<column name="store_id"/>
495491
</index>

app/code/Magento/Eav/etc/db_schema_whitelist.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,7 @@
307307
"constraint": {
308308
"PRIMARY": true,
309309
"EAV_ATTRIBUTE_LABEL_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
310-
"EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true,
311-
"EAV_ATTRIBUTE_LABEL_STORE_ID_ATTRIBUTE_ID": true
310+
"EAV_ATTRIBUTE_LABEL_STORE_ID_STORE_STORE_ID": true
312311
}
313312
},
314313
"eav_form_type": {

lib/internal/Magento/Framework/App/Bootstrap.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,12 @@ public function getParams()
223223
/**
224224
* Factory method for creating application instances
225225
*
226+
* In case of failure,
227+
* the application will be terminated by "exit(1)"
228+
*
226229
* @param string $type
227230
* @param array $arguments
228231
* @return \Magento\Framework\AppInterface | void
229-
* @throws \InvalidArgumentException
230232
*/
231233
public function createApplication($type, $arguments = [])
232234
{

0 commit comments

Comments
 (0)