From 8468f466db260febaf48131dd06b82293379841f Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Sat, 14 Mar 2015 14:11:32 -0500
Subject: [PATCH] MAGETWO-34851: Contribution of Sprint 25 to Mainline
- moved test and updated composer.lock
---
composer.lock | 78 ++++++++++++++++++-
.../DeploymentConfigFactoryTest.php | 4 +-
2 files changed, 80 insertions(+), 2 deletions(-)
rename {dev/tests/unit/testsuite/Magento/Framework/Module => lib/internal/Magento/Framework/Module/Test/Unit}/ModuleList/DeploymentConfigFactoryTest.php (82%)
diff --git a/composer.lock b/composer.lock
index 02b43c39d18..5337e32b2c0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "498056a32c33c43d23e5d2ee37362a2d",
+ "hash": "933a1cf749db0c7e6d16e357c12cdaa8",
"packages": [
{
"name": "composer/composer",
@@ -131,6 +131,82 @@
],
"time": "2012-01-03 00:33:17"
},
+ {
+ "name": "magento/magento-composer-installer",
+ "version": "0.1.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/magento/magento-composer-installer.git",
+ "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/7f03451f71e55d52c2bb07325d56a4e6df322f30",
+ "reference": "7f03451f71e55d52c2bb07325d56a4e6df322f30",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "1.0.0"
+ },
+ "require-dev": {
+ "composer/composer": "*@dev",
+ "firegento/phpcs": "dev-patch-1",
+ "mikey179/vfsstream": "*",
+ "phpunit/phpunit": "*",
+ "phpunit/phpunit-mock-objects": "dev-master",
+ "squizlabs/php_codesniffer": "1.4.7",
+ "symfony/process": "*"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "composer-command-registry": [
+ "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
+ ],
+ "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
+ },
+ "autoload": {
+ "psr-0": {
+ "MagentoHackathon\\Composer\\Magento": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "OSL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Vinai Kopp",
+ "email": "vinai@netzarbeiter.com"
+ },
+ {
+ "name": "Daniel Fahlke aka Flyingmana",
+ "email": "flyingmana@googlemail.com"
+ },
+ {
+ "name": "Jörg Weller",
+ "email": "weller@flagbit.de"
+ },
+ {
+ "name": "Karl Spies",
+ "email": "karl.spies@gmx.net"
+ },
+ {
+ "name": "Tobias Vogt",
+ "email": "tobi@webguys.de"
+ },
+ {
+ "name": "David Fuhr",
+ "email": "fuhr@flagbit.de"
+ }
+ ],
+ "description": "Composer installer for Magento modules",
+ "homepage": "https://github.com/magento/magento-composer-installer",
+ "keywords": [
+ "composer-installer",
+ "magento"
+ ],
+ "time": "2015-03-05 21:40:30"
+ },
{
"name": "magento/zendframework1",
"version": "1.12.10",
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/ModuleList/DeploymentConfigFactoryTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/DeploymentConfigFactoryTest.php
similarity index 82%
rename from dev/tests/unit/testsuite/Magento/Framework/Module/ModuleList/DeploymentConfigFactoryTest.php
rename to lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/DeploymentConfigFactoryTest.php
index c96eeba847e..6491a94bba7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/ModuleList/DeploymentConfigFactoryTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/DeploymentConfigFactoryTest.php
@@ -4,7 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Module\ModuleList;
+namespace Magento\Framework\Module\Test\ModuleList;
+
+use Magento\Framework\Module\ModuleList\DeploymentConfigFactory;
class DeploymentConfigFactoryTest extends \PHPUnit_Framework_TestCase
{
--
GitLab