Merge pull request #29 from kubawerlos/composer-scripts

Use composer scripts

Author: kubawerlos

.travis.yml

@@ -16,15 +16,9 @@ before_install:
     - composer self-update --stable
     - composer global show hirak/prestissimo -q || composer global require hirak/prestissimo
 
-install:
-    - composer install
+install: composer install
 
-script:
-    - vendor/bin/phpcs --exclude=Generic.Files.LineLength --report-full --standard=PSR2 src tests
-    - vendor/bin/php-cs-fixer fix --config=tests/php-cs-fixer.config.php --diff --dry-run
-    - vendor/bin/types-checker src tests
-    - vendor/bin/psalm --config=tests/psalm.xml
-    - phpdbg -qrr vendor/bin/phpunit --configuration=tests
+script: composer check
 
 jobs:
     include:
@@ -45,15 +39,14 @@ jobs:
             stage: Test
             php: '7.2'
             install: composer require --dev php-coveralls/php-coveralls
-            script: phpdbg -qrr vendor/bin/phpunit --configuration=tests --coverage-clover=build/logs/clover.xml
+            script: composer phpunit -- --coverage-clover=build/logs/clover.xml
             after_success: vendor/bin/php-coveralls
 
         -
             stage: Verify correctness for PHP CS Fixer
             php: '7.2'
             install: ~
-            before_script:
-                - phpenv config-rm xdebug.ini || return 0
+            before_script: phpenv config-rm xdebug.ini || return 0
             script:
                 # prepare PHP CS Fixer
                 - composer create-project --no-interaction --prefer-source friendsofphp/php-cs-fixer tmp

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG for PHP CS Fixer: custom fixers
 
 ## [Unreleased]
+- Use composer scripts
 - Switch from Codecov to Coveralls
 - Add NoUselessDoctrineRepositoryCommentFixer
 

README.md

@@ -165,10 +165,6 @@ src/Readme/run > README.md
 ```
 make sure all checks pass:
 ```bash
-vendor/bin/phpcs --exclude=Generic.Files.LineLength --report-full --standard=PSR2 src tests
-vendor/bin/php-cs-fixer fix --config=tests/php-cs-fixer.config.php --diff --dry-run
-vendor/bin/types-checker src tests
-vendor/bin/psalm --config=tests/psalm.xml
-phpdbg -qrr vendor/bin/phpunit --configuration=tests
+composer check
 ```
 and submit a pull request.

composer.json

@@ -20,6 +20,7 @@
         "friendsofphp/php-cs-fixer": "^2.12"
     },
     "require-dev": {
+        "kubawerlos/composer-json-fixer": "^2.1",
         "kubawerlos/types-checker": "^1.1",
         "phpunit/phpunit": "^7.2",
         "sebastian/diff": "^3.0",
@@ -38,5 +39,21 @@
         "psr-4": {
             "Tests\\": "tests/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@analyse",
+            "@phpunit"
+        ],
+        "analyse": [
+            "vendor/bin/composer-json-fixer",
+            "vendor/bin/phpcs --exclude=Generic.Files.LineLength --report-full --standard=PSR2 src tests",
+            "vendor/bin/php-cs-fixer fix --config=tests/php-cs-fixer.config.php --diff --dry-run",
+            "vendor/bin/types-checker src tests",
+            "vendor/bin/psalm --config=tests/psalm.xml"
+        ],
+        "phpunit": [
+            "phpdbg -qrr vendor/bin/phpunit --configuration=tests/phpunit.xml"
+        ]
     }
 }

src/Readme/ReadmeCommand.php

@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Command\Command as BaseCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Yaml;
 
 class ReadmeCommand extends BaseCommand
 {
@@ -138,11 +137,6 @@ private function fixers() : string
         return $output;
     }
 
-    private function composer() : \stdClass
-    {
-        return \json_decode(\file_get_contents(__DIR__ . '/../../composer.json'));
-    }
-
     private function diff(string $from, string $to) : string
     {
         return \str_replace(
@@ -168,16 +162,15 @@ private function contributing() : string
 ```
 make sure all checks pass:
 ```bash
-%s
+composer check
 ```
 and submit a pull request.',
-            $this->composer()->name,
-            \implode("\n", $this->travisScripts())
+            $this->composer()->name
         );
     }
 
-    private function travisScripts() : array
+    private function composer() : \stdClass
     {
-        return Yaml::parse(\file_get_contents(__DIR__ . '/../../.travis.yml'))['script'];
+        return \json_decode(\file_get_contents(__DIR__ . '/../../composer.json'));
     }
 }