From 766b69a0c8c99757c89cb567f77b90a531010087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 22:52:45 +0200
Subject: [PATCH] User upstream class SeparatorFilter
---
lib/private/assetic/separatorfilter.php | 57 -------------------------
lib/private/templatelayout.php | 2 +-
2 files changed, 1 insertion(+), 58 deletions(-)
delete mode 100644 lib/private/assetic/separatorfilter.php
diff --git a/lib/private/assetic/separatorfilter.php b/lib/private/assetic/separatorfilter.php
deleted file mode 100644
index ee6d5c11c20..00000000000
--- a/lib/private/assetic/separatorfilter.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Assetic;
-
-use Assetic\Filter\FilterInterface;
-use Assetic\Asset\AssetInterface;
-
-/**
- * Inserts a separator between assets to prevent merge failures
- * e.g. missing semicolon at the end of a JS file
- */
-class SeparatorFilter implements FilterInterface
-{
- /**
- * @var string
- */
- private $separator;
-
- /**
- * Constructor.
- *
- * @param string $separator Separator to use between assets
- */
- public function __construct($separator = ';')
- {
- $this->separator = $separator;
- }
-
- public function filterLoad(AssetInterface $asset)
- {
- }
-
- public function filterDump(AssetInterface $asset)
- {
- $asset->setContent($asset->getContent() . $this->separator);
- }
-}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 30f75761d05..43c83dea815 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -39,7 +39,7 @@ use Assetic\Filter\CssImportFilter;
use Assetic\Filter\CssMinFilter;
use Assetic\Filter\CssRewriteFilter;
use Assetic\Filter\JSqueezeFilter;
-use OC\Assetic\SeparatorFilter; // waiting on upstream
+use Assetic\Filter\SeparatorFilter;
/**
* Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
--
GitLab