Merge pull request #88 from silinternational/develop

briskt · web-flow · commit 204d8924fb4d · 2020-04-22T14:28:18.000-06:00
Release - add SimpleSAMLphp ~1.18.5
diff --git a/composer.json b/composer.json
@@ -12,9 +12,11 @@
   "minimum-stability": "stable",
   "require": {
     "php": ">=7.0",
-    "roave/security-advisories": "dev-master",
     "simplesamlphp/composer-module-installer": "^1.1.5",
-    "simplesamlphp/simplesamlphp": "~1.17.7",
+    "simplesamlphp/simplesamlphp": "~1.17.7 || ~1.18.5",
     "silinternational/ssp-utilities": "^1.0"
+  },
+  "require-dev": {
+    "roave/security-advisories": "dev-master"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,11 @@`
`12`	`12`	`"minimum-stability": "stable",`
`13`	`13`	`"require": {`
`14`	`14`	`"php": ">=7.0",`
`15`		`- "roave/security-advisories": "dev-master",`
`16`	`15`	`"simplesamlphp/composer-module-installer": "^1.1.5",`
`17`		`- "simplesamlphp/simplesamlphp": "~1.17.7",`
	`16`	`+ "simplesamlphp/simplesamlphp": "~1.17.7 \|\| ~1.18.5",`
`18`	`17`	`"silinternational/ssp-utilities": "^1.0"`
	`18`	`+ },`
	`19`	`+ "require-dev": {`
	`20`	`+ "roave/security-advisories": "dev-master"`
`19`	`21`	`}`
`20`	`22`	`}`