Skip to content

Commit 6da226d

Browse files
authored
Merge pull request #5033 from magento-trigger/MC-19642
- Change single pipes to double pipes in composer.json files
2 parents 57b2f85 + 80b3d3e commit 6da226d

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

app/code/Magento/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-store": "*",
1313
"magento/module-catalog-inventory": "*",
1414
"magento/framework": "*",
15-
"elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
15+
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-search": "*",
1010
"magento/module-store": "*",
1111
"magento/module-elasticsearch": "*",
12-
"elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
12+
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
1313
},
1414
"suggest": {
1515
"magento/module-config": "*"

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@
3434
"colinmollenhour/credis": "1.10.0",
3535
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3636
"composer/composer": "^1.6",
37-
"elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
37+
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
3838
"magento/composer": "~1.5.0",
3939
"magento/magento-composer-installer": ">=0.1.11",
4040
"magento/zendframework1": "~1.14.2",
4141
"monolog/monolog": "^1.17",
4242
"wikimedia/less.php": "~1.8.0",
4343
"paragonie/sodium_compat": "^1.6",
4444
"pelago/emogrifier": "^2.0.0",
45-
"php-amqplib/php-amqplib": "~2.7.0|~2.10.0",
45+
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
4646
"phpseclib/mcrypt_compat": "1.0.8",
4747
"phpseclib/phpseclib": "2.0.*",
4848
"ramsey/uuid": "~3.8.0",
49-
"symfony/console": "~4.1.0|~4.2.0|~4.3.0",
50-
"symfony/event-dispatcher": "~4.1.0|~4.2.0|~4.3.0",
51-
"symfony/process": "~4.1.0|~4.2.0|~4.3.0",
49+
"symfony/console": "~4.1.0||~4.2.0||~4.3.0",
50+
"symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0",
51+
"symfony/process": "~4.1.0||~4.2.0||~4.3.0",
5252
"tedivm/jshrink": "~1.3.0",
5353
"tubalmartin/cssmin": "4.1.1",
5454
"webonyx/graphql-php": "^0.13.8",

composer.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"AFL-3.0"
88
],
99
"require": {
10-
"php": "~5.5.22|~5.6.0|~7.0.0",
10+
"php": "~5.5.22||~5.6.0||~7.0.0",
1111
"ext-ctype": "*",
1212
"ext-curl": "*",
1313
"ext-dom": "*",

lib/internal/Magento/Framework/Amqp/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"require": {
1313
"magento/framework": "*",
1414
"php": "~7.1.3||~7.2.0||~7.3.0",
15-
"php-amqplib/php-amqplib": "~2.7.0|~2.10.0"
15+
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0"
1616
},
1717
"autoload": {
1818
"psr-4": {

lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"AFL-3.0"
99
],
1010
"require": {
11-
"php": "~5.6.0|7.0.2|^7.0.6",
11+
"php": "~5.6.0||7.0.2||^7.0.6",
1212
"ext-openssl": "*"
1313
},
1414
"require-dev": {

0 commit comments

Comments
 (0)