diff --git a/vim/UltiSnips/php.snippets b/vim/UltiSnips/php.snippets index f02dc61..1a01bbf 100644 --- a/vim/UltiSnips/php.snippets +++ b/vim/UltiSnips/php.snippets @@ -27,11 +27,11 @@ snippet gs "Getter and setter" public function set${1/\w+\s*/\u$0/g}(\$$1) { $this->$1 = \$$1; - + return \$this; } -public function get${1/\w+\s*/\u$0/g}() +public function get${1/\w+\s*/\u$0/g}() { return \$this->$1; } @@ -62,6 +62,8 @@ use Trinity\Bundle\ContentManagerBundle\Model\Page; use Trinity\Bundle\ContentManagerBundle\Model\Block; /** + * Class `!p snip.rv = snip.basename`. + * * @author Simon Vieille */ class `!p snip.rv = snip.basename` extends Page @@ -87,10 +89,10 @@ class `!p snip.rv = snip.basename` extends Page ->setBlock('title', 'Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType') ->setBlock('content', 'Trinity\Bundle\ContentManagerBundle\Form\Type\TinymceAdvancedBlockType'); } - + /** - * Getter for the block title - * + * Get the block "title". + * * @return Block */ public function getBlockTitle() @@ -99,8 +101,8 @@ class `!p snip.rv = snip.basename` extends Page } /** - * Setter for the block title - * + * Set the block "title". + * * @param Block $block * * @return `!p snip.rv = snip.basename` @@ -111,8 +113,8 @@ class `!p snip.rv = snip.basename` extends Page } /** - * Getter for the block content - * + * Get the block "content". + * * @return Block */ public function getBlockContent() @@ -121,8 +123,8 @@ class `!p snip.rv = snip.basename` extends Page } /** - * Setter for the block title - * + * Set the block "title". + * * @param Block $block * * @return `!p snip.rv = snip.basename` @@ -146,6 +148,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputArgument; /** + * class `!p snip.rv = snip.basename`. + * * @author `!v g:snips_author` */ class `!p snip.rv = snip.basename` extends ContainerAwareCommand @@ -185,6 +189,8 @@ use Symfony\Component\HttpFoundation\Request; use Trinity\Bundle\ContentManagerBundle\Controller\PageController; /** + * class `!p snip.rv = snip.basename`. + * * @author `!v g:snips_author` */ class `!p snip.rv = snip.basename` extends PageController @@ -215,6 +221,8 @@ use Propel\PropelBundle\Form\BaseAbstractType; use Symfony\Component\Form\FormBuilderInterface; /** + * class `!p snip.rv = snip.basename`. + * * @author `!v g:snips_author` */ class `!p snip.rv = snip.basename` extends BaseAbstractType @@ -241,14 +249,14 @@ endsnippet snippet foreach "foreach" foreach (\$${1}s as \$$1) { - + } endsnippet snippet block "block" /** - * Setter for the block $1 - * + * Set the block "$1". + * * @param Block $block * * @return `!p snip.rv = snip.basename` @@ -259,8 +267,8 @@ public function setBlock${1/\w+\s*/\u$0/}(Block $block) } /** - * Getter for the block $1 - * + * Get the block "$1". + * * @return Block */ public function getBlock${1/\w+\s*/\u$0/}() diff --git a/vim/UltiSnips/xml.snippets b/vim/UltiSnips/xml.snippets index 33a15af..f1d6b4e 100644 --- a/vim/UltiSnips/xml.snippets +++ b/vim/UltiSnips/xml.snippets @@ -50,7 +50,7 @@ snippet bool "BOOL" endsnippet snippet longvarchar "LONGVARCHAR" - + endsnippet snippet fk "fk" @@ -85,7 +85,7 @@ snippet container "service container" - + @@ -97,7 +97,7 @@ endsnippet snippet service "service of service container" - + %% diff --git a/vimrc b/vimrc index 8440ce3..babba6f 100644 --- a/vimrc +++ b/vimrc @@ -63,6 +63,7 @@ Plugin 'bronson/vim-trailing-whitespace' Plugin 'jacoborus/tender' Plugin 'vexxor/phpdoc.vim' Plugin 'mzlogin/vim-markdown-toc' +Plugin 'rosenfeld/conque-term' call vundle#end() @@ -174,6 +175,8 @@ au Filetype html,xml,xsl,php,jsp,jspf,twig source ~/.vim/bundle/closetag.vim/plu let g:nerdtree_tabs_open_on_gui_startup = 2 let g:nerdtree_tabs_open_on_console_startup = 2 let g:nerdtree_tabs_autoclose = 0 +let NERDTreeCascadeSingleChildDir = 0 +let NERDTreeCascadeOpenSingleChildDir = 1 " CTRLP Symfony " """""""""""""""""