mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-18 03:41:35 +02:00
Code Issues Releases Wiki Activity

Apply php-cs-fixer new rules

Browse Source
This commit is contained in:
Elan Ruusamäe
2019-12-11 17:00:16 +02:00
parent f9d3d54e62
commit eff278193b
88 changed files with 1225 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Minify/Controller/Base.php
View File

@@ -1,23 +1,17 @@
<?php
/**
* Class Minify_Controller_Base
* @package Minify
*/
use Psr\Log\LoggerInterface;
use Monolog\Logger;
use Psr\Log\LoggerInterface;
/**
* Base class for Minify controller
*
* The controller class validates a request and uses it to create a configuration for Minify::serve().
*
* @package Minify
* @author Stephen Clay <steve@mrclay.org>
*/
abstract class Minify_Controller_Base implements Minify_ControllerInterface
{
/**
* @var Minify_Env
*/
@@ -63,6 +57,7 @@ abstract class Minify_Controller_Base implements Minify_ControllerInterface
* @param string $msg
*
* @return null
*
* @deprecated use $this->logger
*/
public function log($msg)

13
lib/Minify/Controller/Files.php
View File

@@ -1,11 +1,8 @@
<?php
/**
* Class Minify_Controller_Files
* @package Minify
*/
use Monolog\Logger;
/**
* Controller class for minifying a set of files
*
@@ -24,17 +21,14 @@ use Monolog\Logger;
* ],
* ]);
* </code>
*
* @package Minify
* @author Stephen Clay <steve@mrclay.org>
*/
class Minify_Controller_Files extends Minify_Controller_Base
{
/**
* Set up file sources
*
* @param array $options controller and Minify options
*
* @return Minify_ServeConfiguration
*
* Controller options:
@@ -49,8 +43,8 @@ class Minify_Controller_Files extends Minify_Controller_Base
// if $files is a single object, casting will break it
if (is_object($files)) {
$files = array($files);
} elseif (! is_array($files)) {
$files = (array)$files;
} elseif (!is_array($files)) {
$files = (array) $files;
}
unset($options['files']);
@@ -68,4 +62,3 @@ class Minify_Controller_Files extends Minify_Controller_Base
return new Minify_ServeConfiguration($options, $sources);
}
}

14
lib/Minify/Controller/Groups.php
View File

@@ -1,7 +1,6 @@
<?php
/**
* Class Minify_Controller_Groups
* @package Minify
*/
/**
@@ -19,13 +18,9 @@
*
* If the above code were placed in /serve.php, it would enable the URLs
* /serve.php/js and /serve.php/css
*
* @package Minify
* @author Stephen Clay <steve@mrclay.org>
*/
class Minify_Controller_Groups extends Minify_Controller_Files
{
/**
* Set up groups of files as sources
*
@@ -53,9 +48,9 @@ class Minify_Controller_Groups extends Minify_Controller_Files
$pathInfo = false;
}
if (false === $pathInfo || ! isset($groups[$pathInfo])) {
if ($pathInfo === false || !isset($groups[$pathInfo])) {
// no PATH_INFO or not a valid group
$this->logger->info("Missing PATH_INFO or no group set for \"$pathInfo\"");
$this->logger->info("Missing PATH_INFO or no group set for \"${pathInfo}\"");
return new Minify_ServeConfiguration($options);
}
@@ -64,8 +59,8 @@ class Minify_Controller_Groups extends Minify_Controller_Files
// if $files is a single object, casting will break it
if (is_object($files)) {
$files = array($files);
} elseif (! is_array($files)) {
$files = (array)$files;
} elseif (!is_array($files)) {
$files = (array) $files;
}
$options['files'] = $files;
@@ -73,4 +68,3 @@ class Minify_Controller_Groups extends Minify_Controller_Files
return parent::createConfiguration($options);
}
}

60
lib/Minify/Controller/MinApp.php
View File

@@ -1,18 +1,13 @@
<?php
/**
* Class Minify_Controller_MinApp
* @package Minify
*/
/**
* Controller class for requests to /min/index.php
*
* @package Minify
* @author Stephen Clay <steve@mrclay.org>
*/
class Minify_Controller_MinApp extends Minify_Controller_Base
{
/**
* Set up groups of files as sources
*
@@ -26,15 +21,15 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
$get = $this->env->get();
foreach (array('g', 'b', 'f') as $key) {
if (isset($get[$key])) {
$get[$key] = str_replace("\x00", '', (string)$get[$key]);
$get[$key] = str_replace("\x00", '', (string) $get[$key]);
}
}
// filter controller options
$defaults = array(
'groupsOnly' => false,
'groups' => array(),
'symlinks' => array(),
'groups' => array(),
'symlinks' => array(),
);
$minApp = isset($options['minApp']) ? $options['minApp'] : array();
$localOptions = array_merge($defaults, $minApp);
@@ -44,7 +39,7 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
// normalize $symlinks in order to map to target
$symlinks = array();
foreach ($localOptions['symlinks'] as $link => $target) {
if (0 === strpos($link, '//')) {
if (strpos($link, '//') === 0) {
$link = rtrim(substr($link, 1), '/') . '/';
$target = rtrim($target, '/\\');
$symlinks[$link] = $target;
@@ -60,12 +55,12 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
$selectionId .= 'g=' . $get['g'];
$keys = explode(',', $get['g']);
if ($keys != array_unique($keys)) {
$this->logger->info("Duplicate group key found.");
$this->logger->info('Duplicate group key found.');
return new Minify_ServeConfiguration($options);
}
foreach ($keys as $key) {
if (! isset($localOptions['groups'][$key])) {
if (!isset($localOptions['groups'][$key])) {
$this->logger->info("A group configuration for \"{$key}\" was not found");
return new Minify_ServeConfiguration($options);
@@ -74,8 +69,8 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
// if $files is a single object, casting will break it
if (is_object($files)) {
$files = array($files);
} elseif (! is_array($files)) {
$files = (array)$files;
} elseif (!is_array($files)) {
$files = (array) $files;
}
foreach ($files as $file) {
try {
@@ -83,20 +78,20 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
$sources[] = $source;
} catch (Minify_Source_FactoryException $e) {
$this->logger->error($e->getMessage());
if (null === $firstMissing) {
if ($firstMissing === null) {
$firstMissing = basename($file);
continue;
} else {
$secondMissing = basename($file);
$this->logger->info("More than one file was missing: '$firstMissing', '$secondMissing'");
return new Minify_ServeConfiguration($options);
continue;
}
$secondMissing = basename($file);
$this->logger->info("More than one file was missing: '${firstMissing}', '${secondMissing}'");
return new Minify_ServeConfiguration($options);
}
}
}
}
if (! $localOptions['groupsOnly'] && isset($get['f'])) {
if (!$localOptions['groupsOnly'] && isset($get['f'])) {
// try user files
// The following restrictions are to limit the URLs that minify will
// respond to.
@@ -115,7 +110,7 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
$ext = ".{$m[1]}";
$files = explode(',', $get['f']);
if ($files != array_unique($files)) {
$this->logger->info("Duplicate files were specified");
$this->logger->info('Duplicate files were specified');
return new Minify_ServeConfiguration($options);
}
@@ -123,7 +118,7 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
if (isset($get['b'])) {
// check for validity
$isValidBase = preg_match('@^[^/]+(?:/[^/]+)*$@', $get['b']);
$hasDots = false !== strpos($get['b'], '..');
$hasDots = strpos($get['b'], '..') !== false;
$isDot = $get['b'] === '.';
if ($isValidBase && !$hasDots && !$isDot) {
@@ -145,8 +140,9 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
// try to rewrite path
foreach ($symlinks as $link => $target) {
if (0 === strpos($uri, $link)) {
if (strpos($uri, $link) === 0) {
$path = $target . DIRECTORY_SEPARATOR . substr($uri, strlen($link));
break;
}
}
@@ -157,15 +153,15 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
$basenames[] = basename($path, $ext);
} catch (Minify_Source_FactoryException $e) {
$this->logger->error($e->getMessage());
if (null === $firstMissing) {
if ($firstMissing === null) {
$firstMissing = $uri;
continue;
} else {
$secondMissing = $uri;
$this->logger->info("More than one file was missing: '$firstMissing', '$secondMissing`'");
return new Minify_ServeConfiguration($options);
continue;
}
$secondMissing = $uri;
$this->logger->info("More than one file was missing: '${firstMissing}', '${secondMissing}`'");
return new Minify_ServeConfiguration($options);
}
}
if ($selectionId) {
@@ -175,18 +171,18 @@ class Minify_Controller_MinApp extends Minify_Controller_Base
}
if (!$sources) {
$this->logger->info("No sources to serve");
$this->logger->info('No sources to serve');
return new Minify_ServeConfiguration($options);
}
if (null !== $firstMissing) {
if ($firstMissing !== null) {
array_unshift($sources, new Minify_Source(array(
'id' => 'missingFile',
// should not cause cache invalidation
'lastModified' => 0,
// due to caching, filename is unreliable.
'content' => "/* Minify: at least one missing file. See " . Minify::URL_DEBUG . " */\n",
'content' => '/* Minify: at least one missing file. See ' . Minify::URL_DEBUG . " */\n",
'minifier' => 'Minify::nullMinifier',
)));
}

