Skip to content

Commit

Permalink
Merge branch '4.4' into 5.2
Browse files Browse the repository at this point in the history
* 4.4:
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
  • Loading branch information
nicolas-grekas committed Jul 2, 2021
2 parents cb9f98c + 9c85c35 commit bf71258
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 23 deletions.
3 changes: 0 additions & 3 deletions Resource/ClassExistenceResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public function __construct(string $resource, bool $exists = null)
}
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return $this->resource;
Expand Down
3 changes: 0 additions & 3 deletions Resource/ComposerResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ public function getVendors(): array
return array_keys($this->vendors);
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return __CLASS__;
Expand Down
3 changes: 0 additions & 3 deletions Resource/DirectoryResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ public function __construct(string $resource, string $pattern = null)
}
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return md5(serialize([$this->resource, $this->pattern]));
Expand Down
3 changes: 0 additions & 3 deletions Resource/FileExistenceResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ public function __construct(string $resource)
$this->exists = file_exists($resource);
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return $this->resource;
Expand Down
3 changes: 0 additions & 3 deletions Resource/FileResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ public function __construct(string $resource)
}
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return $this->resource;
Expand Down
3 changes: 0 additions & 3 deletions Resource/GlobResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ public function getPrefix(): string
return $this->prefix;
}

/**
* {@inheritdoc}
*/
public function __toString(): string
{
return 'glob.'.$this->prefix.(int) $this->recursive.$this->pattern.(int) $this->forExclusion.implode("\0", $this->excludedPrefixes);
Expand Down
2 changes: 0 additions & 2 deletions Resource/ResourceInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ interface ResourceInterface
* to be identical for different ResourceInterface instances referring to the same
* resource; and it should be unlikely to collide with that of other, unrelated
* resource instances.
*
* @return string A string representation unique to the underlying Resource
*/
public function __toString();
}
4 changes: 1 addition & 3 deletions Tests/Definition/Builder/ExprBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,6 @@ protected function getTestBuilder(): ExprBuilder
*
* @param array|null $config The config you want to use for the finalization, if nothing provided
* a simple ['key'=>'value'] will be used
*
* @return array The finalized config values
*/
protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, array $config = null): array
{
Expand Down Expand Up @@ -254,7 +252,7 @@ protected function returnClosure($val): \Closure
* @param mixed $value The value to test
* @param mixed $config The config values that new to be finalized
*/
protected function assertFinalizedValueIs($value, NodeDefinition $nodeDefinition, $config = null)
protected function assertFinalizedValueIs($value, NodeDefinition $nodeDefinition, $config = null): void
{
$this->assertEquals(['key' => $value], $this->finalizeTestBuilder($nodeDefinition, $config));
}
Expand Down

0 comments on commit bf71258

Please sign in to comment.