Skip to content

Commit 3d5bf67

Browse files
committed
MC-14884: MySQL Upgrade - v8
Revert back custom ZF1 branch, because new version with needed changes has already released.
1 parent 9a69e0d commit 3d5bf67

File tree

3 files changed

+19
-37
lines changed

3 files changed

+19
-37
lines changed

composer.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"OSL-3.0",
77
"AFL-3.0"
88
],
9-
"minimum-stability": "dev",
109
"config": {
1110
"preferred-install": "dist",
1211
"sort-packages": true
@@ -68,7 +67,7 @@
6867
"laminas/laminas-view": "~2.11.2",
6968
"magento/composer": "1.6.x-dev",
7069
"magento/magento-composer-installer": ">=0.1.11",
71-
"magento/zendframework1": "MC-14884-Discribe-Table-doesnt-return-column-type-width-dev",
70+
"magento/zendframework1": "~1.14.2",
7271
"monolog/monolog": "^1.17",
7372
"paragonie/sodium_compat": "^1.6",
7473
"pelago/emogrifier": "^3.1.0",
@@ -357,11 +356,5 @@
357356
"Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
358357
}
359358
},
360-
"repositories": [
361-
{
362-
"type": "vcs",
363-
"url": "https://github.com/magento-techdivision/zf1.git"
364-
}
365-
],
366359
"prefer-stable": true
367360
}

composer.lock

Lines changed: 16 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/composer.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"laminas/laminas-stdlib": "^3.2.1",
3535
"laminas/laminas-uri": "^2.5.1",
3636
"laminas/laminas-validator": "^2.6.0",
37-
"magento/zendframework1": "MC-14884-Discribe-Table-doesnt-return-column-type-width-dev",
37+
"magento/zendframework1": "~1.14.2",
3838
"monolog/monolog": "^1.17",
3939
"ramsey/uuid": "~3.8.0",
4040
"symfony/console": "~4.4.0",
@@ -59,11 +59,5 @@
5959
"files": [
6060
"registration.php"
6161
]
62-
},
63-
"repositories": [
64-
{
65-
"type": "vcs",
66-
"url": "https://github.com/magento-techdivision/zf1.git"
67-
}
68-
]
62+
}
6963
}

0 commit comments

Comments
 (0)