Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2a10cc6

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
bug #27281 [HttpKernel] Fix dealing with self/parent in ArgumentMetadataFactory (fabpot)
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix dealing with self/parent in ArgumentMetadataFactory | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Applies CS fixes that where merged on 4.0 to 3.4, embeds a fix in ArgumentMetadataFactory, which couldn't deal with self/parent type hints. Commits ------- ba5cb1a fixed CS
2 parents bf2943e + ba5cb1a commit 2a10cc6
Copy full SHA for 2a10cc6

File tree

Expand file treeCollapse file tree

25 files changed

+96
-88
lines changed
Filter options
Expand file treeCollapse file tree

25 files changed

+96
-88
lines changed

‎src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bridge\PhpUnit\Legacy;
1313

14-
use PHPUnit\Framework\Test;
1514
use PHPUnit\Framework\TestCase;
1615
use PHPUnit\Framework\Warning;
1716

‎src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ while (!file_exists($vendor.'/vendor')) {
1515
define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
1616
require PHPUNIT_COMPOSER_INSTALL;
1717
require_once __DIR__.'/../../bootstrap.php';
18-
eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);")
18+
eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);");
1919

2020
?>
2121
--EXPECTF--

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Scope
2020
private $data = array();
2121
private $left = false;
2222

23-
public function __construct(Scope $parent = null)
23+
public function __construct(self $parent = null)
2424
{
2525
$this->parent = $parent;
2626
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
1313

1414
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
15-
use Symfony\Component\HttpFoundation\File\File;
1615

1716
class ControllerTest extends ControllerTraitTest
1817
{

‎src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,30 +122,30 @@ private function calculateStatistics()
122122
);
123123
/** @var TraceableAdapterEvent $call */
124124
foreach ($calls as $call) {
125-
$statistics[$name]['calls'] += 1;
125+
++$statistics[$name]['calls'];
126126
$statistics[$name]['time'] += $call->end - $call->start;
127127
if ('getItem' === $call->name) {
128-
$statistics[$name]['reads'] += 1;
128+
++$statistics[$name]['reads'];
129129
if ($call->hits) {
130-
$statistics[$name]['hits'] += 1;
130+
++$statistics[$name]['hits'];
131131
} else {
132-
$statistics[$name]['misses'] += 1;
132+
++$statistics[$name]['misses'];
133133
}
134134
} elseif ('getItems' === $call->name) {
135135
$statistics[$name]['reads'] += $call->hits + $call->misses;
136136
$statistics[$name]['hits'] += $call->hits;
137137
$statistics[$name]['misses'] += $call->misses;
138138
} elseif ('hasItem' === $call->name) {
139-
$statistics[$name]['reads'] += 1;
139+
++$statistics[$name]['reads'];
140140
if (false === $call->result) {
141-
$statistics[$name]['misses'] += 1;
141+
++$statistics[$name]['misses'];
142142
} else {
143-
$statistics[$name]['hits'] += 1;
143+
++$statistics[$name]['hits'];
144144
}
145145
} elseif ('save' === $call->name) {
146-
$statistics[$name]['writes'] += 1;
146+
++$statistics[$name]['writes'];
147147
} elseif ('deleteItem' === $call->name) {
148-
$statistics[$name]['deletes'] += 1;
148+
++$statistics[$name]['deletes'];
149149
}
150150
}
151151
if ($statistics[$name]['reads']) {

‎src/Symfony/Component/CssSelector/Node/Specificity.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/CssSelector/Node/Specificity.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct($a, $b, $c)
4848
/**
4949
* @return self
5050
*/
51-
public function plus(Specificity $specificity)
51+
public function plus(self $specificity)
5252
{
5353
return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c);
5454
}
@@ -69,7 +69,7 @@ public function getValue()
6969
*
7070
* @return int
7171
*/
72-
public function compareTo(Specificity $specificity)
72+
public function compareTo(self $specificity)
7373
{
7474
if ($this->a !== $specificity->a) {
7575
return $this->a > $specificity->a ? 1 : -1;

‎src/Symfony/Component/CssSelector/XPath/XPathExpr.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/CssSelector/XPath/XPathExpr.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ public function getElement()
5353
}
5454

5555
/**
56-
* @param $condition
57-
*
5856
* @return $this
5957
*/
6058
public function addCondition($condition)

‎src/Symfony/Component/Debug/Exception/FlattenException.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Exception/FlattenException.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function getPrevious()
157157
return $this->previous;
158158
}
159159

160-
public function setPrevious(FlattenException $previous)
160+
public function setPrevious(self $previous)
161161
{
162162
$this->previous = $previous;
163163
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
3434
*
3535
* @param string $fqcn
3636
*
37-
* @return InstanceofConfigurator
37+
* @return self
3838
*/
3939
final protected function setInstanceof($fqcn)
4040
{

‎src/Symfony/Component/Form/FormView.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/FormView.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
5151

5252
private $methodRendered = false;
5353

54-
public function __construct(FormView $parent = null)
54+
public function __construct(self $parent = null)
5555
{
5656
$this->parent = $parent;
5757
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.