Gitlab Worflow updates, composer requirements: support symfony v6 (#57)

* Support Symfony v6

* Diagnostics: little improvements

* Composer: switch to contributte/code-rules

* CI: improve scripts

Author: f3l1x

.github/workflows/main.yaml

@@ -51,7 +51,7 @@ jobs:
         with:
           php-version: "${{ matrix.php-version }}"
           extensions: "${{ env.extensions }}"
-          tools: "composer:${{ env.composer-version }} "
+          tools: "composer:${{ env.composer-version }}, cs2pr"
 
       - name: "Setup problem matchers for PHP"
         run: 'echo "::add-matcher::${{ runner.tool_cache }}/php.json"'
@@ -272,7 +272,7 @@ jobs:
         run: "${{ env.composer-install }}"
 
       - name: "Tests"
-        run: "make coverage-clover"
+        run: "make coverage"
 
       - name: "Coveralls.io"
         env:

Makefile

@@ -1,24 +1,29 @@
-.PHONY: install qa cs csf phpstan tests coverage-clover coverage-html
+.PHONY: install qa cs csf phpstan tests coverage
 
 install:
 	composer update
 
 qa: phpstan cs
 
 cs:
-	vendor/bin/phpcs --standard=vendor/gamee/php-code-checker-rules/ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
+ifdef GITHUB_ACTION
+	vendor/bin/phpcs --standard=ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp -q --report=checkstyle src | cs2pr
+else
+	vendor/bin/phpcs --standard=ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
+endif
 
 csf:
-	vendor/bin/phpcbf --standard=vendor/gamee/php-code-checker-rules/ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
+	vendor/bin/phpcbf --standard=vendor/contributte/code-rules/paveljanda/ruleset.xml --extensions=php,phpt --tab-width=4 --ignore=temp -sp src
 
 phpstan:
-	vendor/bin/phpstan analyse src -c vendor/gamee/php-code-checker-rules/phpstan.neon --level 7
+	vendor/bin/phpstan analyse -c vendor/contributte/code-rules/paveljanda/phpstan.neon --level 8 src
 
 tests:
 	vendor/bin/tester -s -p php --colors 1 -C tests/Cases
 
-coverage-clover:
-	vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage ./coverage.xml --coverage-src ./src ./tests/Cases
-
-coverage-html:
-	vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage ./coverage.html --coverage-src ./src ./tests/Cases
+coverage:
+ifdef GITHUB_ACTION
+	vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases
+else
+	vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.html --coverage-src src tests/Cases
+endif

composer.json

@@ -34,15 +34,15 @@
   "require": {
     "php": ">=7.4",
     "bunny/bunny": "^0.2.4 || ^0.3 || ^0.4 || ^0.5",
-    "symfony/console": "~3.3 || ^4.0 || ^5.0",
+    "symfony/console": "~3.3 || ^4.0 || ^5.0 || ^6.0",
     "nette/di": "^2.4.17 || ^3.0.7",
     "nette/utils": "^2.5.4 || ^3.2.0"
   },
   "require-dev": {
     "ninjify/nunjuck": "^0.4",
     "nette/neon": "^2.4.3 || ^3.2.1",
     "mockery/mockery": "^1.3.3",
-    "gamee/php-code-checker-rules": "^2.0|^3.0",
+    "contributte/code-rules": "^1.1.0",
     "tracy/tracy": "^2.5"
   },
   "suggest": {

ruleset.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset>
+	<!-- Contributte Coding Standard -->
+	<rule ref="./vendor/contributte/code-rules/paveljanda/ruleset.xml">
+		<exclude name="SlevomatCodingStandard.Classes.ForbiddenPublicProperty.ForbiddenPublicProperty"/>
+	</rule>
+
+	<!-- Specific rules -->
+	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+		<properties>
+			<property name="rootNamespaces" type="array">
+				<element key="src" value="Contributte\RabbitMQ"/>
+				<element key="tests/cases" value="Tests\Cases"/>
+				<element key="tests/fixtures" value="Tests\Fixtures"/>
+			</property>
+		</properties>
+	</rule>
+
+	<!-- Exclude folders -->
+	<exclude-pattern>/tests/tmp</exclude-pattern>
+</ruleset>

src/Diagnostics/BarPanel.php

@@ -62,6 +62,13 @@ public function getTab(): string
 	function getPanel(): string
 	{
 		ob_start(static function (): void {});
+
+		// @codingStandardsIgnoreStart
+		$sentMessages = $this->sentMessages;
+		$totalMessages = $this->totalMessages;
+		$displayCount = self::$displayCount;
+		// @codingStandardsIgnoreEnd
+
 		try {
 			require __DIR__ . '/BarPanel.phtml';
 

src/Diagnostics/BarPanel.phtml

@@ -1,12 +1,12 @@
-<h1>RabbitMq, total sent <?php echo $this->totalMessages; ?></h1>
+<h1>RabbitMq, total sent <?php echo $totalMessages; ?></h1>
 
-<?php if(self::$displayCount !== 0 && $this->totalMessages > self::$displayCount): ?>
-<p>Displayed only first <?php echo self::$displayCount ?> messages</p>
+<?php if($displayCount !== 0 && $totalMessages > $displayCount): ?>
+<p>Displayed only first <?php echo $displayCount ?> messages</p>
 <?php endif; ?>
 
 <div class="tracy-inner">
 	<table class="tracy-bs-main">
-		<?php foreach ($this->sentMessages as $producerName => $producerMessages): ?>
+		<?php foreach ($sentMessages as $producerName => $producerMessages): ?>
 			<tr><th>Producer: <?php echo $producerName ?></th></tr>
 		<?php foreach ($producerMessages as $producerMessage): ?>
 			<tr>