Merge branch 'php-translation:master' into symfony-placeholder-as-array

Author: cristoforocervino

.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        strategy: [ 'highest' ]
+        sf_version: ['']
+        include:
+          - php: 7.4
+            strategy: 'lowest'
+          - php: 7.3
+            sf_version: '4.*'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          tools: flex
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.sf_version }}
+        with:
+          dependency-versions: ${{ matrix.strategy }}
+          composer-options: --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: Install PHPUnit
+        run: ./vendor/bin/simple-phpunit install
+
+      - name: Run tests
+        run: ./vendor/bin/simple-phpunit

.github/workflows/static.yml

@@ -11,7 +11,7 @@ jobs:
       - name: PHP-CS-Fixer
         uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-            args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
+            args: php-cs-fixer fix --diff --dry-run -vvv
 
   phpstan:
     name: PHPStan

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.result.cache
 /behat.yml
 /build/
 /composer.lock

.php-cs-fixer.php

@@ -0,0 +1,19 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+  ->in(__DIR__.'/src')
+  ->in(__DIR__.'/tests')
+  ->exclude('Resources')
+  ->name('*.php')
+;
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+    ])
+    ->setFinder($finder)
+;
+
+return $config;

.php_cs

@@ -4,6 +4,22 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+## 2.0.4
+
+### Added
+* Add GitHub Actions CI config by @bocharsky-bw in https://github.com/php-translation/extractor/pull/164
+* Add return type to fix deprecation by @gimler in https://github.com/php-translation/extractor/pull/161
+
+### Removed
+* Remove phpcs-fixer --diff-fomat option by @gimler in https://github.com/php-translation/extractor/pull/163
+* Delete Travis config - repo migrated to GitHub Actions by @bocharsky-bw in https://github.com/php-translation/extractor/pull/162
+
+## 2.0.3
+
+### Added
+
+- Add support for PHP 8 #157
+
 ## 2.0.2
 
 ### Fixed

.travis.yml

@@ -9,18 +9,17 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "nikic/php-parser": "^3.0 || ^4.0",
-        "symfony/finder": "^3.4 || ^4.3 || ^5.0",
+        "symfony/finder": "^3.4 || ^4.4 || ^5.0",
         "twig/twig": "^2.0 || ^3.0",
-        "doctrine/annotations": "^1.2"
+        "doctrine/annotations": "^1.7"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^5.0",
-        "symfony/translation": "^3.4 || ^4.3 || ^5.0",
-        "symfony/validator": "^3.4 || ^4.3 || ^5.0",
-        "symfony/twig-bridge": "^3.4 || ^4.3 || ^5.0",
-        "phpunit/phpunit": "^8.4",
+        "symfony/translation": "^3.4 || ^4.4 || ^5.0",
+        "symfony/validator": "^3.4 || ^4.4 || ^5.0",
+        "symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0",
         "knplabs/knp-menu": "^3.1"
     },
     "autoload": {

Changelog.md

@@ -11,6 +11,11 @@
          bootstrap="./tests/bootstrap.php"
     >
 
+    <php>
+        <env name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="verbose=1" />
+    </php>
+
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>

composer.json

@@ -59,7 +59,7 @@ public function leaveNode(Node $node, Environment $env): ?Node
     /**
      * {@inheritdoc}
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 0;
     }