prepared the 2.18.0 release

PHP-CS-Fixer · Jan 18, 2021 · cbc5b50 · cbc5b50
1 parent 93e0cd1
commit cbc5b50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ CHANGELOG for PHP CS Fixer
 
 This file contains changelogs for stable releases only.
 
+Changelog for v2.18.0
+---------------------
+
+* feature #4943 Add PSR12 ruleset (julienfalque, keradus)
+* feature #5426 Update Symfony ruleset (keradus)
+* feature #5428 Add/Change PHP.MigrationSet to update array/list syntax to short one (keradus)
+* minor #5441 Allow execution under PHP 8 (keradus)
+
 Changelog for v2.17.4
 ---------------------
 

diff --git a/composer.json b/composer.json
@@ -57,11 +57,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.18-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "PhpCsFixer\\": "src/"

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -34,8 +34,8 @@
  */
 final class Application extends BaseApplication
 {
-    const VERSION = '2.18.0-DEV';
-    const VERSION_CODENAME = '';
+    const VERSION = '2.18.0';
+    const VERSION_CODENAME = 'Remote Void';
 
     /**
      * @var ToolInfo