From 4148d58c4206cf5c93b648f0af95fa3502f05716 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Thu, 30 Nov 2023 17:58:48 +0100
Subject: [PATCH] Further improve tests

---
 .woodpecker/.test.yml                    |  1 +
 composer.json                            | 12 +++--
 phpunit-light.xml                        | 25 +++++++++++
 psalm-baseline.xml                       | 56 ++----------------------
 tests/danog/MadelineProto/FileIdTest.php | 10 ++---
 5 files changed, 42 insertions(+), 62 deletions(-)
 create mode 100644 phpunit-light.xml

diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml
index fd8c9d075..0d5265b41 100644
--- a/.woodpecker/.test.yml
+++ b/.woodpecker/.test.yml
@@ -57,3 +57,4 @@ steps:
       - apk add bash
       - tests/test.sh
       - php tests/handshake.php
+      - composer test-light
diff --git a/composer.json b/composer.json
index 3095b589a..5ceddd5d0 100644
--- a/composer.json
+++ b/composer.json
@@ -115,15 +115,19 @@
             "@psalm"
         ],
         "test": [
-            "paratest",
-            "phpunit"
+            "@paratest",
+            "@phpunit"
+        ],
+        "test-light": [
+            "@paratest-light"
         ],
         "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php -d pcre.jit=0 vendor/bin/php-cs-fixer fix -v",
         "psalm": "psalm --no-cache --threads=10",
         "docs": "php tools/build_docs.php",
         "docs-fix": "tools/fix_docs.sh",
-        "phpunit": "@php -dzend.assertions=1 ./vendor/bin/phpunit --coverage-text -c phpunit-noparallel.xml",
-        "paratest": "@php -dzend.assertions=1 ./vendor/bin/paratest --coverage-text",
+        "phpunit": "@php -dzend.assertions=1 ./vendor/bin/phpunit -c phpunit-noparallel.xml",
+        "paratest": "@php -dzend.assertions=1 ./vendor/bin/paratest",
+        "paratest-light": "@php -dzend.assertions=1 ./vendor/bin/paratest -c phpunit-light.xml",
         "bin": "echo 'bin not installed'",
         "post-install-cmd": ["@composer bin all install --ansi"],
         "post-update-cmd": ["@composer bin all update --ansi"]
diff --git a/phpunit-light.xml b/phpunit-light.xml
new file mode 100644
index 000000000..3a8dbdad0
--- /dev/null
+++ b/phpunit-light.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  backupGlobals="false"
+  backupStaticAttributes="false"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  convertErrorsToExceptions="true"
+  convertNoticesToExceptions="true"
+  convertWarningsToExceptions="true"
+  processIsolation="false"
+>
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Main">
+      <directory>tests</directory>
+      <exclude>tests/danog/MadelineProto/DataCenterTest.php</exclude>
+      <exclude>tests/danog/MadelineProto/FileIdTest.php</exclude>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 6301c045b..28d48807b 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="dev-master@baa6d5dd7801e24d99d2f57995b58b79e8ad304a">
+<files psalm-version="dev-master@efdf425983038f7ef6194df43f3dc18cde13d770">
   <file src="src/API.php">
     <ArgumentTypeCoercion>
       <code>$settings</code>
@@ -1067,6 +1067,7 @@
       <code><![CDATA[$this->colors]]></code>
       <code><![CDATA[$this->colors]]></code>
       <code><![CDATA[$this->colors]]></code>
+      <code><![CDATA[$this->colors]]></code>
     </UninitializedProperty>
   </file>
   <file src="src/Loop/Connection/CheckLoop.php">
@@ -1838,58 +1839,6 @@
       <code>$wrapper</code>
     </PropertyNotSetInConstructor>
   </file>
