Merge pull request #4 from phpugph/1.0

psr-2 fixes

Author: Christian Blanquera

.travis.yml

@@ -1,12 +1,15 @@
 language: php
 php:
-  - 7.1
+  - 8.0
+env:
+  global:
+    - XDEBUG_MODE=coverage
 install:
-  - /home/travis/.phpenv/versions/7.1/bin/composer install
+  - /home/travis/.phpenv/versions/8.0/bin/composer install
   - phpenv rehash
 before_script:
   - mkdir -p build/logs
 script:
   - vendor/bin/phpcs
-  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml
   - php vendor/bin/php-coveralls -v

composer.json

@@ -7,12 +7,12 @@
   ],
   "license": "MIT",
   "require-dev": {
-    "phpunit/phpunit": "^9.5.4",
-    "squizlabs/php_codesniffer": "^3.5.8",
-    "php-coveralls/php-coveralls": "^2.4.3"
+    "phpunit/phpunit": "~9.5.4",
+    "squizlabs/php_codesniffer": "~3.5.8",
+    "php-coveralls/php-coveralls": "~2.4.3"
   },
   "require": {
-    "phpugph/components": "^1.0.0"
+    "phpugph/components": "~1.0.0"
   },
   "autoload": {
     "psr-4": {

phpcs.xml

@@ -1,11 +1,32 @@
 <?xml version="1.0"?>
 <ruleset name="PHP_CodeSniffer">
-    <description>The coding standard for PHP_CodeSniffer itself.</description>
+  <description>The coding standard for PHP_CodeSniffer itself.</description>
 
-    <file>src</file>
+  <file>src</file>
 
-    <arg name="report" value="full"/>
-    <arg value="np"/>
+  <arg name="report" value="full"/>
+  <arg value="np"/>
+  <arg name="tab-width" value="2"/>
 
-    <rule ref="PSR2"/>
-</ruleset>
+  <rule ref="PSR2"/>
+  <rule ref="Generic.WhiteSpace.ScopeIndent">
+    <properties>
+      <property name="indent" value="2"/>
+    </properties>
+  </rule>
+  <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+  <rule ref="PSR2.Methods.FunctionCallSignature">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+  <rule ref="PSR2.ControlStructures.SwitchDeclaration">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+</ruleset>

phpunit.xml

@@ -21,7 +21,7 @@
     </testsuite>
   </testsuites>
 
-  <coverage>
+  <coverage processUncoveredFiles="false" pathCoverage="true">
     <include>
       <directory suffix=".php">./src</directory>
     </include>

src/HandlebarsTokenizer.php

@@ -248,8 +248,7 @@ protected function findVariable($i, $escape)
       $close = $close . $this->bars[1];
     }
 
-    for (; substr($this->source, $i, strlen($close)) !== $close;
-    $i++) {
+    for (; substr($this->source, $i, strlen($close)) !== $close; $i++) {
     }
 
     return $i + strlen($close);