From 772efe1be91b4463cdef7415c9a85cc1ed1ae212 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 25 Feb 2019 11:14:15 +0100
Subject: drop fake minifiers

---
 cphalcon-nominifier.patch | 50 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

(limited to 'cphalcon-nominifier.patch')

diff --git a/cphalcon-nominifier.patch b/cphalcon-nominifier.patch
index e2bd442..33e0a67 100644
--- a/cphalcon-nominifier.patch
+++ b/cphalcon-nominifier.patch
@@ -1,6 +1,43 @@
-diff -up phalcon/assets/filters/cssmin.zep.orig phalcon/assets/filters/cssmin.zep
---- phalcon/assets/filters/cssmin.zep.orig	2019-02-25 09:14:47.881823280 +0100
-+++ phalcon/assets/filters/cssmin.zep	2019-02-25 09:14:53.915856132 +0100
+Backported from 4.x
+
+
+
+From b96c58b525123f1c4ec7d3e832ae08270a46b248 Mon Sep 17 00:00:00 2001
+From: Nikolaos Dimopoulos <nikos@niden.net>
+Date: Mon, 11 Feb 2019 13:01:30 -0500
+Subject: [PATCH] [#13819] - Removing css/js optimizers from the config
+
+---
+ config.json | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/config.json b/config.json
+index f4db4ac594..518e022959 100644
+--- a/config.json
++++ b/config.json
+@@ -31,8 +31,6 @@
+         "phalcon/mvc/model/query/parser.c",
+         "phalcon/mvc/view/engine/volt/parser.c",
+         "phalcon/mvc/view/engine/volt/scanner.c",
+-        "phalcon/assets/filters/jsminifier.c",
+-        "phalcon/assets/filters/cssminifier.c",
+         "phalcon/mvc/url/utils.c"
+     ],
+     "globals": {
+From 13a603c0af0f880c34a8ad62061610e90f019a9d Mon Sep 17 00:00:00 2001
+From: Nikolaos Dimopoulos <nikos@niden.net>
+Date: Mon, 11 Feb 2019 12:47:37 -0500
+Subject: [PATCH] [#13819] - Removed minifiers
+
+---
+ phalcon/assets/filters/cssmin.zep | 2 +-
+ phalcon/assets/filters/jsmin.zep  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/phalcon/assets/filters/cssmin.zep b/phalcon/assets/filters/cssmin.zep
+index 7ce0b05343..751cc1f4e8 100644
+--- a/phalcon/assets/filters/cssmin.zep
++++ b/phalcon/assets/filters/cssmin.zep
 @@ -36,6 +36,6 @@ class Cssmin implements FilterInterface
  	 */
  	public function filter(string! content) -> string
@@ -9,9 +46,10 @@ diff -up phalcon/assets/filters/cssmin.zep.orig phalcon/assets/filters/cssmin.ze
 +		return content;
  	}
  }
-diff -up phalcon/assets/filters/jsmin.zep.orig phalcon/assets/filters/jsmin.zep
---- phalcon/assets/filters/jsmin.zep.orig	2019-02-25 09:15:05.946921636 +0100
-+++ phalcon/assets/filters/jsmin.zep	2019-02-25 09:15:18.133987990 +0100
+diff --git a/phalcon/assets/filters/jsmin.zep b/phalcon/assets/filters/jsmin.zep
+index 7559c0503d..bc1c5bd9b4 100644
+--- a/phalcon/assets/filters/jsmin.zep
++++ b/phalcon/assets/filters/jsmin.zep
 @@ -36,6 +36,6 @@ class Jsmin implements FilterInterface
  	 */
  	public function filter(string! content) -> string
-- 
cgit