-  <file src="src/Ogg.php">
-    <InaccessibleProperty>
-      <code><![CDATA[$this->comments]]></code>
-      <code><![CDATA[$this->vendorString]]></code>
-    </InaccessibleProperty>
-    <PossiblyInvalidArgument>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$size</code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidPropertyAssignmentValue>
-      <code><![CDATA[$this->currentDuration += $frameDuration]]></code>
-      <code><![CDATA[$this->currentDuration += $totalDuration]]></code>
-    </PossiblyInvalidPropertyAssignmentValue>
-    <PossiblyNullArgument>
-      <code><![CDATA[($this->stream)($headers['number_page_segments'])]]></code>
-      <code><![CDATA[($this->stream)(23)]]></code>
-    </PossiblyNullArgument>
-    <PossiblyUndefinedVariable>
-      <code>$cancel</code>
-    </PossiblyUndefinedVariable>
-    <PropertyNotSetInConstructor>
-      <code>$comments</code>
-      <code>$streamCount</code>
-      <code>$vendorString</code>
-    </PropertyNotSetInConstructor>
-    <RedundantCondition>
-      <code>$state === self::STATE_READ_COMMENT</code>
-    </RedundantCondition>
-    <ReferenceConstraintViolation>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-      <code>$offset</code>
-    </ReferenceConstraintViolation>
-    <TooFewArguments>
-      <code><![CDATA[($this->stream)($headers['number_page_segments'])]]></code>
-      <code><![CDATA[($this->stream)($sizeAccumulated)]]></code>
-      <code><![CDATA[($this->stream)(23)]]></code>
-      <code><![CDATA[($this->stream)(4)]]></code>
-    </TooFewArguments>
-    <UndefinedClass>
-      <code>?FFI</code>
-      <code>FFI</code>
-      <code>FFI</code>
-      <code>int|CData $err</code>
-    </UndefinedClass>
-  </file>
   <file src="src/PTSException.php">
     <MissingParamType>
       <code>$file</code>
@@ -2375,6 +2324,7 @@
   <file src="src/Tools.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[static fn (ClassLike $c): bool => $c->name !== null]]></code>
+      <code><![CDATA[static fn (ClassLike $c): bool => $c->name !== null]]></code>
     </ArgumentTypeCoercion>
     <MissingClosureParamType>
       <code>$val</code>
diff --git a/tests/danog/MadelineProto/FileIdTest.php b/tests/danog/MadelineProto/FileIdTest.php
index f614fbe0b..c85e845dc 100644
--- a/tests/danog/MadelineProto/FileIdTest.php
+++ b/tests/danog/MadelineProto/FileIdTest.php
@@ -196,11 +196,11 @@ class FileIdTest extends MadelineTestCase
     public function provideUrls(): array
     {
         $res = [
-            'sticker' => 'https://github.com/danog/MadelineProto/blob/master/tests/lel.webp?raw=true',
-            'photo' => 'https://github.com/danog/MadelineProto/blob/master/tests/faust.jpg',
-            'audio' => 'https://github.com/danog/MadelineProto/blob/master/tests/mosconi.mp3?raw=true',
-            'video' => 'https://github.com/danog/MadelineProto/blob/master/tests/swing.mp4?raw=true',
-            'animation' => 'https://github.com/danog/MadelineProto/blob/master/tests/pony.mp4?raw=true',
+            'sticker' => 'https://github.com/danog/MadelineProto/raw/v8/tests/lel.webp?raw=true',
+            'photo' => 'https://github.com/danog/MadelineProto/raw/v8/tests/faust.jpg',
+            'audio' => 'https://github.com/danog/MadelineProto/raw/v8/tests/mosconi.mp3?raw=true',
+            'video' => 'https://github.com/danog/MadelineProto/raw/v8/tests/swing.mp4?raw=true',
+            'animation' => 'https://github.com/danog/MadelineProto/raw/v8/tests/pony.mp4?raw=true',
             'document' => 'https://github.com/danog/danog.github.io/raw/master/lol/index_htm_files/0.gif',
             'voice' => 'https://daniil.it/audio_2020-02-01_18-09-08.ogg',
         ];