Merge branch 'master' of github.com:php-translation/extractor into label-concat

Author: bocharsky-bw

.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

@@ -0,0 +1,24 @@
+on: [push, pull_request]
+
+name: Static analysis
+
+jobs:
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: PHP-CS-Fixer
+        uses: docker://jakzal/phpqa:php7.3-alpine
+        with:
+            args: php-cs-fixer fix --diff --dry-run -vvv
+
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: PHPStan
+        uses: docker://jakzal/phpqa:php7.3-alpine
+        with:
+          args: phpstan analyze --no-progress

.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

@@ -1,9 +1,56 @@
 # Change Log
 
-The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
+The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
 ## 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
+
+- Update image used in github actions to fix CS errors #153
+- Fixed error when using variable in transChoice() #151
+
+### Added
+
+- Knp menu extractors #152
+
+## 2.0.1
+
+### Fixed
+
+- Avoid exception when calling `trans` with a variable.
+
+### Added
+
+- Added extractor for form field titles
+
+## 2.0.0
+
+- Add support of Symfony ^5.0
+- Add strict type hinting
+- Added `PHPFileExtractor::supportsExtension(): bool`
+- Removed `PHPFileExtractor::getType()`
+- Remove support of Twig 1.x (`Twig2Visitor` and `TwigVisitorFactory`)
+- Remove support of PHP < 7.2
+- Remove support of Symfony < 3.4
+
 ## 1.7.1
 
 ### Fixed
@@ -14,16 +61,16 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ### Added
 
-- Support for `@translate` annotation. 
+- Support for `@translate` annotation.
 - Better handle `@ignore` annotation on FormTypeChoices
 
 ## 1.6.0
 
 ### Added
 
-- Support for Symfony form help. 
+- Support for Symfony form help.
 
-### Fixed 
+### Fixed
 
 - Fixed issue where using the `@ignore` annotation ignored the wrong property.
 - Do not run the Twig worker if we are not extracting.
@@ -32,20 +79,20 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ### Fixed
 
-- Fixed Fatal Error in FormTypeImplicit when using method call from variable 
+- Fixed Fatal Error in FormTypeImplicit when using method call from variable
 
 ## 1.5.1
 
 ### Fixed
 
-- Fixed bug where form option key `attr` is not an array. 
+- Fixed bug where form option key `attr` is not an array.
 
 ## 1.5.0
 
 ### Added
 
 - Support for `nikic/php-parser:^4`
-- Support for `array_*` callback in `SourceLocation::createHere` 
+- Support for `array_*` callback in `SourceLocation::createHere`
 - Support for global 'translation_domain' in forms
 - Support for `@Ignore` annotation in $builder->add to prevent implicit label
 
@@ -67,7 +114,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 ### Fixed
 
 - Respect `"label" => false`
-- Form type extractors will only operate on form type classes.  
+- Form type extractors will only operate on form type classes.
 
 ## 1.3.1
 
@@ -94,7 +141,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ### Changed
 
-- Added TwigVisitorFactory to create a TwigVisitor. TwigVisitor::create has been deprecated. 
+- Added TwigVisitorFactory to create a TwigVisitor. TwigVisitor::create has been deprecated.
 
 ## 1.1.2
 
@@ -104,7 +151,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ### Added
 
-- More test to prove correctness. 
+- More test to prove correctness.
 
 ## 1.1.1
 
@@ -122,14 +169,14 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ### Deprecated
 
-- `Twig\TranslationBlock` and `Twig\TranslationFilter`. Use `Twig\Twig1Visitor` instead. 
+- `Twig\TranslationBlock` and `Twig\TranslationFilter`. Use `Twig\Twig1Visitor` instead.
 
 ## 1.0.0
 
 ## Added
 
 - Extractor for classes implementing `TranslationSourceLocationContainer`
-- Made classes final 
+- Made classes final
 
 ## 0.1.1
 
@@ -142,4 +189,3 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 Init release
 
-

.styleci.yml

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) PHP Translation team <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

.travis.yml

@@ -0,0 +1,13 @@
+.PHONY: cs-fix phpstan
+
+DIR := ${CURDIR}
+QA_IMAGE := jakzal/phpqa:php7.3-alpine
+
+cs-lint:
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --dry-run -vvv
+
+cs-fix:
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff -vvv
+
+phpstan:
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyse