Merge branch '3.0.x'

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: Code validation
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php-versions: ['7.4']
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: PHP validator
+        run: find . -type f -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
+
+      - name: PHPCSFixer
+        uses: docker://oskarstark/php-cs-fixer-ga:3.1.0
+        with:
+          args: --config=.php-cs-fixer.dist.php --diff --dry-run

.php-cs-fixer.dist.php

@@ -0,0 +1,23 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+$config =  new PhpCsFixer\Config();
+return $config->setRules([
+    '@Symfony' => true,
+    '@PhpCsFixer' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'is_null' => true,
+    'list_syntax' => ['syntax' => 'short'],
+    'modernize_types_casting' => true,
+    'ternary_to_null_coalescing' => true,
+    'combine_nested_dirname' => true,
+    'phpdoc_types_order' => [
+        'null_adjustment' => 'always_last',
+        'sort_algorithm' => 'none',
+    ],
+])
+->setFinder($finder)
+->setRiskyAllowed(true)
+;

Controller/StatsController.php

@@ -9,13 +9,21 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @Route("/admin/stats")
  * @Security("is_granted('ROLE_ACCESS_STATS')")
  */
 class StatsController extends AbstractController
 {
+    private $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     /**
      * @Route("/series", name="pumukit_stats_series_index")
      * @Route("/objects", name="pumukit_stats_mmobj_index")
@@ -25,7 +33,6 @@ class StatsController extends AbstractController
     public function indexAction(Request $request): Response
     {
         $routeName = $request->get('_route');
-        $translator = $this->get('translator');
 
         if ('pumukit_stats_series_index' === $routeName) {
             $title = 'General Statistics for Series';
@@ -38,7 +45,7 @@ public function indexAction(Request $request): Response
         }
 
         return $this->render('@PumukitStatsUI/Stats/index.html.twig', [
-            'template_title' => $translator->trans($title),
+            'template_title' => $this->translator->trans($title),
         ]);
     }
 }

composer.json

@@ -19,7 +19,7 @@
     "authors": [
         {
             "name": "Teltek Team",
-            "homepage": "http://teltek.es"
+            "homepage": "https://teltek.es"
         }
     ],
     "autoload": {