14
lib/Minify/Controller/Page.php
View File

@@ -1,23 +1,20 @@
<?php
/**
* Class Minify_Controller_Page
* @package Minify
*/
/**
* Controller class for serving a single HTML page
*
* @link http://code.google.com/p/minify/source/browse/trunk/web/examples/1/index.php#59
* @package Minify
* @author Stephen Clay <steve@mrclay.org>
* @see http://code.google.com/p/minify/source/browse/trunk/web/examples/1/index.php#59
*/
class Minify_Controller_Page extends Minify_Controller_Base
{
/**
* Set up source of HTML content
*
* @param array $options controller and Minify options
*
* @return array Minify options
*
* Controller options:
@@ -36,14 +33,14 @@ class Minify_Controller_Page extends Minify_Controller_Base
{
if (isset($options['file'])) {
$sourceSpec = array(
'filepath' => $options['file']
'filepath' => $options['file'],
);
$f = $options['file'];
} else {
// strip controller options
$sourceSpec = array(
'content' => $options['content'],
'id' => $options['id'],
'id' => $options['id'],
);
$f = $options['id'];
unset($options['content'], $options['id']);
@@ -55,7 +52,7 @@ class Minify_Controller_Page extends Minify_Controller_Base
// this will be the 2nd argument passed to Minify_HTML::minify()
$sourceSpec['minifyOptions'] = array(
'cssMinifier' => array('Minify_CSSmin', 'minify'),
'jsMinifier' => array('JSMin\\JSMin', 'minify'),
'jsMinifier' => array('JSMin\\JSMin', 'minify'),
);
unset($options['minifyAll']);
}
@@ -66,4 +63,3 @@ class Minify_Controller_Page extends Minify_Controller_Base
return new Minify_ServeConfiguration($options, $sources, $selectionId);
}
}