From e9b36b8cc7d73d7c0e36018148b816778ab89bc5 Mon Sep 17 00:00:00 2001
From: g <>
Date: Wed, 9 Sep 2020 16:24:47 +0300
Subject: [PATCH 1/4] update jms/serializer branch

---
 composer.lock | 83 ++++++++++++++++-----------------------------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/composer.lock b/composer.lock
index b7a0ab0..4785cfc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b7a1039d5165ccc52cae9b9f3d37a944",
+    "content-hash": "e8fce15735594bde54a65fb1d2415599",
     "packages": [
         {
             "name": "composer/installers",
@@ -143,9 +143,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/cf7-field-validation.zip?timestamp=1523974032",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/cf7-field-validation.zip?timestamp=1523974032"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -163,9 +161,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/contact-form-7.5.0.5.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/contact-form-7.5.0.5.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -183,9 +179,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/enhanced-media-library.2.6.4.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/enhanced-media-library.2.6.4.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -203,9 +197,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/flamingo.1.9.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/flamingo.1.9.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -223,9 +215,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/menu-item-custom-fields.1.0.0.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/menu-item-custom-fields.1.0.0.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -243,9 +233,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/meta-tag-manager.2.1.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/meta-tag-manager.2.1.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -263,9 +251,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/post-smtp.1.9.8.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/post-smtp.1.9.8.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -275,17 +261,15 @@
         },
         {
             "name": "wpackagist-plugin/post-types-order",
-            "version": "1.9.5.1",
+            "version": "1.9.5.2",
             "source": {
                 "type": "svn",
                 "url": "https://plugins.svn.wordpress.org/post-types-order/",
-                "reference": "tags/1.9.5.1"
+                "reference": "tags/1.9.5.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/post-types-order.1.9.5.1.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/post-types-order.1.9.5.2.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -303,9 +287,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/really-simple-captcha.2.0.2.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/really-simple-captcha.2.0.2.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -323,9 +305,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/svg-support.2.3.18.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/svg-support.2.3.18.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -335,17 +315,15 @@
         },
         {
             "name": "wpackagist-plugin/taxonomy-terms-order",
-            "version": "1.5.7.2",
+            "version": "1.5.7.3",
             "source": {
                 "type": "svn",
                 "url": "https://plugins.svn.wordpress.org/taxonomy-terms-order/",
-                "reference": "tags/1.5.7.2"
+                "reference": "tags/1.5.7.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/taxonomy-terms-order.1.5.7.2.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/taxonomy-terms-order.1.5.7.3.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -355,17 +333,15 @@
         },
         {
             "name": "wpackagist-plugin/tinymce-advanced",
-            "version": "4.8.2",
+            "version": "5.2.1",
             "source": {
                 "type": "svn",
                 "url": "https://plugins.svn.wordpress.org/tinymce-advanced/",
-                "reference": "tags/4.8.2"
+                "reference": "tags/5.2.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/tinymce-advanced.4.8.2.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/tinymce-advanced.5.2.1.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -383,9 +359,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/toggle-wpautop.1.2.5.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/toggle-wpautop.1.2.5.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -403,9 +377,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/wordpress-seo.14.6.1.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/wordpress-seo.14.6.1.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -423,9 +395,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/wp-rest-api-v2-menus.0.3.2.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/wp-rest-api-v2-menus.0.3.2.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -443,9 +413,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/wps-hide-login.1.5.6.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://downloads.wordpress.org/plugin/wps-hide-login.1.5.6.zip"
             },
             "require": {
                 "composer/installers": "~1.0"
@@ -461,5 +429,6 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From 1e13fa9e9fc5deeb39639935c31efa88eaadde61 Mon Sep 17 00:00:00 2001
From: g <>
Date: Mon, 14 Sep 2020 17:55:44 +0300
Subject: [PATCH 2/4] configuration for new staging environment

---
 environments/staging/domain_db_fix.sql   | 14 ++++++++++++++
 environments/staging/wp-config-local.php | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 environments/staging/domain_db_fix.sql
 create mode 100644 environments/staging/wp-config-local.php

diff --git a/environments/staging/domain_db_fix.sql b/environments/staging/domain_db_fix.sql
new file mode 100644
index 0000000..1e844a5
--- /dev/null
+++ b/environments/staging/domain_db_fix.sql
@@ -0,0 +1,14 @@
+######FOR TEST STAGING ENV
+
+update wp_options set option_value = "https://staging-law.carta.live" where option_id = 1 limit 1;
+update wp_options set option_value = "https://staging-law.carta.live" where option_id = 2 limit 1;
+
+update wp_2_options set option_value = "https://staging-live.carta.live" where option_id = 1 limit 1;
+update wp_2_options set option_value = "https://staging-law.carta.live/livecarta" where option_id = 2 limit 1;
+
+update wp_blogs set domain = "staging-law.carta.live" where blog_id = 1 limit 1;
+update wp_blogs set domain = "staging-law.carta.live" where blog_id = 2 limit 1;
+
+update wp_domain_mapping set domain = "staging-live.carta.live" where blog_id = 2 limit 1;
+
+update wp_site set domain = "staging-law.carta.livem" where id =1 limit 1;
diff --git a/environments/staging/wp-config-local.php b/environments/staging/wp-config-local.php
new file mode 100644
index 0000000..0833067
--- /dev/null
+++ b/environments/staging/wp-config-local.php
@@ -0,0 +1,18 @@
+<?php
+
+define( 'DB_NAME', '@lcWpMySqlDbnameStaging@' );
+define( 'DB_USER', '@lcWpMySqlUsernameStaging@' );
+define( 'DB_PASSWORD', '@lcWpMySqlPasswordStaging@' );
+define( 'DB_HOST', '@lcWpMySqlHostStaging@' );
+
+define('DOMAIN_CURRENT_SITE', 'staging-law.carta.live');
+
+define('LAWCARTA_SUBDOMAIN', 'app-staging');
+define('LAWCARTA_PORT', '');
+
+define('LAWCARTA_WP_REST_API_REQUEST_URL',  'https://app-staging-law.carta.live/v1/event/request');
+define('LAWCARTA_WP_REST_API_RESPONSE_URL', 'https://app-staging-law.carta.live/v1/event/response');
+
+define('LAWCARTA_ENVIRONMENT_NAME', 'staging');
+
+$_SERVER['HTTPS'] = 'On';

From 23194acbe303da5f232d21175f213b0938032fae Mon Sep 17 00:00:00 2001
From: g <>
Date: Mon, 14 Sep 2020 18:15:26 +0300
Subject: [PATCH 3/4] configuration for new staging environment

---
 build/build.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 5f6446b..eb5dd19 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -14,11 +14,26 @@
     <replace dir="../environments" token="@lcWpMySqlUsernameDev@" value="${lcWpMySqlUsernameDev}"/>
     <replace dir="../environments" token="@lcWpMySqlPasswordDev@" value="${lcWpMySqlPasswordDev}"/>
 
+    <replace dir="../environments" token="@lcWpMySqlHostQA@" value="${lcWpMySqlHostQA}"/>
+    <replace dir="../environments" token="@lcWpMySqlDbnameQA@" value="${lcWpMySqlDbnameQA}"/>
+    <replace dir="../environments" token="@lcWpMySqlUsernameQA@" value="${lcWpMySqlUsernameQA}"/>
+    <replace dir="../environments" token="@lcWpMySqlPasswordQA@" value="${lcWpMySqlPasswordQA}"/>
+
     <replace dir="../environments" token="@lcWpMySqlHostDemo@" value="${lcWpMySqlHostDemo}"/>
     <replace dir="../environments" token="@lcWpMySqlDbnameDemo@" value="${lcWpMySqlDbnameDemo}"/>
     <replace dir="../environments" token="@lcWpMySqlUsernameDemo@" value="${lcWpMySqlUsernameDemo}"/>
     <replace dir="../environments" token="@lcWpMySqlPasswordDemo@" value="${lcWpMySqlPasswordDemo}"/>
 
+    <replace dir="../environments" token="@lcWpMySqlHostStaging@" value="${lcWpMySqlHostStaging}"/>
+    <replace dir="../environments" token="@lcWpMySqlDbnameStaging@" value="${lcWpMySqlDbnameStaging}"/>
+    <replace dir="../environments" token="@lcWpMySqlUsernameStaging@" value="${lcWpMySqlUsernameStaging}"/>
+    <replace dir="../environments" token="@lcWpMySqlPasswordStaging@" value="${lcWpMySqlPasswordStaging}"/>
+
+    <replace dir="../environments" token="@lcWpMySqlHostProd@" value="${lcWpMySqlHostProd}"/>
+    <replace dir="../environments" token="@lcWpMySqlDbnameProd@" value="${lcWpMySqlDbnameProd}"/>
+    <replace dir="../environments" token="@lcWpMySqlUsernameProd@" value="${lcWpMySqlUsernameProd}"/>
+    <replace dir="../environments" token="@lcWpMySqlPasswordProd@" value="${lcWpMySqlPasswordProd}"/>
+
     <property name="replace.done" value="true"/>
 </target>
 

From 53ca3287167b8a853ae2a62b048dd1201f148b79 Mon Sep 17 00:00:00 2001
From: g <>
Date: Mon, 14 Sep 2020 18:17:01 +0300
Subject: [PATCH 4/4] configuration for new staging environment

---
 environments/staging/wp-config-local.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments/staging/wp-config-local.php b/environments/staging/wp-config-local.php
index 0833067..496cd0b 100644
--- a/environments/staging/wp-config-local.php
+++ b/environments/staging/wp-config-local.php
@@ -7,7 +7,7 @@ define( 'DB_HOST', '@lcWpMySqlHostStaging@' );
 
 define('DOMAIN_CURRENT_SITE', 'staging-law.carta.live');
 
-define('LAWCARTA_SUBDOMAIN', 'app-staging');
+define('LAWCARTA_SUBDOMAIN', 'app-staging-law');
 define('LAWCARTA_PORT', '');
 
 define('LAWCARTA_WP_REST_API_REQUEST_URL',  'https://app-staging-law.carta.live/v1/event/request');