feat: Fix remaining linting errors

Author: kkoomen

.vintrc.yaml

@@ -27,7 +27,7 @@ policies:
   ProhibitUnnecessaryDoubleQuote:
     enabled: true
   ProhibitUnusedVariable:
-    enabled: false
+    enabled: true
   ProhibitUsingUndeclaredVariable:
     enabled: true
   ProhibitAutocmdWithNoGroup:

Dockerfile

@@ -8,7 +8,6 @@ RUN apk --update add $PACKAGES \
   && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
 RUN pip install vim-vint==0.3.15
-COPY .vintrc.yaml $HOME/.vintrc.yaml
 
 RUN git clone https://github.com/junegunn/vader.vim vader \
   && cd vader \

autoload/doge/preprocessors/php.vim

@@ -23,7 +23,6 @@ set cpoptions&vim
 "        */
 function! s:get_parameter_type_fqn(type) abort
   let l:fqn = a:type
-  let l:has_fqn_defined = 0
 
   if a:type !~# '\\'
     let l:use_statement_regex = printf('\m^use.\{-}\([[:alnum:]_\\]\+%s\)[;,].\{-}', a:type)
@@ -80,7 +79,7 @@ endfunction
 " function will adjust the input if needed.
 function! doge#preprocessors#php#tokens(params) abort
   if has_key(a:params, 'propertyName') && !empty(a:params['propertyName'])
-    let l:fqn = <SID>get_property_type_via_constructor(a:params['propertyName'])
+    let l:fqn = s:get_property_type_via_constructor(a:params['propertyName'])
     if !empty(l:fqn)
       let a:params['type'] = l:fqn
     endif
@@ -93,7 +92,7 @@ function! doge#preprocessors#php#parameter_tokens(params) abort
   for l:param in a:params
     let l:param_idx = index(a:params, l:param)
     if has_key(l:param, 'type') && !empty(l:param['type'])
-      let l:fqn = <SID>get_parameter_type_fqn(l:param['type'])
+      let l:fqn = s:get_parameter_type_fqn(l:param['type'])
       let a:params[l:param_idx]['type'] = l:fqn
     endif
   endfor

autoload/doge/token.vim

@@ -97,9 +97,9 @@ endfunction
 function! doge#token#replace(tokens, text) abort
   let l:text = deepcopy(a:text)
   if type(l:text) == v:t_list
-    return map(l:text, {key, line -> <SID>token_replace(a:tokens, line)})
+    return map(l:text, {key, line -> s:token_replace(a:tokens, line)})
   elseif type(l:text) == v:t_string
-    return <SID>token_replace(a:tokens, l:text)
+    return s:token_replace(a:tokens, l:text)
   endif
 endfunction
 

run-tests

@@ -6,7 +6,7 @@ set -e
 set -u
 
 docker_image=kkoomen/doge
-current_docker_image_id=45829e92e365
+current_docker_image_id=17b41b268a58
 
 DOGE_DOCKER_IMAGE="$docker_image"
 export DOGE_DOCKER_IMAGE
@@ -115,7 +115,7 @@ for pid in $pid_list; do
     this_failed=1
   fi
 
-  if [[ -f "$output_dir/$index" ]] || ((this_failed)); then
+  if [[ -f "$output_dir/$index" ]] && ((this_failed)); then
     cat "$output_dir/$index"
   fi
 done

scripts/run-vint

@@ -6,7 +6,6 @@ set -e
 set -u
 
 exit_code=0
-docker_flags=(--rm -v "$PWD:/testplugin" -v "$PWD/test:/home" -w /testplugin "$DOGE_DOCKER_IMAGE")
 
 echo '========================================'
 echo 'Running Vint to lint our code'
@@ -15,8 +14,14 @@ echo 'Vint warnings/errors follow:'
 echo
 
 set -o pipefail
-docker run -a stdout "${docker_flags[@]}" vint -s . || exit_code=$?
+docker run \
+  -a stdout \
+  --rm \
+  -v "$PWD:/testplugin" \
+  -v "$PWD/test:/home" \
+  -w /testplugin "$DOGE_DOCKER_IMAGE" vint -s . || exit_code=$?
 set +o pipefail
+
 echo
 
 exit $exit_code