diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.0'

Browse Source 
* 4.0:
  [PropertyInfo] Fix compat with recent phpdocumentor/type-resolver
  fix merge
This commit is contained in:
Nicolas Grekas 2018-02-04 15:19:27 +01:00
commit f601142ccf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Config/Loader/FileLoader.php
View File

@ -70,7 +70,7 @@ abstract class FileLoader extends Loader
* @throws FileLoaderImportCircularReferenceException * @throws FileLoaderImportCircularReferenceException
* @throws FileLocatorFileNotFoundException * @throws FileLocatorFileNotFoundException
*/ */
public function import($resource, $type = null, bool $ignoreErrors = false, $sourceResource = null) public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
{ {
if (is_string($resource) && strlen($resource) !== $i = strcspn($resource, '*?{[')) { if (is_string($resource) && strlen($resource) !== $i = strcspn($resource, '*?{[')) {
$ret = array(); $ret = array();

2
src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
View File

@ -188,7 +188,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
return null; return null;
} }
return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty)); return $this->docBlockFactory->create($reflectionProperty, $this->contextFactory->createFromReflector($reflectionProperty->getDeclaringClass()));
} }
private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array private function getDocBlockFromMethod(string $class, string $ucFirstProperty, int $type): ?array

2
src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
View File

@ -113,7 +113,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
$coll = new RouteCollection(); $coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https'))); $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
$matcher = $this->getUrlMatcher($coll, new RequestContext()); $matcher = $this->getUrlMatcher($coll, new RequestContext());
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array('_route' => 'foo')); $matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array());
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo')); $this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
} }