Merge branch 'main' of labs.scarif.space:chris/nvim

lua/snippets/php.lua

@@ -33,8 +33,8 @@ local function class_name(args, snip)
 end
 
 return {
-    s('du', { t 'dump(', i(1), t ');' }),
-    s('dt', { t '\\PhpStan\\dumpType(', i(1), t ');' }),
+    s('du', { t 'dump(', i(0), t ');' }),
+    s('dt', { t '\\PhpStan\\dumpType(', i(0), t ');' }),
     s('ql', {
         t '\\Illuminate\\Support\\Facades\\DB::listen(function (\\Illuminate\\Database\\Events\\QueryExecuted $e) {',
         t { '', '    dump($e->sql, $e->bindings);' },
@@ -45,21 +45,21 @@ return {
         i(1),
         t ', function () {',
         t { '', '    ' },
-        i(2),
+        i(0),
         t { '', ');' },
     }),
     s('/**', {
         t '/**',
         t { '', ' * ' },
-        i(1),
+        i(0),
         t { '', ' */' },
     }),
-    s('@p', { t '@property ', i(1), t ' $', i(2) }),
-    s('@pb', { t '@property bool $', i(1) }),
-    s('@ps', { t '@property string $', i(1) }),
-    s('@pi', { t '@property int $', i(1) }),
-    s('@pc', { t '@property \\Illuminate\\Support\\Collection<int, ', i(1), t '> $', i(2) }),
-    s('@pd', { t '@property \\Illuminate\\Support\\Carbon $', i(1) }),
+    s('@p', { t '@property ', i(1), t ' $', i(0) }),
+    s('@pb', { t '@property bool $', i(0) }),
+    s('@ps', { t '@property string $', i(0) }),
+    s('@pi', { t '@property int $', i(0) }),
+    s('@pc', { t '@property \\Illuminate\\Support\\Collection<int, ', i(1), t '> $', i(0) }),
+    s('@pd', { t '@property \\Illuminate\\Support\\Carbon $', i(0) }),
     s('@pp', {
         t '/**',
         t { '', ' * @property int $id' },
@@ -69,21 +69,23 @@ return {
         t { '', ' * @property \\Illuminate\\Support\\Carbon $updated_at' },
         t { '', ' *', ' * Relationships' },
         t { '', ' * ' },
-        i(2),
+        i(0),
         t { '', ' */' },
     }),
     s('php', {
         t '<?php',
-        t { '', '', '' },
+        t { '', '' },
         t 'namespace ',
         f(psr_namespace, {}),
         t ';',
-        t { '', '', 'class ' },
+        t { '', '', '/**', ' * Class ' },
         f(class_name, {}),
-        t { '', '{' },
-        t { '', '' },
-        i(0),
-        t { '', '', '}' },
+        t { '', ' */', 'class ' },
+        f(class_name, {}),
+        i(1),
+        t { '', '{', '    public function __construct()', '    {', '        ' },
+        i(0, '// TODO: Implement constructor'),
+        t { '', '    }', '}' },
     }),
     s('pub', {
         t 'public function ',
@@ -93,7 +95,7 @@ return {
         t ')',
         t { '', '{' },
         t { '', '    ' },
-        i(3),
+        i(0),
         t { '', '}' },
     }),
     s('pro', {
@@ -104,7 +106,7 @@ return {
         t ')',
         t { '', '{' },
         t { '', '    ' },
-        i(3),
+        i(0),
         t { '', '}' },
     }),
 }