8000 CS fix · symfony/symfony@780e746 · GitHub
[go: up one dir, main page]
Skip to content

Commit 780e746

Browse files
nicolas-grekasnicolas-grekas
committed
CS fix
1 parent 6e3fa5a commit 780e746

File tree

11 files changed

+28
-25
lines changed

11 files changed

+28
-25
lines changed

‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
*/
2626
abstract class AbstractAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
2727
{
28+
use AbstractAdapterTrait;
29+
use ContractsTrait;
30+
2831
/**
2932
* @internal
3033
*/
3134
protected const NS_SEPARATOR = ':';
3235

33-
use AbstractAdapterTrait;
34-
use ContractsTrait;
35-
3636
private static $apcuSupported;
3737
private static $phpFilesSupported;
3838

‎src/Symfony/Component/Cache/Adapter/Psr16Adapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
*/
2424
class Psr16Adapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
2525
{
26+
use ProxyTrait;
27+
2628
/**
2729
* @internal
2830
*/
2931
protected const NS_SEPARATOR = '_';
3032

31-
use ProxyTrait;
32-
3333
private $miss;
3434

3535
public function __construct(CacheInterface $pool, string $namespace = '', int $defaultLifetime = 0)

‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
*/
2828
class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, PruneableInterface, ResettableInterface, LoggerAwareInterface
2929
{
30-
public const TAGS_PREFIX = "\0tags\0";
31-
3230
use ContractsTrait;
3331
use LoggerAwareTrait;
3432
use ProxyTrait;
3533

34+
public const TAGS_PREFIX = "\0tags\0";
35+
3636
private $deferred = [];
3737
private $createCacheItem;
3838
private $setCacheItemTags;

‎src/Symfony/Component/Cache/Simple/AbstractCache.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
*/
2828
abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
2929
{
30-
/**
31-
* @internal
32-
*/
33-
protected const NS_SEPARATOR = ':';
34-
3530
use AbstractTrait {
3631
deleteItems as private;
3732
AbstractTrait::deleteItem as delete;
3833
AbstractTrait::hasItem as has;
3934
}
4035

36+
/**
37+
* @internal
38+
*/
39+
protected const NS_SEPARATOR = ':';
40+
4141
private $defaultLifetime;
4242

4343
protected function __construct(string $namespace = '', int $defaultLifetime = 0)

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
*/
1919
class AliasConfigurator extends AbstractServiceConfigurator
2020
{
21-
public const FACTORY = 'alias';
22-
2321
use Traits\DeprecateTrait;
2422
use Traits\PublicTrait;
2523

24+
public const FACTORY = 'alias';
25+
2626
public function __construct(ServicesConfigurator $parent, Alias $alias)
2727
{
2828
$this->parent = $parent;

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
*/
2020
class DefaultsConfigurator extends AbstractServiceConfigurator
2121
{
22-
public const FACTORY = 'defaults';
23-
2422
use Traits\AutoconfigureTrait;
2523
use Traits\AutowireTrait;
2624
use Traits\BindTrait;
2725
use Traits\PublicTrait;
2826

27+
public const FACTORY = 'defaults';
28+
2929
private $path;
3030

3131
public function __construct(ServicesConfigurator $parent, Definition $definition, string $path = null)

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919
class InlineServiceConfigurator extends AbstractConfigurator
2020
{
21-
public const FACTORY = 'inline';
22-
2321
use Traits\ArgumentTrait;
2422
use Traits\AutowireTrait;
2523
use Traits\BindTrait;
@@ -29,6 +27,8 @@ class InlineServiceConfigurator extends AbstractConfigurator
2927
use Traits\ParentTrait;
3028
use Traits\TagTrait;
3129

30+
public const FACTORY = 'inline';
31+
3232
private $id = '[inline]';
3333
private $allowParent = true;
3434
private $path = null;

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919
class InstanceofConfigurator extends AbstractServiceConfigurator
2020
{
21-
public const FACTORY = 'instanceof';
22-
2321
use Traits\AutowireTrait;
2422
use Traits\BindTrait;
2523
use Traits\CallTrait;
@@ -30,6 +28,8 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
3028
use Traits\ShareTrait;
3129
use Traits\TagTrait;
3230

31+
public const FACTORY = 'instanceof';
32+
3333
private $path;
3434

3535
public function __construct(ServicesConfigurator $parent, Definition $definition, string $id, string $path = null)

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
*/
2020
class PrototypeConfigurator extends AbstractServiceConfigurator
2121
{
22-
public const FACTORY = 'load';
23-
2422
use Traits\AbstractTrait;
2523
use Traits\ArgumentTrait;
2624
use Traits\AutoconfigureTrait;
@@ -37,6 +35,8 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
3735
use Traits\ShareTrait;
3836
use Traits\TagTrait;
3937

38+
public const FACTORY = 'load';
39+
4040
private $loader;
4141
private $resource;
4242
private $excludes;

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
*/
2121
class ServiceConfigurator extends AbstractServiceConfigurator
2222
{
23-
public const FACTORY = 'services';
24-
2523
use Traits\AbstractTrait;
2624
use Traits\ArgumentTrait;
2725
use Traits\AutoconfigureTrait;
@@ -42,6 +40,8 @@ class ServiceConfigurator extends AbstractServiceConfigurator
4240
use Traits\SyntheticTrait;
4341
use Traits\TagTrait;
4442

43+
public const FACTORY = 'services';
44+
4545
private $container;
4646
private $instanceof;
4747
private $allowParent;

‎src/Symfony/Component/Validator/Constraints/ExpressionValidator.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ class ExpressionValidator extends ConstraintValidator
2525
{
2626
private $expressionLanguage;
2727

28-
public function __construct(/*ExpressionLanguage */$expressionLanguage = null)
28+
/**
29+
* @param ExpressionLanguage|null $expressionLanguage
30+
*/
31+
public function __construct($expressionLanguage = null)
2932
{
3033
if (\func_num_args() > 1) {
3134
@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);

0 commit comments

Comments
 (0)
0