Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit b47b239fd94a · 2020-12-11T11:20:19.000+01:00
* 5.2:
  Cleanup composer.json files
  [Notifier] Add PHP 8 support for bridges
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json
@@ -16,16 +16,14 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/mailer": "^4.4|^5.0"
     },
     "require-dev": {
         "symfony/http-client": "^4.4|^5.0"
     },
     "autoload": {
-        "psr-4": {
-            "Symfony\\Component\\Mailer\\Bridge\\Mailjet\\": ""
-        },
+        "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailjet\\": "" },
         "exclude-from-classmap": [
             "/Tests/"
         ]
diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/composer.json b/src/Symfony/Component/Notifier/Bridge/Discord/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/http-client": "^4.3|^5.0",
         "symfony/notifier": "^5.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/http-client": "^4.4|^5.0",
         "symfony/notifier": "^5.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json b/src/Symfony/Component/Notifier/Bridge/Infobip/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/http-client": "^4.3|^5.0",
         "symfony/notifier": "^5.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "ext-json": "*",
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/http-client": "^4.3|^5.0",
         "symfony/notifier": "^5.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json b/src/Symfony/Component/Notifier/Bridge/Smsapi/composer.json
@@ -21,9 +21,7 @@
         "symfony/notifier": "^5.2"
     },
     "autoload": {
-        "psr-4": {
-            "Symfony\\Component\\Notifier\\Bridge\\Smsapi\\": ""
-        },
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Smsapi\\": "" },
         "exclude-from-classmap": [
             "/Tests/"
         ]
diff --git a/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json b/src/Symfony/Component/Notifier/Bridge/Zulip/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
+        "php": ">=7.2.5",
         "symfony/http-client": "^4.3|^5.0",
         "symfony/notifier": "^5.2"
     },

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"require": {`
`19`		`- "php": "^7.2.5",`
	`19`	`+ "php": ">=7.2.5",`
`20`	`20`	`"symfony/http-client": "^4.3\|^5.0",`
`21`	`21`	`"symfony/notifier": "^5.2"`
`22`	`22`	`},`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"require": {`
`23`		`- "php": "^7.2.5",`
	`23`	`+ "php": ">=7.2.5",`
`24`	`24`	`"symfony/http-client": "^4.3\|^5.0",`
`25`	`25`	`"symfony/notifier": "^5.2"`
`26`	`26`	`},`