Merge pull request #1103 from doctrine/3.0.x-merge-up-into-3.1.x_5fe3…

…60b1ac7f13.67774406

Merge release 3.0.2 into 3.1.x

.github/workflows/continuous-integration.yml

@@ -32,6 +32,7 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
         deps:
           - "normal"
         include:

composer.json

@@ -24,11 +24,11 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "composer/package-versions-deprecated": "^1.8",
         "doctrine/dbal": "^2.10",
         "doctrine/event-manager": "^1.0",
-        "ocramius/proxy-manager": "^2.0.2",
+        "friendsofphp/proxy-manager-lts": "^1.0",
         "psr/log": "^1.1.3",
         "symfony/console": "^3.4 || ^4.4.16 || ^5.0",
         "symfony/stopwatch": "^3.4 || ^4.0 || ^5.0"

download-box.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 if [ ! -f box.phar ]; then
-    wget https://github.com/box-project/box/releases/download/3.9.1/box.phar -O box.phar
+    wget https://github.com/box-project/box/releases/download/$(php -r 'echo PHP_VERSION_ID >= 70300 ? "3.11.0" : "3.9.1";')/box.phar -O box.phar
 fi

lib/Doctrine/Migrations/SchemaDumper.php

@@ -158,7 +158,7 @@ private static function pregMatch(string $pattern, string $subject, ?array &$mat
     {
         try {
             $errorMessages = [];
-            set_error_handler(static function (int $severity, string $message, string $file, int $line, array $params) use (&$errorMessages): bool {
+            set_error_handler(static function (int $severity, string $message, string $file, int $line) use (&$errorMessages): bool {
                 $errorMessages[] = $message;
 
                 return true;

phpstan.neon.dist

@@ -9,8 +9,6 @@ parameters:
     excludes_analyse:
         - %currentWorkingDirectory%/tests/Doctrine/Migrations/Tests/Configuration/ConfigurationTestSource/Migrations/Version123.php
     ignoreErrors:
-        # Ignore proxy manager magic
-        - '~ProxyManager\\Proxy\\VirtualProxyInterface~'
         - '~Variable method call on Doctrine\\Migrations\\AbstractMigration~'
         -
             message: '~^Call to function in_array\(\) requires parameter #3 to be true\.$~'
@@ -30,7 +28,6 @@ parameters:
         - '~Unable to resolve the template type T in call to method static method Doctrine\\DBAL\\DriverManager\:\:getConnection\(\)~'
         - '~Call to method getVersion\(\) of deprecated class PackageVersions\\Versions\:.*~'
 
-
     symfony:
             console_application_loader: %currentWorkingDirectory%/tests/Doctrine/Migrations/Tests/doctrine-migrations-phpstan-app.php
 includes: