Merge pull request #21 from SignpostMarv/travis

Enabling continuous integration via Travis

Author: mihai-vlc

.travis.yml

@@ -0,0 +1,14 @@
+language: php
+php:
+  - '5.3'
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
+  - nightly
+before_script:
+  - composer install
+script:
+  - vendor/bin/php-cs-fixer fix --level=psr2 --dry-run src
+  - vendor/bin/php-cs-fixer fix --level=psr2 --dry-run tests

README.md

@@ -1,4 +1,6 @@
-##PHPVerbalExpressions 
+[![Build Status](https://travis-ci.org/VerbalExpressions/PHPVerbalExpressions.svg)](https://travis-ci.org/VerbalExpressions/PHPVerbalExpressions)
+
+##PHPVerbalExpressions
 - ported from [VerbalExpressions](https://github.com/VerbalExpressions/JSVerbalExpressions)
 
 VerbalExpressions is a PHP library that helps to construct hard regular expressions.  

composer.json

@@ -4,9 +4,11 @@
     "type": "project",
     "description": "PHP Regular expressions made easy",
     "require": {
+        "php": ">=5.3",
+        "fabpot/php-cs-fixer": "^1.11"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.1"
+        "phpunit/phpunit": "* >=4"
     },
     "suggest": {
         "fabpot/php-cs-fixer": "PHP CS Fixer (testing for PSR-2 compliance)"

src/VerbalExpressions/PHPVerbalExpressions/VerbalExpressions.php

@@ -491,12 +491,12 @@ public function clean(array $options = array())
     {
         $options            = array_merge(
             array(
-                'prefixes'      => '', 
-                'source'        => '', 
-                'suffixes'      => '', 
-                'modifiers'     => 'gm', 
+                'prefixes'      => '',
+                'source'        => '',
+                'suffixes'      => '',
+                'modifiers'     => 'gm',
                 'replaceLimit'  => '1'
-            ), 
+            ),
             $options
         );
         $this->prefixes     = $options['prefixes'];

tests/VerbalExpressions/PHPVerbalExpressions/VerbalExpressionsTest.php

@@ -573,55 +573,4 @@ public function testReplace()
         $this->assertEquals('/foo/mg', $regex->getRegex());
         $this->assertEquals('bazbarbaz', $regex->replace('foobarfoo', 'baz'));
     }
-
-
-    public function testPsr2()
-    {
-        $pathToRoot = dirname(dirname(dirname(__DIR__)));
-        $pathToVendor = $pathToRoot . '/vendor';
-        $pathToSrc = $pathToRoot . '/src';
-        $pathToTests = $pathToRoot . '/tests';
-
-        if (
-            !is_dir($pathToVendor)
-        ) {
-            $this->markTestSkipped('Vendor directory not found.');
-            return;
-        } elseif (
-            !is_dir($pathToSrc)
-        ) {
-            $this->markTestSkipped('Source directory not found.');
-            return;
-        } elseif (
-            !is_dir($pathToTests)
-        ) {
-            $this->markTestSkipped('Tests directory not found.');
-            return;
-        }
-
-        foreach (array(
-            $pathToTests,
-            $pathToSrc,
-        ) as $dirToCheck) {
-            $cmd = escapeshellcmd(
-                'php-cs-fixer fix --level=psr2 --dry-run ' . $dirToCheck
-            );
-            exec($cmd, $output, $return_var);
-            if ($output) {
-                array_pop($output);
-                $output = array_map('trim', $output);
-            }
-
-            $this->assertEquals(
-                0,
-                $return_var,
-                (
-                    'PSR-2 linter reported errors in ' .
-                    $dirToCheck .
-                    '/: ' .
-                    implode(';', $output)
-                )
-            );
-        }
-    }
 }