mirror of
https://github.com/flarum/core.git
synced 2025-08-13 20:04:24 +02:00
chore(deps): bump glob-parent from 3.1.0 to 5.1.2 in /extensions/emoji/js (#3345)
* chore(deps): bump glob-parent in /extensions/emoji/js Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 3.1.0 to 5.1.2. - [Release notes](https://github.com/gulpjs/glob-parent/releases) - [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md) - [Commits](https://github.com/gulpjs/glob-parent/compare/v3.1.0...v5.1.2) --- updated-dependencies: - dependency-name: glob-parent dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Apply fixes from StyleCI [ci skip] [skip ci] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: StyleCI Bot <bot@styleci.io>
This commit is contained in:
@@ -10,13 +10,12 @@
|
||||
namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\CheckForUpdates;
|
||||
use Illuminate\Contracts\Bus\Dispatcher;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Flarum\PackageManager\Command\CheckForUpdates;
|
||||
|
||||
class CheckForUpdatesController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -11,11 +11,11 @@ namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\GlobalUpdate;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Flarum\PackageManager\Command\GlobalUpdate;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class GlobalUpdateController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -9,10 +9,10 @@
|
||||
|
||||
namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Api\Controller\AbstractListController;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Api\Serializer\TaskSerializer;
|
||||
use Flarum\PackageManager\Task;
|
||||
use Flarum\Api\Controller\AbstractListController;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Tobscure\JsonApi\Document;
|
||||
|
||||
|
@@ -11,12 +11,12 @@ namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\MajorUpdate;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Illuminate\Support\Arr;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Flarum\PackageManager\Command\MajorUpdate;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class MajorUpdateController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -11,11 +11,11 @@ namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\MinorUpdate;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Flarum\PackageManager\Command\MinorUpdate;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class MinorUpdateController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -11,11 +11,11 @@ namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\RemoveExtension;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Flarum\PackageManager\Command\RemoveExtension;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class RemoveExtensionController implements RequestHandlerInterface
|
||||
|
@@ -10,17 +10,13 @@
|
||||
namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\RequireExtension;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Flarum\PackageManager\Api\Serializer\ExtensionSerializer;
|
||||
use Flarum\PackageManager\Command\RequireExtension;
|
||||
use Flarum\PackageManager\Extension\ExtensionUtils;
|
||||
use Flarum\Api\Controller\AbstractCreateController;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Tobscure\JsonApi\Document;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class RequireExtensionController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -11,12 +11,12 @@ namespace Flarum\PackageManager\Api\Controller;
|
||||
|
||||
use Flarum\Bus\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\PackageManager\Command\UpdateExtension;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Illuminate\Support\Arr;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Flarum\PackageManager\Command\UpdateExtension;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class UpdateExtensionController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -15,8 +15,8 @@ use Flarum\PackageManager\Command\WhyNot;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Server\RequestHandlerInterface;
|
||||
|
||||
class WhyNotController implements RequestHandlerInterface
|
||||
{
|
||||
|
@@ -33,7 +33,7 @@ class CheckForUpdatesHandler
|
||||
}
|
||||
|
||||
/**
|
||||
* We run two commands here
|
||||
* We run two commands here.
|
||||
*
|
||||
* `composer outdated -D --format json`
|
||||
* This queries latest versions for all direct packages, so it can include major updates,
|
||||
|
@@ -11,9 +11,9 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\Bus\Dispatcher as FlarumDispatcher;
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class GlobalUpdateHandler
|
||||
@@ -48,7 +48,7 @@ class GlobalUpdateHandler
|
||||
$command->actor->assertAdmin();
|
||||
|
||||
$output = $this->composer->run(
|
||||
new StringInput("update --prefer-dist --no-dev -a --with-all-dependencies")
|
||||
new StringInput('update --prefer-dist --no-dev -a --with-all-dependencies')
|
||||
);
|
||||
|
||||
if ($output->getExitCode() !== 0) {
|
||||
|
@@ -11,11 +11,11 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Flarum\PackageManager\Composer\ComposerJson;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Exception\MajorUpdateFailedException;
|
||||
use Flarum\PackageManager\Exception\NoNewMajorVersionException;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Settings\LastUpdateCheck;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\ArrayInput;
|
||||
|
||||
class MajorUpdateHandler
|
||||
|
@@ -11,10 +11,10 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Flarum\PackageManager\Composer\ComposerJson;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
|
||||
use Flarum\PackageManager\Settings\LastUpdateCheck;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class MinorUpdateHandler
|
||||
@@ -61,7 +61,7 @@ class MinorUpdateHandler
|
||||
$this->composerJson->require('flarum/core', $coreRequirement);
|
||||
|
||||
$output = $this->composer->run(
|
||||
new StringInput("update --prefer-dist --no-dev -a --with-all-dependencies")
|
||||
new StringInput('update --prefer-dist --no-dev -a --with-all-dependencies')
|
||||
);
|
||||
|
||||
if ($output->getExitCode() !== 0) {
|
||||
|
@@ -11,10 +11,10 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Exception\ComposerCommandFailedException;
|
||||
use Flarum\PackageManager\Exception\ExtensionNotInstalledException;
|
||||
use Flarum\PackageManager\Extension\Event\Removed;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class RemoveExtensionHandler
|
||||
|
@@ -11,12 +11,12 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Exception\ComposerRequireFailedException;
|
||||
use Flarum\PackageManager\Exception\ExtensionAlreadyInstalledException;
|
||||
use Flarum\PackageManager\Extension\Event\Installed;
|
||||
use Flarum\PackageManager\Extension\ExtensionUtils;
|
||||
use Flarum\PackageManager\RequirePackageValidator;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class RequireExtensionHandler
|
||||
@@ -70,7 +70,7 @@ class RequireExtensionHandler
|
||||
|
||||
// Auto append :* if not requiring a specific version.
|
||||
if (strpos($packageName, ':') === false) {
|
||||
$packageName .= ":*";
|
||||
$packageName .= ':*';
|
||||
}
|
||||
|
||||
$output = $this->composer->run(
|
||||
|
@@ -11,12 +11,12 @@ namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
|
||||
use Flarum\PackageManager\Exception\ExtensionNotInstalledException;
|
||||
use Flarum\PackageManager\Extension\Event\Updated;
|
||||
use Flarum\PackageManager\UpdateExtensionValidator;
|
||||
use Flarum\PackageManager\Settings\LastUpdateCheck;
|
||||
use Flarum\PackageManager\UpdateExtensionValidator;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class UpdateExtensionHandler
|
||||
@@ -51,7 +51,8 @@ class UpdateExtensionHandler
|
||||
ExtensionManager $extensions,
|
||||
UpdateExtensionValidator $validator,
|
||||
LastUpdateCheck $lastUpdateCheck,
|
||||
Dispatcher $events)
|
||||
Dispatcher $events
|
||||
)
|
||||
{
|
||||
$this->composer = $composer;
|
||||
$this->extensions = $extensions;
|
||||
|
@@ -10,9 +10,9 @@
|
||||
namespace Flarum\PackageManager\Command;
|
||||
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Flarum\PackageManager\Exception\ComposerRequireFailedException;
|
||||
use Flarum\PackageManager\WhyNotValidator;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\StringInput;
|
||||
|
||||
class WhyNotHandler
|
||||
|
@@ -66,7 +66,7 @@ class ComposerJson
|
||||
|
||||
protected function getComposerJsonPath(): string
|
||||
{
|
||||
return $this->paths->base . '/composer.json';
|
||||
return $this->paths->base.'/composer.json';
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -16,7 +16,7 @@ class NoNewMajorVersionException extends Exception implements KnownError
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct("No new major version known of. Try checking for updates first.");
|
||||
parent::__construct('No new major version known of. Try checking for updates first.');
|
||||
}
|
||||
|
||||
public function getType(): string
|
||||
|
@@ -17,15 +17,15 @@ use Flarum\Foundation\Paths;
|
||||
use Flarum\Frontend\RecompileFrontendAssets;
|
||||
use Flarum\Locale\LocaleManager;
|
||||
use Flarum\PackageManager\Composer\ComposerAdapter;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Extension\Event\Updated;
|
||||
use Flarum\PackageManager\Listener\ClearCacheAfterUpdate;
|
||||
use Flarum\PackageManager\Listener\ReCheckForUpdates;
|
||||
use Illuminate\Contracts\Container\Container;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Monolog\Formatter\LineFormatter;
|
||||
use Monolog\Handler\RotatingFileHandler;
|
||||
use Monolog\Logger;
|
||||
use Flarum\PackageManager\Event\FlarumUpdated;
|
||||
use Flarum\PackageManager\Extension\Event\Updated;
|
||||
use Flarum\PackageManager\Listener\ClearCacheAfterUpdate;
|
||||
|
||||
class PackageManagerServiceProvider extends AbstractServiceProvider
|
||||
{
|
||||
@@ -42,7 +42,7 @@ class PackageManagerServiceProvider extends AbstractServiceProvider
|
||||
|
||||
putenv("COMPOSER_HOME={$paths->storage}/.composer");
|
||||
putenv("COMPOSER={$paths->base}/composer.json");
|
||||
putenv("COMPOSER_DISABLE_XDEBUG_WARN=1");
|
||||
putenv('COMPOSER_DISABLE_XDEBUG_WARN=1');
|
||||
Config::$defaultConfig['vendor-dir'] = $paths->vendor;
|
||||
|
||||
// When running simple require, update and remove commands on packages,
|
||||
|
@@ -12,7 +12,6 @@ namespace Flarum\PackageManager\Settings;
|
||||
use Carbon\Carbon;
|
||||
use Flarum\Settings\SettingsRepositoryInterface;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class LastUpdateCheck implements JsonSetting
|
||||
{
|
||||
|
@@ -39,7 +39,7 @@ class LastUpdateRun implements JsonSetting
|
||||
public function for(string $update): self
|
||||
{
|
||||
if (! in_array($update, [FlarumUpdated::MAJOR, FlarumUpdated::MINOR, FlarumUpdated::GLOBAL])) {
|
||||
throw new \InvalidArgumentException("Last update runs can only be for one of: minor, major, global");
|
||||
throw new \InvalidArgumentException('Last update runs can only be for one of: minor, major, global');
|
||||
}
|
||||
|
||||
$this->activeUpdate = $update;
|
||||
|
Reference in New Issue
Block a user