Merge pull request #9 from elvetemedve/feature/fix-project-dependencies

Jon Acker · Jon Acker · commit 3aabff90976d · 2016-04-08T10:01:30.000+01:00
Feature/fix project dependencies
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+bin/
+vendor/
diff --git a/composer.json b/composer.json
@@ -4,7 +4,8 @@
     "license": "proprietary",
     "description": "Provides Magento with an instance of a Symfony DI Container",
     "require": {
-        "inviqa/symfony-container-generator": "^0.2"
+        "inviqa/symfony-container-generator": "^0.2",
+        "magento-hackathon/magento-composer-installer": "^3.0"
     },
     "require-dev": {
         "phpspec/phpspec": "^2.2"
@@ -18,6 +19,7 @@
         }
     },
     "extra": {
-        "magento-version-ee": "^1.12.0"
+        "magento-version-ee": "^1.12.0",
+        "magento-root-dir": "public"
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`"license": "proprietary",`
`5`	`5`	`"description": "Provides Magento with an instance of a Symfony DI Container",`
`6`	`6`	`"require": {`
`7`		`- "inviqa/symfony-container-generator": "^0.2"`
	`7`	`+ "inviqa/symfony-container-generator": "^0.2",`
	`8`	`+ "magento-hackathon/magento-composer-installer": "^3.0"`
`8`	`9`	`},`
`9`	`10`	`"require-dev": {`
`10`	`11`	`"phpspec/phpspec": "^2.2"`
`@@ -18,6 +19,7 @@`
`18`	`19`	`}`
`19`	`20`	`},`
`20`	`21`	`"extra": {`
`21`		`- "magento-version-ee": "^1.12.0"`
	`22`	`+ "magento-version-ee": "^1.12.0",`
	`23`	`+ "magento-root-dir": "public"`
`22`	`24`	`}`
`23`	`25`	`}`