Apply types

tattersoftware · Jul 22, 2022 · f7d8640 · f7d8640
1 parent c76a51c
commit f7d8640
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/examples/Alerts.php b/examples/Alerts.php
@@ -16,10 +16,8 @@ class Alerts extends AlertsConfig
 {
     /**
      * Template to use for HTML output.
-     *
-     * @var string
      */
-    public $template = 'Tatter\Alerts\Views\Bootstrap4';
+    public string $template = 'Tatter\Alerts\Views\Bootstrap4';
 
     /**
      * Mapping of Session keys to their CSS classes.
@@ -28,20 +26,26 @@ class Alerts extends AlertsConfig
      *
      * @var array<string,string>
      */
-    public $classes = [
+    public array $classes = [
+        // Bootstrap classes
         'primary'   => 'primary',
-        'message'   => 'primary',
         'secondary' => 'secondary',
-        'notice'    => 'secondary',
         'success'   => 'success',
         'danger'    => 'danger',
+        'warning'   => 'warning',
+        'info'      => 'info',
+
+        // Additional log levels
+        'message'   => 'primary',
+        'notice'    => 'secondary',
         'error'     => 'danger',
-        'errors'    => 'danger',
         'critical'  => 'danger',
         'emergency' => 'danger',
-        'warning'   => 'warning',
         'alert'     => 'warning',
-        'info'      => 'info',
         'debug'     => 'info',
+
+        // Common framework keys
+        'messages' => 'primary',
+        'errors'   => 'danger',
     ];
 }
diff --git a/src/Collectors/Alerts.php b/src/Collectors/Alerts.php
@@ -44,7 +44,7 @@ class Alerts extends BaseCollector
      *
      * @var array<string[]>
      */
-    protected $alerts;
+    protected array $alerts;
 
     //--------------------------------------------------------------------
 

diff --git a/src/Config/Alerts.php b/src/Config/Alerts.php
@@ -8,10 +8,8 @@ class Alerts extends BaseConfig
 {
     /**
      * Template to use for HTML output.
-     *
-     * @var string
      */
-    public $template = 'Tatter\Alerts\Views\Bootstrap4';
+    public string $template = 'Tatter\Alerts\Views\Bootstrap4';
 
     /**
      * Mapping of Session keys to their CSS classes.
@@ -20,7 +18,7 @@ class Alerts extends BaseConfig
      *
      * @var array<string,string>
      */
-    public $classes = [
+    public array $classes = [
         // Bootstrap classes
         'primary'   => 'primary',
         'secondary' => 'secondary',

diff --git a/src/Filters/AlertsFilter.php b/src/Filters/AlertsFilter.php
@@ -24,8 +24,7 @@ class AlertsFilter implements FilterInterface
     public static function gather(AlertsConfig $config): array
     {
         // Gather alerts from the Session
-        $session = service('session');
-        $alerts  = [];
+        $alerts = [];
 
         foreach ($config->classes as $key => $class) {
             $content = session($key);

diff --git a/tests/CollectorTest.php b/tests/CollectorTest.php
@@ -8,10 +8,7 @@
  */
 final class CollectorTest extends TestCase
 {
-    /**
-     * @var Alerts
-     */
-    protected $collector;
+    protected Alerts $collector;
 
     protected function setUp(): void
     {

diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -12,10 +12,7 @@ final class FilterTest extends TestCase
 {
     use FilterTestTrait;
 
-    /**
-     * @var string
-     */
-    private $body = <<<'EOD'
+    private string $body = <<<'EOD'
         <html>
         <head>
         	<title>Test</title>