[Psalm] Treat PossiblyFalse* as errors

pamil · pamil · commit 089a0e6c50e9 · 2019-11-11T21:05:53.000+01:00
diff --git a/psalm.xml b/psalm.xml
@@ -137,11 +137,6 @@
         <LessSpecificReturnStatement errorLevel="info" />
         <TypeCoercion errorLevel="info" />
 
-        <PossiblyFalseArgument errorLevel="info" />
-        <PossiblyFalseIterator errorLevel="info" />
-        <PossiblyFalseOperand errorLevel="info" />
-        <PossiblyFalsePropertyAssignmentValue errorLevel="info" />
-        <PossiblyFalseReference errorLevel="info" />
         <PossiblyInvalidArgument errorLevel="info" />
         <PossiblyInvalidArrayAccess errorLevel="info" />
         <PossiblyInvalidArrayAssignment errorLevel="info" />
diff --git a/src/Sylius/Bundle/CoreBundle/Installer/Requirement/ExtensionsRequirements.php b/src/Sylius/Bundle/CoreBundle/Installer/Requirement/ExtensionsRequirements.php
@@ -61,7 +61,7 @@ function_exists('simplexml_import_dom'),
             ))
             ->add(new Requirement(
                 $translator->trans('sylius.installer.extensions.pcre', []),
-                defined('PCRE_VERSION') ? ((float) substr(\PCRE_VERSION, 0, strpos(\PCRE_VERSION, ' '))) > 8.0 : false,
+                defined('PCRE_VERSION') ? ((float) substr(\PCRE_VERSION, 0, (int) strpos(\PCRE_VERSION, ' '))) > 8.0 : false,
                 true,
                 $translator->trans('sylius.installer.extensions.help', ['%extension%' => 'PCRE (>=8.0)'])
             ))
diff --git a/src/Sylius/Component/Core/Model/OrderItem.php b/src/Sylius/Component/Core/Model/OrderItem.php
@@ -123,9 +123,14 @@ public function getDiscountedUnitPrice(): int
             return $this->unitPrice;
         }
 
+        $firstUnit = $this->units->first();
+
+        /** @var OrderItemUnitInterface $firstUnit */
+        Assert::isInstanceOf($firstUnit, OrderItemUnitInterface::class);
+
         return
             $this->unitPrice +
-            $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT)
+            $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT)
         ;
     }
 
@@ -135,10 +140,15 @@ public function getFullDiscountedUnitPrice(): int
             return $this->unitPrice;
         }
 
+        $firstUnit = $this->units->first();
+
+        /** @var OrderItemUnitInterface $firstUnit */
+        Assert::isInstanceOf($firstUnit, OrderItemUnitInterface::class);
+
         return
             $this->unitPrice +
-            $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT) +
-            $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT)
+            $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT) +
+            $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT)
         ;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,14 @@ public function getDiscountedUnitPrice(): int`
`123`	`123`	`return $this->unitPrice;`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ $firstUnit = $this->units->first();`
	`127`	`+`
	`128`	`+ /** @var OrderItemUnitInterface $firstUnit */`
	`129`	`+ Assert::isInstanceOf($firstUnit, OrderItemUnitInterface::class);`
	`130`	`+`
`126`	`131`	`return`
`127`	`132`	`$this->unitPrice +`
`128`		`- $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT)`
	`133`	`+ $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT)`
`129`	`134`	`;`
`130`	`135`	`}`
`131`	`136`
`@@ -135,10 +140,15 @@ public function getFullDiscountedUnitPrice(): int`
`135`	`140`	`return $this->unitPrice;`
`136`	`141`	`}`
`137`	`142`
	`143`	`+ $firstUnit = $this->units->first();`
	`144`	`+`
	`145`	`+ /** @var OrderItemUnitInterface $firstUnit */`
	`146`	`+ Assert::isInstanceOf($firstUnit, OrderItemUnitInterface::class);`
	`147`	`+`
`138`	`148`	`return`
`139`	`149`	`$this->unitPrice +`
`140`		`- $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT) +`
`141`		`- $this->units->first()->getAdjustmentsTotal(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT)`
	`150`	`+ $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT) +`
	`151`	`+ $firstUnit->getAdjustmentsTotal(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT)`
`142`	`152`	`;`
`143`	`153`	`}`
`144`	`154`