Skip to content

Commit 0a2c3ed

Browse files
committed
feat(package): merge with 0.4.x and resolve compatibility
1 parent f5a9ab2 commit 0a2c3ed

114 files changed

Lines changed: 6881 additions & 13703 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assets/js/fileapi/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

assets/lib/APIHelpers.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static function getkey($data, $key, $default = null, $validate = null)
8080
if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {
8181
$out = $data[$key];
8282
}
83-
if (!empty($validate) && is_callable($validate)) {
83+
if (! empty($validate) && is_callable($validate)) {
8484
$out = (($validate($out) === true) ? $out : $default);
8585
}
8686
return $out;
@@ -232,7 +232,7 @@ public static function getUserIP($default = '127.0.0.1')
232232
case ($tmp = self::getEnv('HTTP_X_FORWARDED_FOR')):
233233
$out = $tmp;
234234
break;
235-
case (!empty($_SERVER['REMOTE_ADDR'])):
235+
case (! empty($_SERVER['REMOTE_ADDR'])):
236236
$out = $_SERVER['REMOTE_ADDR'];
237237
break;
238238
default:
@@ -386,7 +386,7 @@ public static function cleanIDs($IDs, $sep = ',', $ignore = array())
386386
foreach ($IDs as $item) {
387387
$item = trim($item);
388388
if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
389-
if (empty($ignore) && !\in_array((int)$item, $ignore, true)) {
389+
if (empty($ignore) || !\in_array((int)$item, $ignore, true)) {
390390
$out[] = (int)$item;
391391
}
392392
}

assets/lib/Formatter/CSSMinify.php

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,8 @@
11
<?php namespace Formatter;
22

3-
class CSSMinify
4-
{
5-
private $cssPath = array();
3+
use EvolutionCMS\Support\Formatter\CSSMinify as BaseCSSMinify;
64

7-
public function __construct($cssFilesPath = array())
8-
{
9-
if (is_array($cssFilesPath) && !empty($cssFilesPath)) {
10-
$this->cssPath = $cssFilesPath;
11-
}
12-
}
13-
14-
public function addFile($cssFilePath)
15-
{
16-
$this->cssPath[] = $cssFilePath;
17-
}
18-
19-
public function minify()
20-
{
21-
$allCss = array();
22-
if (empty($this->cssPath)) {
23-
echo "No CSS was added";
24-
exit;
25-
}
26-
27-
foreach ($this->cssPath as $css) {
28-
$bits = explode(".", $css);
29-
$ext = $bits[count($bits) - 1];
30-
if ($ext !== "css") {
31-
echo "Only CSS allowed";
32-
exit;
33-
}
34-
$filename = basename($css);
35-
$css = file_get_contents($css);
36-
$css = preg_replace("/\s{2,}/", "", $css);
37-
$css = str_replace(array("\n", ', ', ': ', '; ', ' > ', ' }', '} ', ';}', '{ ', ' {'), array('', ',', ':', ';', '>', '}', '}', '}', '{', '{'), $css);
38-
$css = preg_replace('/\/\*.*?\*\//s', '', $css);
39-
40-
$allCss[] = '/* ' . $filename . ' */' . "\n" . $css;
41-
}
42-
43-
return implode("\n", $allCss);
44-
}
45-
}
5+
/**
6+
* @deprecated use EvolutionCMS\Support\Formatter\CSSMinify
7+
*/
8+
class CSSMinify extends BaseCSSMinify{}

0 commit comments

Comments
 (0)