Merge pull request #22 from activecollab/next

Provide PSR-15 compatible middlewares

Author: ilijastuden

.php_cs.php

@@ -18,20 +18,19 @@
             '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,
+        'no_alias_functions' => false,
         '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,
+        'self_accessor' => false,
         'no_trailing_comma_in_singleline_array' => true,
         'single_blank_line_before_namespace' => true,
         'space_after_semicolon' => true,
@@ -46,13 +45,27 @@
         '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,
-        'single_blank_line_at_eof' => true,
+        'blank_line_before_return' => true,
+        'class_attributes_separation' => [
+            'elements' => [],
+        ],
+        'linebreak_after_opening_tag' => true,
+        'native_function_casing' => true,
+        'no_closing_tag' => true,
+        'no_empty_comment' => true,
+        'no_empty_statement' => true,
+        'no_leading_import_slash' => true,
+        'lowercase_constants' => true,
+        'lowercase_cast' => true,
+        'lowercase_keywords' => true,
     ]
 )->setFinder((new PhpCsFixer\Finder())->in(
     [

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
-  - 7.1
+  - 7.3
 before_install:
   - composer self-update
 install: composer install --dev

composer.json

@@ -15,19 +15,21 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.3",
+        "ext-json": "*",
         "ext-mbstring": "*",
-        "activecollab/cookies": "^1.0",
+        "activecollab/cookies": "^2.0",
         "activecollab/user": "^4.0",
         "google/apiclient": "^2.1",
-        "guzzlehttp/psr7": "^1.2"
+        "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
         "lightsaml/lightsaml": "^1.1",
-        "phpunit/phpunit": "^5.0",
+        "phpunit/phpunit": "^7.0",
         "satooshi/php-coveralls": "^1.0",
-        "slim/slim": "~3.2"
+        "zendframework/zend-diactoros": "^2.2",
+        "pimple/pimple": "^3.2"
     },
     "suggest": {
         "lightsaml/lightsaml": "If you want to use SAML authentication you should manually install this package."