Merge branch 'php-cs-fixer-3'

Author: erickskrauch

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions:
+          - '7.4'
+          - '8.0'
+          - '8.1'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, mbstring
+          tools: cs2pr
+
+      - name: Get Composer's cache directory
+        id: composer-cache-path
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v3
+        id: composer-cache
+        with:
+          path: ${{ steps.composer-cache-path.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Normalize composer.json
+        if: matrix.php-versions == '8.1'
+        run: composer normalize --dry-run
+
+      - name: PHP-CS-Fixer
+        if: matrix.php-versions == '8.1'
+        run: vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
+
+      # https://github.com/marketplace/actions/setup-php-action#phpunit
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: PHPUnit
+        run: vendor/bin/phpunit

.gitignore

@@ -1,4 +1,5 @@
 vendor
 dist
-.php_cs
-.php_cs.cache
+.phpunit.result.cache
+.php-cs-fixer
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__);
+
+return Ely\CS\Config::create([
+    // Disable "parameters" and "match" to keep compatibility with PHP 7.4
+    'trailing_comma_in_multiline' => [
+        'elements' => ['arrays', 'arguments'],
+    ],
+])->setFinder($finder);

.php_cs.dist

@@ -12,11 +12,47 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `php_unit_mock_short_will_return` fixer.
 - `php_unit_dedicate_assert_internal_type` fixer.
 - `php_unit_no_expectation_annotation` fixer.
+- `modernize_strpos` fixer.
+- `no_multiple_statements_per_line` fixer.
+- `octal_notation` fixer.
+- `class_reference_name_casing` fixer.
+- `integer_literal_case` fixer.
+- `no_unset_cast` fixer.
+- `no_null_property_initialization` fixer.
+- `comment_to_phpdoc` fixer.
+- `multiline_comment_opening_closing` fixer.
+- `no_empty_comment` fixer.
+- `single_line_comment_spacing` fixer.
+- `single_line_comment_style` fixer.
+- `empty_loop_body` fixer.
+- `empty_loop_condition` fixer.
+- `switch_continue_to_break` fixer.
+- `yoda_style` fixer in non-yoda mode.
+- `function_typehint_space` fixer.
+- `lambda_not_used_import` fixer.
+- `no_unneeded_import_alias` fixer.
+- `combine_consecutive_unsets` fixer.
+- `declare_parentheses` fixer.
+- `clean_namespace` fixer.
+- `assign_null_coalescing_to_coalesce_equal` fixer.
+- `no_useless_nullsafe_operator` fixer.
+- `operator_linebreak` fixer.
+- `php_unit_fqcn_annotation` fixer.
+- `php_unit_test_case_static_method_calls` fixer.
+- `simplified_null_return` fixer.
+- `no_empty_statement` fixer.
+- `no_singleline_whitespace_before_semicolons` fixer.
+- `semicolon_after_instruction` fixer.
+- `types_spaces` fixer.
+- `no_trailing_comma_in_singleline` fixer.
 
 ### Changed
-- `friendsofphp/php-cs-fixer` version bumped to `^2.15.0`.
+- `friendsofphp/php-cs-fixer` version bumped to `^3`.
+- `braces` fixer now enables rule `allow_single_line_anonymous_class_with_empty_body`.
+- `class_attributes_separation` fixer now fixes `const` in the `only_if_meta` mode.
 
 ### Removed
+- `Ely/new_with_braces` since all its functionality is now included in the original fixer.
 - `self_accessor` fixer because it leads to errors in interfaces, that returns self.
 
 ## [0.3.0] - 2019-02-23

.travis.yml

@@ -246,27 +246,6 @@ and `do-while`.
  $c = 'next statement';
 ```
 
-### `Ely/new_with_braces`
-
-This is the extended version of the original `new_with_braces` fixer. It allows you to remove braces around
-an anonymous class declaration in a case when said class constructor doesn't contain any arguments.
-
-```diff
---- Original
-+++ New
-@@ @@
- <?php
--$a = new Foo;
-+$a = new Foo();
--$b = new class() extends Foo {};
-+$b = new class extends Foo {};
-```
-
-**Configuration:**
-
-* `remove_for_anonymous_classes` - if its set to `true`, then braces for anonymous classes without constructor
-  arguments will be removed. **Default**: `false`.
-
 ### `Ely/remove_class_name_method_usages` (Yii2)
 
 Replaces Yii2 [`BaseObject::className()`](https://github.com/yiisoft/yii2/blob/e53fc0ded1/framework/base/BaseObject.php#L84)
@@ -286,9 +265,9 @@ usages with native `::class` keyword, introduced in PHP 5.5.
 [ico-version]: https://img.shields.io/packagist/v/ely/php-code-style.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-Apache-green.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/packagist/dt/ely/php-code-style.svg?style=flat-square
-[ico-build-status]: https://img.shields.io/travis/elyby/php-code-style/master.svg?style=flat-square
+[ico-build-status]: https://img.shields.io/github/workflow/status/elyby/php-code-style/CI.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/ely/php-code-style
 [link-contributors]: ../../contributors
 [link-downloads]: https://packagist.org/packages/ely/php-code-style/stats
-[link-build-status]: https://travis-ci.org/elyby/php-code-style
+[link-build-status]: https://github.com/elyby/php-code-style/actions

CHANGELOG.md

@@ -1,8 +1,12 @@
 {
     "name": "ely/php-code-style",
     "description": "Set of PHP-CS-Fixer rules used in the development of Ely.by PHP projects",
-    "keywords": ["php-cs-fixer", "code style"],
-    "homepage": "https://github.com/elyby/php-code-style",
+    "license": "Apache-2.0",
+    "type": "library",
+    "keywords": [
+        "php-cs-fixer",
+        "code style"
+    ],
     "authors": [
         {
             "name": "Ely.by team",
@@ -13,14 +17,20 @@
             "email": "erickskrauch@ely.by"
         }
     ],
-    "license": "Apache-2.0",
-    "type": "library",
+    "homepage": "https://github.com/elyby/php-code-style",
     "require": {
-        "php": "^7.0|^8.0",
-        "friendsofphp/php-cs-fixer": "^2.15.0"
+        "php": "^7.4 || ^8.0",
+        "friendsofphp/php-cs-fixer": "^3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5.1"
+        "ergebnis/composer-normalize": "^2.28",
+        "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
+        "phpspec/prophecy": "^1.15",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.5",
+        "phpunitgoodpractices/polyfill": "^1.5",
+        "phpunitgoodpractices/traits": "^1.9.1",
+        "symfony/phpunit-bridge": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -29,12 +39,16 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Ely\\CS\\Test\\": "tests/"
+            "Ely\\CS\\Test\\": "tests/",
+            "PhpCsFixer\\Tests\\": "vendor/friendsofphp/php-cs-fixer/tests/"
         }
     },
     "config": {
-        "platform": {
-            "php": "7.0.8"
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        },
+        "preferred-install": {
+            "friendsofphp/php-cs-fixer": "source"
         }
     }
 }