fixed bugs reported by PhpStan (#212)(#211)(#210)(#208)(#207)

nette · Jul 19, 2019 · a37036c · a37036c
1 parent 2f52649
commit a37036c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/src/Bridges/DITracy/ContainerPanel.php b/src/Bridges/DITracy/ContainerPanel.php
@@ -21,13 +21,13 @@ class ContainerPanel implements Tracy\IBarPanel
 {
 	use Nette\SmartObject;
 
-	/** @var int */
+	/** @var float|null */
 	public static $compilationTime;
 
 	/** @var Nette\DI\Container */
 	private $container;
 
-	/** @var int|null */
+	/** @var float|null */
 	private $elapsedTime;
 
 

diff --git a/src/DI/Config/Helpers.php b/src/DI/Config/Helpers.php
@@ -35,7 +35,6 @@ public static function merge($left, $right)
 
 	/**
 	 * Return true if array prevents merging and removes this information.
-	 * @return mixed
 	 */
 	public static function takeParent(&$data): bool
 	{

diff --git a/src/DI/Definitions/Definition.php b/src/DI/Definitions/Definition.php
@@ -19,7 +19,7 @@ abstract class Definition
 {
 	use Nette\SmartObject;
 
-	/** @var string */
+	/** @var string|null */
 	private $name;
 
 	/** @var string|null  class or interface name */

diff --git a/src/DI/Extensions/DIExtension.php b/src/DI/Extensions/DIExtension.php
@@ -26,7 +26,7 @@ final class DIExtension extends Nette\DI\CompilerExtension
 	/** @var bool */
 	private $debugMode;
 
-	/** @var int */
+	/** @var float */
 	private $time;
 
 

diff --git a/src/DI/Extensions/InjectExtension.php b/src/DI/Extensions/InjectExtension.php
@@ -32,12 +32,11 @@ public function getConfigSchema(): Nette\Schema\Schema
 	public function beforeCompile()
 	{
 		foreach ($this->getContainerBuilder()->getDefinitions() as $def) {
-			if (
-				$def->getTag(self::TAG_INJECT)
-				&& ($def = $def instanceof Definitions\FactoryDefinition ? $def->getResultDefinition() : $def)
-				&& ($def instanceof Definitions\ServiceDefinition)
-			) {
-				$this->updateDefinition($def);
+			if ($def->getTag(self::TAG_INJECT)) {
+				$def = $def instanceof Definitions\FactoryDefinition ? $def->getResultDefinition() : $def;
+				if ($def instanceof Definitions\ServiceDefinition) {
+					$this->updateDefinition($def);
+				}
 			}
 		}
 	}
@@ -142,9 +141,9 @@ public static function callInjects(DI\Container $container, $service): void
 
 	/**
 	 * @param  object|string  $class
-	 * @param  DI\Resolver|DI\Container  $container
+	 * @param  DI\Container|DI\ContainerBuilder|null  $container
 	 */
-	private static function checkType($class, string $name, ?string $type, $container = null): void
+	private static function checkType($class, string $name, ?string $type, $container): void
 	{
 		$propName = Reflection::toString(new \ReflectionProperty($class, $name));
 		if (!$type) {

diff --git a/src/DI/Helpers.php b/src/DI/Helpers.php
@@ -147,6 +147,7 @@ public static function prefixServiceName($config, string $namespace)
 
 	/**
 	 * Returns an annotation value.
+	 * @param  \Reflector|\ReflectionMethod  $ref
 	 */
 	public static function parseAnnotation(\Reflector $ref, string $name): ?string
 	{

diff --git a/src/DI/PhpGenerator.php b/src/DI/PhpGenerator.php
@@ -84,8 +84,8 @@ public function toString(Nette\PhpGenerator\ClassType $class): string
 
 	public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
 	{
+		$name = $def->getName();
 		try {
-			$name = $def->getName();
 			$method = new Nette\PhpGenerator\Method(Container::getMethodName($name));
 			$method->setVisibility('public');
 			$method->setReturnType($def->getType());