8000 minor #35587 Fix CS (fabpot) · Pchol/symfony@7322985 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7322985

Browse files
fabpotfabpot
committed
minor symfony#35587 Fix CS (fabpot)
This PR was merged into the 5.0 branch. Discussion ---------- Fix CS | Q | A | ------------- | --- | Branch? | 5.0 <!-- see below --> | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | <!-- prefix each issue number with "Fix #", if any --> | License | MIT | Doc PR | n/a Commits ------- f64f59a Fix CS
2 parents bb4e394 + f64f59a commit 7322985

File tree

22 files changed

+25
-46
lines changed
  • ByteString.php
  • Validator/Tests
  • VarDumper/Test
  • VarExporter/Internal

    • 22 files changed

    +25
    -46
    lines changed

    ‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -247,7 +247,7 @@ private static function getVendors()
    247247
    foreach (get_declared_classes() as $class) {
    248248
    if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
    249249
    $r = new \ReflectionClass($class);
    250-
    $v = \dirname(\dirname($r->getFileName()));
    250+
    $v = \dirname($r->getFileName(), 2);
    251251
    if (file_exists($v.'/composer/installed.json')) {
    252252
    self::$vendors[] = $v;
    253253
    $loader = require $v.'/autoload.php';

    ‎src/Symfony/Bridge/Twig/Node/DumpNode.php

    Lines changed: 0 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -32,9 +32,6 @@ public function __construct($varPrefix, ?Node $values, int $lineno, string $tag
    3232
    $this->varPrefix = $varPrefix;
    3333
    }
    3434

    35-
    /** 8000
    36-
    * @return void
    37-
    */
    3835
    public function compile(Compiler $compiler): void
    3936
    {
    4037
    $compiler

    ‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -107,8 +107,6 @@ protected function doLeaveNode(Node $node, Environment $env): ?Node
    107107

    108108
    /**
    109109
    * {@inheritdoc}
    110-
    *
    111-
    * @return int
    112110
    */
    113111
    public function getPriority(): int
    114112
    {

    ‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -97,8 +97,6 @@ protected function doLeaveNode(Node $node, Environment $env): ?Node
    9797

    9898
    /**
    9999
    * {@inheritdoc}
    100-
    *
    101-
    * @return int
    102100
    */
    103101
    public function getPriority(): int
    104102
    {

    ‎src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -15,7 +15,6 @@
    1515
    use Symfony\Component\HttpKernel\Event\RequestEvent;
    1616
    use Symfony\Component\Security\Core\Exception\LazyResponseException;
    1717
    use Symfony\Component\Security\Http\Firewall\AbstractListener;
    18-
    use Symfony\Component\VarDumper\Caster\ClassStub;
    1918

    2019
    /**
    2120
    * Wraps a lazy security listener.

    ‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -12,7 +12,6 @@
    1212
    namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle;
    1313

    1414
    use Symfony\Component\DependencyInjection\Compiler\CheckTypeDeclarationsPass;
    15-
    use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
    1615
    use Symfony\Component\DependencyInjection\Compiler\PassConfig;
    1716
    use Symfony\Component\DependencyInjection\ContainerBuilder;
    1817
    use Symfony\Component\HttpKernel\Bundle\Bundle;

    ‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,6 @@
    1111

    1212
    namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
    1313

    14-
    use Symfony\Bridge\Twig\Extension\AssetExtension;
    1514
    use Symfony\Component\DependencyInjection\Alias;
    1615
    use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
    1716
    use Symfony\Component\DependencyInjection\ContainerBuilder;

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

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -427,7 +427,7 @@ private function getConnection(): object
    427427
    } else {
    428428
    switch ($this->driver = $this->conn->getDriver()->getName()) {
    429429
    case 'mysqli':
    430-
    throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', \get_class($this)));
    430+
    throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
    431431
    case 'pdo_mysql':
    432432
    case 'drizzle_pdo_mysql':
    433433
    $this->driver = 'mysql';

    ‎src/Symfony/Component/Console/Command/Command.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -255,7 +255,7 @@ public function run(InputInterface $input, OutputInterface $output)
    255255
    $statusCode = $this->execute($input, $output);
    256256

    257257
    if (!\is_int($statusCode)) {
    258-
    throw new \TypeError(sprintf('Return value of "%s::execute()" must be of the type int, %s returned.', \get_class($this), \gettype($statusCode)));
    258+
    throw new \TypeError(sprintf('Return value of "%s::execute()" must be of the type int, %s returned.', static::class, \gettype($statusCode)));
    259259
    }
    260260
    }
    261261

    ‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -57,7 +57,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
    5757
    if ($ignoreNotFound = 'not_found' === $ignoreErrors) {
    5858
    $args[2] = false;
    5959
    } elseif (!\is_bool($ignoreErrors)) {
    60-
    throw new \TypeError(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', \get_class($this), \gettype($ignoreErrors)));
    60+
    throw new \TypeError(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', static::class, \gettype($ignoreErrors)));
    6161
    }
    6262

    6363
    try {

    0 commit comments

    Comments
     (0)
    0