use Events from Symfony EventDispatcher component

gpslab · Jul 15, 2021 · 527ef5b · 527ef5b
1 parent dfda921
commit 527ef5b
Show file tree

Hide file tree

Showing 33 changed files with 733 additions and 1,595 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -12,58 +12,21 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php: '5.5'
-                      symfony: '2.8.*'
-                      doctrine: '2.4.*'
-                      phpunit: '4.8.*'
-                    - php: '5.6'
-                      symfony: '2.8.*'
-                      doctrine: '2.4.*'
-                      phpunit: '4.8.*'
-                    - php: '7.0'
-                      symfony: '2.8.*'
-                      doctrine: '2.4.*'
-                      phpunit: '4.8.*'
-                    - php: '7.1'
-                      symfony: '2.8.*'
-                      doctrine: '2.4.*'
-                      phpunit: '6.5.*'
-                    - php: '7.2'
-                      symfony: '2.8.*'
-                      doctrine: '2.4.*'
-                      phpunit: '6.5.*'
-                    - php: '7.3'
-                      symfony: '3.4.*'
-                      doctrine: '2.6.*'
-                      phpunit: '6.5.*'
-                    - php: '7.4'
-                      symfony: '3.4.*'
-                      doctrine: '2.6.*'
-                      phpunit: '6.5.*'
-                    - php: '5.5'
-                      symfony: '2.8.*'
-                      doctrine: '2.5.*'
-                      phpunit: '4.8.*'
                     - php: '7.4'
                       symfony: '4.4.*'
                       doctrine: '2.6.*'
-                      phpunit: '6.5.*'
                     - php: '7.4'
                       symfony: '5.*'
                       doctrine: '2.7.*'
-                      phpunit: '6.5.*'
                     - php: '7.4'
                       symfony: '4.4.*'
                       doctrine: '2.7.*'
-                      phpunit: '6.5.*'
                     - php: '7.4'
                       symfony: '4.4.*'
                       doctrine: '2.8.*'
-                      phpunit: '6.5.*'
-#                    # require PHPUnit >= 8.5.12
-#                    - php: '8.0'
-#                      symfony: '5.*'
-#                      doctrine: '2.*'
+                    - php: '8.0'
+                      symfony: '5.*'
+                      doctrine: '2.*'
 
         steps:
             - name: Checkout
@@ -82,9 +45,6 @@ jobs:
             - name: Install Doctrine
               run: composer require doctrine/orm:"${{ matrix.doctrine }}" --no-update
 
-            - name: Install PHPUnit
-              run: composer require phpunit/phpunit:"${{ matrix.phpunit }}" --no-update
-
             - name: "Install Composer dependencies (highest)"
               uses: "ramsey/composer-install@v1"
               with:
@@ -95,6 +55,7 @@ jobs:
               run: vendor/bin/phpunit --coverage-clover build/coverage-clover.xml
 
             - name: Send coverage results to Scrutinizer CI
+              if: ${{ matrix.php != '8.0' }}
               run: |
                 wget https://scrutinizer-ci.com/ocular.phar
                 php ocular.phar code-coverage:upload --format=php-clover build/coverage-clover.xml

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 $header = <<<EOF
 GpsLab component.
@@ -7,33 +8,27 @@ GpsLab component.
 @license http://opensource.org/licenses/MIT
 EOF;
 
+$rules = [
+    '@Symfony' => true,
+    'header_comment' => [
+        'comment_type' => 'PHPDoc',
+        'header' => $header,
+    ],
+    'single_line_throw' => false,
+    'blank_line_after_opening_tag' => false,
+    'yoda_style' => false,
+    'ordered_imports' => [
+        'sort_algorithm' => 'alpha',
+    ],
+];
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/tests')
+    ->notPath('bootstrap.php')
+;
+
 return PhpCsFixer\Config::create()
-    ->setRules([
-        '@Symfony' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'header_comment' => [
-            'comment_type' => 'PHPDoc',
-            'header' => $header,
-        ],
-        'class_definition' => [
-            'multi_line_extends_each_single_line' => true,
-        ],
-        'no_superfluous_phpdoc_tags' => false,
-        'single_line_throw' => false,
-        'blank_line_after_opening_tag' => false,
-        'yoda_style' => false,
-        'phpdoc_no_empty_return' => false,
-        'ordered_imports' => [
-            'sort_algorithm' => 'alpha',
-        ],
-        'list_syntax' => [
-            'syntax' => 'short',
-        ],
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/src')
-            ->in(__DIR__.'/tests')
-            ->notPath('bootstrap.php')
-    )
-    ;
+    ->setRules($rules)
+    ->setFinder($finder)
+;