Merge pull request #2 from chimeraphp/upgrade-libs

Upgrade libs

Author: lcobucci

.gitignore

@@ -4,3 +4,4 @@
 /.phpcs.cache
 /composer.lock
 /infection-log.txt
+/.phpunit.result.cache

.travis.yml

@@ -1,9 +1,11 @@
-dist: trusty
+dist: xenial
 sudo: false
 language: php
 
 php:
   - 7.2
+  - 7.3
+  - 7.4snapshot
   - nightly
 
 cache:
@@ -21,9 +23,8 @@ script:
 
 jobs:
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
-    - env: STATIC_ANALYSIS=1
-    - env: MUTATION_TESTS=1
 
   include:
     - stage: Code Quality
@@ -53,4 +54,4 @@ jobs:
         - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
         - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for mutation tests"; exit 1; fi
       script:
-        - ./vendor/bin/infection --test-framework-options='--testsuite unit' --threads=4 --min-msi=100 --min-covered-msi=100
+        - ./vendor/bin/infection --test-framework-options='--testsuite=unit' --threads=$(nproc) --min-msi=75 --min-covered-msi=77

composer.json

@@ -14,18 +14,17 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "doctrine/annotations": "^1.6"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^4.0",
-        "infection/infection": "dev-master@dev",
-        "phpstan/phpdoc-parser": "^0.3@dev",
-        "phpstan/phpstan": "^0.10@dev",
-        "phpstan/phpstan-phpunit": "^0.10@dev",
-        "phpstan/phpstan-strict-rules": "^0.10@dev",
-        "phpunit/phpunit": "^7.1",
-        "squizlabs/php_codesniffer": "^3.2"
+        "infection/infection": "^0.12",
+        "lcobucci/coding-standard": "^2.0",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-deprecation-rules": "^0.11",
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpstan/phpstan-strict-rules": "^0.11",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

phpcs.xml.dist

@@ -13,25 +13,7 @@
     <file>src</file>
     <file>tests</file>
 
-    <rule ref="Doctrine">
-        <exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment" />
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
-        <properties>
-            <property name="newlinesCountBetweenOpenTagAndDeclare" value="1"/>
-            <property name="spacesCountAroundEqualsSign" value="0"/>
-            <property name="newlinesCountAfterDeclare" value="2"/>
-        </properties>
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing">
-        <properties>
-            <property name="spacesCountBeforeColon" value="0"/>
-        </properties>
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.Commenting.DisallowOneLinePropertyDocComment" />
+    <rule ref="Lcobucci" />
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>tests/Functional</exclude-pattern>

phpstan.neon.dist

@@ -2,9 +2,13 @@ includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
     - vendor/phpstan/phpstan-strict-rules/rules.neon
+    - vendor/phpstan/phpstan-deprecation-rules/rules.neon
 
 parameters:
     level: 7
     paths:
         - src
         - tests
+
+    ignoreErrors:
+        - '#Call to deprecated method registerUniqueLoader\(\) of class Doctrine\\Common\\Annotations\\AnnotationRegistry#'

src/Routing/Endpoint.php

@@ -6,7 +6,6 @@
 use Chimera\Mapping\Annotation;
 use Chimera\Mapping\Validator;
 use Doctrine\Common\Annotations\AnnotationException;
-use function get_class;
 
 abstract class Endpoint implements Annotation
 {
@@ -48,7 +47,7 @@ public function __construct(array $values)
      */
     public function validate(string $context): void
     {
-        $validator = new Validator(get_class($this), $context);
+        $validator = new Validator(static::class, $context);
         $validator->requiredScalar('path', 'string', $this->path);
         $validator->requiredScalar('name', 'string', $this->name);
         $validator->nonRequiredScalar('app', 'string', $this->app);

src/Routing/Middleware.php

@@ -43,7 +43,7 @@ public function __construct(array $values)
      */
     public function validate(string $context): void
     {
-        $validator = new Validator(__CLASS__, $context);
+        $validator = new Validator(self::class, $context);
         $validator->requiredScalar('path', 'string', $this->path);
         $validator->nonRequiredScalar('app', 'string', $this->app);
         $validator->nonRequiredScalar('priority', 'integer', $this->priority);

src/ServiceBus/CommandHandler.php

@@ -14,7 +14,6 @@
 final class CommandHandler implements AnnotationInterface
 {
     /**
-     *
      * @var string
      */
     public $handles;
@@ -32,7 +31,7 @@ public function __construct(array $values)
      */
     public function validate(string $context): void
     {
-        $validator = new Validator(__CLASS__, $context);
+        $validator = new Validator(self::class, $context);
         $validator->requiredScalar('handles', 'string', $this->handles);
     }
 }

src/ServiceBus/Middleware.php

@@ -37,7 +37,7 @@ public function __construct(array $values)
      */
     public function validate(string $context): void
     {
-        $validator = new Validator(__CLASS__, $context);
+        $validator = new Validator(self::class, $context);
         $validator->nonRequiredScalar('bus', 'string', $this->bus);
         $validator->requiredScalar('priority', 'integer', $this->priority);
     }

src/ServiceBus/QueryHandler.php

@@ -15,7 +15,6 @@ final class QueryHandler implements AnnotationInterface
 {
     /**
      * @Required
-     *
      * @var string
      */
     public $handles;
@@ -33,7 +32,7 @@ public function __construct(array $values)
      */
     public function validate(string $context): void
     {
-        $validator = new Validator(__CLASS__, $context);
+        $validator = new Validator(self::class, $context);
         $validator->requiredScalar('handles', 'string', $this->handles);
     }
 }