From f99aaa05a087e3b03c3b1d03267074ad04d2354d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= Date: Mon, 27 Nov 2017 13:58:16 +0100 Subject: [PATCH] Update php-cs-fixer configuration --- .php_cs | 32 ++++++++++++++++---------------- CHANGELOG.md | 1 + composer.json | 6 ++++++ src/ScriptSymlinker.php | 4 ++-- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.php_cs b/.php_cs index 3afc053..40c7324 100644 --- a/.php_cs +++ b/.php_cs @@ -9,22 +9,22 @@ For the full copyright and license information, please view the LICENSE file that was distributed with this source code. EOF; -Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header); - -return Symfony\CS\Config\Config::create() - ->setUsingCache(true) - // use default SYMFONY_LEVEL and extra fixers: - ->fixers(array( - '-psr0', - 'header_comment', - 'newline_after_open_tag', - 'ordered_use', - 'phpdoc_order', - 'strict', - 'strict_param', - )) - ->finder( - Symfony\CS\Finder\DefaultFinder::create() +return \PhpCsFixer\Config::create() + ->setRiskyAllowed(true) + ->setRules( + [ + '@Symfony' => true, + 'array_syntax' => array('syntax' => 'long'), + 'header_comment' => array('header' => $header), + 'ordered_imports' => true, + 'phpdoc_order' => true, + 'psr4' => true, + 'strict_comparison' => true, + 'strict_param' => true, + ] + ) + ->setFinder( + \PhpCsFixer\Finder::create() ->in(__DIR__.'/src') ) ; diff --git a/CHANGELOG.md b/CHANGELOG.md index 39fb328..ad00687 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Optimized symlink to package matching +- Update php-cs-fixer configuration ## [0.2.0] - 2016-05-27 diff --git a/composer.json b/composer.json index 2ffeeac..08d5119 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,17 @@ "require": { "composer/composer": "^1.0" }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2" + }, "autoload": { "psr-4": { "Ajgl\\Composer\\": "src/" } }, + "scripts": { + "fix-cs": "vendor/bin/php-cs-fixer fix" + }, "extra": { "branch-alias": { "dev-master": "0.3.x-dev" diff --git a/src/ScriptSymlinker.php b/src/ScriptSymlinker.php index 6a8e7c3..80093d2 100644 --- a/src/ScriptSymlinker.php +++ b/src/ScriptSymlinker.php @@ -28,9 +28,9 @@ public static function createSymlinks(Event $event) foreach ($symlinks as $packageName => $symlinkDefinitions) { $package = $event->getComposer()->getRepositoryManager()->getLocalRepository()->findPackage($packageName, '*'); - if ($package !== null) { + if (null !== $package) { $packageDir = $event->getComposer()->getInstallationManager()->getInstallPath($package); - + foreach ($symlinkDefinitions as $target => $link) { if ($fs->isAbsolutePath($target)) { throw new \InvalidArgumentException(