Merge branch 'master' into 2.0

composer.lock

@@ -451,16 +451,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "84715761c35808076b00908a20317a3a8a67d17e"
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/84715761c35808076b00908a20317a3a8a67d17e",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
-                "reference": "84715761c35808076b00908a20317a3a8a67d17e",
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
                 "shasum": ""
             },
             "require": {
@@ -489,9 +489,9 @@
             ],
             "description": "PHAR file format utilities, for when PHP phars you up",
             "keywords": [
-                "phra"
+                "phar"
             ],
-            "time": "2020-01-13T10:41:09+00:00"
+            "time": "2020-02-14T15:25:33+00:00"
         },
         {
             "name": "symfony/console",
@@ -935,10 +935,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/master"
-            },
             "time": "2015-06-14T21:17:01+00:00"
         },
         {
@@ -982,6 +978,12 @@
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
             "time": "2016-01-25T08:17:30+00:00"
         },
         {

src/Composer/Compiler.php

@@ -18,6 +18,7 @@ use Composer\CaBundle\CaBundle;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Process\Process;
 use Seld\PharUtils\Timestamps;
+use Seld\PharUtils\Linter;
 
 /**
  * The Compiler class compiles composer into a phar
@@ -163,6 +164,8 @@ class Compiler
         $util = new Timestamps($pharFile);
         $util->updateTimestamps($this->versionDate);
         $util->save($pharFile, \Phar::SHA1);
+
+        Linter::lint($pharFile);
     }
 
     /**

src/Composer/Repository/Vcs/GitHubDriver.php

@@ -204,7 +204,7 @@ class GitHubDriver extends VcsDriver
                 ),
                 'retry-auth-failure' => false,
             ));
-        } catch (\TransportException $e) {
+        } catch (TransportException $e) {
             return $this->fundingInfo = false;
         }
         $result = json_decode($result, true);