Update development dependencies

Remove obsolete branch-alias
Merge remote-tracking branch 'origin/3.6' into 3
2024-06-28 23:49:38 +02:00 · 2019-02-19 11:55:35 +13:00 · 2018-06-08 12:19:38 +12:00 · 2018-06-08 12:13:18 +12:00 · 2018-05-26 00:22:25 +12:00 · 2018-05-25 11:02:21 +01:00
1 changed files with 20 additions and 24 deletions
--- a/composer.json
+++ b/composer.json
@ -1,25 +1,21 @@
 {
-	"name": "silverstripe/installer",
-	"description": "The SilverStripe Framework Installer",
-	"require": {
-		"php": ">=5.3.3",
-		"silverstripe/cms": "self.version",
-		"silverstripe/framework": "self.version",
-		"silverstripe/reports": "self.version",
-		"silverstripe/siteconfig": "self.version",
-		"silverstripe-themes/simple": "3.1.*"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "^3 || ^4 || ^5"
-	},
-	"extra": {
-		"branch-alias": {
-			"3.x-dev": "3.6.x-dev"
-		}
-	},
-	"config": {
-		"process-timeout": 600
-	},
-	"prefer-stable": true,
-	"minimum-stability": "dev"
-}
+    "name": "silverstripe/installer",
+    "description": "The SilverStripe Framework Installer",
+    "require": {
+        "php": ">=5.3.3",
+        "silverstripe/cms": "3.7.3@stable",
+        "silverstripe/framework": "3.7.3@stable",
+        "silverstripe/reports": "3.7.3@stable",
+        "silverstripe/siteconfig": "3.7.3@stable",
+        "silverstripe-themes/simple": "3.1.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^3 || ^4 || ^5"
+    },
+    "extra": [],
+    "config": {
+        "process-timeout": 600
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
+}
Author	SHA1	Message	Date
Aaron Carlino	716ee60ef9	Update development dependencies	2019-02-19 11:55:35 +13:00
Damian Mooyman	f7634f39c7	Remove obsolete branch-alias	2018-06-08 12:19:38 +12:00
Damian Mooyman	a970bdecf3	Merge remote-tracking branch 'origin/3.6' into 3	2018-06-08 12:13:18 +12:00
Robbie Averill	53ff2d0f68	Merge pull request #228 from dhensby/pulls/3/phpunit-compat Update phpunit deps to match framework	2018-05-26 00:22:25 +12:00
Daniel Hensby	81872c75c3	Update phpunit deps to match framework	2018-05-25 11:02:21 +01:00
Daniel Hensby	61bf3af041	Merge branch '3.6' into 3	2017-06-27 13:10:11 +01:00
Daniel Hensby	d0de968167	Merge branch '3.6' into 3	2017-05-30 23:50:37 +01:00
Daniel Hensby	02e3e102c1	Merge branch '3.6' into 3	2017-05-08 16:20:04 +01:00
Daniel Hensby	8a3e352595	Aliasing 3 as 3.7.x-dev	2017-04-21 16:14:18 +01:00