update phpstan & psalm & support PHP 8

Author: marc-mabe

.travis.yml

@@ -19,16 +19,23 @@ matrix:
     - php: 7.1
       env:
         - CODE_COVERAGE="1"
+        - BENCHMARK="0"
     - php: 7.2
       env:
         - CODE_COVERAGE="1"
+        - BENCHMARK="0"
     - php: 7.3
       env:
         - CODE_COVERAGE="1"
+        - BENCHMARK="1"
     - php: 7.4
       env:
         - CODE_COVERAGE="1"
+        - BENCHMARK="1"
     - php: nightly
+      env:
+        - CODE_COVERAGE="0"
+        - BENCHMARK="0"
   allow_failures:
     - php: nightly
 
@@ -39,6 +46,9 @@ install:
   - if [ "${CODE_COVERAGE}" == "1" ]; then
       wget -q -N -t 3 --retry-connrefused 'https://scrutinizer-ci.com/ocular.phar' || return 0;
     fi
+  - if [ "${BENCHMARK}" == "0" ]; then
+      composer remove --dev phpbench/phpbench --no-update;
+    fi
   - composer install -n
 
 script:
@@ -55,7 +65,9 @@ script:
   - php vendor/bin/psalm
 
   # run benchmarks to make sure they are working fine
-  - php vendor/bin/phpbench run --no-interaction --revs=1 --retry-threshold=100
+  - if [ "${BENCHMARK}" == "1" ]; then
+      php vendor/bin/phpbench run --no-interaction --revs=1 --retry-threshold=100;
+    fi
 
 after_script:
   - if [ "${CODE_COVERAGE}" == "1" ]; then

composer.json

@@ -22,9 +22,9 @@
     },
     "require-dev": {
         "phpbench/phpbench": "^0.16.10",
-        "phpstan/phpstan": "^0.12.19",
+        "phpstan/phpstan": "^0.12.42",
         "phpunit/phpunit": "^7.5.20",
-        "vimeo/psalm": "^3.11.2"
+        "vimeo/psalm": "^3.15.0"
     },
     "autoload": {
         "psr-4": {

src/EnumSet.php

@@ -476,9 +476,8 @@ private function doSetBitInt($ordinal): void
     {
         /** @var int $thisBitset */
         $thisBitset = $this->bitset;
-        $thisBitset = $thisBitset | (1 << $ordinal);
 
-        $this->bitset = $thisBitset;
+        $this->bitset = $thisBitset | (1 << $ordinal);
     }
 
     /**
@@ -514,7 +513,10 @@ private function doUnsetBitBin($ordinal): void
      */
     private function doUnsetBitInt($ordinal): void
     {
-        $this->bitset = $this->bitset & ~(1 << $ordinal);
+        /** @var int $thisBitset */
+        $thisBitset = $this->bitset;
+
+        $this->bitset = $thisBitset & ~(1 << $ordinal);
     }
 
     /* write access (immutable) */