Merge pull request #4 from Dropelikeit/feature/upgrade-package

Feature/upgrade package

Author: Jens Prangenberg

.gitignore

@@ -1,2 +1,5 @@
 vendor/
-.idea/
+.idea/
+.phpunit.result.cache
+.php_cs
+.phpstan.neon

.php_cs.dist

@@ -0,0 +1,81 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+    '@PSR2' => true,
+    'braces' => false,
+    'array_indentation' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => true,
+    'cast_spaces' => true,
+    'concat_space' => [
+        'spacing' => 'one',
+    ],
+    'declare_equal_normalize' => true,
+    'include' => true,
+    'function_typehint_space' => true,
+    'linebreak_after_opening_tag' => true,
+    'lowercase_cast' => true,
+    'lowercase_static_reference' => true,
+    'magic_constant_casing' => true,
+    'modernize_types_casting' => true,
+    'native_function_casing' => true,
+    'new_with_braces' => true,
+    'no_alternative_syntax' => true,
+    'no_empty_comment' => true,
+    'no_empty_statement' => true,
+    'no_closing_tag' => true,
+    'no_extra_blank_lines' => true,
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'no_null_property_initialization' => true,
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_around_offset' => true,
+    'no_superfluous_elseif' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_unneeded_control_parentheses' => true,
+    'no_unneeded_curly_braces' => true,
+    'no_unneeded_final_method' => true,
+    'no_unused_imports' => true,
+    'no_useless_else' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => true,
+    'phpdoc_annotation_without_dot' => true,
+    'phpdoc_indent' => true,
+    'phpdoc_inline_tag' => true,
+    'phpdoc_no_access' => true,
+    'return_type_declaration' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_quote' => true,
+    'standardize_not_equals' => true,
+    'ternary_operator_spaces' => true,
+    'ternary_to_null_coalescing' => true,
+    'trailing_comma_in_multiline_array' => true,
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => true,
+    'whitespace_after_comma_in_array' => true,
+    'yoda_style' => false,
+
+    /** @risky */
+    'strict_comparison' => true,
+    'dir_constant' => true,
+    'psr4' => true,
+])->setFinder($finder);

.travis.yml

@@ -1,36 +1,42 @@
+# Project language
 language: php
 
-os:
-  - linux
+# Allows use container-based infrastructure
+sudo: false
 
-git:
-  depth: 1
+# Start mysql service
+#services:
+#  - mysql
 
-php:
-  - 7.1
+# Cache composer packages so "composer install" is faster
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
-sudo: false
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.4
+    - php: 8.0
+  allow_failures:
+    - php: hhvm
+
+before-install:
+  - composer self-update
 
+# Install composer dependencies,
+# Create database, schema and fixtures
 install:
-  - travis_retry composer install --no-interaction
+  - composer install
   - wget -c -nc --retry-connrefused --tries=0 https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar
   - chmod +x php-coveralls.phar
   - php php-coveralls.phar --version
 
-before_script:
-  - mkdir -p build/logs
-  - ls -al
-
+# Run script
 script:
-  - ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - phpunit --coverage-clover build/logs/clover.xml
+  - composer cs-check
+  - composer analyze
 
 after_success:
   - travis_retry php php-coveralls.phar -v
-
-branches:
-  only: master
-
-notifications:
-  email:
-    on_success: never
-    on_failure: always

composer.json

@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Simple and clean detection SDK for temporary emails",
     "license": "MIT",
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "authors": [
         {
             "name": "Jens Prangenberg",
@@ -12,16 +12,36 @@
     ],
     "homepage": "https://temporary-email-detection.de",
     "require": {
-        "php": "^7.1",
-        "guzzlehttp/guzzle": "^6.3"
+        "php": "^7.4|^8.0",
+        "ext-json": "*",
+        "guzzlehttp/guzzle": "^7.2"
     },
     "autoload": {
         "psr-4": {
-            "TemporaryEmailDetection\\": "src/",
-            "TemporaryEmailDetectionTests\\": "tests/"
+            "TemporaryEmailDetection\\": "src/"
+
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0@dev"
+        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "^2.18",
+        "phpstan/phpstan": "^0.12.81",
+        "phpstan/phpstan-phpunit": "^0.12.18"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "TemporaryEmailDetectionTests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test",
+            "@analyze"
+        ],
+        "cs-check": "php-cs-fixer -v --dry-run --using-cache=no fix",
+        "cs-fix": "php-cs-fixer --using-cache=no fix",
+        "test": "vendor/bin/phpunit --configuration phpunit.xml",
+        "analyze": "vendor/bin/phpstan analyse --configuration phpstan.neon.dist"
     }
 }