From bfdaf4da1e668c99c168de691d1ba551e93a72f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Tue, 26 Nov 2019 12:17:20 +0100
Subject: [PATCH] Move 3rd-party libs to a dedicated directory

[MAILPOET-2545]
---
 RoboFile.php                                              | 4 ----
 build.sh                                                  | 1 +
 composer.json                                             | 4 ++--
 {lib/Util => lib-3rd-party}/ArrayColumn.php               | 0
 {lib/Util => lib-3rd-party}/CSS.php                       | 0
 {lib/Util => lib-3rd-party}/Sudzy/Engine.php              | 0
 {lib/Util => lib-3rd-party}/Sudzy/ValidModel.php          | 0
 {lib/Util => lib-3rd-party}/Sudzy/ValidationException.php | 0
 {lib/Util => lib-3rd-party}/XLSXWriter.php                | 0
 lib/Util/pQuery/pQuery.php                                | 1 +
 10 files changed, 4 insertions(+), 6 deletions(-)
 rename {lib/Util => lib-3rd-party}/ArrayColumn.php (100%)
 rename {lib/Util => lib-3rd-party}/CSS.php (100%)
 rename {lib/Util => lib-3rd-party}/Sudzy/Engine.php (100%)
 rename {lib/Util => lib-3rd-party}/Sudzy/ValidModel.php (100%)
 rename {lib/Util => lib-3rd-party}/Sudzy/ValidationException.php (100%)
 rename {lib/Util => lib-3rd-party}/XLSXWriter.php (100%)

diff --git a/RoboFile.php b/RoboFile.php
index a2db8f7d52..b17c6babc8 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -373,10 +373,6 @@ class RoboFile extends \Robo\Tasks {
       ->rawArg('--runtime-set testVersion 5.6-7.3')
       ->arg('--ignore=' . implode(',', [
           'lib/Config/PopulatorData/Templates',
-          'lib/Util/CSS.php',
-          'lib/Util/Sudzy',
-          'lib/Util/pQuery',
-          'lib/Util/XLSXWriter.php',
           'tests/_data',
           'tests/_output',
           'tests/_support/_generated',
diff --git a/build.sh b/build.sh
index 5c8cef9a8d..40446fbf72 100755
--- a/build.sh
+++ b/build.sh
@@ -70,6 +70,7 @@ cp -Rf lang $plugin_name
 cp -RfL assets $plugin_name
 cp -Rf generated $plugin_name
 cp -Rf lib $plugin_name
+cp -Rf lib-3rd-party $plugin_name
 cp -Rf vendor $plugin_name
 cp -Rf vendor-prefixed $plugin_name
 cp -Rf views $plugin_name
diff --git a/composer.json b/composer.json
index 793d8a94a0..2cd9972dbc 100644
--- a/composer.json
+++ b/composer.json
@@ -38,15 +38,15 @@
   },
   "autoload": {
     "classmap": [
+      "lib-3rd-party",
       "vendor-prefixed"
     ],
     "files": [
-      "lib/Util/ArrayColumn.php"
+      "lib-3rd-party/ArrayColumn.php"
     ],
     "psr-4": {
       "MailPoet\\": "lib/",
       "MailPoetVendor\\": "vendor-prefixed/",
-      "Sudzy\\": "lib/Util/Sudzy",
       "MailPoetGenerated\\": "generated/"
     }
   },
diff --git a/lib/Util/ArrayColumn.php b/lib-3rd-party/ArrayColumn.php
similarity index 100%
rename from lib/Util/ArrayColumn.php
rename to lib-3rd-party/ArrayColumn.php
diff --git a/lib/Util/CSS.php b/lib-3rd-party/CSS.php
similarity index 100%
rename from lib/Util/CSS.php
rename to lib-3rd-party/CSS.php
diff --git a/lib/Util/Sudzy/Engine.php b/lib-3rd-party/Sudzy/Engine.php
similarity index 100%
rename from lib/Util/Sudzy/Engine.php
rename to lib-3rd-party/Sudzy/Engine.php
diff --git a/lib/Util/Sudzy/ValidModel.php b/lib-3rd-party/Sudzy/ValidModel.php
similarity index 100%
rename from lib/Util/Sudzy/ValidModel.php
rename to lib-3rd-party/Sudzy/ValidModel.php
diff --git a/lib/Util/Sudzy/ValidationException.php b/lib-3rd-party/Sudzy/ValidationException.php
similarity index 100%
rename from lib/Util/Sudzy/ValidationException.php
rename to lib-3rd-party/Sudzy/ValidationException.php
diff --git a/lib/Util/XLSXWriter.php b/lib-3rd-party/XLSXWriter.php
similarity index 100%
rename from lib/Util/XLSXWriter.php
rename to lib-3rd-party/XLSXWriter.php
diff --git a/lib/Util/pQuery/pQuery.php b/lib/Util/pQuery/pQuery.php
index 2ee5dd3bfa..87394e0534 100644
--- a/lib/Util/pQuery/pQuery.php
+++ b/lib/Util/pQuery/pQuery.php
@@ -3,6 +3,7 @@
 namespace MailPoet\Util\pQuery;
 
 // extend pQuery class to use UTF-8 encoding when getting elements' inner/outer text
+// phpcs:ignore Squiz.Classes.ValidClassName
 class pQuery extends \pQuery {
   public static function parseStr($html) {
     $parser = new Html5Parser($html);