PSR-2 code style (#184)

* PSR-2 code style for code and tests

* PHP_CodeSniffer config and related code changes, Travis integration

* Additiomal fixes after merging

Author: alexeyshockov

.gitignore

@@ -1,6 +1,6 @@
 build/
-/phpunit.xml
-/vendor
-composer.lock
-/.idea/
+vendor/
 .php_cs.cache
+composer.lock
+phpcs.xml
+phpunit.xml

.travis.yml

@@ -1,18 +1,18 @@
 language: php
 sudo: false
+
 php:
   - 7.0
   - 7.1
   - 7.2
   - 7.3
   - nightly
-
 matrix:
   allow_failures:
     - php: nightly
 
-before_script: composer install
-
+before_script:
+  - composer install
 script:
-  - vendor/bin/php-cs-fixer fix --dry-run --diff --config=.php_cs.dist
-  - vendor/bin/phpunit --debug
+  - composer tests
+  - composer coding-style

composer.json

@@ -19,7 +19,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~6",
-        "friendsofphp/php-cs-fixer": "^2.13"
+        "squizlabs/php_codesniffer": "~3.0",
+        "friendsofphp/php-cs-fixer": "^2.14"
     },
     "autoload": {
         "psr-4": {"Functional\\": "src/Functional"},
@@ -114,11 +115,9 @@
     "autoload-dev": {
         "psr-4": {"Functional\\Tests\\": "tests/Functional"}
     },
-    "extra": {
-        "branch-alias": { "dev-master": "1.2-dev" }
-    },
     "scripts": {
-        "tests": "phpunit",
+        "tests": "vendor/bin/phpunit",
+        "coding-style": "vendor/bin/phpcs && vendor/bin/php-cs-fixer fix --dry-run --diff --config=.php_cs.dist",
         "clear": "rm -rf vendor/"
     }
 }

phpcs.xml.dist

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         name="PHP_CodeSniffer"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+    <description>Functional PHP coding style configuration</description>
+
+    <file>src</file>
+    <file>tests</file>
+
+    <arg name="colors"/>
+    <arg value="n"/>
+
+    <rule ref="PSR2" />
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
+        <exclude-pattern>tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase">
+        <exclude-pattern>src/Functional/Functional.php</exclude-pattern>
+    </rule>
+</ruleset>

src/Functional/Average.php

@@ -39,12 +39,10 @@ function average($collection)
     $divisor = 0;
 
     foreach ($collection as $element) {
-
         if (\is_numeric($element)) {
             $sum += $element;
             ++$divisor;
         }
-
     }
 
     if ($sum === null) {

src/Functional/ButLast.php

@@ -21,6 +21,7 @@
  * THE SOFTWARE.
  */
 namespace Functional;
+
 use Functional\Exceptions\InvalidArgumentException;
 use Traversable;
 

src/Functional/CompareObjectHashOn.php

@@ -35,4 +35,3 @@ function compare_object_hash_on(callable $comparison, callable $keyFunction = nu
 
     return compare_on($comparison, $keyFunction);
 }
-

src/Functional/CompareOn.php

@@ -21,6 +21,7 @@
  * THE SOFTWARE.
  */
 namespace Functional;
+
 /**
  * Returns a comparison function that can be used with e.g. `usort()`
  *
@@ -40,4 +41,3 @@ function compare_on(callable $comparison, callable $reducer = null)
         return $comparison($reducer($left), $reducer($right));
     };
 }
-

src/Functional/Contains.php

@@ -39,11 +39,9 @@ function contains($collection, $value, $strict = true)
     InvalidArgumentException::assertCollection($collection, __FUNCTION__, 1);
 
     foreach ($collection as $element) {
-
         if ($value === $element || (!$strict && $value == $element)) {
             return true;
         }
-
     }
 
     return false;

src/Functional/Curry.php

@@ -36,7 +36,7 @@
  */
 function curry(callable $function, $required = true)
 {
-    if (\method_exists('Closure','fromCallable')) {
+    if (\method_exists('Closure', 'fromCallable')) {
         $reflection = new ReflectionFunction(Closure::fromCallable($function));
     } else {
         if (\is_string($function) && \strpos($function, '::', 1) !== false) {