Merge remote-tracking branch 'remotes/dev/1.6' into 1.6

oroinc · Feb 8, 2018 · 6e9d750 · 6e9d750
2 parents 93988bf + 65716e9
commit 6e9d750
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -56,3 +56,7 @@ oro_user:
 twig:
     strict_variables: true
     debug: false
+
+oro_message_queue:
+    transport:
+        dbal: null
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
     "mybuilder/phpunit-accelerator": "1.2.*",
     "squizlabs/php_codesniffer": "2.8.*",
     "phpmd/phpmd": "2.6.*",
-    "sebastian/phpcpd": "dev-master#cff7f36c2ae89d59987de25d14fd41a72dd4a703 as 3.1.0",
+    "sebastian/phpcpd": "3.0.*",
     "phpunit/phpcov": "3.1.*",
     "symfony/phpunit-bridge": "3.2.*",
     "friendsofphp/php-cs-fixer": "2.1.*"

diff --git a/dev.json b/dev.json
@@ -48,7 +48,7 @@
     "mybuilder/phpunit-accelerator": "1.2.*",
     "squizlabs/php_codesniffer": "2.8.*",
     "phpmd/phpmd": "2.6.*",
-    "sebastian/phpcpd": "dev-master#cff7f36c2ae89d59987de25d14fd41a72dd4a703 as 3.1.0",
+    "sebastian/phpcpd": "3.0.*",
     "phpunit/phpcov": "3.1.*",
     "symfony/phpunit-bridge": "3.2.*",
     "friendsofphp/php-cs-fixer": "2.1.*"

diff --git a/dev.lock b/dev.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "49ab529d41a296dd6db85218cd949fac",
+    "content-hash": "da4491a3237319edba60aec21e6ef12c",
     "packages": [
         {
             "name": "a2lix/translation-form-bundle",
@@ -6783,12 +6783,12 @@
             "version": "3.7.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/piwik/device-detector.git",
+                "url": "https://github.com/matomo-org/device-detector.git",
                 "reference": "2ea3108d8cdffd58d855eff3cc493c0acc4cf102"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/piwik/device-detector/zipball/2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
                 "reference": "2ea3108d8cdffd58d855eff3cc493c0acc4cf102",
                 "shasum": ""
             },
@@ -11468,16 +11468,16 @@
         },
         {
             "name": "sebastian/phpcpd",
-            "version": "dev-master",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "b6dd25b89fa4891fea79db51871c1488dc12c1ac"
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/b6dd25b89fa4891fea79db51871c1488dc12c1ac",
-                "reference": "b6dd25b89fa4891fea79db51871c1488dc12c1ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/dfed51c1288790fc957c9433e2f49ab152e8a564",
+                "reference": "dfed51c1288790fc957c9433e2f49ab152e8a564",
                 "shasum": ""
             },
             "require": {
@@ -11514,7 +11514,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2017-11-16T09:52:34+00:00"
+            "time": "2017-11-16T08:49:28+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -12040,14 +12040,7 @@
             "time": "2016-11-23T20:04:58+00:00"
         }
     ],
-    "aliases": [
-        {
-            "alias": "3.1.0",
-            "alias_normalized": "3.1.0.0",
-            "version": "9999999-dev",
-            "package": "sebastian/phpcpd"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
         "oro/commerce": 20,
@@ -12070,8 +12063,7 @@
         "oro/crm-zendesk": 20,
         "oro/commerce-dpd": 20,
         "oro/commerce-infinitepay": 20,
-        "oro/german-localization": 20,
-        "sebastian/phpcpd": 20
+        "oro/german-localization": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,