(upgrade): PHP 8.0

Author: markharding

.gitignore

@@ -2,6 +2,7 @@
 /settings.php
 /multi.settings.php
 !.gitlab-ci.yml
+!.php-cs-fixer.php
 bin
 
 /.htaccess

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: minds/php:7.3
+image: minds/php:8.0
 
 stages:
   - build
@@ -23,16 +23,24 @@ build:
 
 test:
   stage: test
-  image: minds/php:7.3
+  image: minds/php:8.0
   script:
     - php -n -c Spec/php-test.ini bin/phpspec run
 
 lint:
   stage: test
-  image: minds/php:7.3
+  image: minds/php:8.0
   script:
     - bin/php-cs-fixer fix --allow-risky=yes --verbose --dry-run
 
+static-analysis:
+  stage: test
+  image: minds/php:8.0
+  script:
+    - mv settings.example.php settings.php
+    - bin/phpstan analyse --memory-limit=1G
+  allow_failure: true
+
 prepare:fpm:
   stage: prepare
   image: minds/ci:latest
@@ -184,7 +192,7 @@ staging:fpm:
   only:
     refs:
       - master
-      - feat/1732-block-refactor
+      - feat/php8
       - production
       - test/gitlab-ci
 

.php_cs renamed to .php-cs-fixer.php

@@ -4,7 +4,7 @@
     ->exclude(['vendor','lib','classes'])
     ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'strict_param' => true,

Api/Exportable.php

@@ -168,6 +168,6 @@ public function jsonSerialize()
      */
     public static function _($items = [])
     {
-        return new static($items);
+        return new self($items);
     }
 }

Api/Factory.php

@@ -223,7 +223,9 @@ public static function exportable($entities, $exceptions = [], $exportContext =
             }
 
             $entities[$k] = $entity->export();
-            $entities[$k]['guid'] = (string) $entities[$k]['guid']; //javascript doesn't like long numbers..
+            if (isset($entities[$k]['guid'])) {
+                $entities[$k]['guid'] = (string) $entities[$k]['guid']; //javascript doesn't like long numbers..
+            }
             if (isset($entities[$k]['ownerObj']['guid'])) {
                 $entities[$k]['ownerObj']['guid'] = (string) $entity->ownerObj['guid'];
             }

Common/Jwt.php

@@ -8,24 +8,30 @@
 
 use DateTimeImmutable;
 use Exception;
-use Lcobucci\JWT\Builder;
+use Lcobucci\JWT\Configuration;
 use Lcobucci\JWT\Claim;
-use Lcobucci\JWT\Parser;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Lcobucci\JWT\Signer\Key\InMemory;
+use Lcobucci\JWT\Validation\Constraint\SignedWith;
 
 class Jwt
 {
     /** @var string */
     protected $key;
 
+    /** @var Configuration */
+    protected $jwtConfig;
+
     /**
      * @param string $key
      * @return Jwt
      */
     public function setKey(string $key): Jwt
     {
         $this->key = $key;
+
+        $this->jwtConfig = Configuration::forSymmetricSigner(new Sha256(), InMemory::plainText($key));
+
         return $this;
     }
 
@@ -42,21 +48,21 @@ public function encode($payload, $exp = null, $nbf = null): string
             throw new Exception('Invalid JWT key');
         }
 
-        $builder = new Builder();
+        $builder = $this->jwtConfig->builder();
 
         foreach ($payload as $key => $value) {
-            $builder->set($key, $value);
+            $builder->withClaim($key, $value);
         }
 
         if ($exp !== null) {
-            $builder->setExpiration((new DateTimeImmutable())->setTimestamp($exp));
+            $builder->expiresAt((new DateTimeImmutable())->setTimestamp($exp));
         }
 
         if ($nbf !== null) {
-            $builder->setNotBefore((new DateTimeImmutable())->setTimestamp($nbf));
+            $builder->canOnlyBeUsedAfter((new DateTimeImmutable())->setTimestamp($nbf));
         }
 
