Merge pull request #277 from mimmi20/master

update dependencies

.dependabot/config.yml

@@ -21,3 +21,7 @@ update_configs:
           dependency_name: "symfony/cache"
       - match:
           dependency_name: "symfony/finder"
+      - match:
+          dependency_name: "roave/doctrine-simplecache"
+      - match:
+          dependency_name: "monolog/monolog"

.gitattributes

@@ -9,6 +9,7 @@
 *.yml text eol=lf
 *.xml text eol=lf
 *.dist text eol=lf
+*.neon text eol=lf
 .gitattributes text eol=lf export-ignore
 .gitignore text eol=lf export-ignore
 .travis-scripts/ export-ignore

.travis.yml

@@ -35,7 +35,6 @@ install: travis_retry composer update --optimize-autoloader --prefer-dist --pref
 script: vendor/bin/phpunit -c phpunit.xml.dist --no-coverage --colors --verbose --exclude-group compare
 
 jobs:
-  fast_finish: true
   allow_failures:
     - php: nightly
     - php: 7.4snapshot
@@ -69,8 +68,9 @@ jobs:
         - phpenv config-rm xdebug.ini || echo "xdebug not available"
         - echo 'opcache.enable=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
         - echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-      install: skip
-      script: composer validate --strict
+      script:
+        - composer validate --strict
+        - composer normalize --dry-run
 
     - stage: check coding style
       php: 7.1

composer.json

@@ -25,30 +25,38 @@
         }
     ],
     "require": {
-        "ext-json": "*",
         "php": ">=7.1.0,<7.5.0",
+        "ext-json": "*",
         "daverandom/exceptional-json": "^1.0.4",
-        "guzzlehttp/guzzle": "^6.2",
-        "monolog/monolog": "^1.23 || ^2.0",
+        "guzzlehttp/guzzle": "^6.5.0",
+        "monolog/monolog": "^1.25.2 || ^2.0.1",
         "psr/simple-cache": "^1.0.1",
-        "roave/doctrine-simplecache": "^1.1.0 || ^2.2.0",
+        "roave/doctrine-simplecache": "^1.1.0 || ^2.3.0",
         "symfony/console": "^3.4.36 || ^4.4.1 || ^5.0.1",
         "symfony/filesystem": "^3.4.36 || ^4.4.1 || ^5.0.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16.1",
+        "localheinz/composer-normalize": "^1.3.1",
         "mikey179/vfsstream": "^1.6.8",
-        "pepakriz/phpstan-exception-rules": "^0.9.0",
-        "phpstan/phpstan": "^0.11.19",
-        "phpstan/phpstan-beberlei-assert": "^0.11.2",
-        "phpstan/phpstan-deprecation-rules": "^0.11.2",
-        "phpstan/phpstan-phpunit": "^0.11.2",
-        "phpstan/phpstan-strict-rules": "^0.11.1",
-        "phpunit/phpunit": "^7.5.17 || ^8.4.0"
+        "pepakriz/phpstan-exception-rules": "^0.10.1",
+        "phpstan/phpstan": "^0.12.3",
+        "phpstan/phpstan-beberlei-assert": "^0.12.0",
+        "phpstan/phpstan-deprecation-rules": "^0.12.0",
+        "phpstan/phpstan-phpunit": "^0.12.1",
+        "phpstan/phpstan-strict-rules": "^0.12.0",
+        "phpunit/phpunit": "^7.5.18 || ^8.5.0"
     },
     "suggest": {
         "ext-curl": "to use curl requests to get the ini file"
     },
+    "config": {
+        "platform": {
+            "php": "7.1"
+        },
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "BrowscapPHP\\": "src/"
@@ -59,6 +67,8 @@
             "BrowscapPHPTest\\": "tests/"
         }
     },
+    "minimum-stability": "stable",
+    "prefer-stable": true,
     "bin": [
         "bin/browscap-php"
     ],

phpstan.neon

@@ -2,19 +2,22 @@ parameters:
   excludes_analyse:
     - */tests/*/data/*
     - */tests/*/Full2Test.php
-  includes:
-    - vendor/phpstan/phpstan-strict-rules/rules.neon
-    - vendor/phpstan/phpstan-phpunit/extension.neon
-    - vendor/phpstan/phpstan-phpunit/rules.neon
-    - vendor/pepakriz/phpstan-exception-rules/extension.neon
-    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
-    - vendor/phpstan/phpstan-beberlei-assert/extension.neon
-  parameters:
-    exceptionRules:
-      reportUnusedCatchesOfUncheckedExceptions: false
-      uncheckedExceptions: []
+  checkMissingIterableValueType: false
+#  exceptionRules:
+#    reportUnusedCatchesOfUncheckedExceptions: false
+#    uncheckedExceptions: []
   ignoreErrors:
     - '~MockObject~'
     - '~expects string, .*Exception given~'
     - '~expects string, Throwable given~'
     - '~Exception is not subtype of Throwable~'
+    - '~does not match assigned variable~'
+
+
+#includes:
+#  - vendor/phpstan/phpstan-strict-rules/rules.neon
+#  - vendor/phpstan/phpstan-phpunit/extension.neon
+#  - vendor/phpstan/phpstan-phpunit/rules.neon
+#  - vendor/pepakriz/phpstan-exception-rules/extension.neon
+#  - vendor/phpstan/phpstan-deprecation-rules/rules.neon
+#  - vendor/phpstan/phpstan-beberlei-assert/extension.neon

src/Data/PropertyFormatter.php

@@ -37,15 +37,14 @@ public function formatPropertyValue($value, string $property)
                 }
 
                 return false;
-                break;
             case PropertyHolder::TYPE_IN_ARRAY:
                 try {
                     return $this->propertyHolder->checkValueInArray($property, (string) $value);
                 } catch (\InvalidArgumentException $ex) {
-                    return '';
+                    // nothing to do here
                 }
 
-                break;
+                return '';
         }
 
         return $value;

tests/Helper/LoggerHelperTest.php

@@ -14,7 +14,7 @@ class LoggerHelperTest extends \PHPUnit\Framework\TestCase
 {
     public function testCreate() : void
     {
-        /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject $logger */
+        /** @var OutputInterface|\PHPUnit\Framework\MockObject\MockObject $logger */
         $output = $this->createMock(OutputInterface::class);
 
         self::assertInstanceOf(Logger::class, LoggerHelper::createDefaultLogger($output));