Updated PHP snippets to make use of VISUAL

Author: codeinabox

UltiSnips/php-phpspec.snippets

@@ -25,7 +25,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	function it_$1()
 	{
-		$0
+		${0:${VISUAL}}
 	}
 }
 endsnippet

snippets/php.snippets

@@ -1,7 +1,7 @@
 snippet <?
 	<?php
 
-	${0}
+	${0:${VISUAL}}
 snippet dst "declare(strict_types=1)"
 	declare(strict_types=${1:1});
 snippet ec
@@ -17,37 +17,38 @@ snippet ?
 	<?php ${0} ?>
 snippet ?f
 	<?php foreach ($${1:vars} as $${2:$var}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endforeach ?>
 snippet ?i
 	<?php if ($${1:var}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endif ?>
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
-	${0}
+	
+	${0:${VISUAL}}
 snippet c
 	class ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet i
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet t.
 	$this->
 snippet f
 	function ${1}(${3})
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # method
 snippet m
 	${1:protected} function ${2:foo}()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet sm "PHP Class Setter"
 	/**
@@ -158,7 +159,7 @@ snippet doc_c
 	 */
 	${1:}class ${2:}
 	{
-		${0}
+		${0:${VISUAL}}
 	} // END $1class $2
 # Constant Definition - post doc
 snippet doc_dp
@@ -232,7 +233,7 @@ snippet interface
 	 */
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # Trait
 snippet trait
@@ -244,7 +245,7 @@ snippet trait
 	 */
 	trait ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # class ...
 snippet class
@@ -267,7 +268,7 @@ snippet nc
 
 	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # define(...)
 snippet def "define('VARIABLE_NAME', 'definition')"
@@ -277,45 +278,43 @@ snippet def?
 	${1}defined('${2}')
 snippet wh "while (condition) { ... }"
 	while (${1:/* condition */}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet do "do { ... } while (condition)"
 	do {
-		${0}
+		${0:${VISUAL}}
 	} while (${1});
 snippet if "if (condition) { ... }"
 	if (${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet ifn "if (!condition) { ... }"
 	if (!${1}) {
-		${2}
+		${0:${VISUAL}}
 	}
 snippet ifil "<?php if (condition): ?> ... <?php endif; ?>"
 	<?php if (${1}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endif; ?>
 snippet ife "if (cond) { ... } else { ... }"
 	if (${1}) {
-		${2}
+		${0:${VISUAL}}
 	} else {
-		${3}
+		${2}
 	}
-	${0}
 snippet ifeil "<?php if (condition): ?> ... <?php else: ?> ... <?php endif; ?>"
 	<?php if (${1}): ?>
-		${2}
+		${0:${VISUAL}}
 	<?php else: ?>
-		${3}
+		${2}
 	<?php endif; ?>
-	${0}
 snippet el "else { ... }"
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet eif "elseif(condition) { ... }"
 	elseif (${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet switch "switch($var) { case 'xyz': ... default: .... }"
 	switch ($${1:variable}) {
@@ -329,23 +328,23 @@ snippet switch "switch($var) { case 'xyz': ... default: .... }"
 	}
 snippet case "case 'value': ... break"
 	case '${1:value}':
-		${2}
+		${0:${VISUAL}}
 		break;
 snippet for "for ($i = 0; $i < $count; $i++) { ... }"
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreach "foreach ($var as $value) { .. }"
 	foreach ($${1:variable} as $${2:value}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreachil "<?php foreach ($var as $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:value}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endforeach; ?>
 snippet foreachk "foreach ($var as $key => $value) { .. }"
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreachkil "<?php foreach ($var as $key => $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
@@ -355,7 +354,7 @@ snippet array "$... = ['' => ]"
 	$${1:arrayName} = ['${2}' => ${3}];
 snippet try "try { ... } catch (Exception $e) { ... }"
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch (${1:Exception} $e) {
 	}
 # lambda with closure
@@ -633,17 +632,17 @@ snippet asnnu "$this->assertNotNull($a)"
 snippet test "public function testXYZ() { ... }"
 	public function test${1}()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet setup "protected function setUp() { ... }"
 	protected function setUp()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet teardown "protected function tearDown() { ... }"
 	protected function tearDown()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet proph "$observer = $this->prophesize(SomeClass::class);"
 	$${1:observer} = $this->prophesize(${2:SomeClass}::class);