vendor update and build/mgmt improvements

Author: craigh

.gitattributes

@@ -1,50 +1,52 @@
-        # .gitattributes snippet to force users to use same line endings for project.
-        #
-        # Handle line endings automatically for files detected as text
-        # and leave all files detected as binary untouched.
-        * text=auto
+# .gitattributes snippet to force users to use same line endings for project.
+#
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
 
-        #
-        # The above will handle all files NOT found below
-        # https://help.github.com/articles/dealing-with-line-endings/
-        # https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
+#
+# The above will handle all files NOT found below
+# https://help.github.com/articles/dealing-with-line-endings/
+# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
 
 
 
-        # These files are text and should be normalized (Convert crlf => lf)
-        *.php text
-        *.css text
-        *.js text
-        *.json text
-        *.htm text
-        *.html text
-        *.xml text
-        *.txt text
-        *.ini text
-        *.inc text
-        *.pl text
-        *.rb text
-        *.py text
-        *.scm text
-        *.sql text
+# These files are text and should be normalized (Convert crlf => lf)
+*.php text
+*.css text
+*.js text
+*.json text
+*.htm text
+*.html text
+*.xml text
+*.txt text
+*.ini text
+*.inc text
+*.pl text
+*.rb text
+*.py text
+*.scm text
+*.sql text
         .htaccess text
-        *.sh text
+*.sh text
 
-        # These files are binary and should be left untouched
-        # (binary is a macro for -text -diff)
-        *.png binary
-        *.jpg binary
-        *.jpeg binary
-        *.gif binary
-        *.ico binary
-        *.mov binary
-        *.mp4 binary
-        *.mp3 binary
-        *.flv binary
-        *.fla binary
-        *.swf binary
-        *.gz binary
-        *.zip binary
-        *.7z binary
-        *.ttf binary
-        *.pyc binary
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.pyc binary
+
+/composer.lock -merge

.travis.yml

@@ -27,7 +27,8 @@ before_install:
     # Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
     - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
 
-    - composer install -o --no-scripts
+    - composer validate --no-check-all --strict
+    - composer install -o --no-scripts --no-suggest
     - composer run-script post-autoload-dump
     - composer run-script post-install-cmd
 
@@ -109,5 +110,5 @@ script:
   # execute Symfony deprecation detector
   - git clone https://github.com/sensiolabs-de/deprecation-detector.git
   - cd deprecation-detector
-  - composer install
+  - composer install --no-suggest
   - ./bin/deprecation-detector check src vendor

CHANGELOG-3.0.md

@@ -276,7 +276,7 @@
   - twig/inky-extra installed in 3.0.1
   - twig/intl-extra installed in 3.0.1
   - twig/markdown-extra installed in 3.0.1
-  - twig/string-extra installed in 3.0.1
+  - twig/string-extra installed in 3.0.1 (currently 3.x-dev)
   - twig/twig updated from 1.42.4 to 3.0.1
   - webmozart/assert updated from 1.5.0 to 1.6.0
   - willdurand/js-translation-bundle updated from 2.6.6 to 3.0.0

composer.json

@@ -42,6 +42,10 @@
         ]
     },
     "config": {
+        "platform": {
+            "php": "7.2.5"
+        },
+        "sort-packages": true,
         "bin-dir": "bin",
         "component-dir": "public",
         "public-dir": "public",