Merge pull request #20 from activecollab/v3.0

V3.0

Author: ilijastuden

.php_cs.php

@@ -12,40 +12,51 @@
 (c) A51 doo <[email protected]>. All rights reserved.
 EOF;
 
-return (new PhpCsFixer\Config('psr2'))->setRules([
-    'header_comment' => ['header' => $header, 'location' => 'after_open'],
-    'no_whitespace_before_comma_in_array' => true,
-    'whitespace_after_comma_in_array' => true,
-    'no_multiline_whitespace_around_double_arrow' => true,
-    'hash_to_slash_comment' => true,
-    'include' => true,
-    'trailing_comma_in_multiline_array' => true,
-    'no_leading_namespace_whitespace' => true,
-    'no_blank_lines_after_class_opening' => true,
-    'no_blank_lines_after_phpdoc' => true,
-    'phpdoc_scalar' => true,
-    'phpdoc_summary' => true,
-    'self_accessor' => true,
-    'no_trailing_comma_in_singleline_array' => true,
-    'single_blank_line_before_namespace' => true,
-    'space_after_semicolon' => true,
-    'no_singleline_whitespace_before_semicolons' => true,
-    'cast_spaces' => true,
-    'standardize_not_equals' => true,
-    'ternary_operator_spaces' => true,
-    'trim_array_spaces' => true,
-    'no_unused_imports' => true,
-    'no_whitespace_in_blank_line' => true,
-    'ordered_imports' => true,
-    'array_syntax' => ['syntax' => 'short'],
-    'phpdoc_align' => true,
-    'return_type_declaration' => true,
-    'single_blank_line_at_eof' => true,
-    'single_line_after_imports' => true,
-    'single_quote' => true,
-    'phpdoc_separation' => false,
-    'phpdoc_no_package' => false,
-    'no_mixed_echo_print' => false,
-    'concat_space' => false,
-    'simplified_null_return' => false,
-])->setFinder((new PhpCsFixer\Finder())->in([__DIR__ . '/src', __DIR__ . '/test']));
+return (new PhpCsFixer\Config('psr2'))->setRules(
+    [
+        'header_comment' => [
+            'header' => $header,
+            'location' => 'after_open',
+        ],
+        'function_typehint_space' => true,
+        'method_argument_space' => true,
+        'no_trailing_whitespace' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'whitespace_after_comma_in_array' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'hash_to_slash_comment' => true,
+        'include' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_summary' => true,
+        'self_accessor' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'single_blank_line_before_namespace' => true,
+        'space_after_semicolon' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'cast_spaces' => true,
+        'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
+        'trim_array_spaces' => true,
+        'no_unused_imports' => true,
+        'no_whitespace_in_blank_line' => true,
+        'ordered_imports' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'phpdoc_align' => true,
+        'return_type_declaration' => true,
+        'single_quote' => true,
+        'phpdoc_separation' => false,
+        'phpdoc_no_package' => false,
+        'no_mixed_echo_print' => false,
+        'concat_space' => false,
+        'simplified_null_return' => false,
+        'single_blank_line_at_eof' => true,
+    ]
+)->setFinder((new PhpCsFixer\Finder())->in(
+    [
+        __DIR__ . '/src',
+        __DIR__ . '/test'
+    ]
+));

.travis.yml

@@ -1,8 +1,7 @@
 language: php
 php:
-  - 5.6
-  - 7
+  - 7.1
 before_install:
   - composer self-update
 install: composer install --dev
-script: vendor/bin/phpunit
+script: php vendor/bin/phpunit

composer.json

@@ -15,13 +15,12 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.1",
         "ext-mbstring": "*",
         "activecollab/cookies": "^1.0",
-        "activecollab/user": "^3.0",
-        "google/apiclient": "^1.1",
-        "guzzlehttp/psr7": "^1.2",
-        "paragonie/random_compat": "^2.0"
+        "activecollab/user": "v4.0.x-dev",
+        "google/apiclient": "^2.1",
+        "guzzlehttp/psr7": "^1.2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",