Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add support for php 8.4 #714

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
php-versions:
["8.1", "8.2", "8.3"]
["8.1", "8.2", "8.3", "8.4"]

name: PHP ${{ matrix.php-versions }} Test on ubantu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion lib/Minify.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Minify
* @param Minify_CacheInterface $cache
* @param LoggerInterface $logger
*/
public function __construct(Minify_CacheInterface $cache, LoggerInterface $logger = null)
public function __construct(Minify_CacheInterface $cache, ?LoggerInterface $logger = null)
{
$this->cache = $cache;
$this->logger = $logger;
Expand Down
2 changes: 1 addition & 1 deletion lib/Minify/Cache/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Minify_Cache_File implements Minify_CacheInterface
* @param bool $fileLocking
* @param LoggerInterface $logger
*/
public function __construct($path = '', $fileLocking = false, LoggerInterface $logger = null)
public function __construct($path = '', $fileLocking = false, ?LoggerInterface $logger = null)
{
if (! $path) {
$path = sys_get_temp_dir();
Expand Down
2 changes: 1 addition & 1 deletion lib/Minify/Controller/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ abstract class Minify_Controller_Base implements Minify_ControllerInterface
* @param Minify_Source_Factory $sourceFactory
* @param LoggerInterface $logger
*/
public function __construct(Minify_Env $env, Minify_Source_Factory $sourceFactory, LoggerInterface $logger = null)
public function __construct(Minify_Env $env, Minify_Source_Factory $sourceFactory, ?LoggerInterface $logger = null)
{
$this->env = $env;
$this->sourceFactory = $sourceFactory;
Expand Down
2 changes: 1 addition & 1 deletion lib/Minify/HTML/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static function getLastModified($sources, $lastModified = 0)
* @return \Minify\App
* @internal
*/
public static function app(\Minify\App $app = null)
public static function app(?\Minify\App $app = null)
{
static $cached;
if ($app) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Minify/Source/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Minify_Source_Factory
* @param Minify_CacheInterface $cache Optional cache for handling .less files.
*
*/
public function __construct(Minify_Env $env, array $options = array(), Minify_CacheInterface $cache = null)
public function __construct(Minify_Env $env, array $options = array(), ?Minify_CacheInterface $cache = null)
{
$this->env = $env;
$this->options = array_merge(array(
Expand Down
2 changes: 1 addition & 1 deletion lib/MrClay/Cli.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function addRequiredArg($letter)
* @return Arg
* @throws InvalidArgumentException
*/
public function addArgument($letter, $required, Arg $arg = null)
public function addArgument($letter, $required, ?Arg $arg = null)
{
if (! preg_match('/^[a-zA-Z]$/', $letter)) {
throw new InvalidArgumentException('$letter must be in [a-zA-Z]');
Expand Down