-        return (string) $builder->getToken(new Sha256(), new InMemory($this->key));
+        return (string) $builder->getToken($this->jwtConfig->signer(), $this->jwtConfig->signingKey())->toString();
     }
 
     /**
@@ -70,15 +76,13 @@ public function decode($jwt): array
             throw new Exception('Invalid JWT key');
         }
 
-        $token = (new Parser())->parse($jwt);
+        $token = $this->jwtConfig->parser()->parse($jwt);
 
-        if (!$token->verify(new Sha256(), new InMemory($this->key))) {
+        if (!$this->jwtConfig->validator()->validate($token, new SignedWith($this->jwtConfig->signer(), $this->jwtConfig->signingKey()))) {
             throw new Exception('Invalid JWT');
         }
 
-        return array_map(function (Claim $claim) {
-            return $claim->getValue();
-        }, $token->getClaims());
+        return $token->claims()->all();
     }
 
     /**

Common/Regex.php

@@ -17,7 +17,7 @@ class Regex
     const CASH_TAG = '/([^&]|\b|^)\$([A-Za-z]+)/uim';
 
     // #tags | $tags
-    const HASH_CASH_TAG = '/([^&]|\b|^)#([\wÀ-ÿ\u0E00-\u0E7F\u2460-\u9FBB]+)|([^&]|\b|^)\$([A-Za-z]+)/uim';
+    const HASH_CASH_TAG = '/([^&]|\b|^)#([\wÀ-ÿ\x0E00\x0E7F\x2460-\x9FBB]+)|([^&]|\b|^)\$([A-Za-z]+)/uim';
 
     /**
      * Wrapper around preg_match_all for testing.

Common/Repository/Response.php

@@ -296,7 +296,7 @@ public function jsonSerialize()
      */
     public function reverse($preserveKeys = false)
     {
-        return new static(array_reverse($this->data, $preserveKeys), $this->pagingToken);
+        return new self(array_reverse($this->data, $preserveKeys), $this->pagingToken);
     }
 
     /**
@@ -315,7 +315,7 @@ public function filter($callback, $preserveKeys = false)
             $filtered = array_values($filtered);
         }
 
-        return new static($filtered, $this->pagingToken);
+        return new self($filtered, $this->pagingToken);
     }
 
     /**
@@ -325,7 +325,7 @@ public function filter($callback, $preserveKeys = false)
      */
     public function map($callback)
     {
-        return new static(array_map($callback, $this->data), $this->pagingToken);
+        return new self(array_map($callback, $this->data), $this->pagingToken);
     }
 
     /**
@@ -348,7 +348,7 @@ public function sort(callable $callback): Response
         $data = $this->data;
         usort($data, $callback);
 
-        return new static($data, $this->pagingToken);
+        return new self($data, $this->pagingToken);
     }
 
     /**

Common/Urn.php

@@ -18,6 +18,9 @@ class Urn implements \JsonSerializable
     /** @var string */
     protected $nss;
 
+    /** @var string[] */
+    protected $components = [];
+
     /**
      * Urn constructor.
      * @param string $urn
@@ -133,6 +136,6 @@ public function jsonSerialize()
      */
     public static function _($urn)
     {
-        return new static($urn);
+        return new self($urn);
     }
 }

Controllers/Cli/Contributions.php

@@ -169,9 +169,7 @@ public function test()
         $totals_by_time = [];
         foreach ($results as $result) {
             $totals += $result->getAmount();
-            $totals_by_type[$result->getMetric()] += $result->getAmount();
         }
         var_dump($totals);
-        var_dump($totals_by_type);
     }
 }

Controllers/Cli/CustomerSync.php

@@ -26,6 +26,8 @@
 use Minds\Core\Suggestions\Manager;
 use Minds\Core\Analytics\Timestamps;
 use Minds\Core\Di\Di;
+use Minds\Core\Email\Campaigns\WirePromotions as CampaignsWirePromotions;
+use Minds\Exceptions\CliException;
 
 class Email extends Cli\Controller implements Interfaces\CliControllerInterface
 {
@@ -261,7 +263,7 @@ public function testWirePromotion()
             exit;
         }
 
-        $campaign = (new WirePromotion())
+        $campaign = (new CampaignsWirePromotions())
             ->setUser($user);
 
         $message = $campaign->build();
@@ -347,6 +349,7 @@ public function testWire()
             $campaign = (new WireReceived());
         } else {
             $this->out('--variant must be sent or received');
+            return;
         }
 
         $campaign

Controllers/Cli/Email.php

@@ -72,7 +72,7 @@ public function exec()
                     $provisioner->reloadStorage();
                     $this->out('OK');
                 }
-            } catch (Exception $ex) {
+            } catch (\Exception $ex) {
                 $this->out('Something BAD happened while provisioning Cassandra' . $ex->getMessage());
             }
 

Controllers/Cli/Install.php

@@ -62,7 +62,7 @@ public function syncUser()
             $this->manager->syncAccount($user);
 
             $this->blockListSync->sync($user);
-        } catch (\Excepton $e) {
+        } catch (\Exception $e) {
         }
 
         $this->out("{$user->getGuid()}");