Skip to content

Commit 6e9d750

Browse files
committed
Merge remote-tracking branch 'remotes/dev/1.6' into 1.6
2 parents 93988bf + 65716e9 commit 6e9d750

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

app/config/config_test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ oro_user:
5656
twig:
5757
strict_variables: true
5858
debug: false
59+
60+
oro_message_queue:
61+
transport:
62+
dbal: null

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"mybuilder/phpunit-accelerator": "1.2.*",
5252
"squizlabs/php_codesniffer": "2.8.*",
5353
"phpmd/phpmd": "2.6.*",
54-
"sebastian/phpcpd": "dev-master#cff7f36c2ae89d59987de25d14fd41a72dd4a703 as 3.1.0",
54+
"sebastian/phpcpd": "3.0.*",
5555
"phpunit/phpcov": "3.1.*",
5656
"symfony/phpunit-bridge": "3.2.*",
5757
"friendsofphp/php-cs-fixer": "2.1.*"

dev.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"mybuilder/phpunit-accelerator": "1.2.*",
4949
"squizlabs/php_codesniffer": "2.8.*",
5050
"phpmd/phpmd": "2.6.*",
51-
"sebastian/phpcpd": "dev-master#cff7f36c2ae89d59987de25d14fd41a72dd4a703 as 3.1.0",
51+
"sebastian/phpcpd": "3.0.*",
5252
"phpunit/phpcov": "3.1.*",
5353
"symfony/phpunit-bridge": "3.2.*",
5454
"friendsofphp/php-cs-fixer": "2.1.*"

dev.lock

+10-18
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
55
"This file is @generated automatically"
66
],
7-
"content-hash": "49ab529d41a296dd6db85218cd949fac",
7+
"content-hash": "da4491a3237319edba60aec21e6ef12c",
88
"packages": [
99
{
1010
"name": "a2lix/translation-form-bundle",
@@ -6783,12 +6783,12 @@
67836783
"version": "3.7.8",
67846784
"source": {
67856785
"type": "git",
6786-
"url": "https://github.com/piwik/device-detector.git",
6786+
"url": "https://github.com/matomo-org/device-detector.git",
67876787
"reference": "2ea3108d8cdffd58d855eff3cc493c0acc4cf102"
67886788
},
67896789
"dist": {
67906790
"type": "zip",
6791-
"url": "https://api.github.com/repos/piwik/device-detector/zipball/2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
6791+
"url": "https://api.github.com/repos/matomo-org/device-detector/zipball/2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
67926792
"reference": "2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
67936793
"shasum": ""
67946794
},
@@ -11468,16 +11468,16 @@
1146811468
},
1146911469
{
1147011470
"name": "sebastian/phpcpd",
11471-
"version": "dev-master",
11471+
"version": "3.0.1",
1147211472
"source": {
1147311473
"type": "git",
1147411474
"url": "https://github.com/sebastianbergmann/phpcpd.git",
11475-
"reference": "b6dd25b89fa4891fea79db51871c1488dc12c1ac"
11475+
"reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
1147611476
},
1147711477
"dist": {
1147811478
"type": "zip",
11479-
"url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/b6dd25b89fa4891fea79db51871c1488dc12c1ac",
11480-
"reference": "b6dd25b89fa4891fea79db51871c1488dc12c1ac",
11479+
"url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
11480+
"reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
1148111481
"shasum": ""
1148211482
},
1148311483
"require": {
@@ -11514,7 +11514,7 @@
1151411514
],
1151511515
"description": "Copy/Paste Detector (CPD) for PHP code.",
1151611516
"homepage": "https://github.com/sebastianbergmann/phpcpd",
11517-
"time": "2017-11-16T09:52:34+00:00"
11517+
"time": "2017-11-16T08:49:28+00:00"
1151811518
},
1151911519
{
1152011520
"name": "sebastian/recursion-context",
@@ -12040,14 +12040,7 @@
1204012040
"time": "2016-11-23T20:04:58+00:00"
1204112041
}
1204212042
],
12043-
"aliases": [
12044-
{
12045-
"alias": "3.1.0",
12046-
"alias_normalized": "3.1.0.0",
12047-
"version": "9999999-dev",
12048-
"package": "sebastian/phpcpd"
12049-
}
12050-
],
12043+
"aliases": [],
1205112044
"minimum-stability": "dev",
1205212045
"stability-flags": {
1205312046
"oro/commerce": 20,
@@ -12070,8 +12063,7 @@
1207012063
"oro/crm-zendesk": 20,
1207112064
"oro/commerce-dpd": 20,
1207212065
"oro/commerce-infinitepay": 20,
12073-
"oro/german-localization": 20,
12074-
"sebastian/phpcpd": 20
12066+
"oro/german-localization": 20
1207512067
},
1207612068
"prefer-stable": true,
1207712069
"prefer-lowest": false,

0 commit comments

Comments
 (0)