Fixed tests (#171)

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: [ 'master' ]
     paths-ignore:
       - 'docs/**'
       - 'README.md'

.github/workflows/composer-require-checker.yml

@@ -11,6 +11,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: [ 'master' ]
     paths-ignore:
       - 'docs/**'
       - 'README.md'

.github/workflows/mutation.yml

@@ -9,6 +9,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: [ 'master' ]
     paths-ignore:
       - 'docs/**'
       - 'README.md'

.github/workflows/static.yml

@@ -10,6 +10,7 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches: [ 'master' ]
     paths-ignore:
       - 'docs/**'
       - 'README.md'

Makefile

@@ -1,32 +1,31 @@
 export COMPOSE_PROJECT_NAME=yii-queue
 
-build:
-	docker-compose -f tests/docker-compose.yml up -d --build
+help:			## Display help information
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
 
-down:
-	docker-compose -f tests/docker-compose.yml down
+build:			## Build an image from a docker-compose file. Params: {{ v=8.1 }}. Default latest PHP 8.1
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml up -d --build
 
-test:
-	docker-compose -f tests/docker-compose.yml build --pull php$(v)
-	docker-compose -f tests/docker-compose.yml run php$(v) vendor/bin/phpunit --colors=always -v --debug
-	make down
+down:			## Stop and remove containers, networks
+	docker-compose -f tests/docker/docker-compose.yml down
+
+sh:			## Enter the container with the application
+	docker exec -it yii-queue-php sh
 
-mutation-test:
-	docker-compose -f tests/docker-compose.yml build --pull php$(v)
-	docker-compose -f tests/docker-compose.yml run php$(v) php -dpcov.enabled=1 -dpcov.directory=. vendor/bin/roave-infection-static-analysis-plugin -j2 --ignore-msi-with-no-mutations --only-covered
+test:			## Run tests. Params: {{ v=8.1 }}. Default latest PHP 8.1
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml build --pull yii-queue-php
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml run yii-queue-php vendor/bin/phpunit --debug
 	make down
 
-coverage:
-	docker-compose -f tests/docker-compose.yml run php$(v) vendor/bin/phpunit --coverage-clover coverage.xml
+mutation-test:		## Run mutation tests. Params: {{ v=8.1 }}. Default latest PHP 8.1
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml build --pull yii-queue-php
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml run yii-queue-php php -dpcov.enabled=1 -dpcov.directory=. vendor/bin/roave-infection-static-analysis-plugin -j2 --ignore-msi-with-no-mutations --only-covered
 	make down
 
-static-analyze:
-	docker-compose -f tests/docker-compose.yml run php$(v) vendor/bin/psalm --config=psalm.xml --shepherd --stats --php-version=$(v)
+coverage:		## Run code coverage. Params: {{ v=8.1 }}. Default latest PHP 8.1
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml run yii-queue-php vendor/bin/phpunit --coverage-clover coverage.xml
 	make down
 
-clean:
-	docker-compose down
-	sudo rm -rf tests/runtime/*
-	sudo rm -rf composer.lock
-	sudo rm -rf vendor/
-	sudo rm -rf tests/runtime/.composer*
+static-analyze:		## Run code static analyze. Params: {{ v=8.1 }}. Default latest PHP 8.1
+	PHP_VERSION=$(filter-out $@,$(v)) docker-compose -f tests/docker/docker-compose.yml run yii-queue-php vendor/bin/psalm --config=psalm.xml --shepherd --stats --php-version=$(v)
+	make down

composer.json

@@ -73,7 +73,8 @@
         "sort-packages": true,
         "allow-plugins": {
             "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "yiisoft/config": true
         }
     },
     "scripts": {

phpunit.xml.dist

@@ -8,6 +8,8 @@
     convertWarningsToExceptions="true"
     stopOnFailure="false"
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    executionOrder="random"
+    verbose="true"
 >
     <coverage>
         <include>

tests/Unit/Debug/QueueCollectorTest.php

@@ -5,6 +5,7 @@
 namespace Yiisoft\Yii\Queue\Tests\Unit\Debug;
 
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
+use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 use Yiisoft\Yii\Debug\Tests\Shared\AbstractCollectorTestCase;
 use Yiisoft\Yii\Queue\Debug\QueueCollector;
 use Yiisoft\Yii\Queue\Enum\JobStatus;
@@ -91,9 +92,9 @@ protected function checkCollectedData(array $data): void
         );
     }
 
-    protected function checkIndexData(array $data): void
+    protected function checkSummaryData(array $data): void
     {
-        parent::checkIndexData($data);
+        parent::checkSummaryData($data);
         [
             'countPushes' => $countPushes,
             'countStatuses' => $countStatuses,
@@ -104,4 +105,19 @@ protected function checkIndexData(array $data): void
         $this->assertEquals(1, $countStatuses);
         $this->assertEquals(3, $countProcessingMessages);
     }
+
+    public function testEmptyCollector(): void
+    {
+        $collector = $this->getCollector();
+
+        foreach ($collector->getCollected() as $collected) {
+            $this->assertEquals([], $collected);
+        }
+
+        if ($collector instanceof SummaryCollectorInterface) {
+            foreach ($collector->getSummary()['queue'] as $count) {
+                $this->assertEquals(0, $count);
+            }
+        }
+    }
 }

tests/docker/docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3.8'
+
+services:
+  yii-queue-php:
+    container_name: yii-queue-php
+    build:
+      context: ../..
+      dockerfile: tests/docker/php/Dockerfile
+      args:
+        PHP_VERSION: ${PHP_VERSION:-8.1}
+    volumes:
+      - ../runtime:/app/tests/runtime
+      - ../..:/app

tests/docker/php/Dockerfile

@@ -1,5 +1,7 @@
+# Important! Do not use this image in production!
+
 ARG PHP_VERSION
-FROM php:${PHP_VERSION}-fpm-alpine
+FROM --platform=linux/amd64 php:${PHP_VERSION}-cli-alpine
 
 RUN apk add git autoconf g++ make linux-headers