mirror of
https://github.com/flarum/core.git
synced 2025-08-04 23:47:32 +02:00
Apply fixes from StyleCI
This commit is contained in:
@@ -40,6 +40,7 @@ class AddCanFlagAttribute
|
||||
// If $actor is the post author, check to see if the setting is enabled
|
||||
return (bool) $this->settings->get('flarum-flags.can_flag_own');
|
||||
}
|
||||
|
||||
// $actor is not the post author
|
||||
return true;
|
||||
}
|
||||
|
@@ -12,8 +12,8 @@ namespace Flarum\Mentions\Tests\integration\api;
|
||||
use Carbon\Carbon;
|
||||
use Flarum\Extend;
|
||||
use Flarum\Formatter\Formatter;
|
||||
use Flarum\Post\Post;
|
||||
use Flarum\Post\CommentPost;
|
||||
use Flarum\Post\Post;
|
||||
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
|
||||
use Flarum\Testing\integration\TestCase;
|
||||
use Flarum\User\DisplayName\DriverInterface;
|
||||
@@ -574,7 +574,6 @@ class PostMentionsTest extends TestCase
|
||||
|
||||
$this->assertStringContainsString('TOBY$', $renderedHtml);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class CustomOtherDisplayNameDriver implements DriverInterface
|
||||
|
@@ -1,5 +1,12 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of Flarum.
|
||||
*
|
||||
* For detailed copyright and license information, please view the
|
||||
* LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
use Illuminate\Database\Schema\Builder;
|
||||
|
||||
return [
|
||||
|
@@ -1,5 +1,12 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of Flarum.
|
||||
*
|
||||
* For detailed copyright and license information, please view the
|
||||
* LICENSE file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Flarum\ExtensionManager;
|
||||
|
||||
/**
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\CheckForUpdates;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
|
@@ -9,11 +9,11 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\ExtensionManager\Composer\ComposerJson;
|
||||
use Flarum\ExtensionManager\ConfigureAuthValidator;
|
||||
use Flarum\ExtensionManager\ConfigureComposerValidator;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Composer\ComposerJson;
|
||||
use Flarum\ExtensionManager\ConfigureComposerValidator;
|
||||
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||
use Illuminate\Filesystem\Filesystem;
|
||||
use Illuminate\Support\Arr;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\GlobalUpdate;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -10,10 +10,10 @@
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Api\Controller\AbstractListController;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\Http\UrlGenerator;
|
||||
use Flarum\ExtensionManager\Api\Serializer\TaskSerializer;
|
||||
use Flarum\ExtensionManager\Task\Task;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\Http\UrlGenerator;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Tobscure\JsonApi\Document;
|
||||
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\MajorUpdate;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\MinorUpdate;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\RemoveExtension;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\RequireExtension;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\UpdateExtension;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\EmptyResponse;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
|
@@ -9,9 +9,9 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Api\Controller;
|
||||
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Flarum\ExtensionManager\Command\WhyNot;
|
||||
use Flarum\ExtensionManager\Job\Dispatcher;
|
||||
use Flarum\Http\RequestUtil;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laminas\Diactoros\Response\JsonResponse;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -10,10 +10,10 @@
|
||||
namespace Flarum\ExtensionManager\Command;
|
||||
|
||||
use Flarum\Bus\Dispatcher as FlarumDispatcher;
|
||||
use Flarum\Foundation\Config;
|
||||
use Flarum\ExtensionManager\Composer\ComposerAdapter;
|
||||
use Flarum\ExtensionManager\Event\FlarumUpdated;
|
||||
use Flarum\ExtensionManager\Exception\ComposerUpdateFailedException;
|
||||
use Flarum\Foundation\Config;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Symfony\Component\Console\Input\ArrayInput;
|
||||
|
||||
|
@@ -11,10 +11,10 @@ namespace Flarum\ExtensionManager\Composer;
|
||||
|
||||
use Composer\Config;
|
||||
use Composer\Console\Application;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\ExtensionManager\OutputLogger;
|
||||
use Flarum\ExtensionManager\Support\Util;
|
||||
use Flarum\ExtensionManager\Task\Task;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Illuminate\Filesystem\Filesystem;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\BufferedOutput;
|
||||
|
@@ -10,8 +10,8 @@
|
||||
namespace Flarum\ExtensionManager\Composer;
|
||||
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\ExtensionManager\Support\Util;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Illuminate\Filesystem\Filesystem;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
|
@@ -13,15 +13,15 @@ use Composer\Config;
|
||||
use Composer\Console\Application;
|
||||
use Composer\Util\Platform;
|
||||
use Flarum\Extension\ExtensionManager;
|
||||
use Flarum\Foundation\AbstractServiceProvider;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\Frontend\RecompileFrontendAssets;
|
||||
use Flarum\Locale\LocaleManager;
|
||||
use Flarum\ExtensionManager\Composer\ComposerAdapter;
|
||||
use Flarum\ExtensionManager\Event\FlarumUpdated;
|
||||
use Flarum\ExtensionManager\Extension\Event\Updated;
|
||||
use Flarum\ExtensionManager\Listener\ClearCacheAfterUpdate;
|
||||
use Flarum\ExtensionManager\Listener\ReCheckForUpdates;
|
||||
use Flarum\Foundation\AbstractServiceProvider;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\Frontend\RecompileFrontendAssets;
|
||||
use Flarum\Locale\LocaleManager;
|
||||
use Illuminate\Contracts\Container\Container;
|
||||
use Illuminate\Contracts\Events\Dispatcher;
|
||||
use Illuminate\Filesystem\Filesystem;
|
||||
|
@@ -11,8 +11,8 @@ namespace Flarum\ExtensionManager\Listener;
|
||||
|
||||
use Composer\Command\ClearCacheCommand;
|
||||
use Flarum\Database\Console\MigrateCommand;
|
||||
use Flarum\Foundation\Console\AssetsPublishCommand;
|
||||
use Flarum\ExtensionManager\Event\FlarumUpdated;
|
||||
use Flarum\Foundation\Console\AssetsPublishCommand;
|
||||
use Symfony\Component\Console\Input\ArrayInput;
|
||||
use Symfony\Component\Console\Output\NullOutput;
|
||||
|
||||
|
@@ -9,10 +9,10 @@
|
||||
|
||||
namespace Flarum\ExtensionManager\Tests\integration;
|
||||
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\ExtensionManager\Composer\ComposerAdapter;
|
||||
use Flarum\ExtensionManager\Composer\ComposerJson;
|
||||
use Flarum\ExtensionManager\Support\Util;
|
||||
use Flarum\Foundation\Paths;
|
||||
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
|
||||
use Illuminate\Support\Arr;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
@@ -192,6 +192,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
|
||||
protected function database(): ConnectionInterface
|
||||
{
|
||||
$this->app();
|
||||
|
||||
// Set in `BeginTransactionAndSetDatabase` extender.
|
||||
return $this->database;
|
||||
}
|
||||
|
Reference in New Issue
Block a user