This commit is contained in:
Nicolas Grekas 2021-06-30 15:27:08 +02:00
parent 6e3fa5a43f
commit 780e746adb
11 changed files with 28 additions and 25 deletions

View File

@ -25,14 +25,14 @@ use Symfony\Contracts\Cache\CacheInterface;
*/
abstract class AbstractAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
{
use AbstractAdapterTrait;
use ContractsTrait;
/**
* @internal
*/
protected const NS_SEPARATOR = ':';
use AbstractAdapterTrait;
use ContractsTrait;
private static $apcuSupported;
private static $phpFilesSupported;

View File

@ -23,13 +23,13 @@ use Symfony\Component\Cache\Traits\ProxyTrait;
*/
class Psr16Adapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
{
use ProxyTrait;
/**
* @internal
*/
protected const NS_SEPARATOR = '_';
use ProxyTrait;
private $miss;
public function __construct(CacheInterface $pool, string $namespace = '', int $defaultLifetime = 0)

View File

@ -27,12 +27,12 @@ use Symfony\Contracts\Cache\TagAwareCacheInterface;
*/
class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, PruneableInterface, ResettableInterface, LoggerAwareInterface
{
public const TAGS_PREFIX = "\0tags\0";
use ContractsTrait;
use LoggerAwareTrait;
use ProxyTrait;
public const TAGS_PREFIX = "\0tags\0";
private $deferred = [];
private $createCacheItem;
private $setCacheItemTags;

View File

@ -27,17 +27,17 @@ use Symfony\Contracts\Cache\CacheInterface;
*/
abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
{
/**
* @internal
*/
protected const NS_SEPARATOR = ':';
use AbstractTrait {
deleteItems as private;
AbstractTrait::deleteItem as delete;
AbstractTrait::hasItem as has;
}
/**
* @internal
*/
protected const NS_SEPARATOR = ':';
private $defaultLifetime;
protected function __construct(string $namespace = '', int $defaultLifetime = 0)

View File

@ -18,11 +18,11 @@ use Symfony\Component\DependencyInjection\Alias;
*/
class AliasConfigurator extends AbstractServiceConfigurator
{
public const FACTORY = 'alias';
use Traits\DeprecateTrait;
use Traits\PublicTrait;
public const FACTORY = 'alias';
public function __construct(ServicesConfigurator $parent, Alias $alias)
{
$this->parent = $parent;

View File

@ -19,13 +19,13 @@ use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
*/
class DefaultsConfigurator extends AbstractServiceConfigurator
{
public const FACTORY = 'defaults';
use Traits\AutoconfigureTrait;
use Traits\AutowireTrait;
use Traits\BindTrait;
use Traits\PublicTrait;
public const FACTORY = 'defaults';
private $path;
public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null)

View File

@ -18,8 +18,6 @@ use Symfony\Component\DependencyInjection\Definition;
*/
class InlineServiceConfigurator extends AbstractConfigurator
{
public const FACTORY = 'inline';
use Traits\ArgumentTrait;
use Traits\AutowireTrait;
use Traits\BindTrait;
@ -29,6 +27,8 @@ class InlineServiceConfigurator extends AbstractConfigurator
use Traits\ParentTrait;
use Traits\TagTrait;
public const FACTORY = 'inline';
private $id = '[inline]';
private $allowParent = true;
private $path = null;

View File

@ -18,8 +18,6 @@ use Symfony\Component\DependencyInjection\Definition;
*/
class InstanceofConfigurator extends AbstractServiceConfigurator
{
public const FACTORY = 'instanceof';
use Traits\AutowireTrait;
use Traits\BindTrait;
use Traits\CallTrait;
@ -30,6 +28,8 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
use Traits\ShareTrait;
use Traits\TagTrait;
public const FACTORY = 'instanceof';
private $path;
public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, string $path = null)

View File

@ -19,8 +19,6 @@ use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
*/
class PrototypeConfigurator extends AbstractServiceConfigurator
{
public const FACTORY = 'load';
use Traits\AbstractTrait;
use Traits\ArgumentTrait;
use Traits\AutoconfigureTrait;
@ -37,6 +35,8 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
use Traits\ShareTrait;
use Traits\TagTrait;
public const FACTORY = 'load';
private $loader;
private $resource;
private $excludes;

View File

@ -20,8 +20,6 @@ use Symfony\Component\DependencyInjection\Definition;
*/
class ServiceConfigurator extends AbstractServiceConfigurator
{
public const FACTORY = 'services';
use Traits\AbstractTrait;
use Traits\ArgumentTrait;
use Traits\AutoconfigureTrait;
@ -42,6 +40,8 @@ class ServiceConfigurator extends AbstractServiceConfigurator
use Traits\SyntheticTrait;
use Traits\TagTrait;
public const FACTORY = 'services';
private $container;
private $instanceof;
private $allowParent;

View File

@ -25,7 +25,10 @@ class ExpressionValidator extends ConstraintValidator
{
private $expressionLanguage;
public function __construct(/*ExpressionLanguage */$expressionLanguage = null)
/**
* @param ExpressionLanguage|null $expressionLanguage
*/
public function __construct($expressionLanguage = null)
{
if (\func_num_args() > 1) {
@trigger_error(sprintf('The "%s" instance should be passed as "%s" first argument instead of second argument since 4.4.', ExpressionLanguage::class, __METHOD__), \E_USER_DEPRECATED);