Skip to content

Commit ae9745f

Browse files
author
Kopylova,Olga(okopylova)
committed
Merge pull request #705 from magento-nord/MAGETWO-43826
[NORD] Fixed MAGETWO-43826
2 parents 515bb06 + 7a3fd99 commit ae9745f

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/etc/NonComposerComponentRegistration.php

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

7+
$pathList[] = dirname(__DIR__) . '/code/*/*/cli_commands.php';
78
$pathList[] = dirname(__DIR__) . '/code/*/*/registration.php';
89
$pathList[] = dirname(__DIR__) . '/design/*/*/*/registration.php';
910
$pathList[] = dirname(__DIR__) . '/i18n/*/*/registration.php';

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"ext-mbstring": "*",
7272
"sjparkinson/static-review": "~4.1",
7373
"fabpot/php-cs-fixer": "~1.2",
74-
"lusitanian/oauth": "~0.3"
74+
"lusitanian/oauth": "~0.3 <=0.7.0"
7575
},
7676
"replace": {
7777
"magento/module-marketplace": "self.version",
@@ -225,8 +225,7 @@
225225
"": "app/code/"
226226
},
227227
"files": [
228-
"app/etc/NonComposerComponentRegistration.php",
229-
"app/code/Magento/SampleData/cli_commands.php"
228+
"app/etc/NonComposerComponentRegistration.php"
230229
]
231230
},
232231
"autoload-dev": {

composer.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)