Psalm level 2 (#152)

vjik · web-flow · commit b9d788049b60 · 2021-05-22T23:12:54.000+03:00
diff --git a/psalm.xml b/psalm.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
-    resolveFromConfigFile="true"
+    errorLevel="2"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/src/BaseView.php b/src/BaseView.php
@@ -77,7 +77,7 @@ abstract class BaseView implements DynamicContentAwareInterface
      * content. You can call {@see beginBlock()} and {@see endBlock()} to capture small fragments of a view.
      * They can be later accessed somewhere else through this property.
      */
-    private array $blocks;
+    private array $blocks = [];
 
     /**
      * @var array The view files currently being rendered. There may be multiple view files being
@@ -146,12 +146,12 @@ public function getBasePath(): string
         return $this->basePath;
     }
 
-    public function getPlaceholderSignature(): string
+    final public function getPlaceholderSignature(): string
     {
         return $this->placeholderSignature;
     }
 
-    public function setPlaceholderSalt(string $salt): void
+    final public function setPlaceholderSalt(string $salt): void
     {
         $this->placeholderSignature = dechex(crc32($salt));
     }
diff --git a/src/PhpTemplateRenderer.php b/src/PhpTemplateRenderer.php
@@ -4,22 +4,27 @@
 
 namespace Yiisoft\View;
 
+use Throwable;
+
 class PhpTemplateRenderer implements TemplateRendererInterface
 {
     public function render(BaseView $view, string $template, array $params): string
     {
-        $renderer = function () {
+        $renderer = function (): void {
             extract(func_get_arg(1), EXTR_OVERWRITE);
+            /** @psalm-suppress UnresolvableInclude */
             require func_get_arg(0);
         };
 
         $obInitialLevel = ob_get_level();
         ob_start();
+        /** @psalm-suppress PossiblyFalseArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
         try {
+            /** @psalm-suppress PossiblyInvalidFunctionCall */
             $renderer->bindTo($view)($template, $params);
             return ob_get_clean();
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             while (ob_get_level() > $obInitialLevel) {
                 if (!@ob_end_clean()) {
                     ob_clean();
diff --git a/src/View.php b/src/View.php
@@ -26,6 +26,7 @@ final class View extends BaseView
     public function beginPage(): void
     {
         ob_start();
+        /** @psalm-suppress PossiblyFalseArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
 
         $this->eventDispatcher->dispatch(new PageBegin($this));
diff --git a/src/WebView.php b/src/WebView.php
@@ -182,6 +182,7 @@ public function endBody(): void
     public function beginPage(): void
     {
         ob_start();
+        /** @psalm-suppress PossiblyFalseArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
 
         $this->eventDispatcher->dispatch(new PageBegin($this));
@@ -230,6 +231,7 @@ public function renderAjax(string $view, array $params = []): string
         $viewFile = $this->findTemplateFile($view);
 
         ob_start();
+        /** @psalm-suppress PossiblyFalseArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
 
         $this->beginPage();
@@ -252,6 +254,7 @@ public function renderAjax(string $view, array $params = []): string
     public function renderAjaxString(string $string): string
     {
         ob_start();
+        /** @psalm-suppress PossiblyFalseArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
 
         $this->beginPage();

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ abstract class BaseView implements DynamicContentAwareInterface`
`77`	`77`	`* content. You can call {@see beginBlock()} and {@see endBlock()} to capture small fragments of a view.`
`78`	`78`	`* They can be later accessed somewhere else through this property.`
`79`	`79`	`*/`
`80`		`- private array $blocks;`
	`80`	`+ private array $blocks = [];`
`81`	`81`
`82`	`82`	`/**`
`83`	`83`	`* @var array The view files currently being rendered. There may be multiple view files being`
`@@ -146,12 +146,12 @@ public function getBasePath(): string`
`146`	`146`	`return $this->basePath;`
`147`	`147`	`}`
`148`	`148`
`149`		`- public function getPlaceholderSignature(): string`
	`149`	`+ final public function getPlaceholderSignature(): string`
`150`	`150`	`{`
`151`	`151`	`return $this->placeholderSignature;`
`152`	`152`	`}`
`153`	`153`
`154`		`- public function setPlaceholderSalt(string $salt): void`
	`154`	`+ final public function setPlaceholderSalt(string $salt): void`
`155`	`155`	`{`
`156`	`156`	`$this->placeholderSignature = dechex(crc32($salt));`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ final class View extends BaseView`
`26`	`26`	`public function beginPage(): void`
`27`	`27`	`{`
`28`	`28`	`ob_start();`
	`29`	`+ /** @psalm-suppress PossiblyFalseArgument */`
`29`	`30`	`PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);`
`30`	`31`
`31`	`32`	`$this->eventDispatcher->dispatch(new PageBegin($this));`