From 5ff57db401bd0e45920ee49ed29cac7b0ebbc8dc Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 8 Aug 2018 11:06:37 +1000
Subject: [PATCH] Update Unit test to ensure it locks in 2.8 and include
 polyfil

---
 composer.json                                 |  1 +
 composer.lock                                 | 61 ++++++++++++++++++-
 tests/phpunit/CRM/Core/ComposerConfigTest.php | 12 ++--
 3 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index c2782ce1cc..0988e0cd99 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
     "dompdf/dompdf" : "0.8.*",
     "electrolinux/phpquery": "^0.9.6",
     "symfony/config": "^2.8.44 || ~3.0",
+    "symfony/polyfill-iconv": "~1.0",
     "symfony/dependency-injection": "^2.8.44 || ~3.0",
     "symfony/event-dispatcher": "^2.8.44 || ~3.0",
     "symfony/filesystem": "^2.8.44 || ~3.0",
diff --git a/composer.lock b/composer.lock
index 3087cac073..7b5f352c9f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e89bfeb385572696a2193f830412c2bf",
+    "content-hash": "38f5450ab72f881008f5cd10bb588b6f",
     "packages": [
         {
             "name": "civicrm/civicrm-cxn-rpc",
@@ -1565,6 +1565,65 @@
             ],
             "time": "2018-04-30T19:57:29+00:00"
         },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
+                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
+        },
         {
             "name": "symfony/process",
             "version": "v2.8.44",
diff --git a/tests/phpunit/CRM/Core/ComposerConfigTest.php b/tests/phpunit/CRM/Core/ComposerConfigTest.php
index e62c907b24..9166688b86 100644
--- a/tests/phpunit/CRM/Core/ComposerConfigTest.php
+++ b/tests/phpunit/CRM/Core/ComposerConfigTest.php
@@ -21,12 +21,12 @@ class CRM_Core_ComposerConfigTest extends \PHPUnit_Framework_TestCase {
    */
   public function testHardLocks() {
     $hardLocks = array(
-      'symfony/config' => '/^v2\.6\./',
-      'symfony/dependency-injection' => '/^v2\.6\./',
-      'symfony/event-dispatcher' => '/^v2\.6\./',
-      'symfony/filesystem' => '/^v2\.6\./',
-      'symfony/finder' => '/^v2\.6\./',
-      'symfony/process' => '/^v2\.6\./',
+      'symfony/config' => '/^v2\.8\./',
+      'symfony/dependency-injection' => '/^v2\.8\./',
+      'symfony/event-dispatcher' => '/^v2\.8\./',
+      'symfony/filesystem' => '/^v2\.8\./',
+      'symfony/finder' => '/^v2\.8\./',
+      'symfony/process' => '/^v2\.8\./',
     );
 
     $lockFile = Civi::paths()->getPath('[civicrm.root]/composer.lock');
-- 
2.25.1