wip

freekmurze · freekmurze · commit 2cffba94b30f · 2020-10-14T10:38:31.000+02:00
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="3.17.1@8f211792d813e4dc89f04ed372785ce93b902fd1">
+  <file src="src/IgnitionServiceProvider.php">
+    <UndefinedInterfaceMethod occurrences="7">
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+    </UndefinedInterfaceMethod>
+  </file>
+  <file src="src/LogRecorder/LogRecorder.php">
+    <UndefinedInterfaceMethod occurrences="1">
+      <code>$this-&gt;app</code>
+    </UndefinedInterfaceMethod>
+  </file>
+  <file src="src/QueryRecorder/QueryRecorder.php">
+    <UndefinedInterfaceMethod occurrences="3">
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+      <code>$this-&gt;app</code>
+    </UndefinedInterfaceMethod>
+  </file>
+  <file src="src/SolutionProviders/MissingLivewireComponentSolutionProvider.php">
+    <UndefinedClass occurrences="1">
+      <code>ComponentNotFoundException</code>
+    </UndefinedClass>
+  </file>
+  <file src="src/SolutionProviders/UnknownValidationSolutionProvider.php">
+    <UndefinedClass occurrences="1">
+      <code>app('validator')</code>
+    </UndefinedClass>
+  </file>
+  <file src="src/Solutions/LivewireDiscoverSolution.php">
+    <UndefinedClass occurrences="1">
+      <code>LivewireComponentsFinder</code>
+    </UndefinedClass>
+  </file>
+  <file src="src/Views/Engines/CompilerEngine.php">
+    <ParamNameMismatch occurrences="1">
+      <code>$baseException</code>
+    </ParamNameMismatch>
+  </file>
+  <file src="src/Views/Engines/PhpEngine.php">
+    <ParamNameMismatch occurrences="1">
+      <code>$baseException</code>
+    </ParamNameMismatch>
+  </file>
+</files>
diff --git a/psalm.xml b/psalm.xml
@@ -7,6 +7,7 @@
     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"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src"/>
diff --git a/src/SolutionProviders/MissingLivewireComponentSolutionProvider.php b/src/SolutionProviders/MissingLivewireComponentSolutionProvider.php
@@ -13,12 +13,10 @@ class MissingLivewireComponentSolutionProvider implements HasSolutionsForThrowab
 {
     public function canSolve(Throwable $throwable): bool
     {
-        if (! class_exists(ComponentNotFoundException::class)) {
-            return false;
-        }
-        if (! class_exists(LivewireComponentsFinder::class)) {
+        if (! $this->livewireIsInstalled()) {
             return false;
         }
+
         if (! $throwable instanceof ComponentNotFoundException) {
             return false;
         }
@@ -30,4 +28,16 @@ public function getSolutions(Throwable $throwable): array
     {
         return [new LivewireDiscoverSolution('A livewire component was not found')];
     }
+
+    public function livewireIsInstalled(): bool
+    {
+        if (! class_exists(ComponentNotFoundException::class)) {
+            return false;
+        }
+        if (! class_exists(LivewireComponentsFinder::class)) {
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/src/Solutions/LivewireDiscoverSolution.php b/src/Solutions/LivewireDiscoverSolution.php
@@ -21,7 +21,7 @@ public function getSolutionTitle(): string
 
     public function getSolutionDescription(): string
     {
-        return 'You might have forgotten to discover your livewire components. You can discover your livewire components using `php artisan livewire:discover`.';
+        return 'You might have forgotten to discover your Livewire components. You can discover your Livewire components using `php artisan livewire:discover`.';
     }
 
     public function getDocumentationLinks(): array
@@ -38,7 +38,7 @@ public function getRunParameters(): array
 
     public function getSolutionActionDescription(): string
     {
-        return 'Pressing the button below will try to discover your components.';
+        return 'Pressing the button below will try to discover your Livewire components.';
     }
 
     public function getRunButtonText(): string

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`8`	`8`	`xmlns="https://getpsalm.org/schema/config"`
`9`	`9`	`xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"`
	`10`	`+ errorBaseline="psalm-baseline.xml"`
`10`	`11`	`>`
`11`	`12`	`<projectFiles>`
`12`	`13`	`<directory name="src"/>`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,10 @@ class MissingLivewireComponentSolutionProvider implements HasSolutionsForThrowab`
`13`	`13`	`{`
`14`	`14`	`public function canSolve(Throwable $throwable): bool`
`15`	`15`	`{`
`16`		`- if (! class_exists(ComponentNotFoundException::class)) {`
`17`		`- return false;`
`18`		`- }`
`19`		`- if (! class_exists(LivewireComponentsFinder::class)) {`
	`16`	`+ if (! $this->livewireIsInstalled()) {`
`20`	`17`	`return false;`
`21`	`18`	`}`
	`19`	`+`
`22`	`20`	`if (! $throwable instanceof ComponentNotFoundException) {`
`23`	`21`	`return false;`
`24`	`22`	`}`
`@@ -30,4 +28,16 @@ public function getSolutions(Throwable $throwable): array`
`30`	`28`	`{`
`31`	`29`	`return [new LivewireDiscoverSolution('A livewire component was not found')];`
`32`	`30`	`}`
	`31`	`+`
	`32`	`+ public function livewireIsInstalled(): bool`
	`33`	`+ {`
	`34`	`+ if (! class_exists(ComponentNotFoundException::class)) {`
	`35`	`+ return false;`
	`36`	`+ }`
	`37`	`+ if (! class_exists(LivewireComponentsFinder::class)) {`
	`38`	`+ return false;`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ return true;`
	`42`	`+ }`
`33`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function getSolutionTitle(): string`
`21`	`21`
`22`	`22`	`public function getSolutionDescription(): string`
`23`	`23`	`{`
`24`		- return 'You might have forgotten to discover your livewire components. You can discover your livewire components using `php artisan livewire:discover`.';
	`24`	+ return 'You might have forgotten to discover your Livewire components. You can discover your Livewire components using `php artisan livewire:discover`.';
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function getDocumentationLinks(): array`
`@@ -38,7 +38,7 @@ public function getRunParameters(): array`
`38`	`38`
`39`	`39`	`public function getSolutionActionDescription(): string`
`40`	`40`	`{`
`41`		`- return 'Pressing the button below will try to discover your components.';`
	`41`	`+ return 'Pressing the button below will try to discover your Livewire components.';`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function getRunButtonText(): string`