Merge pull request #94 from localheinz/feature/composer-normalize

Enhancement: Run 'composer normalize'
ergebnis · Aug 6, 2018 · a0d6ff9 · a0d6ff9
2 parents cb4e19b + f218bfe
commit a0d6ff9
Show file tree

Hide file tree

Showing 4 changed files with 233 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,7 @@ jobs:
       php: 7.1
 
       before_install:
+        - composer self-update 1.6.5
         - source .travis/xdebug.sh
         - xdebug-disable
         - composer validate
@@ -36,13 +37,15 @@ jobs:
         - mkdir -p $HOME/.php-cs-fixer
 
       script:
+        - composer normalize --dry-run
         - vendor/bin/php-cs-fixer fix --config=.php_cs --diff --dry-run --verbose
 
     - stage: Stan
 
       php: 7.1
 
       before_install:
+        - composer self-update 1.6.5
         - source .travis/xdebug.sh
         - xdebug-disable
         - composer validate
@@ -63,6 +66,7 @@ jobs:
       env: WITH_LOWEST=true
 
       before_install:
+        - composer self-update 1.6.5
         - source .travis/xdebug.sh
         - xdebug-disable
         - composer validate
@@ -118,6 +122,7 @@ jobs:
       php: 7.2
 
       before_install:
+        - composer self-update 1.6.5
         - source .travis/xdebug.sh
         - xdebug-disable
         - composer validate

diff --git a/Makefile b/Makefile
@@ -19,6 +19,7 @@ test: vendor
 	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml
 
 vendor: composer.json composer.lock
-	composer self-update
+	composer self-update 1.6.5
 	composer validate
 	composer install
+	composer normalize
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
   },
   "require-dev": {
     "infection/infection": "~0.8.2",
+    "localheinz/composer-normalize": "~0.8.0",
     "localheinz/php-cs-fixer-config": "~1.14.0",
     "phpstan/phpstan": "~0.9.2",
     "phpstan/phpstan-phpunit": "~0.9.4",

diff --git a/composer.lock b/composer.lock