Merge pull request #29 from pmsipilot/update-deps

chore: Update dependencies
pmsipilot · Jan 20, 2018 · aa9cff3 · aa9cff3
2 parents 27758c0 + f6f67be
commit aa9cff3
Show file tree

Hide file tree

Showing 7 changed files with 653 additions and 165 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ bin/
 !bin/dcv
 !bin/entrypoint.sh
 .cache/
+.php_cs.cache
diff --git a/.php_cs b/.php_cs
@@ -1,12 +1,15 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->exclude('somedir')
+use PhpCsFixer as CS;
+
+$finder = CS\Finder::create()
     ->in(__DIR__.DIRECTORY_SEPARATOR.'src')
     ->in(__DIR__.DIRECTORY_SEPARATOR.'spec')
 ;
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->finder($finder)
+return CS\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+    ])
+    ->setFinder($finder)
 ;
diff --git a/.travis.yml b/.travis.yml
@@ -8,12 +8,14 @@ services:
 php:
     - 7.0
     - 7.1
+    - 7.2
     - nightly
 
 env:
     matrix:
         - COMPOSERFLAGS=
         - COMPOSERFLAGS=--prefer-lowest
+        - COMPOSERFLAGS=--prefer-stable
 
     global:
         # DOCKER_EMAIL
@@ -29,6 +31,8 @@ matrix:
           env: COMPOSERFLAGS=
         - php: 7.1
           env: COMPOSERFLAGS=--prefer-lowest
+        - php: 7.2
+          env: COMPOSERFLAGS=--prefer-lowest
         - php: nightly
           env: COMPOSERFLAGS=--prefer-lowest
     allow_failures:

diff --git a/composer.json b/composer.json
@@ -2,14 +2,15 @@
     "name": "pmsipilot/docker-compose-viz",
     "description": "Docker compose graph visualization",
     "require": {
-        "symfony/yaml": "^3.1 || ^4@dev",
+        "php": "^7",
+        "symfony/yaml": "^3.1 || ^4",
         "symfony/console": "^3.1",
         "clue/graph": "^0.9",
         "graphp/graphviz": "^0.2"
     },
     "require-dev": {
         "crysalead/kahlan": "^2.5.4",
-        "friendsofphp/php-cs-fixer": "^1.11"
+        "friendsofphp/php-cs-fixer": "^2"
     },
     "license": "MIT",
     "authors": [