Merge pull request #8 from holtkamp/patch-isolated-from-zf1

mnapoli · mnapoli · commit 418d80d38617 · 2015-05-29T11:54:09.000+02:00
Patch isolate from ZF1
diff --git a/composer.json b/composer.json
@@ -10,10 +10,13 @@
         }
     },
     "require": {
-        "mnapoli/php-di": "~4.0",
-        "zendframework/zendframework1": "1.12.*"
+        "mnapoli/php-di": "~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^3.7"
+    },
+    "suggest": {
+        "zendframework/zendframework1": "The complete Zend Framework 1",
+	"zf1/zend-controller": "The involved Zend Controller fuctionality"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,13 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"require": {`
`13`		`- "mnapoli/php-di": "~4.0",`
`14`		`- "zendframework/zendframework1": "1.12.*"`
	`13`	`+ "mnapoli/php-di": "~4.0"`
`15`	`14`	`},`
`16`	`15`	`"require-dev": {`
`17`	`16`	`"phpunit/phpunit": "^3.7"`
	`17`	`+ },`
	`18`	`+ "suggest": {`
	`19`	`+ "zendframework/zendframework1": "The complete Zend Framework 1",`
	`20`	`+ "zf1/zend-controller": "The involved Zend Controller fuctionality"`
`18`	`21`	`}`
`19`	`22`	`}`