Merge remote-tracking branch 'mainline/develop' into...
Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-32905-Refactor-API-Framework
Showing
- app/code/Magento/PageCache/Controller/Block/Render.php 2 additions, 1 deletionapp/code/Magento/PageCache/Controller/Block/Render.php
- app/etc/vendor_path.php 1 addition, 6 deletionsapp/etc/vendor_path.php
- composer.json 5 additions, 4 deletionscomposer.json
- composer.lock 77 additions, 1 deletioncomposer.lock
- dev/tools/Magento/Tools/View/deploy.php 26 additions, 24 deletionsdev/tools/Magento/Tools/View/deploy.php
- lib/internal/Magento/Framework/App/StaticResource.php 2 additions, 0 deletionslib/internal/Magento/Framework/App/StaticResource.php
- lib/internal/Magento/Framework/Module/ModuleList/DeploymentConfigFactory.php 24 additions, 0 deletions...o/Framework/Module/ModuleList/DeploymentConfigFactory.php
- lib/internal/Magento/Framework/Module/Status.php 15 additions, 2 deletionslib/internal/Magento/Framework/Module/Status.php
- lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/DeploymentConfigFactoryTest.php 26 additions, 0 deletions...dule/Test/Unit/ModuleList/DeploymentConfigFactoryTest.php
- lib/internal/Magento/Framework/Module/Test/Unit/StatusTest.php 19 additions, 5 deletions...nternal/Magento/Framework/Module/Test/Unit/StatusTest.php
- setup/pub/magento/setup/add-database.js 4 additions, 1 deletionsetup/pub/magento/setup/add-database.js
- setup/pub/magento/setup/readiness-check.js 18 additions, 0 deletionssetup/pub/magento/setup/readiness-check.js
- setup/src/Magento/Setup/Controller/ConsoleController.php 3 additions, 0 deletionssetup/src/Magento/Setup/Controller/ConsoleController.php
- setup/src/Magento/Setup/Controller/Environment.php 23 additions, 0 deletionssetup/src/Magento/Setup/Controller/Environment.php
- setup/src/Magento/Setup/Model/Installer.php 50 additions, 1 deletionsetup/src/Magento/Setup/Model/Installer.php
- setup/src/Magento/Setup/Model/InstallerFactory.php 6 additions, 0 deletionssetup/src/Magento/Setup/Model/InstallerFactory.php
- setup/src/Magento/Setup/Test/Unit/Controller/ConsoleControllerTest.php 3 additions, 2 deletions...ento/Setup/Test/Unit/Controller/ConsoleControllerTest.php
- setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php 8 additions, 0 deletions...rc/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php
- setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php 76 additions, 6 deletionssetup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
- setup/view/magento/setup/add-database.phtml 2 additions, 2 deletionssetup/view/magento/setup/add-database.phtml
Please register or sign in to comment