From 7078a4620c4094c9d9387a329d4b8df1e9d6a91b Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <mattab@users.noreply.github.com>
Date: Sun, 19 Feb 2017 08:03:19 +0100
Subject: [PATCH] Fix the builds + Submodule update (#11355)
* Fix the build
* UI tests
* Submodules
* UI test
---
libs/Zend/Validate/Hostname.php | 6 ++++++
plugins/QueuedTracking | 2 +-
...Reports.generateReport_month.original.html | 18 +++++++++---------
...dReports.generateReport_week.original.html | 18 +++++++++---------
.../CoreUpdaterDb_updated.png | Bin 130 -> 130 bytes
.../EmptySite_emptySiteDashboard.png | Bin 131 -> 131 bytes
.../Installation_js_tracking.png | Bin 131 -> 131 bytes
.../MeasurableManager_add_measurable_view.png | Bin 131 -> 131 bytes
...grationTest_admin_manage_tracking_code.png | Bin 131 -> 131 bytes
9 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php
index 1ea9800546..72d5a3acbe 100644
--- a/libs/Zend/Validate/Hostname.php
+++ b/libs/Zend/Validate/Hostname.php
@@ -498,6 +498,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
'電訊盈科' => array(1 => self::VALID_UNICODE_DOMAIN),
'العليان' => array(1 => self::VALID_UNICODE_DOMAIN),
'嘉里' => array(1 => self::VALID_UNICODE_DOMAIN),
+ 'বাংলা' => array(1 => self::VALID_UNICODE_DOMAIN),
+ 'католик' => array(1 => self::VALID_UNICODE_DOMAIN),
+ '通販' => array(1 => self::VALID_UNICODE_DOMAIN),
+ 'پاکستان' => array(1 => self::VALID_UNICODE_DOMAIN),
+ 'كاثوليك' => array(1 => self::VALID_UNICODE_DOMAIN),
+ '天主教' => array(1 => self::VALID_UNICODE_DOMAIN),
);
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index 6fbf3bb0f4..16636060a0 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit 6fbf3bb0f4722183ff3117d2efb12380373de12e
+Subproject commit 16636060a0616040cc567c3296c43d55e779ba87
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index cdbadbaa2a..fe63fbe641 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -15,8 +15,8 @@
<tr>
<td>
<a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px">
- <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
- </a>
+ <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
+ </a>
</td>
<td align="right">
<a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests">
@@ -5343,14 +5343,14 @@
There is no data for this report.
-<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
+ <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
-<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
- Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
- <br />
- The leading open analytics platform that respects your privacy.
-</p>
+ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
+ Powered by
+ <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <br />
+ The leading open analytics platform that respects your privacy.
+ </p>
</div>
</body>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 66ae5338cf..a068adcd4d 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -15,8 +15,8 @@
<tr>
<td>
<a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px">
- <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
- </a>
+ <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
+ </a>
</td>
<td align="right">
<a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests">
@@ -6746,14 +6746,14 @@
There is no data for this report.
-<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
+ <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
-<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
- Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
- <br />
- The leading open analytics platform that respects your privacy.
-</p>
+ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
+ Powered by
+ <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <br />
+ The leading open analytics platform that respects your privacy.
+ </p>
</div>
</body>
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
index 14563d38879fc7d82ba57b1b5583474e5069115e..b855411727a05171b0b09b5b366bcafb4c0626c4 100644
GIT binary patch
delta 83
zcmWN_xeb6Y3;;mUW(r2IV&i8AmPq_a)O3`YfRW+KTie=RJ^>v}Vgkn)!cpWl-E#cX
eCn|!IA(NUCOBKZ77}GjrWp!=$_2e#0#O(vy_ZI^I
delta 83
zcmV~$yAgmO3;@uxWeP_iB;>P$OF%;ItnDnBz>$4#AN%<DN}ip<$C666!cd~Z0Bfk}
e+yZe#Dq|Y;*~Ep_t5a(0qz+u3`(39H8k8T@y%u-?
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
index e11b4e63290a84266597cef99fe60b1a4cff078e..0ec9b44b84921ee5f89061e8ffcd9ee8dd326cc4 100644
GIT binary patch
delta 84
zcmV~$yAgme2msKt%@mFhgzy={Atb<^wViDiaAe<G+uA-pXQBu79y4$#SAq%wL87vm
d_@qEnEWyjj(}(7fgyq6jp3$EB%^gIIwf*q)7lQx*
delta 84
zcmV~$xeb6Y3;;mUW(r2|7e7NVM65UxH63jhU}Wz0v5!x$GByuGS<z`^!t8}=yq2;+
dRYF%zFmg##QDJqUWQ3SXBieJnb)vb2v>&pg6^j4>
diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png
index f9141294b2e49f88b8570735e2320edc1f7493b3..f763bd2c8a7ff14b2ff9c2d70a9cd3ae12dec371 100644
GIT binary patch
delta 84
zcmV~$xeb6Y3;;mUW(r2|6Fc@043Wo{sOf0403&m^k9~Z4an2c)Vu(SYST2k{8wX)k
eR_M&)HB?fTlY}U$+klpAYw{}3{l<w-4pe^UycVPY
delta 84
zcmWN@yAgmO3;@uhWeP{gkB|)E5abAV)^@fm;K=%_x63ZCo+)W*s(`o_3J-5{5D#J1
eL<S9l4Au@ozM9V<v;W;q8s(_>_2hw0U8H`)iWUd}
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index 7f27f96eed444b8bdaeb89851335d13f52c24c6e..fa3726eebaf6a369f70feb7bbba5a14d8e1509b0 100644
GIT binary patch
delta 84
zcmV~$yA6Oa3<W^ZW(r0yFa9J$Fhq!LiJFc!3otTwYg^l=XG%3r(bkN6zXrw}Kngj5
ey1E7BbcJAa60J-v9C9Ed$t=oqzp*n|l*<prVHQ9D
delta 84
zcmV~$yAgmO3;@uxWeP`t{29U_5+HZhcD5|w$iBCaeSC5$Vb~;)>YS?FS8^A2!iK4f
d0H`8Is5g@VGjI)`Vk*<zBg=EY>m=x+SboN(7S{j(
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index c24b54671b374ddb74f5a2d592148e720d643a57..93374c50e5a089f1ab8741752446023565c61d06 100644
GIT binary patch
delta 84
zcmWN`yAgmO5Cy<7r3y>9<33;!76Hd&#@Ni11}s@O-L<Xl_0uE@w~^gyXajO?jMAle
fFvo~P#V1+x3ZY5;Pe7-8t}s$d_w`^GViijt?8O%4
delta 84
zcmV~$yA6Oa3<W^ZW(r2I9mh_FU<ki_Bx*X^EWpUz?PDLGU9Cf-8v^LUnyFI2MUCBZ
f8+BoY4kmbQ<bp|<Ru;2Ul*pQ%`<-Vd7W4E2^Ai@+
--
GitLab