diff --git a/.gitignore b/.gitignore index 7579f74311d35aae05dd0f0a54537ea7a0034e89..b2987a3551cba33004736aabb6f57209bf4ae2af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -vendor -composer.lock +/vendor/ +/.env +/composer.lock diff --git a/Utils.php b/Utils.php index 845f68d9d833dda9ef87302d1bbf2351c75e2a88..89c48f9e56e786a5497fd406f479dfb819a1c8e2 100644 --- a/Utils.php +++ b/Utils.php @@ -4,6 +4,7 @@ namespace LakeDrops\Component\Composer; use Composer\Composer; use Composer\Json\JsonFile; +use Exception; /** * Manages composer.json files. @@ -94,7 +95,7 @@ final class Utils { try { $jsonFile->write($this->content); } - catch (\Exception $ex) { + catch (Exception $ex) { // Let's ignore this, if composer.json is read-only there is a general problem. } return $this; @@ -209,7 +210,7 @@ final class Utils { } } - if (\in_array($pattern, self::$ignoredGitPatterns, TRUE)) { + if (in_array($pattern, self::$ignoredGitPatterns, TRUE)) { return; } diff --git a/composer.json b/composer.json index 692b49ed54faf6374a7f1a41fde7552ef11824a6..679d45f7501d47005519700c180448e618dce522 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "ext-json": "*" }, "require-dev": { - "composer/composer": "^1.5.0", - "phpunit/phpunit": "^4.8.0" + "composer/composer": "^1||^2", + "phpunit/phpunit": "^8.4" }, "minimum-stability": "dev", "prefer-stable": true,