adding grumphp, php-cs-fixer, fixing style

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 /composer.lock
-/clover.xml
+/clover.xml
+.php_cs.cache

.php_cs

@@ -0,0 +1,22 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->files()
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        '@PHPUnit60Migration:risky' => true,
+        'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => true],
+        'single_quote' => true,
+        'array_syntax' => ['syntax' => 'long'],
+        'concat_space' => ['spacing' => 'one'],
+        'psr0' => true
+    ])
+    ->setUsingCache(true)
+    ->setFinder($finder);
+;

.travis.yml

@@ -23,6 +23,7 @@ install:
 
 stages:
   - test
+  - style check
   - phpstan analysis
   - test with coverage
 
@@ -37,6 +38,11 @@ jobs:
   allow_failures:
     - php: nightly
   include:
+    - stage: style check
+      php: 7.1
+      env: TMPDIR=/tmp USE_XDEBUG=false
+      script:
+        - composer style-check
     - stage: phpstan analysis
       php: 7.1
       env: TMPDIR=/tmp USE_XDEBUG=false

composer.json

@@ -12,6 +12,9 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.0.0",
+        "ext-dom": "*",
+        "ext-libxml": "*",
+        "ext-SimpleXML": "*",
         "diablomedia/zendframework1-exception": "^1.0.0"
     },
     "autoload": {
@@ -26,14 +29,18 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
-        "phpstan/phpstan": "^0.9.2"
+        "phpstan/phpstan": "^0.9.2",
+        "friendsofphp/php-cs-fixer": "^2.11",
+        "maglnet/composer-require-checker": "^0.1.6 | ^0.2.1",
+        "phpro/grumphp": "^0.14.0"
     },
     "archive": {
         "exclude": ["/tests"]
     },
     "scripts": {
-        "test": "phpunit ./tests",
-        "test-with-coverage": "phpunit --coverage-clover=clover.xml ./tests",
-        "phpstan": "phpstan analyze -l7 -c phpstan.neon --no-progress ./src --ansi"
+        "test": "phpunit",
+        "test-with-coverage": "phpunit --coverage-clover=clover.xml",
+        "phpstan": "phpstan analyze -l7 -c phpstan.neon --no-progress ./ --ansi",
+        "style-check": "php-cs-fixer fix --dry-run -vv"
     }
 }

grumphp.yml.dist

@@ -0,0 +1,16 @@
+# grumphp.yml
+parameters:
+    tasks:
+        composer:
+            strict: true
+        composer_require_checker: ~
+        phpcsfixer2:
+            allow_risky: true
+            config: .php_cs
+        phpstan:
+            level: 7
+            configuration: phpstan.neon
+        phpunit:
+            metadata:
+                priority: 100
+            always_execute: true

phpstan.neon

@@ -1,4 +1,7 @@
 parameters:
+    excludes_analyse:
+        - %rootDir%/../../../tests/*
+        - %rootDir%/../../../vendor/*
     ignoreErrors:
         - '#Variable \$loadEntities might not be defined\.#'
         - '#Variable \$useInternalXmlErrors might not be defined\.#'

phpunit.xml.dist

@@ -6,6 +6,11 @@
     backupGlobals="true"
     stderr="true"
     colors="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>

src/Zend/Xml/Exception.php

@@ -27,4 +27,5 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Xml_Exception extends Zend_Exception
-{}
+{
+}

src/Zend/Xml/Security.php

@@ -80,11 +80,11 @@ public static function scan($xml, DOMDocument $dom = null)
 
         if (null === $dom) {
             $simpleXml = true;
-            $dom = new DOMDocument();
+            $dom       = new DOMDocument();
         }
 
         if (!self::isPhpFpm()) {
-            $loadEntities = libxml_disable_entity_loader(true);
+            $loadEntities         = libxml_disable_entity_loader(true);
             $useInternalXmlErrors = libxml_use_internal_errors(true);
         }
 
@@ -270,7 +270,7 @@ protected static function detectXmlEncoding($xml, $fileEncoding)
         $quote       = call_user_func($generator, '"');
         $close       = call_user_func($generator, '>');
 
-        $closePos    = strpos($xml, $close);
+        $closePos = strpos($xml, $close);
         if (false === $closePos) {
             return array($fileEncoding);
         }
@@ -282,7 +282,7 @@ protected static function detectXmlEncoding($xml, $fileEncoding)
             return array($fileEncoding);
         }
 
-        $encPos   += strlen($encAttr);
+        $encPos += strlen($encAttr);
         $quotePos = strpos($xml, $quote, $encPos);
         if (false === $quotePos) {
             return array($fileEncoding);

tests/Zend/Xml/SecurityTest.php

@@ -74,7 +74,7 @@ public function testScanSimpleXmlResult()
 
     public function testScanDom()
     {
-        $dom = new DOMDocument('1.0');
+        $dom    = new DOMDocument('1.0');
         $result = Zend_Xml_Security::scan($this->_getXml(), $dom);
         $this->assertTrue($result instanceof DOMDocument);
         $node = $result->getElementsByTagName('result')->item(0);
@@ -97,7 +97,7 @@ public function testScanInvalidXmlDom()
 <foo>test</bar>
 XML;
 
-        $dom = new DOMDocument('1.0');
+        $dom    = new DOMDocument('1.0');
         $result = Zend_Xml_Security::scan($xml, $dom);
         $this->assertFalse($result);
     }
@@ -126,7 +126,7 @@ public function testScanXmlWithDTD()
 </results>
 XML;
 
-        $dom = new DOMDocument('1.0');
+        $dom    = new DOMDocument('1.0');
         $result = Zend_Xml_Security::scan($xml, $dom);
         $this->assertTrue($result instanceof DOMDocument);
         $this->assertTrue($result->validate());
@@ -140,6 +140,5 @@ protected function _getXml()
     <result>test</result>
 </results>
 XML;
-
     }
 }