php-mode: improve existent snippets and add a few more

php-mode/abstract-class

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: abstract class
-# key: acl
-# uuid: acl
+# key: ab
+# uuid: ab
 # --
 abstract class ${1:Name}${2: extends ${3:Parent}}
 {

php-mode/array

@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: array(...)
-# key: arr
-# uuid: arr
+# key: ar
+# uuid: ar
 # --
 array(`%`$0)

php-mode/assignment

@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: $var = value;
-# key: =
-# uuid: =
+# key: va
+# uuid: va
 # --
 \$${1:var_name} = `%`$0;

php-mode/class-final

@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: PHP class
+# key: clf
+# uuid: clf
+# --
+final class ${1:Name}${2: extends ${3:Parent}}
+{
+    `%`$0
+}

php-mode/constructor

@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: class construct
+# key: ct
+# uuid: ct
+# --
+${1:public} function __construct(\$${1:property})
+{
+    `%`$0
+}

php-mode/do-while

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: do while loop
+# key: do
+# uuid: do
+# --
+do {
+    $0
+} while (${1:condition});

php-mode/echo

@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: echo ...;
-# key: e
-# uuid: e
+# key: ec
+# uuid: ec
 # --
 echo `%`$0;

php-mode/elseif

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: elseif (...) { ... }
-# key: eli
-# uuid: eli
+# key: ei
+# uuid: ei
 # --
 elseif ($1) {
     `%`$0

php-mode/enumeration

@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: enumeration
+# key: enu
+# uuid: enu
+# --
+enum ${1:Name}
+{
+    case ${2:name};$0
+}

php-mode/function-anonymous

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: anonymous function
+# key: fuan
+# uuid: fuan
+# --
+function ($${2:variable}) {
+    $0;
+}

php-mode/function-arrow

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: arrow function
+# key: fuar
+# uuid: fuar
+# --
+fn(\$${1:variable}) => $0;

php-mode/match

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: match expression
+# key: match
+# uuid: match
+# --
+match (\$${1:subject_expression}) {
+    ${2:conditional_expression} => ${3:return_expression},
+};

php-mode/method

@@ -3,7 +3,7 @@
 # key: met
 # uuid: met
 # --
-${1:public} function ${2:name}($3)
+${1:public} function ${2:name}($3)${4::} ${5:type}
 {
     `%`$0
 }

php-mode/namespace

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: namespace
+# key: name
+# uuid: name
+# --
+namespace ${1:name};

php-mode/object-property

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: $object->prop
+# key: op
+# uuid: op
+# --
+\$${1:object}->${2:property};

php-mode/php

@@ -3,4 +3,4 @@
 # key: php
 # uuid: php
 # --
-<?php $0 ?>
+<?php ${1:declare(strict_types=1);} ${0:?>}

php-mode/phpdoc

@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
-# name: /** ... */
-# key: /**
-# uuid: /**
+# name: docblock summary
+# key: doc
+# uuid: doc
 # --
 /**
  * ${0:`(if % (s-replace "\n" "\n * " %))`}

php-mode/phpdoc-tag

@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: docblock tag
+# key: dot
+# uuid: dot
+# --
+/**
+ * @${1:tag} ${2:type} ${0:optional} 
+ */

php-mode/shebang

@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
-# name: #!/usr/bin/env php
+# name: php shebang
 # key: #!
 # uuid: #!
 # --
 #!/usr/bin/env php
-<?php
+<?php ${1:declare(strict_types=1);}
 
 $0

php-mode/switch

@@ -1,6 +1,12 @@
 # -*- mode: snippet -*-
 # name: switch (...) {...}
+# key: switch
+# uuid: switch
 # --
-switch (${on}) {
-    $0
+switch (\$${1:expression}) {
+    case ${2:condition}:
+        ${3:statement}
+        break;
+    default:
+        $0
 }

php-mode/ternary

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: ternary 
+# key: te
+# uuid: te
+# --
+${1:condition} ? ${2:truthy} : ${0:falsy};

php-mode/this

@@ -3,4 +3,4 @@
 # key: thi
 # uuid: thi
 # --
-\$this->$0
+\$this->$0;

php-mode/try-catch

@@ -0,0 +1,10 @@
+# -*- mode: snippet -*-
+# name: try-catch
+# key: try
+# uuid: try
+# --
+try {
+    ${1:statement}
+} catch (${2:Exception} \$${3:variable}) {
+    $0
+}

php-mode/variable

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: variable
+# key: va
+# uuid: va
+# --
+\$${1:name} = ${value};

php-mode/while

@@ -1,5 +1,7 @@
 # -*- mode: snippet -*-
 # name: while loop
+# key: whi
+# uuid: whi
 # --
 while (${1:condition}) {
     `%`$0